refactor(radio): unified battery and RTC voltage (#6065)
This commit is contained in:
@@ -88,6 +88,16 @@ uint32_t stm32_hal_get_inputs_mask()
|
||||
return _adc_input_inhibt_mask;
|
||||
}
|
||||
|
||||
#if defined(STM32H7)
|
||||
#if defined(ADC3)
|
||||
#define VBAT_ADC ADC3
|
||||
#else
|
||||
#define VBAT_ADC ADC2
|
||||
#endif
|
||||
#else
|
||||
#define VBAT_ADC ADC1
|
||||
#endif
|
||||
|
||||
// STM32 uses a 25K+25K voltage divider bridge to measure the battery voltage
|
||||
// Measuring VBAT puts considerable drain (22 µA) on the battery instead of
|
||||
// normal drain (~10 nA)
|
||||
@@ -96,7 +106,7 @@ void enableVBatBridge()
|
||||
if (adcGetMaxInputs(ADC_INPUT_RTC_BAT) < 1) return;
|
||||
|
||||
// Set internal measurement path for vbat sensor
|
||||
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(ADC1), LL_ADC_PATH_INTERNAL_VBAT);
|
||||
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(VBAT_ADC), LL_ADC_PATH_INTERNAL_VBAT);
|
||||
|
||||
auto channel = adcGetInputOffset(ADC_INPUT_RTC_BAT);
|
||||
_adc_inhibit_mask &= ~(1 << channel);
|
||||
@@ -110,13 +120,13 @@ void disableVBatBridge()
|
||||
_adc_inhibit_mask |= (1 << channel);
|
||||
|
||||
// Set internal measurement path to none
|
||||
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(ADC1), LL_ADC_PATH_INTERNAL_NONE);
|
||||
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(VBAT_ADC), LL_ADC_PATH_INTERNAL_NONE);
|
||||
}
|
||||
|
||||
bool isVBatBridgeEnabled()
|
||||
{
|
||||
// && !(_adc_inhibit_mask & (1 << channel));
|
||||
return LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(ADC1)) == LL_ADC_PATH_INTERNAL_VBAT;
|
||||
return LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(VBAT_ADC)) == LL_ADC_PATH_INTERNAL_VBAT;
|
||||
}
|
||||
|
||||
static void adc_enable_clock(ADC_TypeDef* ADCx)
|
||||
|
||||
@@ -382,11 +382,16 @@ void initCSD203(void)
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t getCSD203BatteryVoltage(void)
|
||||
static uint16_t getCSD203BatteryVoltage(void)
|
||||
{ // 1000=1000mV
|
||||
return csd203extvbus;
|
||||
}
|
||||
|
||||
uint16_t getBatteryVoltage()
|
||||
{
|
||||
return getCSD203BatteryVoltage() / 10;
|
||||
}
|
||||
|
||||
void readCSD203(void)
|
||||
{ // 5ms
|
||||
static uint16_t GetSenSorStep = 0;
|
||||
|
||||
@@ -397,7 +397,7 @@
|
||||
#define ADC_DMA_STREAM_IRQ DMA2_Stream0_IRQn
|
||||
#define ADC_DMA_STREAM_IRQHandler DMA2_Stream0_IRQHandler
|
||||
#define ADC_SAMPTIME LL_ADC_SAMPLINGTIME_56CYCLES
|
||||
#define ADC_VREF_PREC2 600
|
||||
#define ADC_VREF_PREC2 300
|
||||
#elif defined(RADIO_V16)
|
||||
#define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_0 // PA.00
|
||||
#define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_1 // PA.01
|
||||
@@ -446,7 +446,7 @@
|
||||
#define ADC_DMA_STREAM LL_DMA_STREAM_0
|
||||
#define ADC_DMA_STREAM_IRQ DMA2_Stream0_IRQn
|
||||
#define ADC_DMA_STREAM_IRQHandler DMA2_Stream0_IRQHandler
|
||||
#define ADC_VREF_PREC2 660
|
||||
#define ADC_VREF_PREC2 330
|
||||
#elif defined(PCBX10)
|
||||
#if defined(RADIO_T15)
|
||||
#define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_1 // PA.01
|
||||
@@ -546,11 +546,11 @@
|
||||
|
||||
// VBat divider is /4 on F42x and F43x devices
|
||||
#if defined(RADIO_TX16S) || defined(RADIO_T15) || defined(RADIO_F16) || defined(RADIO_V16)
|
||||
#define ADC_VREF_PREC2 660
|
||||
#define ADC_VREF_PREC2 330
|
||||
#elif defined(RADIO_T16) || defined(RADIO_T18)
|
||||
#define ADC_VREF_PREC2 600
|
||||
#define ADC_VREF_PREC2 300
|
||||
#else
|
||||
#define ADC_VREF_PREC2 500
|
||||
#define ADC_VREF_PREC2 250
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
#define ADC_EXT_DMA_STREAM_IRQ DMA2_Stream0_IRQn
|
||||
#define ADC_EXT_DMA_STREAM_IRQHandler DMA2_Stream0_IRQHandler
|
||||
#define ADC_EXT_SAMPTIME LL_ADC_SAMPLINGTIME_28CYCLES
|
||||
#define ADC_VREF_PREC2 660
|
||||
#define ADC_VREF_PREC2 330
|
||||
|
||||
#define ADC_DIRECTION \
|
||||
{ 0 /*STICK1*/, 0 /*STICK2*/, 0 /*STICK3*/, 0 /*STICK4*/, \
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
#define ADC_EXT_DMA_STREAM_IRQ DMA2_Stream0_IRQn
|
||||
#define ADC_EXT_DMA_STREAM_IRQHandler DMA2_Stream0_IRQHandler
|
||||
#define ADC_EXT_SAMPTIME LL_ADC_SAMPLINGTIME_28CYCLES
|
||||
#define ADC_VREF_PREC2 660
|
||||
#define ADC_VREF_PREC2 330
|
||||
|
||||
#define ADC_DIRECTION \
|
||||
{ 0 /*STICK1*/, 0 /*STICK2*/, 0 /*STICK3*/, 0 /*STICK4*/, \
|
||||
@@ -223,7 +223,7 @@
|
||||
#define ADC_DMA_STREAM_IRQ DMA2_Stream4_IRQn
|
||||
#define ADC_DMA_STREAM_IRQHandler DMA2_Stream4_IRQHandler
|
||||
|
||||
#define ADC_VREF_PREC2 660
|
||||
#define ADC_VREF_PREC2 330
|
||||
|
||||
#define ADC_DIRECTION { \
|
||||
0,0, /* gimbals */ \
|
||||
@@ -454,7 +454,7 @@
|
||||
#define ADC_EXT_DMA_STREAM_IRQHandler DMA2_Stream0_IRQHandler
|
||||
#define ADC_EXT_SAMPTIME LL_ADC_SAMPLINGTIME_28CYCLES
|
||||
|
||||
#define ADC_VREF_PREC2 660
|
||||
#define ADC_VREF_PREC2 330
|
||||
|
||||
#if defined(RADIO_PL18EV)
|
||||
#define ADC_DIRECTION { \
|
||||
|
||||
@@ -33,6 +33,17 @@ void enableVBatBridge(){}
|
||||
void disableVBatBridge(){}
|
||||
bool isVBatBridgeEnabled(){ return false; }
|
||||
|
||||
uint16_t getBatteryVoltage()
|
||||
{
|
||||
if (adcGetMaxInputs(ADC_INPUT_VBAT) < 1) return 0;
|
||||
return anaIn(adcGetInputOffset(ADC_INPUT_VBAT));
|
||||
}
|
||||
|
||||
uint16_t getRTCBatteryVoltage()
|
||||
{
|
||||
return 300;
|
||||
}
|
||||
|
||||
extern uint16_t simu_get_analog(uint8_t idx);
|
||||
|
||||
static bool simu_start_conversion()
|
||||
@@ -44,38 +55,9 @@ static bool simu_start_conversion()
|
||||
|
||||
// set batteries default voltages
|
||||
int i = adcGetInputOffset(ADC_INPUT_VBAT);
|
||||
|
||||
if (i > 0) {
|
||||
// calculate default voltage on 1st call
|
||||
uint32_t adc = (simu_get_analog(i) - 2048) * 1000 / 2000;
|
||||
// TRACE("raw ana: %d adj ana: %d", simu_get_analog(i), vbat);
|
||||
// just in case the voltage has not been initialised in sim initialisation/startup
|
||||
// these formulae must mirror OpenTxSimulator::voltageToAdc
|
||||
if (adc == 0) {
|
||||
uint32_t volts = (uint32_t)((g_eeGeneral.vBatWarn > 0 ? g_eeGeneral.vBatWarn : BATTERY_WARN) + 5) * 10; // +0.5V and prec2
|
||||
#if defined(VBAT_MOSFET_DROP)
|
||||
// TRACE("volts: %d r1: %d r2: %d drop: %d vref: %d calib: %d", volts, VBAT_DIV_R1, VBAT_DIV_R2, VBAT_MOSFET_DROP, ADC_VREF_PREC2, g_eeGeneral.txVoltageCalibration);
|
||||
adc = (volts - VBAT_MOSFET_DROP) * (2 * RESX * 1000) / ADC_VREF_PREC2 / (((1000 + g_eeGeneral.txVoltageCalibration) * (VBAT_DIV_R2 + VBAT_DIV_R1)) / VBAT_DIV_R1);
|
||||
#elif defined(BATT_SCALE)
|
||||
// TRACE("volts: %d div: %d drop: %d scale: %d calib: %d", volts, BATTERY_DIVIDER, VOLTAGE_DROP, BATT_SCALE, g_eeGeneral.txVoltageCalibration);
|
||||
adc = (volts - VOLTAGE_DROP) * BATTERY_DIVIDER / (128 + g_eeGeneral.txVoltageCalibration) / BATT_SCALE;
|
||||
#elif defined(VOLTAGE_DROP)
|
||||
// TRACE("volts: %d div: %d drop: %d", volts, BATTERY_DIVIDER, VOLTAGE_DROP);
|
||||
adc = (volts - VOLTAGE_DROP) * BATTERY_DIVIDER / (1000 + g_eeGeneral.txVoltageCalibration);
|
||||
#else
|
||||
// TRACE("volts: %d div: %d calib: %d", volts, BATTERY_DIVIDER, g_eeGeneral.txVoltageCalibration);
|
||||
adc = volts * BATTERY_DIVIDER / (1000 + g_eeGeneral.txVoltageCalibration);
|
||||
#endif
|
||||
// TRACE("calc adc: %d", adc);
|
||||
adc = adc * 2; // div by 2 in firmware filtered adc calcs
|
||||
}
|
||||
|
||||
setAnalogValue(i, adc);
|
||||
}
|
||||
|
||||
if (adcGetMaxInputs(ADC_INPUT_RTC_BAT) > 0) {
|
||||
uint32_t rtc_bat = (300 * (2048 >> ANALOG_SCALE)) / ADC_VREF_PREC2;
|
||||
setAnalogValue(adcGetInputOffset(ADC_INPUT_RTC_BAT), rtc_bat * 2);
|
||||
uint16_t volts = (uint16_t)((g_eeGeneral.vBatWarn > 0 ? g_eeGeneral.vBatWarn : BATTERY_WARN) + 5) * 10; // +0.5V and prec2
|
||||
setAnalogValue(i, volts * 2);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -391,7 +391,7 @@ void OpenTxSimulator::setInputValue(int type, uint8_t index, int16_t value)
|
||||
case INPUT_SRC_TXVIN :
|
||||
if (adcGetMaxInputs(ADC_INPUT_VBAT) > 0) {
|
||||
auto idx = adcGetInputOffset(ADC_INPUT_VBAT);
|
||||
setAnalogValue(idx, voltageToAdc(value));
|
||||
setAnalogValue(idx, value);
|
||||
emit txBatteryVoltageChanged((unsigned int)value);
|
||||
}
|
||||
break;
|
||||
@@ -907,28 +907,6 @@ const char * OpenTxSimulator::getError()
|
||||
return main_thread_error;
|
||||
}
|
||||
|
||||
const int OpenTxSimulator::voltageToAdc(const int voltage)
|
||||
{
|
||||
int volts = voltage * 10; // prec2
|
||||
int adc = 0;
|
||||
|
||||
#if defined(VBAT_MOSFET_DROP)
|
||||
// TRACE("volts: %d r1: %d r2: %d drop: %d vref: %d calib: %d", volts, VBAT_DIV_R1, VBAT_DIV_R2, VBAT_MOSFET_DROP, ADC_VREF_PREC2, g_eeGeneral.txVoltageCalibration);
|
||||
adc = (volts - VBAT_MOSFET_DROP) * (2 * RESX * 1000) / ADC_VREF_PREC2 / (((1000 + g_eeGeneral.txVoltageCalibration) * (VBAT_DIV_R2 + VBAT_DIV_R1)) / VBAT_DIV_R1);
|
||||
#elif defined(BATT_SCALE)
|
||||
// TRACE("volts: %d div: %d drop: %d scale: %d calib: %d", volts, BATTERY_DIVIDER, VOLTAGE_DROP, BATT_SCALE, g_eeGeneral.txVoltageCalibration);
|
||||
adc = (volts - VOLTAGE_DROP) * BATTERY_DIVIDER / (128 + g_eeGeneral.txVoltageCalibration) / BATT_SCALE;
|
||||
#elif defined(VOLTAGE_DROP)
|
||||
// TRACE("volts: %d div: %d drop: %d", volts, BATTERY_DIVIDER, VOLTAGE_DROP);
|
||||
adc = (volts - VOLTAGE_DROP) * BATTERY_DIVIDER / (1000 + g_eeGeneral.txVoltageCalibration);
|
||||
#else
|
||||
// TRACE("volts: %d div: %d calib: %d", volts, BATTERY_DIVIDER, g_eeGeneral.txVoltageCalibration);
|
||||
adc = volts * BATTERY_DIVIDER / (1000 + g_eeGeneral.txVoltageCalibration);
|
||||
#endif
|
||||
// TRACE("calc adc: %d", adc);
|
||||
return adc * 2; // div by 2 in firmware filtered adc calcs
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* OpenTxSimulatorFactory
|
||||
|
||||
@@ -106,7 +106,6 @@ class DLLEXPORT OpenTxSimulator : public SimulatorInterface
|
||||
const char * getPhaseName(unsigned int phase);
|
||||
const QString getCurrentPhaseName();
|
||||
const char * getError();
|
||||
const int voltageToAdc(const int voltage);
|
||||
|
||||
QString simuSdDirectory;
|
||||
QString simuSettingsDirectory;
|
||||
|
||||
@@ -359,26 +359,26 @@ void setTopBatteryValue(uint32_t volts);
|
||||
#define BATTERY_DIVIDER 27500 // TODO: fix when we have proper schematics
|
||||
#define VOLTAGE_DROP 20
|
||||
#elif defined(MANUFACTURER_RADIOMASTER) || defined(MANUFACTURER_JUMPER)
|
||||
// --- MOSFET ---- R2 --- MCU
|
||||
// |__ R1 --- GND
|
||||
//
|
||||
#define VBAT_DIV_R1 160 // kOhms
|
||||
#define VBAT_DIV_R2 499 // kOhms
|
||||
#if defined(MANUFACTURER_JUMPER)
|
||||
#define VBAT_MOSFET_DROP 50 // * 10mV
|
||||
// --- MOSFET ---- R1 --- MCU
|
||||
// |__ R2 --- GND
|
||||
//
|
||||
#define VBAT_DIV_R1 499 // kOhms
|
||||
#define VBAT_DIV_R2 160 // kOhms
|
||||
#if defined(MANUFACTURER_JUMPER)
|
||||
#define VBAT_MOSFET_DROP 50 // * 10mV
|
||||
#else
|
||||
#define VBAT_MOSFET_DROP 25 // * 10mV
|
||||
#endif
|
||||
#else
|
||||
#define VBAT_MOSFET_DROP 25 // * 10mV
|
||||
#if defined (RADIO_T8) || defined(RADIO_COMMANDO8)
|
||||
#define BATTERY_DIVIDER 50000
|
||||
#elif defined (RADIO_LR3PRO)
|
||||
#define BATTERY_DIVIDER 39500
|
||||
#else
|
||||
#define BATTERY_DIVIDER 26214
|
||||
#endif
|
||||
#define VOLTAGE_DROP 20
|
||||
#endif
|
||||
#else //--- MOSFET ---- R2 --- MCU
|
||||
#if defined (RADIO_T8) || defined(RADIO_COMMANDO8)
|
||||
#define BATTERY_DIVIDER 50000
|
||||
#elif defined (RADIO_LR3PRO)
|
||||
#define BATTERY_DIVIDER 39500
|
||||
#else
|
||||
#define BATTERY_DIVIDER 26214
|
||||
#endif
|
||||
#define VOLTAGE_DROP 20
|
||||
#endif //--- MOSFET ---- R2 --- MCU
|
||||
|
||||
#if defined(RADIO_FAMILY_T20)
|
||||
#define NUM_TRIMS 8
|
||||
|
||||
Reference in New Issue
Block a user