Browse Source

Update to new mavCommandResult signature

QGC4.4
Don Gagne 8 years ago
parent
commit
159e12cd4e
  1. 2
      src/AutoPilotPlugins/Common/ESP8266ComponentController.cc
  2. 2
      src/AutoPilotPlugins/Common/ESP8266ComponentController.h
  3. 2
      src/Vehicle/MAVLinkLogManager.cc
  4. 2
      src/Vehicle/MAVLinkLogManager.h
  5. 2
      src/Vehicle/Vehicle.h

2
src/AutoPilotPlugins/Common/ESP8266ComponentController.cc

@ -381,7 +381,7 @@ ESP8266ComponentController::_processTimeout() @@ -381,7 +381,7 @@ ESP8266ComponentController::_processTimeout()
//-----------------------------------------------------------------------------
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(noReponseFromVehicle);

2
src/AutoPilotPlugins/Common/ESP8266ComponentController.h

@ -83,7 +83,7 @@ signals: @@ -83,7 +83,7 @@ signals:
private slots:
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 _passwordChanged (QVariant value);
void _baudChanged (QVariant value);

2
src/Vehicle/MAVLinkLogManager.cc

@ -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
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(component);

2
src/Vehicle/MAVLinkLogManager.h

@ -172,7 +172,7 @@ private slots: @@ -172,7 +172,7 @@ private slots:
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 _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:
bool _sendLog (const QString& logFile);

2
src/Vehicle/Vehicle.h

@ -664,7 +664,7 @@ signals: @@ -664,7 +664,7 @@ signals:
/// @param command MAV_CMD Command which was sent
/// @param result MAV_RESULT returned in ack
/// @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:
void _mavlinkMessageReceived(LinkInterface* link, mavlink_message_t message);

Loading…
Cancel
Save