Merge branch 'dl9rdz:devel' into devel

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

Wyświetl plik

@ -3751,7 +3751,7 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
// Only send pressure if provided
if (!isnan(s->d.pressure)) {
sprintf(w, "\"pressure\": %.1f,", s->d.pressure);
sprintf(w, "\"pressure\": %.2f,", s->d.pressure);
w += strlen(w);
}

Wyświetl plik

@ -69,7 +69,7 @@ var cfgs = [
[ "sondehub.fiactive", "SondeHub frequency import active (0=disabled, 1=active)" ],
[ "sondehub.fiinterval", "Import frequency (minutes, ≥ 5)" ],
[ "sondehub.fimaxdist", "Import maximum distance (km, ≤ 500)" ],
[ "sondehub.fimaxage", "Import maximum age (hours, ≤ 24)" ],
[ "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)"],
[ "oled_sda", "OLED SDA/TFT SDA"],

Wyświetl plik

@ -273,6 +273,7 @@ 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.fimaxage>48) config.sondehub.fimaxage = 48;
if(config.sondehub.fimaxdist==0) config.sondehub.fimaxdist = 150;
if(config.sondehub.fimaxage==0) config.sondehub.fimaxage = 2;
}