diff --git a/Modules/CommandPad/commandpad.cpp b/Modules/CommandPad/commandpad.cpp index 85113d00a31905127c8269461ef6ab349332fb4e..a95d315d06d6108ea4f944aa5f49afc5106fca20 100644 --- a/Modules/CommandPad/commandpad.cpp +++ b/Modules/CommandPad/commandpad.cpp @@ -167,14 +167,14 @@ void CommandPad::setupUi() { _CMD(setDeploymentAltitude, "SET_DEPLOYMENT_ALTITUDE_TC") _CMD_FLOAT_PROP(setDeploymentAltitude, dpl_altitude) _CMD_END - _CMD(setInitialOrientation, "SET_INITIAL_ORIENTATION_TC") - _CMD_FLOAT_PROP(setInitialOrientation, yaw) - _CMD_FLOAT_PROP(setInitialOrientation, pitch) - _CMD_FLOAT_PROP(setInitialOrientation, roll) + _CMD(setOrientation, "SET_ORIENTATION_TC") + _CMD_FLOAT_PROP(setOrientation, yaw) + _CMD_FLOAT_PROP(setOrientation, pitch) + _CMD_FLOAT_PROP(setOrientation, roll) _CMD_END - _CMD(setInitialCoordinates, "SET_INITIAL_COORDINATES_TC") - _CMD_FLOAT_PROP(setInitialCoordinates, latitude) - _CMD_FLOAT_PROP(setInitialCoordinates, longitude) + _CMD(setCoordinates, "SET_COORDINATES_TC") + _CMD_FLOAT_PROP(setCoordinates, latitude) + _CMD_FLOAT_PROP(setCoordinates, longitude) _CMD_END _CMD(rawEvent, "RAW_EVENT_TC") _CMD_UINT8_PROP(rawEvent, topic_id) @@ -223,14 +223,14 @@ void CommandPad::setupUi() { _SEND(setDeploymentAltitude, "SET_DEPLOYMENT_ALTITUDE_TC") _SEND_FLOAT_PROP(setDeploymentAltitude, dpl_altitude) _SEND_END - _SEND(setInitialOrientation, "SET_INITIAL_ORIENTATION_TC") - _SEND_FLOAT_PROP(setInitialOrientation, yaw) - _SEND_FLOAT_PROP(setInitialOrientation, pitch) - _SEND_FLOAT_PROP(setInitialOrientation, roll) + _SEND(setOrientation, "SET_ORIENTATION_TC") + _SEND_FLOAT_PROP(setOrientation, yaw) + _SEND_FLOAT_PROP(setOrientation, pitch) + _SEND_FLOAT_PROP(setOrientation, roll) _SEND_END - _SEND(setInitialCoordinates, "SET_INITIAL_COORDINATES_TC") - _SEND_FLOAT_PROP(setInitialCoordinates, latitude) - _SEND_FLOAT_PROP(setInitialCoordinates, longitude) + _SEND(setCoordinates, "SET_COORDINATES_TC") + _SEND_FLOAT_PROP(setCoordinates, latitude) + _SEND_FLOAT_PROP(setCoordinates, longitude) _SEND_END _SEND(rawEvent, "RAW_EVENT_TC") _SEND_UINT8_PROP(rawEvent, topic_id) diff --git a/Modules/Mavlink/mavlinkcommandadapter.cpp b/Modules/Mavlink/mavlinkcommandadapter.cpp index bfa6caefe25dc5f82cd9ca21e59f8037cf889f22..f41dd5ad1765b6be2d155c1d41508215ef1184c5 100644 --- a/Modules/Mavlink/mavlinkcommandadapter.cpp +++ b/Modules/Mavlink/mavlinkcommandadapter.cpp @@ -69,14 +69,14 @@ bool MavlinkCommandAdapter::encodeCommand(const ModuleMessage &msg, MAV_SYS, MAV_CMP, &output, msg.getField("dpl_altitude").getDouble(0.0)); return true; - } else if (messageName == "SET_INITIAL_ORIENTATION_TC") { - mavlink_msg_set_initial_orientation_tc_pack( + } else if (messageName == "SET_ORIENTATION_TC") { + mavlink_msg_set_orientation_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("yaw").getDouble(0.0), msg.getField("pitch").getDouble(0.0), msg.getField("roll").getDouble(0.0)); return true; - } else if (messageName == "SET_INITIAL_COORDINATES_TC") { - mavlink_msg_set_initial_coordinates_tc_pack( + } else if (messageName == "SET_COORDINATES_TC") { + mavlink_msg_set_coordinates_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("latitude").getDouble(0.0), msg.getField("longitude").getDouble(0.0)); return true;