diff options
| author | tumbili <bapstr@ethz.ch> | 2014-12-03 09:46:52 +0100 |
|---|---|---|
| committer | tumbili <bapstr@ethz.ch> | 2014-12-03 09:46:52 +0100 |
| commit | f7ca1d36d2a35b9781a41ffc40acfb2eaf84544f (patch) | |
| tree | 8bfde9b58a3f03bd14dd5f17270067d3630a926d /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 0e33e52d4ae2df06467f5b862bb0734c3ba23015 (diff) | |
| download | px4-firmware-f7ca1d36d2a35b9781a41ffc40acfb2eaf84544f.tar.gz px4-firmware-f7ca1d36d2a35b9781a41ffc40acfb2eaf84544f.tar.bz2 px4-firmware-f7ca1d36d2a35b9781a41ffc40acfb2eaf84544f.zip | |
renamed FWC to ATC1
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 447b3fb9c..b78b430aa 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -150,6 +150,7 @@ struct log_GPS_s { /* --- ATTC - ATTITUDE CONTROLS (ACTUATOR_0 CONTROLS)--- */ #define LOG_ATTC_MSG 9 +#define LOG_ATC1_MSG 40 struct log_ATTC_s { float roll; float pitch; @@ -423,15 +424,6 @@ struct log_ENCD_s { float vel1; }; -/* ATTITUDE CONTROLS (ACTUATOR_1 CONTROLS) */ -#define LOG_FWC_MSG 40 -struct log_FWC_s { - float roll; - float pitch; - float yaw; - float thrust; -}; - /********** SYSTEM MESSAGES, ID > 0x80 **********/ /* --- TIME - TIME STAMP --- */ @@ -469,8 +461,8 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(LPOS, "ffffffffLLfBBBff", "X,Y,Z,Dist,DistR,VX,VY,VZ,RLat,RLon,RAlt,PFlg,LFlg,GFlg,EPH,EPV"), LOG_FORMAT(LPSP, "ffff", "X,Y,Z,Yaw"), LOG_FORMAT(GPS, "QBffLLfffffBHHH", "GPSTime,Fix,EPH,EPV,Lat,Lon,Alt,VelN,VelE,VelD,Cog,nSat,SNR,N,J"), - LOG_FORMAT(ATTC, "ffff", "Roll,Pitch,Yaw,Thrust"), - LOG_FORMAT(FWC,"ffff", "Roll,Pitch,Yaw,Thrust"), + LOG_FORMAT_S(ATTC, ATTC, "ffff", "Roll,Pitch,Yaw,Thrust"), + LOG_FORMAT_S(ATC1, ATTC, "ffff", "Roll,Pitch,Yaw,Thrust"), LOG_FORMAT(STAT, "BBBfBB", "MainState,ArmState,FailsafeState,BatRem,BatWarn,Landed"), LOG_FORMAT(RC, "ffffffffBB", "Ch0,Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7,Count,SignalLost"), LOG_FORMAT(OUT0, "ffffffff", "Out0,Out1,Out2,Out3,Out4,Out5,Out6,Out7"), |