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 'eben80-patch-1' into devel

pull/193/head
Hansi, dl9rdz 2021-09-24 16:47:43 +02:00
rodzic 320d621cbc aba060d2e0
commit a39479dda7
2 zmienionych plików z 30 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
README.md
Wyświetl plik

@ -26,7 +26,7 @@ Manufacturer | Model | Position | Temperature | Humidity | Pressure
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: | :heavy_check_mark:
Graw | DFM06/09/17 | :heavy_check_mark: | :x: | :x: | :x:
Meteomodem | M10 | :heavy_check_mark: | :x: | :x: | Not Sent
Meteomodem | M10 | :heavy_check_mark: | :heavy_checkmark: | :x: | Not Sent
Meteomodem | M20 | :heavy_check_mark: | :x: | :x: | Not Sent
Meteo-Radiy | MP3-H1 (MRZ-H1) | :heavy_check_mark: | :x: | :x: | :x:

29
RX_FSK/src/Display.cpp
Wyświetl plik

@ -809,6 +809,10 @@ void Display::parseDispElement(char *text, DispEntry *de)
de->extra = strdup(text+1);
//Serial.printf("parsing 'f' entry: extra is '%s'\n", de->extra);
break;
case 'm':
de->func = disp.drawTelemetry;
de->extra = strdup(text+1);
break;
case 'n':
// IP address / small always uses tiny font on TFT for backward compatibility
// Large font can be used arbitrarily
@ -1283,6 +1287,31 @@ void Display::drawSite(DispEntry *de) {
drawString(de, buf);
}
void Display::drawTelemetry(DispEntry *de) {
rdis->setFont(de->fmt);
float value=0;
switch(de->extra[0]) {
case 't':
value = sonde.si()->d.temperature;
if(value!=0xffff) snprintf(buf, 8, "%3.2f", value);
else strcpy(buf, " ");
break;
case 'p':
value = sonde.si()->d.pressure;
if(value!=0xffff) snprintf(buf, 7, "%4.2f", value);
else strcpy(buf, " ");
break;
case 'h':
value = sonde.si()->d.relativeHumidity;
if(value!=0xffff) snprintf(buf, 5, "%3.1f", value);
else strcpy(buf, " ");
break;
case 'b':
value = sonde.si()->d.batteryVoltage;
if(value!=0xffff) snprintf(buf, 5, "%1.2f", value);
else strcpy(buf, " ");
break;
}
drawString(de,buf);
}
void Display::drawKilltimer(DispEntry *de) {