mirror
/
rdz_ttgo_sonde
kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'dl9rdz:devel' into devel

pull/212/head
eben80 2021-09-23 14:12:03 +02:00 zatwierdzone przez GitHub
rodzic 910220775a c64651f36b
commit 006ee09f27
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
README.md
Wyświetl plik

@ -24,7 +24,7 @@ for details on supported boards, and additional setup instructions.
Manufacturer | Model | Position | Temperature | Humidity | Pressure Manufacturer | Model | Position | Temperature | Humidity | Pressure
-------------|-------|----------|-------------|----------|---------- -------------|-------|----------|-------------|----------|----------
Vaisala | RS92-SGP/NGP | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: Vaisala | RS92-SGP/NGP | :heavy_check_mark: | :heavy_check_mark: | :x: | :x:
Vaisala | RS41-SG/SGP/SGM | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: Vaisala | RS41-SG/SGP/SGM | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
Graw | DFM06/09/17 | :heavy_check_mark: | :x: | :x: | :x: Graw | DFM06/09/17 | :heavy_check_mark: | :x: | :x: | :x:
Meteomodem | M10 | :heavy_check_mark: | :x: | :x: | Not Sent Meteomodem | M10 | :heavy_check_mark: | :x: | :x: | Not Sent
Meteomodem | M20 | :heavy_check_mark: | :x: | :x: | Not Sent Meteomodem | M20 | :heavy_check_mark: | :x: | :x: | Not Sent

2
RX_FSK/RX_FSK.ino
Wyświetl plik

@ -3578,7 +3578,7 @@ void sondehub_reply_handler(WiFiClient * client) {
// also handle periodic station updates here... // also handle periodic station updates here...
// interval check moved to sondehub_station_update to avoid having to calculate distance in auto mode twice // interval check moved to sondehub_station_update to avoid having to calculate distance in auto mode twice
if (shState == SH_CONN_IDLE) { if (shState == SH_CONN_IDLE || shState == SH_DISCONNECTED ) {
// (do not set station update while a telemetry report is being sent // (do not set station update while a telemetry report is being sent
sondehub_station_update(&shclient, &sonde.config.sondehub); sondehub_station_update(&shclient, &sonde.config.sondehub);
} }

1
RX_FSK/src/ShFreqImport.cpp
Wyświetl plik

@ -90,6 +90,7 @@ void ShFreqImport::populate(char *id, float lat, float lon, float freq, const ch
return; return;
} // no more free slots } // no more free slots
sonde.clearAllData(&sonde.sondeList[ppos]);
sonde.sondeList[ppos].active = 1; sonde.sondeList[ppos].active = 1;
sonde.sondeList[ppos].freq = freq; sonde.sondeList[ppos].freq = freq;
sonde.sondeList[ppos].type = (SondeType)stype; sonde.sondeList[ppos].type = (SondeType)stype;

2
RX_FSK/src/Sonde.cpp
Wyświetl plik

@ -676,7 +676,7 @@ void Sonde::clearAllData(SondeInfo *si) {
memset(&(si->d), 0, sizeof(SondeData)); memset(&(si->d), 0, sizeof(SondeData));
// set floats to NaN // set floats to NaN
si->d.lat = si->d.lon = si->d.alt = si->d.vs = si->d.hs = si->d.dir = NAN; si->d.lat = si->d.lon = si->d.alt = si->d.vs = si->d.hs = si->d.dir = NAN;
si->d.temperature = si->d.tempRHSensor = si->d.relativeHumidity = si->d.batteryVoltage = NAN; si->d.temperature = si->d.tempRHSensor = si->d.relativeHumidity = si->d.pressure = si->d.batteryVoltage = NAN;
} }
void Sonde::updateDisplayPos() { void Sonde::updateDisplayPos() {