[Power] Add extra display page showing power consumption

src/display.cpp

@@ -53,6 +53,21 @@ BB_SPI_LCD *dp = NULL;
 #endif
 #endif
 
+
+#define DISPLAY_PAGE_PAX_PARAM_OVERVIEW 0
+#define DISPLAY_PAGE_PAX_LORAWAN_PARAM  1
+#define DISPLAY_PAGE_PAX_GPS_LAT_LONG   2
+#define DISPLAY_PAGE_BME280_680_VALUES  3
+#define DISPLAY_PAGE_TIME_OF_DAY        4
+#define DISPLAY_PAGE_POWER_OVERVIEW     5
+#define DISPLAY_PAGE_PAX_GRAPH          6
+#define DISPLAY_PAGE_BLANK_SCREEN       7
+
+
+
+
+
+
 void dp_setup(int contrast) {
 #if (HAS_DISPLAY) == 1 // I2C OLED
 
@@ -181,10 +196,11 @@ void dp_refresh(bool nextPage) {
     // page 3: BME280/680 values
     // page 4: timeofday
     // page 5: pax graph
-    // page 6: blank screen
+    // page 6: power overview
+    // page 7: blank screen
 
     // ---------- page 0: parameters overview ----------
-  case 0:
+  case DISPLAY_PAGE_PAX_PARAM_OVERVIEW:
 
     // show pax
     libpax_counter_count(&count);
@@ -260,7 +276,7 @@ void dp_refresh(bool nextPage) {
     break;
 
   // ---------- page 1: lorawan parameters ----------
-  case 1:
+  case DISPLAY_PAGE_PAX_LORAWAN_PARAM:
 
 #if (HAS_LORA)
 
@@ -293,7 +309,7 @@ void dp_refresh(bool nextPage) {
 #endif // HAS_LORA
 
   // ---------- page 2: GPS ----------
-  case 2:
+  case DISPLAY_PAGE_PAX_GPS_LAT_LONG:
 
 #if (HAS_GPS)
 
@@ -323,7 +339,7 @@ void dp_refresh(bool nextPage) {
 #endif
 
   // ---------- page 3: BME280/680 ----------
-  case 3:
+  case DISPLAY_PAGE_BME280_680_VALUES:
 
 #if (HAS_BME)
     dp_setFont(MY_FONT_STRETCHED);
@@ -335,14 +351,13 @@ void dp_refresh(bool nextPage) {
     dp->printf("IAQ %-6.0f", bme_status.iaq);
 #endif
     dp_dump();
-    break;
 #else  // skip this page
     DisplayPage++;
-    break;
 #endif // HAS_BME
+    break;
 
   // ---------- page 4: time ----------
-  case 4:
+  case DISPLAY_PAGE_TIME_OF_DAY:
 
     time(&now);
     localtime_r(&now, &timeinfo);
@@ -359,16 +374,125 @@ void dp_refresh(bool nextPage) {
     dp_dump();
     break;
 
-  // ---------- page 5: pax graph ----------
-  case 5:
+  // ---------- page 5: power overview ----------
+  case DISPLAY_PAGE_POWER_OVERVIEW:
+  {
+#if defined(HAS_PMU) || defined(HAS_IP5306)
+
+    dp_setFont(MY_FONT_STRETCHED); // 12x16px = 10 chars / line @ 4 lines
+
+  #ifdef HAS_PMU
+
+    if (pmu.isBatteryConnect()) {
+      const float volt = static_cast<float>(pmu.getBattVoltage()) / 1000.0f;
+      const bool charging = pmu.isCharging();
+      const float current_mA = charging 
+          ? pmu.getBatteryChargeCurrent()
+          : pmu.getBattDischargeCurrent();
+
+      const float power_mw = volt * current_mA;
+
+      dp->printf("Bat %5.3fV\r\n",
+                 volt);
+
+      if (pmu.isVbusIn()) {
+        dp_setFont(MY_FONT_NORMAL); // 8x8px = 16 chars / line @ 8 lines
+
+        // When charging, no use of showing battery level
+        dp->printf("%4.0fmA @ %4.0fmW \r\n%16s\r\n%16s\r\n", 
+            current_mA,
+            power_mw,
+            charging ? "    charging    " : "      full      ",
+            "");
+      } else {
+        // We have a few extra lines
+        dp_setFont(MY_FONT_STRETCHED); // 12x16px = 10 chars / line @ 4 lines
+
+        dp->printf("%8.0fmA \r\n%8.0fmW \r\n", 
+            current_mA,
+            power_mw);
+
+        dp_setFont(MY_FONT_NORMAL); // 8x8px = 16 chars / line @ 8 lines
+
+        if (!charging) {
+          // Not charging with current_mA of 0mA is possible when the battery is nearly full
+          // Make sure we're not showing "-0mA" when USB connected but not charging.
+          dp->printf("%16s\r\n%3u%%%12s\r\n",
+              "",
+              pmu.getBatteryPercent(),
+              (current_mA > 1.0f) ? "discharging" : "full");
+        }
+      }
+    } else {
+      dp->printf("%-10s\r\n%-10s\r\n", "", "No Battery");
+    }
+
+    // Do some averaging to make the displayed values less flipping around
+    static float filtered_m_volt = -1.0f;
+    static float filtered_m_amp  = -1.0f;
+    static float filtered_m_watt = -1.0f;
+    if (pmu.isVbusIn())
+    {
+      if (filtered_m_volt < 0.0f)
+        filtered_m_volt = pmu.getVbusVoltage();
+      if (filtered_m_amp < 0.0f)
+        filtered_m_amp = pmu.getVbusCurrent();
+      if (filtered_m_watt < 0.0f)  
+        filtered_m_watt = filtered_m_volt * filtered_m_amp / 1000.0f;
+      const float m_volt = pmu.getVbusVoltage();
+      const float m_amp  = pmu.getVbusCurrent();
+      filtered_m_volt = (3 * filtered_m_volt + m_volt) / 4;
+      filtered_m_amp  = (3 * filtered_m_amp + m_amp) / 4;
+      const float m_watt = (filtered_m_volt * filtered_m_amp) / 1000.0f;
+      filtered_m_watt = (7 * filtered_m_watt + m_watt) / 8;
+
+      dp_setFont(MY_FONT_STRETCHED); // 12x16px = 10 chars / line @ 4 lines
+
+      dp->printf("USB %5.3fV \r\n",
+              filtered_m_volt / 1000.0f);
+
+      dp_setFont(MY_FONT_NORMAL); // 8x8px = 16 chars / line @ 8 lines
+      dp->printf("%4.0fmA @ %4.0fmW \r\n",
+              filtered_m_amp,
+              filtered_m_watt);
+    } else {
+      // Filtering adds some delayed response, so make sure to 
+      // force a full refresh when USB is reconnected
+      filtered_m_volt = -1.0f;
+      filtered_m_amp  = -1.0f;
+      filtered_m_watt = -1.0f;
+      dp_setFont(MY_FONT_STRETCHED); // 12x16px = 10 chars / line @ 4 lines
+      dp->printf("%11s\r\n%11s\r\n", "", "");
+    }
+
+  #else
+
+    bool usb = IP5306_GetPowerSource();
+    bool full = IP5306_GetBatteryFull();
+    uint8_t level = IP5306_GetBatteryLevel();
+    dp->printf("%-10s\r\n%-10s\r\nLvl: %3u%%\r\n",
+            usb ? "USB" : "BATTERY", // Power source
+            full ? "CHARGED" : (usb ? "CHARGING" : "DISCHARGE"), // State
+            level); // Battery level
+
+  #endif
+    dp_dump();
+#else  // skip this page
+    DisplayPage++;
+#endif // HAS_PMU
+    break;
+  }
+
+  // ---------- page 6: pax graph ----------
+  case DISPLAY_PAGE_PAX_GRAPH:
 
     // update and show histogram
     dp_plotCurve(count.pax, false);
     dp_dump(plotbuf);
     break;
 
-  // ---------- page 6: blank screen ----------
-  case 6:
+  // ---------- page 7: blank screen ----------
+  case DISPLAY_PAGE_BLANK_SCREEN:
 
 #ifdef HAS_BUTTON
     dp_clear();

src/main.cpp

@@ -84,6 +84,9 @@ char clientId[20] = {0}; // unique ClientID
 void setup() {
   char features[100] = "";
 
+  // Reduce power consumption
+  setCpuFrequencyMhz(80);
+
   // disable brownout detection
 #ifdef DISABLE_BROWNOUT
   // register with brownout is at address DR_REG_RTCCNTL_BASE + 0xd4
@@ -146,6 +149,8 @@ void setup() {
              ESP.getFlashChipSpeed());
     ESP_LOGI(TAG, "Wifi/BT software coexist version %s",
              esp_coex_version_get());
+    ESP_LOGI(TAG, "Wifi STA MAC: %s",
+             WiFi.macAddress().c_str());
 
 #if (HAS_LORA)
     ESP_LOGI(TAG, "IBM LMIC version %d.%d.%d", LMIC_VERSION_MAJOR,