Fix last build issues on develop (#8046)

src/graphics/Screen.cpp

@@ -953,7 +953,6 @@ void Screen::setFrames(FrameFocus focus)
     }
 
 #if defined(DISPLAY_CLOCK_FRAME)
-    if (!hiddenFrames.clock) {
     if (!hiddenFrames.clock) {
         fsi.positions.clock = numframes;
 #if defined(M5STACK_UNITC6L)
@@ -963,6 +962,7 @@ void Screen::setFrames(FrameFocus focus)
                                                                  : graphics::ClockRenderer::drawDigitalClockFrame;
 #endif
         indicatorIcons.push_back(digital_icon_clock);
+    }
 #endif
 
     // Declare this early so it’s available in FOCUS_PRESERVE block
@@ -1116,8 +1116,7 @@ void Screen::setFrames(FrameFocus focus)
     ui->disableAllIndicators();
 
     // Add overlays: frame icons and alert banner)
-            static OverlayCallback overlays[] = {graphics::UIRenderer::drawNavigationBar,
+    static OverlayCallback overlays[] = {graphics::UIRenderer::drawNavigationBar, NotificationRenderer::drawBannercallback};
-                                                 NotificationRenderer::drawBannercallback};
     ui->setOverlays(overlays, sizeof(overlays) / sizeof(overlays[0]));
 
     prevFrame = -1; // Force drawNodeInfo to pick a new node (because our list just changed)
@@ -1164,17 +1163,17 @@ void Screen::setFrames(FrameFocus focus)
     this->framesetInfo = fsi;
 
     setFastFramerate(); // Draw ASAP
-        }
+}
 
-        void Screen::setFrameImmediateDraw(FrameCallback * drawFrames)
+void Screen::setFrameImmediateDraw(FrameCallback *drawFrames)
-        {
+{
     ui->disableAllIndicators();
     ui->setFrames(drawFrames, 1);
     setFastFramerate();
-        }
+}
 
-        void Screen::toggleFrameVisibility(const std::string &frameName)
+void Screen::toggleFrameVisibility(const std::string &frameName)
-        {
+{
 #ifndef USE_EINK
     if (frameName == "nodelist") {
         hiddenFrames.nodelist = !hiddenFrames.nodelist;
@@ -1211,10 +1210,10 @@ void Screen::setFrames(FrameFocus focus)
     if (frameName == "chirpy") {
         hiddenFrames.chirpy = !hiddenFrames.chirpy;
     }
-        }
+}
 
-        bool Screen::isFrameHidden(const std::string &frameName) const
+bool Screen::isFrameHidden(const std::string &frameName) const
-        {
+{
 #ifndef USE_EINK
     if (frameName == "nodelist")
         return hiddenFrames.nodelist;
@@ -1243,13 +1242,13 @@ void Screen::setFrames(FrameFocus focus)
         return hiddenFrames.chirpy;
 
     return false;
-        }
+}
 
-        // Dismisses the currently displayed screen frame, if possible
+// Dismisses the currently displayed screen frame, if possible
-        // Relevant for text message, waypoint, others in future?
+// Relevant for text message, waypoint, others in future?
-        // Triggered with a CardKB keycombo
+// Triggered with a CardKB keycombo
-        void Screen::hideCurrentFrame()
+void Screen::hideCurrentFrame()
-        {
+{
     uint8_t currentFrame = ui->getUiState()->currentFrame;
     bool dismissed = false;
     if (currentFrame == framesetInfo.positions.textMessage && devicestate.has_rx_text_message) {
@@ -1274,20 +1273,20 @@ void Screen::setFrames(FrameFocus focus)
     if (dismissed) {
         setFrames(FOCUS_DEFAULT); // You could also use FOCUS_PRESERVE
     }
-        }
+}
 
-        void Screen::handleStartFirmwareUpdateScreen()
+void Screen::handleStartFirmwareUpdateScreen()
-        {
+{
     LOG_DEBUG("Show firmware screen");
     showingNormalScreen = false;
     EINK_ADD_FRAMEFLAG(dispdev, DEMAND_FAST); // E-Ink: Explicitly use fast-refresh for next frame
 
     static FrameCallback frames[] = {graphics::NotificationRenderer::drawFrameFirmware};
     setFrameImmediateDraw(frames);
-        }
+}
 
-        void Screen::blink()
+void Screen::blink()
-        {
+{
     setFastFramerate();
     uint8_t count = 10;
     dispdev->setBrightness(254);
@@ -1303,10 +1302,10 @@ void Screen::setFrames(FrameFocus focus)
     // The dispdev->setBrightness does not work for t-deck display, it seems to run the setBrightness function in
     // OLEDDisplay.
     dispdev->setBrightness(brightness);
-        }
+}
 
-        void Screen::increaseBrightness()
+void Screen::increaseBrightness()
-        {
+{
     brightness = ((brightness + 62) > 254) ? brightness : (brightness + 62);
 
 #if defined(ST7789_CS)
@@ -1315,10 +1314,10 @@ void Screen::setFrames(FrameFocus focus)
 #endif
 
     /* TO DO: add little popup in center of screen saying what brightness level it is set to*/
-        }
+}
 
-        void Screen::decreaseBrightness()
+void Screen::decreaseBrightness()
-        {
+{
     brightness = (brightness < 70) ? brightness : (brightness - 62);
 
 #if defined(ST7789_CS)
@@ -1326,10 +1325,10 @@ void Screen::setFrames(FrameFocus focus)
 #endif
 
     /* TO DO: add little popup in center of screen saying what brightness level it is set to*/
-        }
+}
 
-        void Screen::setFunctionSymbol(std::string sym)
+void Screen::setFunctionSymbol(std::string sym)
-        {
+{
     if (std::find(functionSymbol.begin(), functionSymbol.end(), sym) == functionSymbol.end()) {
         functionSymbol.push_back(sym);
         functionSymbolString = "";
@@ -1338,20 +1337,20 @@ void Screen::setFrames(FrameFocus focus)
         }
         setFastFramerate();
     }
-        }
+}
 
-        void Screen::removeFunctionSymbol(std::string sym)
+void Screen::removeFunctionSymbol(std::string sym)
-        {
+{
     functionSymbol.erase(std::remove(functionSymbol.begin(), functionSymbol.end(), sym), functionSymbol.end());
     functionSymbolString = "";
     for (auto symbol : functionSymbol) {
         functionSymbolString = symbol + " " + functionSymbolString;
     }
     setFastFramerate();
-        }
+}
 
-        void Screen::handleOnPress()
+void Screen::handleOnPress()
-        {
+{
     // If screen was off, just wake it, otherwise advance to next frame
     // If we are in a transition, the press must have bounced, drop it.
     if (ui->getUiState()->frameState == FIXED) {
@@ -1359,10 +1358,10 @@ void Screen::setFrames(FrameFocus focus)
         lastScreenTransition = millis();
         setFastFramerate();
     }
-        }
+}
 
-        void Screen::handleShowPrevFrame()
+void Screen::handleShowPrevFrame()
-        {
+{
     // If screen was off, just wake it, otherwise go back to previous frame
     // If we are in a transition, the press must have bounced, drop it.
     if (ui->getUiState()->frameState == FIXED) {
@@ -1370,10 +1369,10 @@ void Screen::setFrames(FrameFocus focus)
         lastScreenTransition = millis();
         setFastFramerate();
     }
-        }
+}
 
-        void Screen::handleShowNextFrame()
+void Screen::handleShowNextFrame()
-        {
+{
     // If screen was off, just wake it, otherwise advance to next frame
     // If we are in a transition, the press must have bounced, drop it.
     if (ui->getUiState()->frameState == FIXED) {
@@ -1381,14 +1380,14 @@ void Screen::setFrames(FrameFocus focus)
         lastScreenTransition = millis();
         setFastFramerate();
     }
-        }
+}
 
 #ifndef SCREEN_TRANSITION_FRAMERATE
 #define SCREEN_TRANSITION_FRAMERATE 30 // fps
 #endif
 
-        void Screen::setFastFramerate()
+void Screen::setFastFramerate()
-        {
+{
 #if defined(M5STACK_UNITC6L)
     dispdev->clear();
     dispdev->display();
@@ -1399,10 +1398,10 @@ void Screen::setFrames(FrameFocus focus)
     ui->setTargetFPS(targetFramerate);
     setInterval(0); // redraw ASAP
     runASAP = true;
-        }
+}
 
-        int Screen::handleStatusUpdate(const meshtastic::Status *arg)
+int Screen::handleStatusUpdate(const meshtastic::Status *arg)
-        {
+{
     // LOG_DEBUG("Screen got status update %d", arg->getStatusType());
     switch (arg->getStatusType()) {
     case STATUS_TYPE_NODE:
@@ -1414,11 +1413,11 @@ void Screen::setFrames(FrameFocus focus)
     }
 
     return 0;
-        }
+}
 
-        // Handles when message is received; will jump to text message frame.
+// Handles when message is received; will jump to text message frame.
-        int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
+int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
-        {
+{
     if (showingNormalScreen) {
         if (packet->from == 0) {
             // Outgoing message (likely sent from phone)
@@ -1485,11 +1484,11 @@ void Screen::setFrames(FrameFocus focus)
     }
 
     return 0;
-        }
+}
 
-        // Triggered by MeshModules
+// Triggered by MeshModules
-        int Screen::handleUIFrameEvent(const UIFrameEvent *event)
+int Screen::handleUIFrameEvent(const UIFrameEvent *event)
-        {
+{
     // Block UI frame events when virtual keyboard is active
     if (NotificationRenderer::current_notification_type == notificationTypeEnum::text_input) {
         return 0;
@@ -1510,18 +1509,17 @@ void Screen::setFrames(FrameFocus focus)
     }
 
     return 0;
-        }
+}
 
-        int Screen::handleInputEvent(const InputEvent *event)
+int Screen::handleInputEvent(const InputEvent *event)
-        {
+{
     if (!screenOn)
         return 0;
 
     // Handle text input notifications specially - pass input to virtual keyboard
     if (NotificationRenderer::current_notification_type == notificationTypeEnum::text_input) {
         NotificationRenderer::inEvent = *event;
-                static OverlayCallback overlays[] = {graphics::UIRenderer::drawNavigationBar,
+        static OverlayCallback overlays[] = {graphics::UIRenderer::drawNavigationBar, NotificationRenderer::drawBannercallback};
-                                                     NotificationRenderer::drawBannercallback};
         ui->setOverlays(overlays, sizeof(overlays) / sizeof(overlays[0]));
         setFastFramerate(); // Draw ASAP
         ui->update();
@@ -1536,8 +1534,7 @@ void Screen::setFrames(FrameFocus focus)
 #endif
     if (NotificationRenderer::isOverlayBannerShowing()) {
         NotificationRenderer::inEvent = *event;
-                static OverlayCallback overlays[] = {graphics::UIRenderer::drawNavigationBar,
+        static OverlayCallback overlays[] = {graphics::UIRenderer::drawNavigationBar, NotificationRenderer::drawBannercallback};
-                                                     NotificationRenderer::drawBannercallback};
         ui->setOverlays(overlays, sizeof(overlays) / sizeof(overlays[0]));
         setFastFramerate(); // Draw ASAP
         ui->update();
@@ -1609,10 +1606,10 @@ void Screen::setFrames(FrameFocus focus)
     }
 
     return 0;
-        }
+}
 
-        int Screen::handleAdminMessage(AdminModule_ObserverData * arg)
+int Screen::handleAdminMessage(AdminModule_ObserverData *arg)
-        {
+{
     switch (arg->request->which_payload_variant) {
     // Node removed manually (i.e. via app)
     case meshtastic_AdminMessage_remove_by_nodenum_tag:
@@ -1625,21 +1622,21 @@ void Screen::setFrames(FrameFocus focus)
         break;
     }
     return 0;
-        }
+}
 
-        bool Screen::isOverlayBannerShowing()
+bool Screen::isOverlayBannerShowing()
-        {
+{
     return NotificationRenderer::isOverlayBannerShowing();
-        }
+}
 
-    } // namespace graphics
+} // namespace graphics
 
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
 #endif // HAS_SCREEN
 
-    bool shouldWakeOnReceivedMessage()
+bool shouldWakeOnReceivedMessage()
-    {
+{
     /*
     The goal here is to determine when we do NOT wake up the screen on message received:
     - Any ext. notifications are turned on
@@ -1658,4 +1655,4 @@ graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig
         return false;
     }
     return true;
-    }
+}