[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [4334] Change current data type from int16 to int32
From: |
Mark Griffin |
Subject: |
[paparazzi-commits] [4334] Change current data type from int16 to int32 in order to support currents >32767 mA |
Date: |
Fri, 13 Nov 2009 22:01:30 +0000 |
Revision: 4334
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4334
Author: markgriffin
Date: 2009-11-13 22:01:30 +0000 (Fri, 13 Nov 2009)
Log Message:
-----------
Change current data type from int16 to int32 in order to support currents
>32767 mA
Modified Paths:
--------------
paparazzi3/trunk/conf/messages.xml
paparazzi3/trunk/sw/airborne/inter_mcu.h
paparazzi3/trunk/sw/airborne/main_ap.c
paparazzi3/trunk/sw/airborne/main_fbw.c
paparazzi3/trunk/sw/airborne/main_fbw.h
Modified: paparazzi3/trunk/conf/messages.xml
===================================================================
--- paparazzi3/trunk/conf/messages.xml 2009-11-13 22:01:23 UTC (rev 4333)
+++ paparazzi3/trunk/conf/messages.xml 2009-11-13 22:01:30 UTC (rev 4334)
@@ -226,7 +226,7 @@
<message name="MOTOR" id="34">
<field name="rpm" type="uint16" unit="Hz"/>
- <field name="current" type="uint16" unit="mA"/>
+ <field name="current" type="int32" unit="mA"/>
</message>
<message name="WP_MOVED" id="35">
@@ -420,7 +420,7 @@
<field name="rc_status" type="uint8" values="OK|LOST|REALLY_LOST"/>
<field name="mode" type="uint8" values="MANUAL|AUTO|FAILSAFE"/>
<field name="vsupply" type="uint8" unit="decivolt"/>
- <field name="current" type="int16" unit="mA"/>
+ <field name="current" type="int32" unit="mA"/>
</message>
<message name="ADC" id="104">
Modified: paparazzi3/trunk/sw/airborne/inter_mcu.h
===================================================================
--- paparazzi3/trunk/sw/airborne/inter_mcu.h 2009-11-13 22:01:23 UTC (rev
4333)
+++ paparazzi3/trunk/sw/airborne/inter_mcu.h 2009-11-13 22:01:30 UTC (rev
4334)
@@ -56,7 +56,7 @@
uint8_t status;
uint8_t nb_err;
uint8_t vsupply; /* 1e-1 V */
- int16_t current; /* milliAmps */
+ int32_t current; /* milliAmps */
};
struct ap_state {
Modified: paparazzi3/trunk/sw/airborne/main_ap.c
===================================================================
--- paparazzi3/trunk/sw/airborne/main_ap.c 2009-11-13 22:01:23 UTC (rev
4333)
+++ paparazzi3/trunk/sw/airborne/main_ap.c 2009-11-13 22:01:30 UTC (rev
4334)
@@ -190,7 +190,7 @@
bool_t launch = FALSE;
uint8_t vsupply; // deciVolt
-static int16_t current; // milliAmpere
+static int32_t current; // milliAmpere
float energy; // Fuel consumption (mAh)
Modified: paparazzi3/trunk/sw/airborne/main_fbw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/main_fbw.c 2009-11-13 22:01:23 UTC (rev
4333)
+++ paparazzi3/trunk/sw/airborne/main_fbw.c 2009-11-13 22:01:30 UTC (rev
4334)
@@ -76,7 +76,7 @@
#endif
uint8_t fbw_vsupply_decivolt;
-int16_t fbw_current_milliamp;
+int32_t fbw_current_milliamp;
uint8_t fbw_mode;
Modified: paparazzi3/trunk/sw/airborne/main_fbw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/main_fbw.h 2009-11-13 22:01:23 UTC (rev
4333)
+++ paparazzi3/trunk/sw/airborne/main_fbw.h 2009-11-13 22:01:30 UTC (rev
4334)
@@ -41,7 +41,7 @@
extern uint8_t fbw_mode;
extern uint8_t fbw_vsupply_decivolt;
-extern int16_t fbw_current_milliamp;
+extern int32_t fbw_current_milliamp;
extern bool_t failsafe_mode;
void init_fbw( void );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [4334] Change current data type from int16 to int32 in order to support currents >32767 mA,
Mark Griffin <=