Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

Fixes from review.

Browse source
This commit is contained in:
mikeller 2020-03-26 01:54:42 +13:00
parent b020917c4b
commit afe704bbd9
4 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -358,6 +358,8 @@ void batteryInit(void)
lowVoltageCutoff.startTime = 0;
voltageMeterReset(&voltageMeter);
voltageMeterGenericInit();
switch (batteryConfig()->voltageMeterSource) {
case VOLTAGE_METER_ESC:
#ifdef USE_ESC_SENSOR

29
src/main/sensors/voltage.c
View file

@ -89,7 +89,9 @@ void voltageMeterReset(voltageMeter_t *meter)
{
meter->displayFiltered = 0;
meter->unfiltered = 0;
#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
meter->sagFiltered = 0;
#endif
}
//
// ADC
@ -117,10 +119,10 @@ typedef struct voltageMeterADCState_s {
#endif
} voltageMeterADCState_t;
extern voltageMeterADCState_t voltageMeterADCStates[MAX_VOLTAGE_SENSOR_ADC];
voltageMeterADCState_t voltageMeterADCStates[MAX_VOLTAGE_SENSOR_ADC];
static bool sagCompensationConfigured;
voltageMeterADCState_t *getVoltageMeterADC(uint8_t index)
{
return &voltageMeterADCStates[index];
@ -208,16 +210,7 @@ void voltageMeterADCRead(voltageSensorADC_e adcChannel, voltageMeter_t *voltageM
bool isSagCompensationConfigured(void)
{
bool isConfigured = false;
#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
for (unsigned i = 0; i < PID_PROFILE_COUNT; i++) {
if (pidProfiles(i)->vbat_sag_compensation > 0) {
isConfigured = true;
}
}
#endif
return isConfigured;
return sagCompensationConfigured;
}
void voltageMeterADCInit(void)
@ -237,6 +230,18 @@ void voltageMeterADCInit(void)
}
}
void voltageMeterGenericInit(void)
{
sagCompensationConfigured = false;
#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
for (unsigned i = 0; i < PID_PROFILE_COUNT; i++) {
if (pidProfiles(i)->vbat_sag_compensation > 0) {
sagCompensationConfigured = true;
}
}
#endif
}
//
// ESC
//

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

@ -100,6 +100,8 @@ PG_DECLARE_ARRAY(voltageSensorADCConfig_t, MAX_VOLTAGE_SENSOR_ADC, voltageSensor
//
void voltageMeterReset(voltageMeter_t *voltageMeter);
void voltageMeterGenericInit(void);
void voltageMeterADCInit(void);
void voltageMeterADCRefresh(void);
void voltageMeterADCRead(voltageSensorADC_e adcChannel, voltageMeter_t *voltageMeter);