X-dark/esp32-env-monitor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

split metrics reading and printing

Browse source
This commit is contained in:
Cedric Girard 2020-05-11 17:11:07 +02:00
parent 7b02bdc17f
commit 562a2a9fe2
Signed by: X-dark
GPG key ID: E7D0E125DB9519E4
1 changed files with 59 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
esp32-env-monitor.ino
View file

@ -22,6 +22,7 @@ WebServer server(80);
Preferences preferences; Preferences preferences;
Ticker metricsReader; Ticker metricsReader;
Ticker metricsPrinter;
Ticker baselineReader; Ticker baselineReader;
U8G2_SSD1327_WS_128X128_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 17, /* dc=*/ 3, /* reset=*/ 16); U8G2_SSD1327_WS_128X128_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 17, /* dc=*/ 3, /* reset=*/ 16);
@ -77,10 +78,9 @@ float temp(NAN), hum(NAN), pres(NAN);
uint16_t TVOC_base, eCO2_base; uint16_t TVOC_base, eCO2_base;
bool baseline_set = false; bool baseline_set = false;
void readMetrics() { uint8_t last_printed = 0;
//Clear screen void readMetrics() {
u8g2log.print("\f");
//Read Temperature, humidity and pressure //Read Temperature, humidity and pressure
bme.read(pres, temp, hum, tempUnit, presUnit); bme.read(pres, temp, hum, tempUnit, presUnit);
@ -93,22 +93,60 @@ void readMetrics() {
return; return;
} }
}
void printMetrics() {
//Clear screen
u8g2log.print("\f\n");
//Print a different metrics each time
switch (last_printed) {
case 0:
u8g2log.print("Temp: "); u8g2log.print("Temp: ");
u8g2log.print(temp); u8g2log.print(temp);
u8g2log.print("°"+ String(tempUnit == BME280::TempUnit_Celsius ? 'C' :'F')); u8g2log.print("°C\n");
u8g2log.print("\nHum: "); last_printed++;
break;
case 1:
u8g2log.print("Hum: ");
u8g2log.print(hum); u8g2log.print(hum);
u8g2log.print("% RH"); u8g2log.print("% RH\n");
u8g2log.print("\nPres: "); last_printed++;
break;
case 2:
u8g2log.print("Pres: ");
u8g2log.print(pres); u8g2log.print(pres);
u8g2log.print("hPa\n"); u8g2log.print("hPa\n");
last_printed++;
break;
case 3:
u8g2log.print("TVOC "); u8g2log.print("TVOC ");
u8g2log.print(sgp.TVOC); u8g2log.print(sgp.TVOC);
u8g2log.print(" ppb\n"); u8g2log.print(" ppb\n");
last_printed++;
break;
case 4:
u8g2log.print("eCO2 "); u8g2log.print("eCO2 ");
u8g2log.print(sgp.eCO2); u8g2log.print(sgp.eCO2);
u8g2log.print(" ppm\n"); u8g2log.print(" ppm\n");
last_printed = 0;
break;
default:
u8g2log.print("invalid last_printed value\n");
last_printed = 0;
break;
}
} }
@ -290,6 +328,9 @@ void setup() {
//and then read Metrics every minutes //and then read Metrics every minutes
metricsReader.attach(60, readMetrics); metricsReader.attach(60, readMetrics);
//print metrics every 15 seconds
metricsPrinter.attach(15, printMetrics);
//First baseline reading after 12 hours //First baseline reading after 12 hours
baselineReader.once(3600 * 12, readBaseline); baselineReader.once(3600 * 12, readBaseline);