From 976d541940d0d21533cadb65f24d6a18098176dd Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Thu, 3 Dec 2015 17:19:56 +0100 Subject: [PATCH] sdlog2: Update RC logging --- src/modules/sdlog2/sdlog2.c | 3 ++- src/modules/sdlog2/sdlog2_messages.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 0fb8254a92..57aec762e6 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -1677,11 +1677,12 @@ int sdlog2_thread_main(int argc, char *argv[]) /* --- RC CHANNELS --- */ if (copy_if_updated(ORB_ID(rc_channels), &subs.rc_sub, &buf.rc)) { log_msg.msg_type = LOG_RC_MSG; - /* Copy only the first 8 channels of 14 */ + /* Copy only the first 12 channels of 18 */ memcpy(log_msg.body.log_RC.channel, buf.rc.channels, sizeof(log_msg.body.log_RC.channel)); log_msg.body.log_RC.rssi = buf.rc.rssi; log_msg.body.log_RC.channel_count = buf.rc.channel_count; log_msg.body.log_RC.signal_lost = buf.rc.signal_lost; + log_msg.body.log_RC.frame_drop = buf.rc.frame_drop_count; LOGBUFFER_WRITE_AND_COUNT(RC); } diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 6ccbec2fa9..86c2c58868 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -188,10 +188,11 @@ struct log_STAT_s { /* --- RC - RC INPUT CHANNELS --- */ #define LOG_RC_MSG 11 struct log_RC_s { - float channel[8]; + float channel[12]; uint8_t rssi; uint8_t channel_count; uint8_t signal_lost; + uint32_t frame_drop; }; /* --- OUT0 - ACTUATOR_0 OUTPUT --- */ @@ -533,7 +534,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(STAT, "BBBfBBf", "MainState,ArmS,Failsafe,BatRem,BatWarn,Landed,Load"), LOG_FORMAT(VTOL, "f", "Arsp"), LOG_FORMAT(CTS, "fffffff", "Vx_b,Vy_b,Vz_b,Vinf,P,Q,R"), - LOG_FORMAT(RC, "ffffffffBBB", "Ch0,Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7,RSSI,Count,SignalLost"), + LOG_FORMAT(RC, "ffffffffffffBBBL", "C0,C1,C2,C3,C4,C5,C6,C7,C8,C9,C10,C11,RSSI,CNT,Lost,Drop"), LOG_FORMAT(OUT0, "ffffffff", "Out0,Out1,Out2,Out3,Out4,Out5,Out6,Out7"), LOG_FORMAT(AIRS, "fff", "IndSpeed,TrueSpeed,AirTemp"), LOG_FORMAT(ARSP, "fff", "RollRateSP,PitchRateSP,YawRateSP"),