diff --git a/src/qgcunittest/MockUAS.h b/src/qgcunittest/MockUAS.h index b6bda697570b42202fa73eca1619be0abe6cbc3f..e9a48d9dea2ed416099e72c8f88f91e52de4cecc 100644 --- a/src/qgcunittest/MockUAS.h +++ b/src/qgcunittest/MockUAS.h @@ -133,7 +133,6 @@ public slots: virtual void setTargetPosition(float x, float y, float z, float yaw) { Q_UNUSED(x); Q_UNUSED(y); Q_UNUSED(z); Q_UNUSED(yaw); Q_ASSERT(false); }; virtual void setLocalOriginAtCurrentGPSPosition() { Q_ASSERT(false); }; virtual void setHomePosition(double lat, double lon, double alt) { Q_UNUSED(lat); Q_UNUSED(lon); Q_UNUSED(alt); Q_ASSERT(false); }; - virtual void requestParameters() { Q_ASSERT(false); }; virtual void requestParameter(int component, const QString& parameter) { Q_UNUSED(component); Q_UNUSED(parameter); Q_ASSERT(false); }; virtual void writeParametersToStorage() { Q_ASSERT(false); }; virtual void readParametersFromStorage() { Q_ASSERT(false); }; diff --git a/src/uas/QGCUASParamManager.cc b/src/uas/QGCUASParamManager.cc index 7212d9caa56184a0f0aac9496eed2f462967a633..f1de5ab4f104d8470379943afb3bb1d9a79a54b5 100644 --- a/src/uas/QGCUASParamManager.cc +++ b/src/uas/QGCUASParamManager.cc @@ -217,6 +217,8 @@ void QGCUASParamManager::requestRcCalibrationParamsUpdate() { void QGCUASParamManager::_parameterListUpToDate(void) { + qDebug() << "Emitting parameters ready, count:" << paramDataModel.countOnboardParams(); + _parametersReady = true; emit parameterListUpToDate(); } diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 1e7f16d0e99e04f6dbc15d6fc05ee42706bbfb17..29a618e0e2d941971c201b3f4b3d7e32958473a6 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -1968,16 +1968,6 @@ int UAS::getCommunicationStatus() const return commStatus; } -void UAS::requestParameters() -{ - mavlink_message_t msg; - mavlink_msg_param_request_list_pack(mavlink->getSystemId(), mavlink->getComponentId(), &msg, this->getUASID(), MAV_COMP_ID_ALL); - sendMessage(msg); - - QDateTime time = QDateTime::currentDateTime(); - qDebug() << __FILE__ << ":" << __LINE__ << time.toString() << "LOADING PARAM LIST"; -} - void UAS::writeParametersToStorage() { mavlink_message_t msg; diff --git a/src/uas/UAS.h b/src/uas/UAS.h index a359de316da857a3509cfaba8300aff1a3bd8938..ed203a81af6813a7187f595f1235f1715c11f789 100644 --- a/src/uas/UAS.h +++ b/src/uas/UAS.h @@ -830,9 +830,6 @@ public slots: /** @brief Set current mode of operation, e.g. auto or manual, does not check the arming status, for anything else than arming/disarming operations use setMode instead */ void setModeArm(uint8_t newBaseMode, uint32_t newCustomMode); - /** @brief Request all parameters */ - void requestParameters(); - /** @brief Request a single parameter by name */ void requestParameter(int component, const QString& parameter); /** @brief Request a single parameter by index */ diff --git a/src/uas/UASInterface.h b/src/uas/UASInterface.h index 2d7beb74a0616f20e401a351b526a04d5d5a8a09..6a6b56660a6ff379c246f7b136dc95ceefcdfc67 100644 --- a/src/uas/UASInterface.h +++ b/src/uas/UASInterface.h @@ -315,8 +315,6 @@ public slots: virtual void setLocalOriginAtCurrentGPSPosition() = 0; /** @brief Set world frame origin / home position at this GPS position */ virtual void setHomePosition(double lat, double lon, double alt) = 0; - /** @brief Request all onboard parameters of all components */ - virtual void requestParameters() = 0; /** @brief Request one specific onboard parameter */ virtual void requestParameter(int component, const QString& parameter) = 0; /** @brief Write parameter to permanent storage */