Merge remote-tracking branch 'origin/master'

ScStwLibraries/headers/scstwclient.h

@@ -141,7 +141,7 @@ public slots:
      * \brief Function to pair all extensions that are currently connected via USB to the base station
      * \return whether the pairing was successfull
      */
-    bool pairConnectedUsbExtensions();
+    int pairConnectedUsbExtensions();
 
     /*!
      * \brief Function to write a setting on the base station

ScStwLibraries/sources/scstwclient.cpp

@@ -409,10 +409,9 @@ bool ScStwClient::isFirmwareUpToDate() {
 // --- helper functions ---
 // ------------------------
 
-bool ScStwClient::pairConnectedUsbExtensions() {
+int ScStwClient::pairConnectedUsbExtensions() {
     QVariantMap ret = this->sendCommand(5002, "", 10000);
-    qDebug() << ret;
+    return ret["status"].toInt();
-    return ScStw::StatusCode(ret["status"].toInt()) == ScStw::Success;
 }
 
 ScStw::StatusCode ScStwClient::writeRemoteSetting(ScStw::BaseStationSetting key, QString value) {