Fix formatting and inconsistent flag behavior

Author: Feksaaargh

src/displayapp/screens/WatchFaceMaze.cpp

@@ -199,14 +199,14 @@ WatchFaceMaze::WatchFaceMaze(Pinetime::Components::LittleVgl& lvgl,
                              Controllers::MotorController& motor,
                              const Controllers::Battery& batteryController,
                              const Controllers::Ble& bleController)
-  : dateTimeController{dateTimeController},
-    settingsController{settingsController},
-    motor{motor},
-    batteryController{batteryController},
-    bleController{bleController},
-    lvgl{lvgl},
-    maze{Maze()},
-    prng{MazeRNG()} {
+  : dateTimeController {dateTimeController},
+    settingsController {settingsController},
+    motor {motor},
+    batteryController {batteryController},
+    bleController {bleController},
+    lvgl {lvgl},
+    maze {Maze()},
+    prng {MazeRNG()} {
 
   // set it to be in the past so it always takes two clicks to go to the secret, even if you're fast
   lastLongClickTime = xTaskGetTickCount() - doubleDoubleClickDelay;
@@ -238,6 +238,8 @@ void WatchFaceMaze::HandleMazeRefresh() {
 
   // Refresh if it's needed by some other component, a minute has passed on the watchface, or if generation has paused.
   if (screenRefreshRequired || (currentState == MazeScreen::WatchFace && currentDateTime.IsUpdated()) || pausedGeneration) {
+    // make sure isUpdated flags are reset
+    currentDateTime.IsUpdated();
 
     // if generation wasn't paused (i.e. doing a ground up maze gen), set everything up
     if (!pausedGeneration) {
@@ -305,6 +307,10 @@ void WatchFaceMaze::UpdateBatteryDisplay(const bool forceRedraw) {
     // need to redraw battery stuff
     SwapActiveBuffer();
 
+    // make sure isUpdated flags are reset
+    batteryPercent.IsUpdated();
+    charging.IsUpdated();
+
     // number of pixels between top of indicator and fill line. rounds up, so 0% is 24px but 1% is 23px
     const uint8_t fillLevel = 24 - ((uint16_t) (batteryPercent.Get()) * 24) / 100;
     constexpr lv_area_t area = {223, 3, 236, 26};
@@ -341,7 +347,7 @@ void WatchFaceMaze::UpdateBatteryDisplay(const bool forceRedraw) {
 
 void WatchFaceMaze::UpdateBleDisplay(const bool forceRedraw) {
   bleConnected = bleController.IsConnected();
-  if (forceRedraw || bleConnected.IsUpdated()) {
+  if (bleConnected.IsUpdated() || forceRedraw) {
     // need to redraw BLE indicator
     SwapActiveBuffer();
 
@@ -581,7 +587,6 @@ void WatchFaceMaze::GenerateMaze() {
           pausedGeneration = true;
           return;
         }
-
       }
     }
   }
@@ -722,6 +727,7 @@ void WatchFaceMaze::ForceValidMaze() {
     coord_t x : 16;
     coord_t y : 16;
   };
+
   std::stack<coordXY> backtrackStack;
 
   while (true) {

src/displayapp/screens/WatchFaceMaze.h

@@ -4,7 +4,7 @@
 #include <numbers>
 #include <stack>
 #include "FreeRTOS.h"
-#include "task.h"  // configTICK_RATE_HZ
+#include "task.h" // configTICK_RATE_HZ
 #include "sys/unistd.h"
 #include "displayapp/LittleVgl.h"
 #include "displayapp/apps/Apps.h"
@@ -274,7 +274,7 @@ namespace Pinetime {
         MazeRNG prng;
 
         // Used for keeping track of minutes. It's what refreshes the screen every minute.
-        Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime{};
+        Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime {};
 
         // Indicator values. Used for refreshing the respective indicators.
         Utility::DirtyValue<uint8_t> batteryPercent;
@@ -326,9 +326,9 @@ namespace Pinetime {
 
         // Used for swipe sequences for easter eggs.
         // currentState is what is being displayed. It's generally categorized into "WatchFace" and "not WatchFace".
-        // lastInputTime is for long clicking on the main watchface. If you long click twice in a certain timespan, it goes to the secret input
-        // doubleDoubleClickDelay is the aforementioned 'certain timespan' to get to the secret input. In ticks.
-        // screen. currentCode is the current swipe sequence that's being inputted.
+        // lastInputTime is for long clicking on the main watchface. If you long click twice in a certain timespan, it goes to the secret
+        // input doubleDoubleClickDelay is the aforementioned 'certain timespan' to get to the secret input. In ticks. screen. currentCode
+        // is the current swipe sequence that's being inputted.
         MazeScreen currentState = MazeScreen::WatchFace;
         TickType_t lastLongClickTime;
         constexpr static uint32_t doubleDoubleClickDelay = pdMS_TO_TICKS(2500);