From 5be57a02b5d784de943bf6ef3eeff0bb2982136b Mon Sep 17 00:00:00 2001 From: eben80 Date: Fri, 24 Sep 2021 14:55:53 +0200 Subject: [PATCH 1/2] Make telemetry values available on device display This is probably not the cleanest coding so apologies in advance. Tested on TTGO. --- RX_FSK/src/Display.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/RX_FSK/src/Display.cpp b/RX_FSK/src/Display.cpp index 3fa56ce..0272678 100644 --- a/RX_FSK/src/Display.cpp +++ b/RX_FSK/src/Display.cpp @@ -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) { From 93628c9d4faac60205c0969dc57a95a1c30ee43c Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Fri, 24 Sep 2021 16:47:27 +0200 Subject: [PATCH 2/2] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 022c404..3f209e5 100644 --- a/README.md +++ b/README.md @@ -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: