Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 13:27:32 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Change current data type from int16 to int32 in order to support currents >32767 mA

Browse Source
This commit is contained in:
Mark Griffin
2009-11-13 22:01:30 +00:00
parent 9a49b0e91d
commit 60e6f95efd
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/messages.xml
+2 -2
View File
@@ -226,7 +226,7 @@
<message name="MOTOR" id="34"> <message name="MOTOR" id="34">
<field name="rpm" type="uint16" unit="Hz"/> <field name="rpm" type="uint16" unit="Hz"/>
<field name="current" type="uint16" unit="mA"/> <field name="current" type="int32" unit="mA"/>
</message> </message>
<message name="WP_MOVED" id="35"> <message name="WP_MOVED" id="35">
@@ -420,7 +420,7 @@
<field name="rc_status" type="uint8" values="OK|LOST|REALLY_LOST"/> <field name="rc_status" type="uint8" values="OK|LOST|REALLY_LOST"/>
<field name="mode" type="uint8" values="MANUAL|AUTO|FAILSAFE"/> <field name="mode" type="uint8" values="MANUAL|AUTO|FAILSAFE"/>
<field name="vsupply" type="uint8" unit="decivolt"/> <field name="vsupply" type="uint8" unit="decivolt"/>
<field name="current" type="int16" unit="mA"/> <field name="current" type="int32" unit="mA"/>
</message> </message>
<message name="ADC" id="104"> <message name="ADC" id="104">
sw/airborne/inter_mcu.h
+1 -1
View File
@@ -56,7 +56,7 @@ struct fbw_state {
uint8_t status; uint8_t status;
uint8_t nb_err; uint8_t nb_err;
uint8_t vsupply; /* 1e-1 V */ uint8_t vsupply; /* 1e-1 V */
int16_t current; /* milliAmps */ int32_t current; /* milliAmps */
}; };
struct ap_state { struct ap_state {
sw/airborne/main_ap.c
+1 -1
View File
@@ -190,7 +190,7 @@ float slider_1_val, slider_2_val;
bool_t launch = FALSE; bool_t launch = FALSE;
uint8_t vsupply; // deciVolt uint8_t vsupply; // deciVolt
static int16_t current; // milliAmpere static int32_t current; // milliAmpere
float energy; // Fuel consumption (mAh) float energy; // Fuel consumption (mAh)
sw/airborne/main_fbw.c
+1 -1
View File
@@ -76,7 +76,7 @@ struct adc_buf current_adc_buf;
#endif #endif
uint8_t fbw_vsupply_decivolt; uint8_t fbw_vsupply_decivolt;
int16_t fbw_current_milliamp; int32_t fbw_current_milliamp;
uint8_t fbw_mode; uint8_t fbw_mode;
sw/airborne/main_fbw.h
+1 -1
View File
@@ -41,7 +41,7 @@
extern uint8_t fbw_mode; extern uint8_t fbw_mode;
extern uint8_t fbw_vsupply_decivolt; extern uint8_t fbw_vsupply_decivolt;
extern int16_t fbw_current_milliamp; extern int32_t fbw_current_milliamp;
extern bool_t failsafe_mode; extern bool_t failsafe_mode;
void init_fbw( void ); void init_fbw( void );