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

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

Browse source 
Hott telemetry alarm voltage and mAh
This commit is contained in:
Michael Keller 2018-08-19 01:45:39 +12:00 • committed by GitHub
commit a1b84b58d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 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;
}
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)

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

@ -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);

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

@ -260,11 +260,17 @@ static inline void updateAlarmBatteryStatus(HOTT_EAM_MSG_t *hottEAMMessage)
{
if (shouldTriggerBatteryAlarmNow()) {
lastHottAlarmSoundTime = millis();
const batteryState_e batteryState = getBatteryState();
if (batteryState == BATTERY_WARNING || batteryState == BATTERY_CRITICAL) {
const batteryState_e voltageState = getVoltageState();
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;
}

10
src/test/unit/telemetry_hott_unittest.cc
View file

@ -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;