[subsystems/electrical] fix conversion of vsupply to decivolts

* Should now work correctly with <define name="VoltageOfAdc(adc)" value ="(VOLTAGE_ADC_A * adc + VOLTAGE_ADC_B )"/> with VOLTAGE_ADC_B in Volts * Also fix VoltageOfAdc to DefaultVoltageOfAdc in board header for tiny_2.0
paparazzi · Jan 8, 2013 · d266565 · d266565
1 parent 67e9833
commit d266565
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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