Merge pull request #6182 from Ziege-One/Hott-telemetry-alarm-voltage-and-mAh

Hott telemetry alarm voltage and mAh

src/main/sensors/battery.c

@@ -279,6 +279,16 @@ batteryState_e getBatteryState(void)
     return batteryState;
 }
 
+batteryState_e getVoltageState(void)
+{
+    return voltageState;
+}
+
+batteryState_e getConsumptionState(void)
+{
+    return consumptionState;
+}
+
 const char * const batteryStateStrings[] = {"OK", "WARNING", "CRITICAL", "NOT PRESENT", "INIT"};
 
 const char * getBatteryStateString(void)

src/main/sensors/battery.h

@@ -71,6 +71,8 @@ void batteryUpdateVoltage(timeUs_t currentTimeUs);
 void batteryUpdatePresence(void);
 
 batteryState_e getBatteryState(void);
+batteryState_e getVoltageState(void);
+batteryState_e getConsumptionState(void);
 const  char * getBatteryStateString(void);
 
 void batteryUpdateStates(timeUs_t currentTimeUs);

src/main/telemetry/hott.c

@@ -260,11 +260,17 @@ static inline void updateAlarmBatteryStatus(HOTT_EAM_MSG_t *hottEAMMessage)
 {
     if (shouldTriggerBatteryAlarmNow()) {
         lastHottAlarmSoundTime = millis();
-        const batteryState_e batteryState = getBatteryState();
+	const batteryState_e voltageState = getVoltageState();
-        if (batteryState == BATTERY_WARNING  || batteryState == BATTERY_CRITICAL) {
+	const batteryState_e consumptionState = getConsumptionState();
+        if (voltageState == BATTERY_WARNING  || voltageState == BATTERY_CRITICAL) {
             hottEAMMessage->warning_beeps = 0x10;
             hottEAMMessage->alarm_invers1 = HOTT_EAM_ALARM1_FLAG_BATTERY_1;
-        } else {
+	}
+	else if (consumptionState == BATTERY_WARNING  || consumptionState == BATTERY_CRITICAL) {
+            hottEAMMessage->warning_beeps = 0x16;
+            hottEAMMessage->alarm_invers1 = HOTT_EAM_ALARM1_FLAG_MAH;
+	}		
+	else {
             hottEAMMessage->warning_beeps = HOTT_EAM_ALARM1_FLAG_NONE;
             hottEAMMessage->alarm_invers1 = HOTT_EAM_ALARM1_FLAG_NONE;
 	}

src/test/unit/telemetry_hott_unittest.cc

@@ -265,6 +265,16 @@ batteryState_e getBatteryState(void)
 	return BATTERY_OK;
 }
 
+batteryState_e getVoltageState(void)
+{
+	return BATTERY_OK;
+}
+	
+batteryState_e getConsumptionState(void)	
+{
+	return BATTERY_OK;
+}
+	
 uint16_t getBatteryVoltage(void)
 {
     return testBatteryVoltage;