[paparazzi-commits] [4152] replace VoltageOfAdc() by DefaultVoltageOfAdc()

[Pascal Brisset]

Revision: 4152
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4152
Author:   hecto
Date:     2009-09-11 16:41:39 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
 replace VoltageOfAdc() by DefaultVoltageOfAdc()

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/slayer2.xml
    paparazzi3/trunk/conf/autopilot/tiny_0_99.h

Modified: paparazzi3/trunk/conf/airframes/slayer2.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/slayer2.xml 2009-09-11 16:25:31 UTC (rev 
4151)
+++ paparazzi3/trunk/conf/airframes/slayer2.xml 2009-09-11 16:41:39 UTC (rev 
4152)
@@ -91,6 +91,7 @@
  <section name="BAT">
     <define name="MILLIAMP_AT_FULL_THROTTLE" value="5000"/>
     <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
+    <define name="VoltageOfAdc(adc)" value="(0.0183*adc)"/>
   </section>
  
  <section name="MISC">

Modified: paparazzi3/trunk/conf/autopilot/tiny_0_99.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny_0_99.h 2009-09-11 16:25:31 UTC (rev 
4151)
+++ paparazzi3/trunk/conf/autopilot/tiny_0_99.h 2009-09-11 16:41:39 UTC (rev 
4152)
@@ -122,11 +122,8 @@
 #endif
 #define USE_AD1_6
 
+#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
 
-#ifndef VoltageOfAdc
-#define VoltageOfAdc(adc) (0.01787109375*adc)
-#endif
-
 #define SPI_SELECT_SLAVE0_PORT 0
 #define SPI_SELECT_SLAVE0_PIN 20