diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-07 15:34:13 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-07 15:34:13 +0100 |
| commit | 9b711d6a722fc254bb0d461b9aec66d20fbf59b1 (patch) | |
| tree | e4e1cea58709e8513da969cf356de9917dd12f18 /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 2a2c8337e8a01c59a542c8dd3dc77a087b34e3c2 (diff) | |
| parent | 94b539dfddc5a2e293f51058ee5bf0d6ffc78406 (diff) | |
| download | px4-firmware-9b711d6a722fc254bb0d461b9aec66d20fbf59b1.tar.gz px4-firmware-9b711d6a722fc254bb0d461b9aec66d20fbf59b1.tar.bz2 px4-firmware-9b711d6a722fc254bb0d461b9aec66d20fbf59b1.zip | |
Merged origin/master into batt_fixes
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index b02f39858..a784a1f30 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -157,6 +157,7 @@ struct log_STAT_s { #define LOG_RC_MSG 11 struct log_RC_s { float channel[8]; + uint8_t channel_count; }; /* --- OUT0 - ACTUATOR_0 OUTPUT --- */ @@ -288,7 +289,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(GPS, "QBffLLfffff", "GPSTime,FixType,EPH,EPV,Lat,Lon,Alt,VelN,VelE,VelD,Cog"), LOG_FORMAT(ATTC, "ffff", "Roll,Pitch,Yaw,Thrust"), LOG_FORMAT(STAT, "BBBfBB", "MainState,NavState,ArmState,BatRem,BatWarn,Landed"), - LOG_FORMAT(RC, "ffffffff", "Ch0,Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7"), + LOG_FORMAT(RC, "ffffffffB", "Ch0,Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7,Count"), LOG_FORMAT(OUT0, "ffffffff", "Out0,Out1,Out2,Out3,Out4,Out5,Out6,Out7"), LOG_FORMAT(AIRS, "ff", "IndSpeed,TrueSpeed"), LOG_FORMAT(ARSP, "fff", "RollRateSP,PitchRateSP,YawRateSP"), |