Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 19:40:31 +03:00
Code Issues Wiki Activity

Merge pull request #10563 from etracer65/fix_vbat_hysteresis

Browse source 
Fix vbat_hysteresis docs and potential calculation underflow
This commit is contained in:
Michael Keller 2021-02-22 00:16:19 +13:00
parent 61a66ca85e
commit 6b8fc3ac93
4 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/Battery.md
View file

@ -59,7 +59,7 @@ Configure min/max cell voltages using the following CLI setting:
`vbat_warning_cell_voltage` - Warning voltage per cell; this triggers battery-warning alarms, in 0.1V units, i.e. 34 = 3.4V `vbat_warning_cell_voltage` - Warning voltage per cell; this triggers battery-warning alarms, in 0.1V units, i.e. 34 = 3.4V
`vbat_hysteresis` - Sets the hysteresis value for low-battery alarms, in 0.1V units, i.e. 1 = 0.1V `vbat_hysteresis` - Sets the hysteresis value for low-battery alarms, in 0.01V units, i.e. 10 = 0.10V
`vbat_duration_for_warning` - Period voltage has to sustain before the battery state is set to battery-warning, in 0.1 s, i.e. 60 = 6.0 seconds `vbat_duration_for_warning` - Period voltage has to sustain before the battery state is set to battery-warning, in 0.1 s, i.e. 60 = 6.0 seconds

2
docs/Cli.md
View file

@ -180,7 +180,7 @@ Click on a variable to jump to the relevant documentation page.
| [`vbat_max_cell_voltage`](Battery.md) | Maximum voltage per cell, used for auto-detecting battery voltage in 0.1V units, default is 43 (4.3V) | 10 | 50 | 43 | Master | UINT8 | | [`vbat_max_cell_voltage`](Battery.md) | Maximum voltage per cell, used for auto-detecting battery voltage in 0.1V units, default is 43 (4.3V) | 10 | 50 | 43 | Master | UINT8 |
| [`vbat_min_cell_voltage`](Battery.md) | Minimum voltage per cell, this triggers battery-critical alarms, in 0.1V units, default is 33 (3.3V) | 10 | 50 | 33 | Master | UINT8 | | [`vbat_min_cell_voltage`](Battery.md) | Minimum voltage per cell, this triggers battery-critical alarms, in 0.1V units, default is 33 (3.3V) | 10 | 50 | 33 | Master | UINT8 |
| [`vbat_warning_cell_voltage`](Battery.md) | Warning voltage per cell, this triggers battery-warning alarms, in 0.1V units, default is 35 (3.5V) | 10 | 50 | 35 | Master | UINT8 | | [`vbat_warning_cell_voltage`](Battery.md) | Warning voltage per cell, this triggers battery-warning alarms, in 0.1V units, default is 35 (3.5V) | 10 | 50 | 35 | Master | UINT8 |
| [`vbat_hysteresis`](Battery.md) | Sets the hysteresis value for low-battery alarms, in 0.1V units, default is 1 (0.1V) | 10 | 250 | 1 | Master | UINT8 | | [`vbat_hysteresis`](Battery.md) | Sets the hysteresis value for low-battery alarms, in 0.01V units, default is 1 (0.01V) | 10 | 250 | 1 | Master | UINT8 |
| [`current_meter_scale`](Battery.md) | This sets the output voltage to current scaling for the current sensor in 0.1 mV/A steps. 400 is 40mV/A such as the ACS756 sensor outputs. 183 is the setting for the uberdistro with a 0.25mOhm shunt. | -10000 | 10000 | 400 | Master | INT16 | | [`current_meter_scale`](Battery.md) | This sets the output voltage to current scaling for the current sensor in 0.1 mV/A steps. 400 is 40mV/A such as the ACS756 sensor outputs. 183 is the setting for the uberdistro with a 0.25mOhm shunt. | -10000 | 10000 | 400 | Master | INT16 |
| [`current_meter_offset`](Battery.md) | This sets the output offset voltage of the current sensor in millivolts. | 0 | 3300 | 0 | Master | UINT16 | | [`current_meter_offset`](Battery.md) | This sets the output offset voltage of the current sensor in millivolts. | 0 | 3300 | 0 | Master | UINT16 |
| [`multiwii_current_meter_output`](Battery.md) | Default current output via MSP is in 0.01A steps. Setting this to 1 causes output in default multiwii scaling (1mA steps). | OFF | ON | OFF | Master | UINT8 | | [`multiwii_current_meter_output`](Battery.md) | Default current output via MSP is in 0.01A steps. Setting this to 1 causes output in default multiwii scaling (1mA steps). | OFF | ON | OFF | Master | UINT8 |

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

@ -64,9 +64,11 @@
#define LVC_AFFECT_TIME 10000000 //10 secs for the LVC to slowly kick in #define LVC_AFFECT_TIME 10000000 //10 secs for the LVC to slowly kick in
// Battery monitoring stuff // Battery monitoring stuff
uint8_t batteryCellCount; // Note: this can be 0 when no battery is detected or when the battery voltage sensor is missing or disabled. static uint8_t batteryCellCount; // Note: this can be 0 when no battery is detected or when the battery voltage sensor is missing or disabled.
uint16_t batteryWarningVoltage; static uint16_t batteryWarningVoltage;
uint16_t batteryCriticalVoltage; static uint16_t batteryCriticalVoltage;
static uint16_t batteryWarningHysteresisVoltage;
static uint16_t batteryCriticalHysteresisVoltage;
static lowVoltageCutoff_t lowVoltageCutoff; static lowVoltageCutoff_t lowVoltageCutoff;
// //
static currentMeter_t currentMeter; static currentMeter_t currentMeter;
@ -114,7 +116,7 @@ PG_RESET_TEMPLATE(batteryConfig_t, batteryConfig,
.useVBatAlerts = true, .useVBatAlerts = true,
.useConsumptionAlerts = false, .useConsumptionAlerts = false,
.consumptionWarningPercentage = 10, .consumptionWarningPercentage = 10,
.vbathysteresis = 1, .vbathysteresis = 1, // 0.01V
.vbatfullcellvoltage = 410, .vbatfullcellvoltage = 410,
@ -191,9 +193,7 @@ void batteryUpdatePresence(void)
{ {
if ( if ((voltageState == BATTERY_NOT_PRESENT || voltageState == BATTERY_INIT) && isVoltageFromBat() && isVoltageStable()) {
(voltageState == BATTERY_NOT_PRESENT || voltageState == BATTERY_INIT) && isVoltageFromBat() && isVoltageStable()
) {
// Battery has just been connected - calculate cells, warning voltages and reset state // Battery has just been connected - calculate cells, warning voltages and reset state
consumptionState = voltageState = BATTERY_OK; consumptionState = voltageState = BATTERY_OK;
@ -213,11 +213,11 @@ void batteryUpdatePresence(void)
} }
batteryWarningVoltage = batteryCellCount * batteryConfig()->vbatwarningcellvoltage; batteryWarningVoltage = batteryCellCount * batteryConfig()->vbatwarningcellvoltage;
batteryCriticalVoltage = batteryCellCount * batteryConfig()->vbatmincellvoltage; batteryCriticalVoltage = batteryCellCount * batteryConfig()->vbatmincellvoltage;
batteryWarningHysteresisVoltage = (batteryWarningVoltage > batteryConfig()->vbathysteresis) ? batteryWarningVoltage - batteryConfig()->vbathysteresis : 0;
batteryCriticalHysteresisVoltage = (batteryCriticalVoltage > batteryConfig()->vbathysteresis) ? batteryCriticalVoltage - batteryConfig()->vbathysteresis : 0;
lowVoltageCutoff.percentage = 100; lowVoltageCutoff.percentage = 100;
lowVoltageCutoff.startTime = 0; lowVoltageCutoff.startTime = 0;
} else if ( } else if (voltageState != BATTERY_NOT_PRESENT && isVoltageStable() && !isVoltageFromBat()) {
voltageState != BATTERY_NOT_PRESENT && isVoltageStable() && !isVoltageFromBat()
) {
/* battery has been disconnected - can take a while for filter cap to disharge so we use a threshold of batteryConfig()->vbatnotpresentcellvoltage */ /* battery has been disconnected - can take a while for filter cap to disharge so we use a threshold of batteryConfig()->vbatnotpresentcellvoltage */
consumptionState = voltageState = BATTERY_NOT_PRESENT; consumptionState = voltageState = BATTERY_NOT_PRESENT;
@ -225,6 +225,8 @@ void batteryUpdatePresence(void)
batteryCellCount = 0; batteryCellCount = 0;
batteryWarningVoltage = 0; batteryWarningVoltage = 0;
batteryCriticalVoltage = 0; batteryCriticalVoltage = 0;
batteryWarningHysteresisVoltage = 0;
batteryCriticalHysteresisVoltage = 0;
} }
} }
@ -234,7 +236,7 @@ static void batteryUpdateVoltageState(void)
static uint32_t lastVoltageChangeMs; static uint32_t lastVoltageChangeMs;
switch (voltageState) { switch (voltageState) {
case BATTERY_OK: case BATTERY_OK:
if (voltageMeter.displayFiltered <= (batteryWarningVoltage - batteryConfig()->vbathysteresis)) { if (voltageMeter.displayFiltered <= batteryWarningHysteresisVoltage) {
if (cmp32(millis(), lastVoltageChangeMs) >= batteryConfig()->vbatDurationForWarning * 100) { if (cmp32(millis(), lastVoltageChangeMs) >= batteryConfig()->vbatDurationForWarning * 100) {
voltageState = BATTERY_WARNING; voltageState = BATTERY_WARNING;
} }
@ -244,7 +246,7 @@ static void batteryUpdateVoltageState(void)
break; break;
case BATTERY_WARNING: case BATTERY_WARNING:
if (voltageMeter.displayFiltered <= (batteryCriticalVoltage - batteryConfig()->vbathysteresis)) { if (voltageMeter.displayFiltered <= batteryCriticalHysteresisVoltage) {
if (cmp32(millis(), lastVoltageChangeMs) >= batteryConfig()->vbatDurationForCritical * 100) { if (cmp32(millis(), lastVoltageChangeMs) >= batteryConfig()->vbatDurationForCritical * 100) {
voltageState = BATTERY_CRITICAL; voltageState = BATTERY_CRITICAL;
} }
@ -353,6 +355,8 @@ void batteryInit(void)
voltageState = BATTERY_INIT; voltageState = BATTERY_INIT;
batteryWarningVoltage = 0; batteryWarningVoltage = 0;
batteryCriticalVoltage = 0; batteryCriticalVoltage = 0;
batteryWarningHysteresisVoltage = 0;
batteryCriticalHysteresisVoltage = 0;
lowVoltageCutoff.enabled = false; lowVoltageCutoff.enabled = false;
lowVoltageCutoff.percentage = 100; lowVoltageCutoff.percentage = 100;
lowVoltageCutoff.startTime = 0; lowVoltageCutoff.startTime = 0;

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

@ -61,7 +61,7 @@ typedef struct batteryConfig_s {
bool useVBatAlerts; // Issue alerts based on VBat readings bool useVBatAlerts; // Issue alerts based on VBat readings
bool useConsumptionAlerts; // Issue alerts based on total power consumption bool useConsumptionAlerts; // Issue alerts based on total power consumption
uint8_t consumptionWarningPercentage; // Percentage of remaining capacity that should trigger a battery warning uint8_t consumptionWarningPercentage; // Percentage of remaining capacity that should trigger a battery warning
uint8_t vbathysteresis; // hysteresis for alarm, default 1 = 0.1V uint8_t vbathysteresis; // hysteresis for alarm in 0.01V units, default 1 = 0.01V
uint16_t vbatfullcellvoltage; // Cell voltage at which the battery is deemed to be "full" 0.01V units, default is 410 (4.1V) uint16_t vbatfullcellvoltage; // Cell voltage at which the battery is deemed to be "full" 0.01V units, default is 410 (4.1V)