powermon gps support

meshtastic#4136
geeksville · Jun 21, 2024 · b2a388b · b2a388b
1 parent 809e06b
commit b2a388b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/protobufs b/protobufs
diff --git a/src/PowerMon.cpp b/src/PowerMon.cpp
@@ -22,7 +22,7 @@ void PowerMon::clearState(_meshtastic_PowerMon_State state, const char *reason)
 void PowerMon::emitLog(const char *reason)
 {
     // The nrf52 printf doesn't understand 64 bit ints, so if we ever reach that point this function will need to change.
-    LOG_INFO("S:PMon:C,0x%08lx,%s\n", (uint32_t)states, reason);
+    LOG_INFO("S:PM:C,0x%08lx,%s\n", (uint32_t)states, reason);
 }
 
 PowerMon *powerMon;

diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
@@ -3,6 +3,7 @@
 #include "Default.h"
 #include "GPS.h"
 #include "NodeDB.h"
+#include "PowerMon.h"
 #include "RTC.h"
 
 #include "main.h" // pmu_found
@@ -799,9 +800,12 @@ void GPS::setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime)
         return;
 
     if (on) {
+        powerMon->setState(meshtastic_PowerMon_State_GPS_Active);
         clearBuffer(); // drop any old data waiting in the buffer before re-enabling
         if (en_gpio)
             digitalWrite(en_gpio, on ? GPS_EN_ACTIVE : !GPS_EN_ACTIVE); // turn this on if defined, every time
+    } else {
+        powerMon->clearState(meshtastic_PowerMon_State_GPS_Active);
     }
     isInPowersave = !on;
     if (!standbyOnly && en_gpio != 0 &&

diff --git a/src/mesh/generated/meshtastic/powermon.pb.h b/src/mesh/generated/meshtastic/powermon.pb.h
@@ -25,14 +25,14 @@ typedef enum _meshtastic_PowerMon_State {
     meshtastic_PowerMon_State_Screen_On = 256,
     meshtastic_PowerMon_State_Screen_Drawing = 512,
     meshtastic_PowerMon_State_Wifi_On = 1024,
-    meshtastic_PowerMon_State_GPS_LowPower = 2048,
-    meshtastic_PowerMon_State_GPS_MediumPower = 4096,
-    meshtastic_PowerMon_State_GPS_HighPower = 8192
+    /* GPS is actively trying to find our location
+See GPSPowerState for more details */
+    meshtastic_PowerMon_State_GPS_Active = 2048
 } meshtastic_PowerMon_State;
 
 /* Struct definitions */
 /* the log messages will be short and complete (see PowerMon.Event in the protobufs for details). 
-something like "PwrMon,C,0x00001234,REASON" where the hex number is the bitmask of all current states. 
+something like "PwrMon:C,0x00001234,REASON" where the hex number is the bitmask of all current states. 
 (We use a bitmask for states so that if a log message gets lost it won't be fatal) */
 typedef struct _meshtastic_PowerMon_Event {
     /* Bitwise-OR of States */
@@ -47,8 +47,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_PowerMon_State_MIN meshtastic_PowerMon_State_None
-#define _meshtastic_PowerMon_State_MAX meshtastic_PowerMon_State_GPS_HighPower
-#define _meshtastic_PowerMon_State_ARRAYSIZE ((meshtastic_PowerMon_State)(meshtastic_PowerMon_State_GPS_HighPower+1))
+#define _meshtastic_PowerMon_State_MAX meshtastic_PowerMon_State_GPS_Active
+#define _meshtastic_PowerMon_State_ARRAYSIZE ((meshtastic_PowerMon_State)(meshtastic_PowerMon_State_GPS_Active+1))