diff --git a/Modules/CommandPad/MessagesList.h b/Modules/CommandPad/MessagesList.h index f7bc731c5570b66d77081991cf806896f24d1a4b..0f8ef8ab962c55ce85288548399e81da828c08be 100644 --- a/Modules/CommandPad/MessagesList.h +++ b/Modules/CommandPad/MessagesList.h @@ -57,7 +57,7 @@ static const QMap<QString, int> sensorsList{ {"MAV_STATIC_PRESS_ID", MAV_STATIC_PRESS_ID}, {"MAV_PITOT_PRESS_ID", MAV_PITOT_PRESS_ID}, {"MAV_BATTERY_VOLTAGE_ID", MAV_BATTERY_VOLTAGE_ID}, - {"MAV_STRAIN_GAUGE_ID", MAV_STRAIN_GAUGE_ID}, + {"MAV_LOAD_CELL_ID", MAV_LOAD_CELL_ID}, }; static const QMap<QString, int> commandsList{ @@ -71,7 +71,7 @@ static const QMap<QString, int> commandsList{ {"MAV_CMD_FORCE_EXPULSION", MAV_CMD_FORCE_EXPULSION}, {"MAV_CMD_FORCE_MAIN", MAV_CMD_FORCE_MAIN}, {"MAV_CMD_START_LOGGING", MAV_CMD_START_LOGGING}, - {"MAV_CMD_CLOSE_LOG", MAV_CMD_CLOSE_LOG}, + {"MAV_CMD_STOP_LOGGING", MAV_CMD_STOP_LOGGING}, {"MAV_CMD_FORCE_REBOOT", MAV_CMD_FORCE_REBOOT}, {"MAV_CMD_ENTER_TEST_MODE", MAV_CMD_ENTER_TEST_MODE}, {"MAV_CMD_EXIT_TEST_MODE", MAV_CMD_EXIT_TEST_MODE}, @@ -80,10 +80,10 @@ static const QMap<QString, int> commandsList{ }; const QMap<QString, int> servosList{ - {"AIRBRAKES_SERVO", AIRBRAKES_SERVO}, + {"AIR_BRAKES_SERVO", AIR_BRAKES_SERVO}, {"EXPULSION_SERVO", EXPULSION_SERVO}, - {"PARAFOIL_SERVO1", PARAFOIL_SERVO1}, - {"PARAFOIL_SERVO2", PARAFOIL_SERVO2}, + {"PARAFOIL_LEFT_SERVO", PARAFOIL_LEFT_SERVO}, + {"PARAFOIL_RIGHT_SERVO", PARAFOIL_RIGHT_SERVO}, }; inline void fillMessagesMap(QMap<QString, MessageFormElement *> &formElements) diff --git a/Modules/Mavlink/mavlink_skyward_lib b/Modules/Mavlink/mavlink_skyward_lib index 2c2e845903311deb1aa9758977ac870e16959d58..1d4094f921b69ebb000cfd2615f3b102198c1232 160000 --- a/Modules/Mavlink/mavlink_skyward_lib +++ b/Modules/Mavlink/mavlink_skyward_lib @@ -1 +1 @@ -Subproject commit 2c2e845903311deb1aa9758977ac870e16959d58 +Subproject commit 1d4094f921b69ebb000cfd2615f3b102198c1232