Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 07:15:18 +03:00
Code Issues Wiki Activity

Add Hott voltage and mAh alarms

Browse source 
Add Hott Voltage and mAh alarms
difference between voltage and mAh
This commit is contained in:
Frank 2018-06-20 22:54:47 +02:00
parent 418fd4beaa
commit 91a7dd4ffa
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/sensors/battery.c
View file

@ -279,6 +279,16 @@ batteryState_e getBatteryState(void)
return batteryState; 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 * const batteryStateStrings[] = {"OK", "WARNING", "CRITICAL", "NOT PRESENT", "INIT"};
const char * getBatteryStateString(void) const char * getBatteryStateString(void)

2
src/main/sensors/battery.h
View file

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

14
src/main/telemetry/hott.c
View file

@ -229,14 +229,20 @@ static inline void updateAlarmBatteryStatus(HOTT_EAM_MSG_t *hottEAMMessage)
{ {
if (shouldTriggerBatteryAlarmNow()) { if (shouldTriggerBatteryAlarmNow()) {
lastHottAlarmSoundTime = millis(); 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->warning_beeps = 0x10;
hottEAMMessage->alarm_invers1 = HOTT_EAM_ALARM1_FLAG_BATTERY_1; 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->warning_beeps = HOTT_EAM_ALARM1_FLAG_NONE;
hottEAMMessage->alarm_invers1 = HOTT_EAM_ALARM1_FLAG_NONE; hottEAMMessage->alarm_invers1 = HOTT_EAM_ALARM1_FLAG_NONE;
} }
} }
} }