diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-25 18:31:12 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-25 18:31:12 +0400 |
| commit | 1e4bb764a61335c0e209f83438e74264e972a164 (patch) | |
| tree | 1d4fd2c9616ee7953eea17ab0c3e37fe49c05b47 /src/modules/sdlog2/sdlog2_messages.h | |
| parent | f36ffe0859912e2976df5b2cabc87018d3f55f4e (diff) | |
| parent | 8d2950561d1889ab1d4c2fc5d832a2984048487d (diff) | |
| download | px4-firmware-1e4bb764a61335c0e209f83438e74264e972a164.tar.gz px4-firmware-1e4bb764a61335c0e209f83438e74264e972a164.tar.bz2 px4-firmware-1e4bb764a61335c0e209f83438e74264e972a164.zip | |
Merge branch 'mathlib_new' into vector_control2
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 2bbde18fc..6bfc8606e 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -159,6 +159,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 --- */ @@ -291,7 +292,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, "BBBfffBB", "MainState,NavState,ArmState,BatV,BatC,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"), |