Commit ace1649c authored by DonLakeFlyer's avatar DonLakeFlyer

Fix current mission item updates

parent 3d841012
...@@ -40,8 +40,6 @@ void MissionManager::writeArduPilotGuidedMissionItem(const QGeoCoordinate& gotoC ...@@ -40,8 +40,6 @@ void MissionManager::writeArduPilotGuidedMissionItem(const QGeoCoordinate& gotoC
_transactionInProgress = TransactionWrite; _transactionInProgress = TransactionWrite;
_connectToMavlink();
mavlink_message_t messageOut; mavlink_message_t messageOut;
mavlink_mission_item_t missionItem; mavlink_mission_item_t missionItem;
......
...@@ -38,6 +38,7 @@ PlanManager::PlanManager(Vehicle* vehicle, MAV_MISSION_TYPE planType) ...@@ -38,6 +38,7 @@ PlanManager::PlanManager(Vehicle* vehicle, MAV_MISSION_TYPE planType)
_ackTimeoutTimer->setInterval(_ackTimeoutMilliseconds); _ackTimeoutTimer->setInterval(_ackTimeoutMilliseconds);
connect(_ackTimeoutTimer, &QTimer::timeout, this, &PlanManager::_ackTimeout); connect(_ackTimeoutTimer, &QTimer::timeout, this, &PlanManager::_ackTimeout);
connect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &PlanManager::_mavlinkMessageReceived);
} }
PlanManager::~PlanManager() PlanManager::~PlanManager()
...@@ -62,7 +63,6 @@ void PlanManager::_writeMissionItemsWorker(void) ...@@ -62,7 +63,6 @@ void PlanManager::_writeMissionItemsWorker(void)
_transactionInProgress = TransactionWrite; _transactionInProgress = TransactionWrite;
_retryCount = 0; _retryCount = 0;
emit inProgressChanged(true); emit inProgressChanged(true);
_connectToMavlink();
_writeMissionCount(); _writeMissionCount();
} }
...@@ -139,7 +139,6 @@ void PlanManager::loadFromVehicle(void) ...@@ -139,7 +139,6 @@ void PlanManager::loadFromVehicle(void)
_retryCount = 0; _retryCount = 0;
_transactionInProgress = TransactionRead; _transactionInProgress = TransactionRead;
emit inProgressChanged(true); emit inProgressChanged(true);
_connectToMavlink();
_requestList(); _requestList();
} }
...@@ -803,7 +802,6 @@ QString PlanManager::_missionResultToString(MAV_MISSION_RESULT result) ...@@ -803,7 +802,6 @@ QString PlanManager::_missionResultToString(MAV_MISSION_RESULT result)
void PlanManager::_finishTransaction(bool success) void PlanManager::_finishTransaction(bool success)
{ {
emit progressPct(1); emit progressPct(1);
_disconnectFromMavlink();
_itemIndicesToRead.clear(); _itemIndicesToRead.clear();
_itemIndicesToWrite.clear(); _itemIndicesToWrite.clear();
...@@ -892,7 +890,6 @@ void PlanManager::_removeAllWorker(void) ...@@ -892,7 +890,6 @@ void PlanManager::_removeAllWorker(void)
emit progressPct(0); emit progressPct(0);
_connectToMavlink();
_dedicatedLink = _vehicle->priorityLink(); _dedicatedLink = _vehicle->priorityLink();
mavlink_msg_mission_clear_all_pack_chan(qgcApp()->toolbox()->mavlinkProtocol()->getSystemId(), mavlink_msg_mission_clear_all_pack_chan(qgcApp()->toolbox()->mavlinkProtocol()->getSystemId(),
qgcApp()->toolbox()->mavlinkProtocol()->getComponentId(), qgcApp()->toolbox()->mavlinkProtocol()->getComponentId(),
...@@ -944,16 +941,6 @@ void PlanManager::_clearAndDeleteWriteMissionItems(void) ...@@ -944,16 +941,6 @@ void PlanManager::_clearAndDeleteWriteMissionItems(void)
_writeMissionItems.clear(); _writeMissionItems.clear();
} }
void PlanManager::_connectToMavlink(void)
{
connect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &PlanManager::_mavlinkMessageReceived);
}
void PlanManager::_disconnectFromMavlink(void)
{
disconnect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &PlanManager::_mavlinkMessageReceived);
}
QString PlanManager::_planTypeString(void) QString PlanManager::_planTypeString(void)
{ {
switch (_planType) { switch (_planType) {
......
...@@ -126,8 +126,6 @@ protected: ...@@ -126,8 +126,6 @@ protected:
void _clearAndDeleteWriteMissionItems(void); void _clearAndDeleteWriteMissionItems(void);
QString _lastMissionReqestString(MAV_MISSION_RESULT result); QString _lastMissionReqestString(MAV_MISSION_RESULT result);
void _removeAllWorker(void); void _removeAllWorker(void);
void _connectToMavlink(void);
void _disconnectFromMavlink(void);
QString _planTypeString(void); QString _planTypeString(void);
protected: protected:
......
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