nicer display

1 files changed, 10 insertions, 8 deletions

diff --git a/display.h b/display.h
index fdab3f3..40e9bce 100644
--- a/display.h
+++ b/display.h
@@ -34,27 +34,29 @@ public:
   void show(const SensorData *data) {
     display.fillScreen(GxEPD_WHITE);
 
-    display.setCursor(0,20);
+    display.setCursor(0,10);
     display.print("Co2 ");
     display.print(data->co2);
 
-    display.setCursor(100,20);
+    display.setCursor(100,10);
     display.print("t");
     display.print(data->temperature,1);
 
-    display.setCursor(150,20);
+    display.setCursor(160,10);
     display.print(" h");
     display.print(data->humidity,0);
     display.print("%");
 
-    display.setCursor(0,45);
+    display.setCursor(0,30);
     display.println("   PM");
+    // PM measurements include particles "up to" that size, but we
+    // want to display the values for *that* size
     display.print(" 1.0 "); display.println(data->pm.mc_1p0,1);
-    display.print(" 2.5 "); display.println(data->pm.mc_2p5,1);
-    display.print(" 4.0 "); display.println(data->pm.mc_4p0,1);
-    display.print("10.0 "); display.println(data->pm.mc_10p0,1);
+    display.print(" 2.5 "); display.println(data->pm.mc_2p5 - data->pm.mc_1p0,1);
+    display.print(" 4.0 "); display.println(data->pm.mc_4p0 - data->pm.mc_2p5,1);
+    display.print("10.0 "); display.println(data->pm.mc_10p0 - data->pm.mc_4p0,1);
 
-    display.setCursor(100,45);
+    display.setCursor(120,30);
     display.print("Batt "); display.print(data->batteryVoltage);
 
     // "partial" update