Fix bugs and add update power consumption notes

README.md

@@ -139,10 +139,12 @@ Sensor driver code contributions are welcome!
 
 Power consumption notes (at 3V supply voltage) by Mark VK5QI:
 
-- GPS in default (max performance) mode, transmitting with Si4032 @ 13 dBm = ~150 mA
-- GPS in default (max performance) mode, not transmitting = 70-90 mA
-- GPS in power-saving mode, transmitting with Si4032 @ 13 dBm = ~120 mA
-- GPS in power-saving mode, not transmitting = 30-50 mA, depending on GPS state.
+- GPS in full power acquisition mode: 110-120 mA (TX off), 160-170 mA (TX on)
+- GPS locked (5 sats), full power: 96 - 126 mA (TX off), 170 mA (TX on)
+- GPS locked, powersave mode, state 1: ~96 - 110 mA (TX off), ?
+- GPS locked, powersave mode, state 2: 60 - 90mA (TX off), 130 mA (TX on)
+
+The variations seem to be the GPS powering up every second to do its fixes.
 
 ### Time sync settings
 

src/codecs/horus/horus_packet_v1.c

@@ -49,7 +49,8 @@ size_t horus_packet_v1_create(uint8_t *payload, size_t length, telemetry_data *d
     } else if (gps_data->power_safe_mode_state == POWER_SAFE_MODE_STATE_POWER_OPTIMIZED_TRACKING) {
         horus_packet.Sats += 200;
     } else if (gps_data->power_safe_mode_state == POWER_SAFE_MODE_STATE_INACTIVE) {
-        horus_packet.Sats += 300;
+        // Inactive = Most parts of the receiver are switched off
+        horus_packet.Sats += 50;
     }
 
     horus_packet.Checksum = (uint16_t) calculate_crc16_checksum((char *) &horus_packet, sizeof(horus_packet) - 2);

src/codecs/horus/horus_packet_v2.c

@@ -44,7 +44,8 @@ size_t horus_packet_v2_create(uint8_t *payload, size_t length, telemetry_data *d
     } else if (gps_data->power_safe_mode_state == POWER_SAFE_MODE_STATE_POWER_OPTIMIZED_TRACKING) {
         horus_packet.Sats += 200;
     } else if (gps_data->power_safe_mode_state == POWER_SAFE_MODE_STATE_INACTIVE) {
-        horus_packet.Sats += 300;
+        // Inactive = Most parts of the receiver are switched off
+        horus_packet.Sats += 50;
     }
 
     memset(horus_packet.CustomData, 0, sizeof(horus_packet.CustomData));

src/gps.h

@@ -5,7 +5,8 @@
 #include <stdbool.h>
 #include "config.h"
 
-// Acquisition state: The receiver actively searches for and acquires signals. Maximum power consumption.
+// Acquisition state: The receiver actively searches for and acquires signals.
+// Maximum power consumption. Can also mean that power saving is not turned on.
 #define POWER_SAFE_MODE_STATE_ACQUISITION 0
 // Tracking state: The receiver continuously tracks and downloads data. Less power consumption than in Acquisition state.
 #define POWER_SAFE_MODE_STATE_TRACKING 1

src/telemetry.c

@@ -39,7 +39,7 @@ void telemetry_collect(telemetry_data *data)
     if (GPS_HAS_FIX(data->gps)) {
         // If we have a good fix, we can enter power-saving mode
         if ((data->gps.satellites_visible >= 6) && !gps_power_saving_enabled) {
-            #ifdef GPS_POWER_SAVING_ENABLE
+            #if GPS_POWER_SAVING_ENABLE
             ubxg6010_enable_power_save_mode();
             gps_power_saving_enabled = true;
             #endif