Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 03:27:33 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

yapa_xsens compiles with no more warnings

Browse Source
This commit is contained in:
Christophe De Wagter
2011-04-20 15:32:34 +02:00
parent 7e67bffb01
commit 418371d775
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/TU_Delft/yapa_xsens.xml
+1 -3
View File
@@ -215,11 +215,9 @@
<!-- Actuators -->
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="navigation" type="extra"/>
<subsystem name="navigation"/>
<subsystem name="gps" type="xsens"/>
<!--<subsystem name="i2c"/>-->
</firmware>
</airframe>
sw/airborne/modules/ins/imu_chimu.h
-4
View File
@@ -93,11 +93,7 @@ typedef struct {
unsigned char m_MsgLen;
unsigned char m_TempDeviceID;
unsigned char m_DeviceID;
<<<<<<< HEAD
unsigned char m_Payload[CHIMU_RX_BUFFERSIZE]; // CHIMU data
=======
unsigned char m_Payload[CHIMU_RX_BUFFERSIZE]; // CHIMU data
>>>>>>> paparazzi/CHIMU
unsigned char m_FullMessage[CHIMU_RX_BUFFERSIZE]; // CHIMU data
CHIMU_attitude_data m_attitude;
CHIMU_attitude_data m_attrates;
sw/airborne/modules/ins/ins_xsens.h
-3
View File
@@ -31,9 +31,6 @@
#include "std.h"
extern float ins_pitch_neutral;
extern float ins_roll_neutral;
extern int8_t xsens_hour;
extern int8_t xsens_min;
extern int8_t xsens_sec;
sw/airborne/subsystems/navigation/spiral.c
+1 -1
View File
@@ -37,7 +37,7 @@ static float SRad;
static float IRad;
static float Alphalimit;
static float Segmente;
static float CamAngle;
// static float CamAngle;
static float ZPoint;
static float nav_radius_min;