diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde index b4bbf9878b..0c6bb2dc6a 100644 --- a/ArduPlane/ArduPlane.pde +++ b/ArduPlane/ArduPlane.pde @@ -902,8 +902,12 @@ static void update_logging(void) if (g.log_bitmask & MASK_LOG_NTUN) Log_Write_Nav_Tuning(); + + if (g.log_bitmask & MASK_LOG_RC) + Log_Write_RC(); } + /* check for OBC failsafe check */ diff --git a/ArduPlane/Log.pde b/ArduPlane/Log.pde index 5f20d4b535..c294f28d44 100644 --- a/ArduPlane/Log.pde +++ b/ArduPlane/Log.pde @@ -51,6 +51,7 @@ print_log_menu(void) PLOG(COMPASS); PLOG(TECS); PLOG(CAMERA); + PLOG(RC); #undef PLOG } @@ -142,6 +143,7 @@ select_logs(uint8_t argc, const Menu::arg *argv) TARG(COMPASS); TARG(TECS); TARG(CAMERA); + TARG(RC); #undef TARG } @@ -450,6 +452,12 @@ static void Log_Write_IMU() DataFlash.Log_Write_IMU(ins); } +static void Log_Write_RC(void) +{ + DataFlash.Log_Write_RCIN(); + DataFlash.Log_Write_SERVO(); +} + static const struct LogStructure log_structure[] PROGMEM = { LOG_COMMON_STRUCTURES, { LOG_ATTITUDE_MSG, sizeof(log_Attitude), @@ -514,6 +522,7 @@ static void Log_Write_Mode(uint8_t mode) {} static void Log_Write_Compass() {} static void Log_Write_GPS() {} static void Log_Write_IMU() {} +static void Log_Write_RC() {} static int8_t process_logs(uint8_t argc, const Menu::arg *argv) { return 0; diff --git a/ArduPlane/config.h b/ArduPlane/config.h index 105a50ab09..0c950a1927 100644 --- a/ArduPlane/config.h +++ b/ArduPlane/config.h @@ -451,7 +451,8 @@ MASK_LOG_COMPASS | \ MASK_LOG_CURRENT | \ MASK_LOG_TECS | \ - MASK_LOG_CAMERA + MASK_LOG_CAMERA | \ + MASK_LOG_RC diff --git a/ArduPlane/defines.h b/ArduPlane/defines.h index 012eeba424..9122428bce 100644 --- a/ArduPlane/defines.h +++ b/ArduPlane/defines.h @@ -161,6 +161,7 @@ enum log_messages { LOG_MODE_MSG, LOG_COMPASS_MSG, LOG_TECS_MSG, + LOG_RC_MSG, MAX_NUM_LOGS // always at the end }; @@ -177,6 +178,7 @@ enum log_messages { #define MASK_LOG_COMPASS (1<<10) #define MASK_LOG_TECS (1<<11) #define MASK_LOG_CAMERA (1<<12) +#define MASK_LOG_RC (1<<13) // Waypoint Modes // ----------------