Merge remote-tracking branch 'upstream/master' into sh1106-support

src/main.cpp

@@ -37,8 +37,8 @@
 #include "main.h"
 #include "screen.h"
 #include "sleep.h"
-#include <Wire.h>
 #include <OneButton.h>
+#include <Wire.h>
 // #include <driver/rtc_io.h>
 
 #ifndef NO_ESP32
@@ -134,15 +134,17 @@ Periodic ledPeriodic(ledBlinker);
 
 // Prepare for button presses
 #ifdef BUTTON_PIN
-    OneButton userButton;
+OneButton userButton;
 #endif
 #ifdef BUTTON_PIN_ALT
-    OneButton userButtonAlt;
+OneButton userButtonAlt;
 #endif
-void userButtonPressed() {
+void userButtonPressed()
+{
     powerFSM.trigger(EVENT_PRESS);
 }
-void userButtonPressedLong(){
+void userButtonPressedLong()
+{
     screen.adjustBrightness();
 }
 
@@ -229,6 +231,10 @@ void setup()
         ssd1306_found = false; // forget we even have the hardware
 
     esp32Setup();
+#endif
+
+#ifdef TBEAM_V10
+    // Currently only the tbeam has a PMU
     power = new Power();
     power->setup();
     power->setStatusHandler(powerStatus);
@@ -306,7 +312,6 @@ void setup()
     // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
     PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS
 
-
     // setBluetoothEnable(false); we now don't start bluetooth until we enter the proper state
     setCPUFast(false); // 80MHz is fine for our slow peripherals
 }
@@ -352,6 +357,8 @@ void loop()
 
 #ifndef NO_ESP32
     esp32Loop();
+#endif
+#ifdef TBEAM_V10
     power->loop();
 #endif
 
@@ -379,7 +386,7 @@ void loop()
 
     // Update the screen last, after we've figured out what to show.
     screen.debug()->setChannelNameStatus(channelSettings.name);
-    //screen.debug()->setPowerStatus(powerStatus);
+    // screen.debug()->setPowerStatus(powerStatus);
 
     // No GPS lock yet, let the OS put the main CPU in low power mode for 100ms (or until another interrupt comes in)
     // i.e. don't just keep spinning in loop as fast as we can.

src/screen.cpp

@@ -52,8 +52,13 @@ static FrameCallback normalFrames[MAX_NUM_NODES + NUM_EXTRA_FRAMES];
 static uint32_t targetFramerate = IDLE_FRAMERATE;
 static char btPIN[16] = "888888";
 
-uint8_t imgBattery[16] = { 0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xE7, 0x3C };
+uint8_t imgBattery[16] = {0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xE7, 0x3C};
+
+// if defined a pixel will blink to show redraws
+// #define SHOW_REDRAWS
+#ifdef SHOW_REDRAWS
 static bool heartbeat = false;
+#endif
 
 static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -174,10 +179,10 @@ static void drawColumns(OLEDDisplay *display, int16_t x, int16_t y, const char *
 #endif
 
 // Draw power bars or a charging indicator on an image of a battery, determined by battery charge voltage or percentage.
-static void drawBattery(OLEDDisplay *display, int16_t x, int16_t y, uint8_t *imgBuffer, const PowerStatus *powerStatus) 
+static void drawBattery(OLEDDisplay *display, int16_t x, int16_t y, uint8_t *imgBuffer, const PowerStatus *powerStatus)
 {
-    static const uint8_t powerBar[3] = { 0x81, 0xBD, 0xBD };
-    static const uint8_t lightning[8] = { 0xA1, 0xA1, 0xA5, 0xAD, 0xB5, 0xA5, 0x85, 0x85 };
+    static const uint8_t powerBar[3] = {0x81, 0xBD, 0xBD};
+    static const uint8_t lightning[8] = {0xA1, 0xA1, 0xA5, 0xAD, 0xB5, 0xA5, 0x85, 0x85};
     // Clear the bar area on the battery image
     for (int i = 1; i < 14; i++) {
         imgBuffer[i] = 0x81;
@@ -188,7 +193,7 @@ static void drawBattery(OLEDDisplay *display, int16_t x, int16_t y, uint8_t *img
         // If not charging, Draw power bars
     } else {
         for (int i = 0; i < 4; i++) {
-            if(powerStatus->getBatteryChargePercent() >= 25 * i) 
+            if (powerStatus->getBatteryChargePercent() >= 25 * i)
                 memcpy(imgBuffer + 1 + (i * 3), powerBar, 3);
         }
     }
@@ -196,7 +201,7 @@ static void drawBattery(OLEDDisplay *display, int16_t x, int16_t y, uint8_t *img
 }
 
 // Draw nodes status
-static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, NodeStatus *nodeStatus) 
+static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, NodeStatus *nodeStatus)
 {
     char usersString[20];
     sprintf(usersString, "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal());
@@ -762,10 +767,12 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 
     display->drawLogBuffer(x, y + (FONT_HEIGHT * 2));
 
-    /* Display a heartbeat pixel that blinks every time the frame is redrawn
-    if(heartbeat) display->setPixel(0, 0);
+    /* Display a heartbeat pixel that blinks every time the frame is redrawn */
+#ifdef SHOW_REDRAWS
+    if (heartbeat)
+        display->setPixel(0, 0);
     heartbeat = !heartbeat;
-    */
+#endif
 }
 
 // adjust Brightness cycle trough 1 to 254 as long as attachDuringLongPress is true
@@ -783,13 +790,13 @@ void Screen::adjustBrightness()
     dispdev.setBrightness(brightness);
 }
 
-int Screen::handleStatusUpdate(const Status *arg) {
+int Screen::handleStatusUpdate(const Status *arg)
+{
     DEBUG_MSG("Screen got status update %d\n", arg->getStatusType());
-    switch(arg->getStatusType())
-    {
-        case STATUS_TYPE_NODE:
-            setFrames();
-            break;
+    switch (arg->getStatusType()) {
+    case STATUS_TYPE_NODE:
+        setFrames();
+        break;
     }
     setPeriod(1); // Update the screen right away
     return 0;