Merge pull request #1303 from DonLakeFlyer/RCCal

Set new RC_CHAN_CNT param after cal

src/qgcunittest/MockQGCUASParamManager.cc

@@ -102,3 +102,14 @@ void MockQGCUASParamManager::_loadParams(void)
         _mapParams[paramName] = paramValue;
     }
 }
+
+QList<int> MockQGCUASParamManager::getComponentForParam(const QString& parameter) const
+{
+    if (_mapParams.contains(parameter)) {
+        QList<int> list;
+        list << 50;
+        return list;
+    } else {
+        return QList<int>();
+    }
+}

src/qgcunittest/MockQGCUASParamManager.h

@@ -77,7 +77,7 @@ public:
     
 public:
     // Unimplemented QGCUASParamManagerInterface overrides
-    virtual QList<int> getComponentForParam(const QString& parameter) const { Q_ASSERT(false); Q_UNUSED(parameter); return _bogusQListInt; }
+    virtual QList<int> getComponentForParam(const QString& parameter) const;
     virtual void setParamDescriptions(const QMap<QString,QString>& paramDescs) { Q_ASSERT(false); Q_UNUSED(paramDescs); }
     virtual int countPendingParams() { Q_ASSERT(false); return 0; }
     virtual UASParameterDataModel* dataModel() { Q_ASSERT(false); return NULL; }

src/ui/px4_configuration/PX4RCCalibration.cc

@@ -924,6 +924,11 @@ void PX4RCCalibration::_writeCalibration(void)
         paramMgr->setPendingParam(0, _rgFunctionInfo[i].parameterName, paramChannel);
     }
     
+    // If the RC_CHAN_COUNT parameter is available write the channel count
+    if (paramMgr->getComponentForParam("RC_CHAN_CNT").count() != 0) {
+        paramMgr->setPendingParam(0, "RC_CHAN_CNT", _chanCount);
+    }
+
     //let the param mgr manage sending all the pending RC_foo updates and persisting after
     paramMgr->sendPendingParameters(true, true);