GPS duty cycle and cpu power management for extended battery life implemented

examples/companion_radio/MyMesh.h

@@ -12,7 +12,7 @@
 #endif
 
 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "Meck v0.8.3"
+#define FIRMWARE_VERSION "Meck v0.8.4"
 #endif
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

examples/companion_radio/main.cpp

@@ -3,6 +3,8 @@
 #include "MyMesh.h"
 #include "variant.h"   // Board-specific defines (HAS_GPS, etc.)
 #include "target.h"    // For sensors, board, etc.
+#include "GPSDutyCycle.h"
+#include "CPUPowerManager.h"
 
 // T-Deck Pro Keyboard support
 #if defined(LilyGo_TDeck_Pro)
@@ -11,7 +13,6 @@
   #include "TextReaderScreen.h"
   #include "ContactsScreen.h"
   #include "ChannelScreen.h"
-  #include "SettingsScreen.h"
   extern SPIClass displaySpi;  // From GxEPDDisplay.cpp, shared SPI bus
 
   TCA8418Keyboard keyboard(I2C_ADDR_KEYBOARD, &Wire);
@@ -40,6 +41,12 @@
   
   // Text reader mode state
   static bool readerMode = false;
+
+  // Power management
+  #if HAS_GPS
+    GPSDutyCycle gpsDuty;
+  #endif
+  CPUPowerManager cpuPower;
   
   void initKeyboard();
   void handleKeyboardInput();
@@ -392,7 +399,7 @@ void setup() {
   MESH_DEBUG_PRINTLN("setup() - SPIFFS.begin() done");
 
   // ---------------------------------------------------------------------------
-  // Early SD card init — needed BEFORE the_mesh.begin() so we can restore
+  // Early SD card init — needed BEFORE the_mesh.begin() so we can restore
   // settings from a previous firmware flash.  The display SPI bus is already
   // up (display.begin() ran earlier), so SD can share it now.
   // ---------------------------------------------------------------------------
@@ -448,12 +455,6 @@ void setup() {
   the_mesh.startInterface(serial_interface);
   MESH_DEBUG_PRINTLN("setup() - the_mesh.startInterface() done");
 
-  // T-Deck Pro: default BLE to OFF on boot (user can toggle with Bluetooth page)
-  #if defined(LilyGo_TDeck_Pro)
-    serial_interface.disable();
-    MESH_DEBUG_PRINTLN("setup() - BLE disabled by default (toggle via home screen)");
-  #endif
-
 #else
   #error "need to define filesystem"
 #endif
@@ -501,6 +502,7 @@ void setup() {
     if (reader) {
       reader->setSDReady(true);
       if (disp) {
+        cpuPower.setBoost();  // Boost CPU for EPUB processing
         reader->bootIndex(*disp);
       }
     }
@@ -510,30 +512,29 @@ void setup() {
   }
   #endif
 
-  // ---------------------------------------------------------------------------
-  // First-boot onboarding detection
-  // Check if node name is still the default hex prefix (first 4 bytes of pub key)
-  // If so, launch onboarding wizard to set name and radio preset
-  // ---------------------------------------------------------------------------
-  #if defined(LilyGo_TDeck_Pro)
+  // GPS duty cycle — honour saved pref, default to enabled on first boot
+  #if HAS_GPS
   {
-    char defaultName[10];
-    mesh::Utils::toHex(defaultName, the_mesh.self_id.pub_key, 4);
-    NodePrefs* prefs = the_mesh.getNodePrefs();
-    if (strcmp(prefs->node_name, defaultName) == 0) {
-      MESH_DEBUG_PRINTLN("setup() - Default node name detected, launching onboarding");
-      ui_task.gotoOnboarding();
+    bool gps_wanted = the_mesh.getNodePrefs()->gps_enabled;
+    gpsDuty.setStreamCounter(&gpsStream);
+    gpsDuty.begin(gps_wanted);
+    if (gps_wanted) {
+      sensors.setSettingValue("gps", "1");
+    } else {
+      sensors.setSettingValue("gps", "0");
     }
+    MESH_DEBUG_PRINTLN("setup() - GPS duty cycle started (enabled=%d)", gps_wanted);
   }
   #endif
 
-  // Enable GPS by default on T-Deck Pro
-  #if HAS_GPS
-    // Set GPS enabled in both sensor manager and node prefs
-    sensors.setSettingValue("gps", "1");
-    the_mesh.getNodePrefs()->gps_enabled = 1;
-    the_mesh.savePrefs();  // SD backup triggered automatically
-    MESH_DEBUG_PRINTLN("setup() - GPS enabled by default");
+  // CPU frequency scaling — drop to 80 MHz for idle mesh listening
+  cpuPower.begin();
+
+  // T-Deck Pro: BLE starts disabled for standalone-first operation
+  // User can toggle it on from the Bluetooth home page (Enter or long-press)
+  #if defined(LilyGo_TDeck_Pro) && defined(BLE_PIN_CODE)
+    serial_interface.disable();
+    MESH_DEBUG_PRINTLN("setup() - BLE disabled at boot (standalone mode)");
   #endif
 
   MESH_DEBUG_PRINTLN("=== setup() - COMPLETE ===");
@@ -541,7 +542,24 @@ void setup() {
 
 void loop() {
   the_mesh.loop();
+
+  // GPS duty cycle — check for fix and manage power state
+  #if HAS_GPS
+  {
+    bool gps_hw_on = gpsDuty.loop();
+    if (gps_hw_on) {
+      LocationProvider* lp = sensors.getLocationProvider();
+      if (lp != NULL && lp->isValid()) {
+        gpsDuty.notifyFix();
+      }
+    }
+  }
+  #endif
+
   sensors.loop();
+
+  // CPU frequency auto-timeout back to idle
+  cpuPower.loop();
 #ifdef DISPLAY_CLASS
   // Skip UITask rendering when in compose mode to prevent flickering
   #if defined(LilyGo_TDeck_Pro)
@@ -769,28 +787,20 @@ void handleKeyboardInput() {
       return;
     }
     
-    // All other keys pass through to the reader screen
-    ui_task.injectKey(key);
-    return;
-  }
-
-  // *** SETTINGS MODE ***
-  if (ui_task.isOnSettingsScreen()) {
-    SettingsScreen* settings = (SettingsScreen*)ui_task.getSettingsScreen();
-
-    // Q key: exit settings (when not editing)
-    if (!settings->isEditing() && (key == 'q' || key == 'Q')) {
-      if (settings->hasRadioChanges()) {
-        // Let settings show "apply changes?" confirm dialog
-        ui_task.injectKey(key);
-      } else {
-        Serial.println("Exiting settings");
-        ui_task.gotoHomeScreen();
-      }
+    // C key: allow entering compose mode from reader
+    if (key == 'c' || key == 'C') {
+      composeDM = false;
+      composeDMContactIdx = -1;
+      composeMode = true;
+      composeBuffer[0] = '\0';
+      composePos = 0;
+      Serial.printf("Entering compose mode from reader, channel %d\n", composeChannelIdx);
+      drawComposeScreen();
+      lastComposeRefresh = millis();
       return;
     }
-
-    // All other keys → settings screen via injectKey (no forceRefresh)
+    
+    // All other keys pass through to the reader screen
     ui_task.injectKey(key);
     return;
   }
@@ -799,11 +809,38 @@ void handleKeyboardInput() {
   switch (key) {
     case 'c':
     case 'C':
-      // Open contacts list
-      Serial.println("Opening contacts");
-      ui_task.gotoContactsScreen();
+      // Enter compose mode - DM if on contacts screen, channel otherwise
+      if (ui_task.isOnContactsScreen()) {
+        ContactsScreen* cs = (ContactsScreen*)ui_task.getContactsScreen();
+        int idx = cs->getSelectedContactIdx();
+        uint8_t ctype = cs->getSelectedContactType();
+        if (idx >= 0 && ctype == ADV_TYPE_CHAT) {
+          composeDM = true;
+          composeDMContactIdx = idx;
+          cs->getSelectedContactName(composeDMName, sizeof(composeDMName));
+          composeMode = true;
+          composeBuffer[0] = '\0';
+          composePos = 0;
+          Serial.printf("Entering DM compose to %s (idx %d)\n", composeDMName, idx);
+          drawComposeScreen();
+          lastComposeRefresh = millis();
+        }
+      } else {
+        composeDM = false;
+        composeDMContactIdx = -1;
+        composeMode = true;
+        composeBuffer[0] = '\0';
+        composePos = 0;
+        // If on channel screen, sync compose channel with viewed channel
+        if (ui_task.isOnChannelScreen()) {
+          composeChannelIdx = ui_task.getChannelScreenViewIdx();
+        }
+        Serial.printf("Entering compose mode, channel %d\n", composeChannelIdx);
+        drawComposeScreen();
+        lastComposeRefresh = millis();
+      }
       break;
-
+    
     case 'm':
     case 'M':
       // Go to channel message screen
@@ -811,22 +848,18 @@ void handleKeyboardInput() {
       ui_task.gotoChannelScreen();
       break;
     
-    case 'e':
-    case 'E':
-      // Open text reader (ebooks)
+    case 'r':
+    case 'R':
+      // Open text reader
       Serial.println("Opening text reader");
       ui_task.gotoTextReader();
       break;
     
-    case 's':
-    case 'S':
-      // Open settings (from home), or navigate down on channel/contacts
-      if (ui_task.isOnChannelScreen() || ui_task.isOnContactsScreen()) {
-        ui_task.injectKey('s');  // Pass directly for channel/contacts scrolling
-      } else {
-        Serial.println("Opening settings");
-        ui_task.gotoSettingsScreen();
-      }
+    case 'n':
+    case 'N':
+      // Open contacts list
+      Serial.println("Opening contacts");
+      ui_task.gotoContactsScreen();
       break;
     
     case 'w':
@@ -840,6 +873,17 @@ void handleKeyboardInput() {
       }
       break;
     
+    case 's':
+    case 'S':
+      // Navigate down/next (scroll on channel screen)
+      if (ui_task.isOnChannelScreen() || ui_task.isOnContactsScreen()) {
+        ui_task.injectKey('s');  // Pass directly for channel/contacts switching
+      } else {
+        Serial.println("Nav: Next");
+        ui_task.injectKey(0xF1);  // KEY_NEXT
+      }
+      break;
+      
     case 'a':
     case 'A':
       // Navigate left or switch channel (on channel screen)
@@ -863,7 +907,7 @@ void handleKeyboardInput() {
       break;
       
     case '\r':
-      // Enter = compose (only from channel or contacts screen)
+      // Select/Enter - if on contacts screen, enter DM compose for chat contacts
       if (ui_task.isOnContactsScreen()) {
         ContactsScreen* cs = (ContactsScreen*)ui_task.getContactsScreen();
         int idx = cs->getSelectedContactIdx();
@@ -879,21 +923,12 @@ void handleKeyboardInput() {
           drawComposeScreen();
           lastComposeRefresh = millis();
         } else if (idx >= 0) {
+          // Non-chat contact selected (repeater, room, etc.) - future use
           Serial.printf("Selected non-chat contact type=%d idx=%d\n", ctype, idx);
         }
-      } else if (ui_task.isOnChannelScreen()) {
-        composeDM = false;
-        composeDMContactIdx = -1;
-        composeChannelIdx = ui_task.getChannelScreenViewIdx();
-        composeMode = true;
-        composeBuffer[0] = '\0';
-        composePos = 0;
-        Serial.printf("Entering compose mode, channel %d\n", composeChannelIdx);
-        drawComposeScreen();
-        lastComposeRefresh = millis();
       } else {
-        // Other screens: pass Enter as generic select
-        ui_task.injectKey(13);
+        Serial.println("Nav: Enter/Select");
+        ui_task.injectKey(13);  // KEY_ENTER
       }
       break;
       
@@ -1059,6 +1094,8 @@ void drawEmojiPicker() {
 void sendComposedMessage() {
   if (composePos == 0) return;
   
+  cpuPower.setBoost();  // Boost CPU for crypto + radio TX
+
   // Convert escape bytes back to UTF-8 for mesh transmission and BLE app
   char utf8Buf[512];
   emojiUnescape(composeBuffer, utf8Buf, sizeof(utf8Buf));

examples/companion_radio/ui-new/UITask.cpp

@@ -2,6 +2,7 @@
 #include <helpers/TxtDataHelpers.h>
 #include "../MyMesh.h"
 #include "target.h"
+#include "GPSDutyCycle.h"
 #ifdef WIFI_SSID
   #include <WiFi.h>
 #endif
@@ -33,7 +34,6 @@
 #include "ChannelScreen.h"
 #include "ContactsScreen.h"
 #include "TextReaderScreen.h"
-#include "SettingsScreen.h"
 
 class SplashScreen : public UIScreen {
   UITask* _task;
@@ -329,21 +329,37 @@ public:
       display.drawTextCentered(display.width() / 2, 64 - 11, "advert: " PRESS_LABEL);
 #if ENV_INCLUDE_GPS == 1
     } else if (_page == HomePage::GPS) {
+      extern GPSDutyCycle gpsDuty;
+      extern GPSStreamCounter gpsStream;
       LocationProvider* nmea = sensors.getLocationProvider();
       char buf[50];
       int y = 18;
-      bool gps_state = _task->getGPSState();
-#ifdef PIN_GPS_SWITCH
-      bool hw_gps_state = digitalRead(PIN_GPS_SWITCH);
-      if (gps_state != hw_gps_state) {
-        strcpy(buf, gps_state ? "gps off(hw)" : "gps off(sw)");
+
+      // GPS state line with duty cycle info
+      if (!_node_prefs->gps_enabled) {
+        strcpy(buf, "gps off");
       } else {
-        strcpy(buf, gps_state ? "gps on" : "gps off");
+        switch (gpsDuty.getState()) {
+          case GPSDutyState::ACQUIRING: {
+            uint32_t elapsed = gpsDuty.acquireElapsedSecs();
+            sprintf(buf, "acquiring %us", (unsigned)elapsed);
+            break;
+          }
+          case GPSDutyState::SLEEPING: {
+            uint32_t remain = gpsDuty.sleepRemainingSecs();
+            if (remain >= 60) {
+              sprintf(buf, "sleep %um%02us", (unsigned)(remain / 60), (unsigned)(remain % 60));
+            } else {
+              sprintf(buf, "sleep %us", (unsigned)remain);
+            }
+            break;
+          }
+          default:
+            strcpy(buf, "gps off");
+        }
       }
-#else
-      strcpy(buf, gps_state ? "gps on" : "gps off");
-#endif
       display.drawTextLeftAlign(0, y, buf);
+
       if (nmea == NULL) {
         y = y + 12;
         display.drawTextLeftAlign(0, y, "Can't access GPS");
@@ -355,6 +371,19 @@ public:
         sprintf(buf, "%d", nmea->satellitesCount());
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
+
+        // NMEA sentence counter — confirms baud rate and data flow
+        display.drawTextLeftAlign(0, y, "sentences");
+        if (gpsDuty.isHardwareOn()) {
+          uint16_t sps = gpsStream.getSentencesPerSec();
+          uint32_t total = gpsStream.getSentenceCount();
+          sprintf(buf, "%u/s (%lu)", sps, (unsigned long)total);
+        } else {
+          strcpy(buf, "hw off");
+        }
+        display.drawTextRightAlign(display.width()-1, y, buf);
+        y = y + 12;
+
         display.drawTextLeftAlign(0, y, "pos");
         sprintf(buf, "%.4f %.4f", 
           nmea->getLatitude()/1000000., nmea->getLongitude()/1000000.);
@@ -524,6 +553,12 @@ public:
 
     if (c == KEY_LEFT || c == KEY_PREV) {
       _page = (_page + HomePage::Count - 1) % HomePage::Count;
+      #if ENV_INCLUDE_GPS == 1
+      if (_page == HomePage::GPS) {
+        extern GPSDutyCycle gpsDuty;
+        gpsDuty.forceWake();
+      }
+      #endif
       return true;
     }
     if (c == KEY_NEXT || c == KEY_RIGHT) {
@@ -531,6 +566,12 @@ public:
       if (_page == HomePage::RECENT) {
         _task->showAlert("Recent adverts", 800);
       }
+      #if ENV_INCLUDE_GPS == 1
+      if (_page == HomePage::GPS) {
+        extern GPSDutyCycle gpsDuty;
+        gpsDuty.forceWake();
+      }
+      #endif
       return true;
     }
     if (c == KEY_ENTER && _page == HomePage::BLUETOOTH) {
@@ -717,7 +758,6 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no
   channel_screen = new ChannelScreen(this, &rtc_clock);
   contacts_screen = new ContactsScreen(this, &rtc_clock);
   text_reader = new TextReaderScreen(this);
-  settings_screen = new SettingsScreen(this, &rtc_clock, node_prefs);
   setCurrScreen(splash);
 }
 
@@ -1037,39 +1077,36 @@ char UITask::handleTripleClick(char c) {
 }
 
 bool UITask::getGPSState() {
-  if (_sensors != NULL) {
-    int num = _sensors->getNumSettings();
-    for (int i = 0; i < num; i++) {
-      if (strcmp(_sensors->getSettingName(i), "gps") == 0) {
-        return !strcmp(_sensors->getSettingValue(i), "1");
-      }
-    }
-  } 
-  return false;
+  #if ENV_INCLUDE_GPS == 1
+    return _node_prefs != NULL && _node_prefs->gps_enabled;
+  #else
+    return false;
+  #endif
 }
 
 void UITask::toggleGPS() {
+  #if ENV_INCLUDE_GPS == 1
+    extern GPSDutyCycle gpsDuty;
+
     if (_sensors != NULL) {
-    // toggle GPS on/off
-    int num = _sensors->getNumSettings();
-    for (int i = 0; i < num; i++) {
-      if (strcmp(_sensors->getSettingName(i), "gps") == 0) {
-        if (strcmp(_sensors->getSettingValue(i), "1") == 0) {
-          _sensors->setSettingValue("gps", "0");
-          _node_prefs->gps_enabled = 0;
-          notify(UIEventType::ack);
-        } else {
-          _sensors->setSettingValue("gps", "1");
-          _node_prefs->gps_enabled = 1;
-          notify(UIEventType::ack);
-        }
-        the_mesh.savePrefs();
-        showAlert(_node_prefs->gps_enabled ? "GPS: Enabled" : "GPS: Disabled", 800);
-        _next_refresh = 0;
-        break;
+      if (_node_prefs->gps_enabled) {
+        // Disable GPS — cut hardware power
+        _sensors->setSettingValue("gps", "0");
+        _node_prefs->gps_enabled = 0;
+        gpsDuty.disable();
+        notify(UIEventType::ack);
+      } else {
+        // Enable GPS — start duty cycle
+        _sensors->setSettingValue("gps", "1");
+        _node_prefs->gps_enabled = 1;
+        gpsDuty.enable();
+        notify(UIEventType::ack);
       }
+      the_mesh.savePrefs();
+      showAlert(_node_prefs->gps_enabled ? "GPS: Enabled" : "GPS: Disabled", 800);
+      _next_refresh = 0;
     }
-  }
+  #endif
 }
 
 void UITask::toggleBuzzer() {
@@ -1157,26 +1194,6 @@ void UITask::gotoTextReader() {
   _next_refresh = 100;
 }
 
-void UITask::gotoSettingsScreen() {
-  ((SettingsScreen*)settings_screen)->enter();
-  setCurrScreen(settings_screen);
-  if (_display != NULL && !_display->isOn()) {
-    _display->turnOn();
-  }
-  _auto_off = millis() + AUTO_OFF_MILLIS;
-  _next_refresh = 100;
-}
-
-void UITask::gotoOnboarding() {
-  ((SettingsScreen*)settings_screen)->enterOnboarding();
-  setCurrScreen(settings_screen);
-  if (_display != NULL && !_display->isOn()) {
-    _display->turnOn();
-  }
-  _auto_off = millis() + AUTO_OFF_MILLIS;
-  _next_refresh = 100;
-}
-
 uint8_t UITask::getChannelScreenViewIdx() const {
   return ((ChannelScreen *) channel_screen)->getViewChannelIdx();
 }