Commit 159e12cd authored by Don Gagne's avatar Don Gagne

Update to new mavCommandResult signature

parent d84dd7e4
...@@ -381,7 +381,7 @@ ESP8266ComponentController::_processTimeout() ...@@ -381,7 +381,7 @@ ESP8266ComponentController::_processTimeout()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
ESP8266ComponentController::_mavCommandResult(int vehicleId, int component, MAV_CMD command, MAV_RESULT result, bool noReponseFromVehicle) ESP8266ComponentController::_mavCommandResult(int vehicleId, int component, int command, int result, bool noReponseFromVehicle)
{ {
Q_UNUSED(vehicleId); Q_UNUSED(vehicleId);
Q_UNUSED(noReponseFromVehicle); Q_UNUSED(noReponseFromVehicle);
......
...@@ -83,7 +83,7 @@ signals: ...@@ -83,7 +83,7 @@ signals:
private slots: private slots:
void _processTimeout (); void _processTimeout ();
void _mavCommandResult(int vehicleId, int component, MAV_CMD command, MAV_RESULT result, bool noReponseFromVehicle); void _mavCommandResult(int vehicleId, int component, int command, int result, bool noReponseFromVehicle);
void _ssidChanged (QVariant value); void _ssidChanged (QVariant value);
void _passwordChanged (QVariant value); void _passwordChanged (QVariant value);
void _baudChanged (QVariant value); void _baudChanged (QVariant value);
......
...@@ -769,7 +769,7 @@ MAVLinkLogManager::_mavlinkLogData(Vehicle* /*vehicle*/, uint8_t /*target_system ...@@ -769,7 +769,7 @@ MAVLinkLogManager::_mavlinkLogData(Vehicle* /*vehicle*/, uint8_t /*target_system
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
MAVLinkLogManager::_mavCommandResult(int vehicleId, int component, MAV_CMD command, MAV_RESULT result, bool noReponseFromVehicle) MAVLinkLogManager::_mavCommandResult(int vehicleId, int component, int command, int result, bool noReponseFromVehicle)
{ {
Q_UNUSED(vehicleId); Q_UNUSED(vehicleId);
Q_UNUSED(component); Q_UNUSED(component);
......
...@@ -172,7 +172,7 @@ private slots: ...@@ -172,7 +172,7 @@ private slots:
void _activeVehicleChanged (Vehicle* vehicle); void _activeVehicleChanged (Vehicle* vehicle);
void _mavlinkLogData (Vehicle* vehicle, uint8_t target_system, uint8_t target_component, uint16_t sequence, uint8_t first_message, QByteArray data, bool acked); void _mavlinkLogData (Vehicle* vehicle, uint8_t target_system, uint8_t target_component, uint16_t sequence, uint8_t first_message, QByteArray data, bool acked);
void _armedChanged (bool armed); void _armedChanged (bool armed);
void _mavCommandResult (int vehicleId, int component, MAV_CMD command, MAV_RESULT result, bool noReponseFromVehicle); void _mavCommandResult (int vehicleId, int component, int command, int result, bool noReponseFromVehicle);
private: private:
bool _sendLog (const QString& logFile); bool _sendLog (const QString& logFile);
......
...@@ -664,7 +664,7 @@ signals: ...@@ -664,7 +664,7 @@ signals:
/// @param command MAV_CMD Command which was sent /// @param command MAV_CMD Command which was sent
/// @param result MAV_RESULT returned in ack /// @param result MAV_RESULT returned in ack
/// @param noResponseFromVehicle true: vehicle did not respond to command, false: vehicle responsed, MAV_RESULT in result /// @param noResponseFromVehicle true: vehicle did not respond to command, false: vehicle responsed, MAV_RESULT in result
void mavCommandResult(int vehicleId, int component, MAV_CMD command, MAV_RESULT result, bool noReponseFromVehicle); void mavCommandResult(int vehicleId, int component, int command, int result, bool noReponseFromVehicle);
private slots: private slots:
void _mavlinkMessageReceived(LinkInterface* link, mavlink_message_t message); void _mavlinkMessageReceived(LinkInterface* link, mavlink_message_t message);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment