Merge branch 'master' into max_hardware_current_set

Author: jeremypoulter

platformio.ini

@@ -70,6 +70,10 @@ debug_flags =
   #-D ENABLE_DEBUG_CETRIFICATES
   #-D ENABLE_DEBUG_WEB_CETRIFICATES
   #-D ENABLE_DEBUG_MONGOOSE_MQTT_CLIENT
+  #-D ENABLE_DEBUG_SCREEN_MANAGER
+  #-D ENABLE_DEBUG_SCREEN_RENDERER
+  #-D ENABLE_DEBUG_SCREEN_CHARGE
+  #-D ENABLE_DEBUG_SCREEN_BOOT
 src_build_flags =
 #  -D ARDUINOJSON_USE_LONG_LONG
 #  -D ENABLE_ASYNC_WIFI_SCAN

src/lcd_tft.cpp

@@ -166,20 +166,16 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
     DBUGF("Back buffer %p", _back_buffer_pixels);
 #endif
 
+    // Create the screen manager with pointers to display and data sources
+    _screenManager = new ScreenManager(_screen, evse, scheduler, manual);
+
     pinMode(LCD_BACKLIGHT_PIN, OUTPUT);
 #ifdef TFT_BACKLIGHT_TIMEOUT_MS
-    if(_screenManager) {
-      _screenManager->wakeBacklight();
-    } else {
-      digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
-    }
+    _screenManager->wakeBacklight();
 #else
     digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
 #endif //TFT_BACKLIGHT_TIMEOUT_MS
     _initialise = false;
-
-    // Create the screen manager with pointers to display and data sources
-    _screenManager = new ScreenManager(_screen, evse, scheduler, manual);
   }
 
   // If we have messages to display, do it

src/lcd_tft.h

@@ -88,18 +88,9 @@ class LcdTask : public MicroTasks::Task
     // Screen management
     ScreenManager* _screenManager = nullptr;
 
-#ifdef TFT_BACKLIGHT_TIMEOUT_MS
-    long _last_backlight_wakeup = 0;
-    bool _previous_vehicle_state;
-#endif //TFT_BACKLIGHT_TIMEOUT_MS
-
     void display(Message *msg, uint32_t flags);
     unsigned long displayNextMessage();
 
-#ifdef TFT_BACKLIGHT_TIMEOUT_MS
-    void timeoutBacklight();
-#endif //TFT_BACKLIGHT_TIMEOUT_MS
-
   protected:
     void setup();
     unsigned long loop(MicroTasks::WakeReason reason);
@@ -115,10 +106,6 @@ class LcdTask : public MicroTasks::Task
     void display(const char *msg, int x, int y, int time, uint32_t flags);
     void setWifiMode(bool client, bool connected);
 
-#ifdef TFT_BACKLIGHT_TIMEOUT_MS
-    void wakeBacklight();
-#endif //TFT_BACKLIGHT_TIMEOUT_MS
-
     void fill_screen(uint16_t color) {
       _screen.fillScreen(color);
     }

src/screens/screen_boot.cpp

@@ -1,4 +1,4 @@
-#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_LCD)
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_SCREEN_BOOT)
 #undef ENABLE_DEBUG
 #endif
 

src/screens/screen_charge.cpp

@@ -1,4 +1,4 @@
-#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_LCD)
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_SCREEN_CHARGE)
 #undef ENABLE_DEBUG
 #endif
 

src/screens/screen_manager.cpp

@@ -1,4 +1,4 @@
-#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_LCD)
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_SCREEN_MANAGER)
 #undef ENABLE_DEBUG
 #endif
 
@@ -64,6 +64,8 @@ void ScreenManager::setScreen(ScreenType screen)
 
 unsigned long ScreenManager::update()
 {
+  unsigned long nextUpdate = 1000; // Default to 1 second
+
   // Handle special case: automatic transition from boot to charge screen
   if (_current_screen == SCREEN_BOOT) {
     BootScreen* bootScreen = static_cast<BootScreen*>(_screens[SCREEN_BOOT]);
@@ -74,7 +76,7 @@ unsigned long ScreenManager::update()
 
   // Update the current screen
   if (_screens[_current_screen]) {
-    return _screens[_current_screen]->update();
+    nextUpdate = _screens[_current_screen]->update();
   }
 
 #ifdef TFT_BACKLIGHT_TIMEOUT_MS
@@ -83,15 +85,14 @@ unsigned long ScreenManager::update()
 
   if (_previous_evse_state != evse_state || _previous_vehicle_state != vehicle_state) {
     wakeBacklight();
-    _previous_vehicle_state = vehicle_state;
+    _previous_vehicle_state = vehicle_state;  
     _previous_evse_state = evse_state;
   } else {
     updateBacklight();
   }
 #endif //TFT_BACKLIGHT_TIMEOUT_MS
 
-
-  return 1000; // Default update interval if no screen is active
+  return nextUpdate; 
 }
 
 void ScreenManager::handleEvent(uint8_t event)
@@ -117,19 +118,26 @@ void ScreenManager::setWifiMode(bool client, bool connected)
 
 // Add backlight management implementations
 #ifdef TFT_BACKLIGHT_TIMEOUT_MS
-void ScreenManager::wakeBacklight() {
+void ScreenManager::wakeBacklight()
+{
+  DBUGLN("🔦 Waking backlight");
   digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
-  _last_backlight_wakeup = millis();
+  _backlight_timeout = millis() + TFT_BACKLIGHT_TIMEOUT_MS;
 }
 
-void ScreenManager::timeoutBacklight() {
-  if (millis() - _last_backlight_wakeup >= TFT_BACKLIGHT_TIMEOUT_MS) {
+void ScreenManager::timeoutBacklight()
+{
+  if (millis() >= _backlight_timeout) 
+  {
+    DBUGLN("Timing out backlight");
     digitalWrite(LCD_BACKLIGHT_PIN, LOW);
   }
 }
 
 void ScreenManager::updateBacklight()
 {
+  DBUGF("Backlight timeout in %lu ms", _backlight_timeout - millis());
+
   bool timeout = true;
   if (_evse.isVehicleConnected()) {
     switch (_evse.getEvseState()) {
@@ -165,6 +173,7 @@ void ScreenManager::updateBacklight()
         break;
     }
   }
+  DBUGVAR(timeout);
   if (timeout) {
     timeoutBacklight();
   }

src/screens/screen_manager.h

@@ -48,7 +48,7 @@ class ScreenManager {
   ScreenBase* _screens[SCREEN_COUNT];
 
 #ifdef TFT_BACKLIGHT_TIMEOUT_MS
-  unsigned long _last_backlight_wakeup = 0;
+  unsigned long _backlight_timeout = 0;
   bool _previous_vehicle_state = false;
   uint8_t _previous_evse_state = 0;
 #endif //TFT_BACKLIGHT_TIMEOUT_MS

src/screens/screen_renderer.cpp

@@ -1,4 +1,4 @@
-#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_LCD)
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_SCREEN_RENDERER)
 #undef ENABLE_DEBUG
 #endif