Merge branch 'dl9rdz:devel' into devel

pull/212/head
eben80 2021-10-01 09:40:59 +02:00 zatwierdzone przez GitHub
commit ba4d0c40fb
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -4,7 +4,7 @@ rdzTTGOsonde
This a decoder for radiosonde RS41, RS92, DFM06/09/17, M10/M20, and MP3H
based on a TTGO LoRa ESP32 board.
It supports OLED displays (SSD1306, SH1106) and TFT displays (ILI9225).
It supports OLED displays (SSD1306, SH1106) and TFT displays (ILI9225, ILI9341/9342).
It also supports feeding data to external applications using WiFi (NOT bluetooth):
- Arduino app by dl9rdz (see https://github.com/dl9rdz/rdzwx-go for apk download)

Wyświetl plik

@ -68,7 +68,7 @@ var cfgs = [
[ "", "SondeHub frequency import", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/SondeHub-import" ],
[ "sondehub.fiactive", "SondeHub frequency import active (0=disabled, 1=active)" ],
[ "sondehub.fiinterval", "Import frequency (minutes, ≥ 5)" ],
[ "sondehub.fimaxdist", "Import maximum distance (km, ≤ 500)" ],
[ "sondehub.fimaxdist", "Import maximum distance (km, ≤ 700)" ],
[ "sondehub.fimaxage", "Import maximum age (hours, ≤ 48)" ],
[ "", "Hardware configuration (requires reboot)", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/Hardware-configuration"],
[ "disptype", "Display type (0=OLED/SSD1306, 1=ILI9225, 2=OLED/SH1106, 3=ILI9341, 4=ILI9342)"],

Wyświetl plik

@ -272,7 +272,7 @@ extern const int N_CONFIG;
void Sonde::checkConfig() {
if(config.maxsonde > MAXSONDE) config.maxsonde = MAXSONDE;
if(config.sondehub.fiinterval<5) config.sondehub.fiinterval = 5;
if(config.sondehub.fimaxdist>500) config.sondehub.fimaxdist = 500;
if(config.sondehub.fimaxdist>700) config.sondehub.fimaxdist = 700;
if(config.sondehub.fimaxage>48) config.sondehub.fimaxage = 48;
if(config.sondehub.fimaxdist==0) config.sondehub.fimaxdist = 150;
if(config.sondehub.fimaxage==0) config.sondehub.fimaxage = 2;