From d266565227bb81f071662d104e4ccf0244ff87df Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Tue, 8 Jan 2013 23:52:33 +0100 Subject: [PATCH] [subsystems/electrical] fix conversion of vsupply to decivolts * Should now work correctly with with VOLTAGE_ADC_B in Volts * Also fix VoltageOfAdc to DefaultVoltageOfAdc in board header for tiny_2.0 --- sw/airborne/boards/tiny_2.0.h | 4 +--- sw/airborne/subsystems/electrical.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sw/airborne/boards/tiny_2.0.h b/sw/airborne/boards/tiny_2.0.h index ff8cebaabcd..ef6399ddf25 100644 --- a/sw/airborne/boards/tiny_2.0.h +++ b/sw/airborne/boards/tiny_2.0.h @@ -150,9 +150,7 @@ #endif -#ifndef VoltageOfAdc -#define VoltageOfAdc(adc) (0.01787109375*adc) -#endif +#define DefaultVoltageOfAdc(adc) (0.01787109375*adc) #define SPI_SELECT_SLAVE0_PORT 0 #define SPI_SELECT_SLAVE0_PIN 20 diff --git a/sw/airborne/subsystems/electrical.c b/sw/airborne/subsystems/electrical.c index 6761fcd8c02..a32f960c692 100644 --- a/sw/airborne/subsystems/electrical.c +++ b/sw/airborne/subsystems/electrical.c @@ -52,7 +52,7 @@ void electrical_init(void) { void electrical_periodic(void) { #ifndef SITL - electrical.vsupply = VoltageOfAdc((10*(electrical_priv.vsupply_adc_buf.sum/electrical_priv.vsupply_adc_buf.av_nb_sample))); + electrical.vsupply = 10 * VoltageOfAdc(electrical_priv.vsupply_adc_buf.sum/electrical_priv.vsupply_adc_buf.av_nb_sample)); #endif #ifdef ADC_CHANNEL_CURRENT