From d2629a13eebd49d68860fce5fee63d1250a9f1a4 Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Sun, 16 Apr 2017 14:11:15 -0400 Subject: [PATCH] Sub: Remove handling of unsupported mavlink messages --- ArduSub/GCS_Mavlink.cpp | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp index a003110297..8c95a7d99f 100644 --- a/ArduSub/GCS_Mavlink.cpp +++ b/ArduSub/GCS_Mavlink.cpp @@ -956,14 +956,8 @@ void GCS_MAVLINK_Sub::handleMessage(mavlink_message_t* msg) } // GCS has sent us a mission item, store to EEPROM - case MAVLINK_MSG_ID_MISSION_ITEM: { // MAV ID: 39 - if (handle_mission_item(msg, sub.mission)) { - sub.DataFlash.Log_Write_EntireMission(sub.mission); - } - break; - } - - case MAVLINK_MSG_ID_MISSION_ITEM_INT: { + case MAVLINK_MSG_ID_MISSION_ITEM: + case MAVLINK_MSG_ID_MISSION_ITEM_INT: { // MAV ID: 39 if (handle_mission_item(msg, sub.mission)) { sub.DataFlash.Log_Write_EntireMission(sub.mission); } @@ -1104,15 +1098,6 @@ void GCS_MAVLINK_Sub::handleMessage(mavlink_message_t* msg) } break; - case MAV_CMD_START_RX_PAIR: - // initiate bind procedure - if (!hal.rcin->rc_bind(packet.param1)) { - result = MAV_RESULT_FAILED; - } else { - result = MAV_RESULT_ACCEPTED; - } - break; - case MAV_CMD_NAV_LOITER_UNLIM: if (sub.set_mode(POSHOLD, MODE_REASON_GCS_COMMAND)) { result = MAV_RESULT_ACCEPTED; @@ -1665,12 +1650,6 @@ void GCS_MAVLINK_Sub::handleMessage(mavlink_message_t* msg) break; } - case MAVLINK_MSG_ID_RADIO: - case MAVLINK_MSG_ID_RADIO_STATUS: { // MAV ID: 109 - handle_radio_status(msg, sub.DataFlash, sub.should_log(MASK_LOG_PM)); - break; - } - case MAVLINK_MSG_ID_LOG_REQUEST_DATA: case MAVLINK_MSG_ID_LOG_ERASE: sub.in_log_download = true; @@ -1831,6 +1810,8 @@ void GCS_MAVLINK_Sub::handleMessage(mavlink_message_t* msg) break; } + // This adds support for leak detectors in a separate enclosure + // connected to a mavlink enabled subsystem case MAVLINK_MSG_ID_SYS_STATUS: { uint32_t MAV_SENSOR_WATER = 0x20000000; mavlink_sys_status_t packet;