Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 03:57:45 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

relaces defines IMU_TYPE with SECTION_IMU

Browse Source 
removes IMU_TYPE defines from goras...xml configuration files
This commit is contained in:
jpdumont
2005-08-23 12:16:13 +00:00
parent a1dc975192
commit b6a69b55c9
5 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/gorazoptere_brushless_3DMG.xml
-1
View File
@@ -1,6 +1,5 @@
<airframe name="Gorazoptere_brushless_3DMG" ctl_board="V1_2_1" gps="SAM_LS"> <airframe name="Gorazoptere_brushless_3DMG" ctl_board="V1_2_1" gps="SAM_LS">
<section name="IMU_3DMG" prefix="IMU_"> <section name="IMU_3DMG" prefix="IMU_">
<define name="TYPE_3DMG" value="1"/>
</section> </section>
<section name="rate_loop"> <section name="rate_loop">
<define name="ROLL_DOT_PGAIN" value="-192."/> <define name="ROLL_DOT_PGAIN" value="-192."/>
conf/airframes/gorazoptere_brushless_ANALOG.xml
-1
View File
@@ -1,6 +1,5 @@
<airframe name="Gorazoptere_brushless_ANALOG" ctl_board="V1_2" gps="SAM_LS"> <airframe name="Gorazoptere_brushless_ANALOG" ctl_board="V1_2" gps="SAM_LS">
<section name="IMU_ANALOG" prefix="IMU_"> <section name="IMU_ANALOG" prefix="IMU_">
<define name="TYPE_ANALOG" value="1"/>
<define name="ADC_ROLL_DOT" value="1"/> <define name="ADC_ROLL_DOT" value="1"/>
<define name="ADC_PITCH_DOT" value="2"/> <define name="ADC_PITCH_DOT" value="2"/>
<define name="ADC_YAW_DOT" value="3"/> <define name="ADC_YAW_DOT" value="3"/>
sw/airborne/autopilot/estimator.c
+1 -1
View File
@@ -149,7 +149,7 @@ void estimator_update_state_infrared( void ) {
} }
#ifdef IMU_TYPE_3DMG #ifdef SECTION_IMU_3DMG
#include "link_fbw.h" #include "link_fbw.h"
void estimator_update_state_3DMG ( void ) { void estimator_update_state_3DMG ( void ) {
estimator_phi = from_fbw.euler[0]; estimator_phi = from_fbw.euler[0];
sw/airborne/autopilot/main.c
+1 -1
View File
@@ -492,7 +492,7 @@ inline void periodic_task( void ) {
} }
case 2: case 2:
ir_update(); ir_update();
#ifndef IMU_TYPE_3DMG #ifndef SECTION_IMU_3DMG
estimator_update_state_infrared(); estimator_update_state_infrared();
#endif #endif
roll_pitch_pid_run(); /* Set desired_aileron & desired_elevator */ roll_pitch_pid_run(); /* Set desired_aileron & desired_elevator */
sw/airborne/autopilot/mainloop.c
+1 -1
View File
@@ -100,7 +100,7 @@ int main( void ) {
/* receive radio control task from fbw */ /* receive radio control task from fbw */
link_fbw_receive_complete = FALSE; link_fbw_receive_complete = FALSE;
radio_control_task(); radio_control_task();
#ifdef IMU_TYPE_3DMG #ifdef SECTION_IMU_3DMG
DOWNLINK_SEND_IMU_3DMG(&from_fbw.euler_dot[0], &from_fbw.euler_dot[1], &from_fbw.euler_dot[2], &from_fbw.euler[0], &from_fbw.euler[1], &from_fbw.euler[2]); DOWNLINK_SEND_IMU_3DMG(&from_fbw.euler_dot[0], &from_fbw.euler_dot[1], &from_fbw.euler_dot[2], &from_fbw.euler[0], &from_fbw.euler[1], &from_fbw.euler[2]);
estimator_update_state_3DMG(); estimator_update_state_3DMG();
#endif #endif