ua1zbe
/
rdz_ttgo_sonde
mirror of https://github.com/oh3bsg/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'eben80-patch-1' into devel

This commit is contained in:
Hansi, dl9rdz 2021-09-24 16:47:43 +02:00
parent 320d621cbc aba060d2e0
commit a39479dda7
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -26,7 +26,7 @@ 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: | :heavy_check_mark: 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: | :heavy_checkmark: | :x: | Not Sent
Meteomodem | M20 | :heavy_check_mark: | :x: | :x: | Not Sent Meteomodem | M20 | :heavy_check_mark: | :x: | :x: | Not Sent
Meteo-Radiy | MP3-H1 (MRZ-H1) | :heavy_check_mark: | :x: | :x: | :x: Meteo-Radiy | MP3-H1 (MRZ-H1) | :heavy_check_mark: | :x: | :x: | :x:

29
RX_FSK/src/Display.cpp
View File

@ -809,6 +809,10 @@ void Display::parseDispElement(char *text, DispEntry *de)
de->extra = strdup(text+1); de->extra = strdup(text+1);
//Serial.printf("parsing 'f' entry: extra is '%s'\n", de->extra); //Serial.printf("parsing 'f' entry: extra is '%s'\n", de->extra);
break; break;
case 'm':
de->func = disp.drawTelemetry;
de->extra = strdup(text+1);
break;
case 'n': case 'n':
// IP address / small always uses tiny font on TFT for backward compatibility // IP address / small always uses tiny font on TFT for backward compatibility
// Large font can be used arbitrarily // Large font can be used arbitrarily
@ -1283,6 +1287,31 @@ void Display::drawSite(DispEntry *de) {
drawString(de, buf); drawString(de, buf);
} }
void Display::drawTelemetry(DispEntry *de) { 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) { void Display::drawKilltimer(DispEntry *de) {