[paparazzi-commits] [4115] add sign to current

[Pascal Brisset]

Revision: 4115
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4115
Author:   hecto
Date:     2009-09-08 20:10:48 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
 add sign to current

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/main_fbw.c
    paparazzi3/trunk/sw/airborne/main_fbw.h

Modified: paparazzi3/trunk/sw/airborne/main_fbw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/main_fbw.c     2009-09-08 20:10:15 UTC (rev 
4114)
+++ paparazzi3/trunk/sw/airborne/main_fbw.c     2009-09-08 20:10:48 UTC (rev 
4115)
@@ -61,9 +61,6 @@
 #ifdef MILLIAMP_PER_PERCENT
 #  warning "deprecated MILLIAMP_PER_PERCENT --> Please use 
MILLIAMP_AT_FULL_THROTTLE"
 #endif
-#ifndef MILLIAMP_AT_FULL_THROTTLE
-#define MILLIAMP_AT_FULL_THROTTLE 0
-#endif
 
 #ifdef ADC
 struct adc_buf vsupply_adc_buf;
@@ -79,7 +76,7 @@
 #endif
 
 uint8_t fbw_vsupply_decivolt;
-uint16_t fbw_current_milliamp;
+int16_t fbw_current_milliamp;
 
 uint8_t fbw_mode;
 
@@ -229,7 +226,7 @@
 #   endif
 #endif
 
-#ifndef ADC_CHANNEL_CURRENT
+#if ((! defined ADC_CHANNEL_CURRENT) && defined MILLIAMP_AT_FULL_THROTTLE)
 #ifdef COMMAND_THROTTLE
     fbw_current_milliamp = Min(((float)commands[COMMAND_THROTTLE]) * 
((float)MILLIAMP_AT_FULL_THROTTLE) / ((float)MAX_PPRZ), 65000);
 #endif

Modified: paparazzi3/trunk/sw/airborne/main_fbw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/main_fbw.h     2009-09-08 20:10:15 UTC (rev 
4114)
+++ paparazzi3/trunk/sw/airborne/main_fbw.h     2009-09-08 20:10:48 UTC (rev 
4115)
@@ -41,7 +41,7 @@
 
 extern uint8_t fbw_mode;
 extern uint8_t fbw_vsupply_decivolt;
-extern uint16_t fbw_current_milliamp;
+extern int16_t fbw_current_milliamp;
 extern bool_t failsafe_mode;
 
 void init_fbw( void );