From c77c93c8b7c4fc690b2f5c7b7c25d5b6f5124b41 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Mon, 12 May 2014 00:20:15 +0100 Subject: [PATCH] Update battery voltage calculation to use a hex value for the 12bit ADC value. --- src/battery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battery.c b/src/battery.c index 5b42784ef5..e10315e572 100644 --- a/src/battery.c +++ b/src/battery.c @@ -17,8 +17,8 @@ static batteryConfig_t *batteryConfig; uint16_t batteryAdcToVoltage(uint16_t src) { // calculate battery voltage based on ADC reading - // result is Vbatt in 0.1V steps. 3.3V = ADC Vref, 4095 = 12bit adc, 110 = 11:1 voltage divider (10k:1k) * 10 for 0.1V - return (((src) * 3.3f) / 4095) * batteryConfig->vbatscale; + // result is Vbatt in 0.1V steps. 3.3V = ADC Vref, 0xFFF = 12bit adc, 110 = 11:1 voltage divider (10k:1k) * 10 for 0.1V + return (((src) * 3.3f) / 0xFFF) * batteryConfig->vbatscale; }