From 293415fa50cda10e8659830a87aa5652be2b0f7b Mon Sep 17 00:00:00 2001 From: dakkar Date: Sun, 27 Mar 2022 12:10:31 +0100 Subject: battery voltage, move display around --- main.ino | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) (limited to 'main.ino') diff --git a/main.ino b/main.ino index bde8892..ce9f981 100644 --- a/main.ino +++ b/main.ino @@ -12,12 +12,16 @@ #include #include +#include "battery.h" + GxIO_Class io(SPI, EPD_CS, EPD_DC, EPD_RSET); GxEPD_Class display(io, EPD_RSET, EPD_BUSY); SPIClass SDSPI(VSPI); // for sdcard SensirionI2CScd4x scd4x; +Battery batt; + uint16_t co2 = 0; float temperature = 0.0f; float humidity = 0.0f; @@ -25,24 +29,29 @@ struct sps30_measurement m; void showThings(bool all=false) { display.fillScreen(GxEPD_WHITE); - display.setCursor(0,20); - display.print("Co2:"); - display.println(co2); - display.print("T:"); - display.print(temperature); - display.print(" H:"); - display.println(humidity); - - display.print("PM 1:"); - display.print(m.mc_1p0); - display.print(" PM 2.5:"); - display.println(m.mc_2p5); - - display.print("PM 4:"); - display.print(m.mc_4p0); - display.print(" PM 10:"); - display.println(m.mc_10p0); + display.setCursor(0,20); + display.print("Co2 "); + display.print(co2); + + display.setCursor(100,20); + display.print("t"); + display.print(temperature,1); + + display.setCursor(150,20); + display.print(" h"); + display.print(humidity,0); + display.print("%"); + + display.setCursor(0,45); + display.println(" PM"); + display.print(" 1.0 "); display.println(m.mc_1p0,1); + display.print(" 2.5 "); display.println(m.mc_2p5,1); + display.print(" 4.0 "); display.println(m.mc_4p0,1); + display.print("10.0 "); display.println(m.mc_10p0,1); + + display.setCursor(100,45); + display.print("Batt "); display.print(batt.voltage()); // "partial" update display.updateWindow(0, 0, GxEPD_WIDTH, GxEPD_HEIGHT, false); -- cgit v1.2.3