Index: sources/device/DeviceController.cpp =================================================================== diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision f0c8b8720a2e314268445a4a20fe701292026f6f) +++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -1078,32 +1078,32 @@ } -////////////////////////////////////////////////////////////////////////////////////////////////// DeviceConnectWifi -void DeviceController::onAttributeRequest(const DeviceConnectWifiRequestData &vData) +////////////////////////////////////////////////////////////////////////////////////////////////// DeviceWifiConnect +void DeviceController::onAttributeRequest(const DeviceWifiConnectRequestData &vData) { - connectWifiRequest(vData); + wifiConnectRequest(vData); } /*! - * \brief DeviceController::connectWifiRequest + * \brief DeviceController::wifiConnectRequest * \details Calls the Wifi connect/ disconnect script * \note This function is created to be able to call independently if needed in this class. */ -void DeviceController::connectWifiRequest(const DeviceConnectWifiRequestData &vData) +void DeviceController::wifiConnectRequest(const DeviceWifiConnectRequestData &vData) { DeviceError::Scripts_Error_Enum error = DeviceError::eDevice_OK; // ----- initializing the member variable models - _deviceConnectWifiRequest._data = vData; + _deviceWifiConnectRequest._data = vData; // ----- check that script exists. QString script; - if ( checkError( DeviceError::checkScript(script, (vData.mConnect ? Scripts_Wifi_Connect : Scripts_Wifi_Disconnect )), _deviceConnectWifiResponse, script) ) + if ( checkError( DeviceError::checkScript(script, (vData.mConnect ? Scripts_Wifi_Connect : Scripts_Wifi_Disconnect )), _deviceWifiConnectResponse, script) ) return; // ----- check if the process is not running - if ( _processConnectWifi.state() != QProcess::NotRunning ) { - checkError(DeviceError::eDevice_Scripts_Error_IsRunning, _deviceConnectWifiResponse); + if ( _processWifiConnect.state() != QProcess::NotRunning ) { + checkError(DeviceError::eDevice_Scripts_Error_IsRunning, _deviceWifiConnectResponse); return; } @@ -1114,42 +1114,42 @@ } if ( error ) { - checkError(error, _deviceConnectWifiResponse); + checkError(error, _deviceWifiConnectResponse); return; } // ----- run the process int timeout_ms = 10000; - TimedProcess *timedProcess = new TimedProcess(&_processConnectWifi, script, timeout_ms, params); + TimedProcess *timedProcess = new TimedProcess(&_processWifiConnect, script, timeout_ms, params); timedProcess->start(); - MDeviceConnectWifiResponse model; + MDeviceWifiConnectResponse model; model._data.mConnect = vData.mConnect; model._data.mAccepted = false; model._data.mMessage = vData.mConnect ? tr("Connecting to Wifi.") : tr("Disconnecting to Wifi."); emit didAttributeResponse(model.data()); } /*! - * \brief DeviceController::processConnectWifiResponse + * \brief DeviceController::processWifiConnectResponse * \param vExitCode * \param vStatus */ -void DeviceController::processConnectWifiResponse(int vExitCode, QProcess::ExitStatus vStatus, QProcess::ProcessChannel vChannel) +void DeviceController::processWifiConnectResponse(int vExitCode, QProcess::ExitStatus vStatus, QProcess::ProcessChannel vChannel) { Q_UNUSED(vStatus ) Q_UNUSED(vChannel ) - static MDeviceConnectWifiResponse model; + static MDeviceWifiConnectResponse model; if ( vExitCode < 0 ) { emit didAttributeResponse(model.data()); switch (vChannel) { - case QProcess::StandardOutput : processConnectWifiReadyOut(model); break; - case QProcess::StandardError : processConnectWifiReadyErr(model); break; + case QProcess::StandardOutput : processWifiConnectReadyOut(model); break; + case QProcess::StandardError : processWifiConnectReadyErr(model); break; } } else { - processConnectWifiComplete(model, vExitCode, vStatus); + processWifiConnectComplete(model, vExitCode, vStatus); emit didAttributeResponse(model.data()); model._data.clear(); } Index: sources/device/DeviceController.h =================================================================== diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceController.h (.../DeviceController.h) (revision f0c8b8720a2e314268445a4a20fe701292026f6f) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -447,7 +447,7 @@ // ----- WiFi void wifiListRequest(); void wifiInfoRequest(); - void connectWifiRequest(const DeviceConnectWifiRequestData &vData); + void wifiConnectRequest(const DeviceWifiConnectRequestData &vData); SAFE_CALL_EX2(doAddWatch, const QString &, bool) }; Index: sources/device/DeviceError.cpp =================================================================== diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceError.cpp (.../DeviceError.cpp) (revision f0c8b8720a2e314268445a4a20fe701292026f6f) +++ sources/device/DeviceError.cpp (.../DeviceError.cpp) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -56,8 +56,8 @@ QT_TR_NOOP("The Brightness failed." ), // eDevice_Brightness_Error QT_TR_NOOP("The WiFi scan failed." ), // eDevice_WifiList_Error QT_TR_NOOP("The WiFi info failed." ), // eDevice_WifiInfo_Error - QT_TR_NOOP("The Connect WiFi failed." ), // eDevice_ConnectWifi_Error - QT_TR_NOOP("The Disconnect WiFi failed." ), // eDevice_DisconnectWifi_Error + QT_TR_NOOP("The Connect WiFi failed." ), // eDevice_WifiConnect_Error + QT_TR_NOOP("The Disconnect WiFi failed." ), // eDevice_WifiDisconnect_Error QT_TR_NOOP("The USB Mount failed." ), // eDevice_USBMount_Error }; Index: sources/device/DeviceError.h =================================================================== diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceError.h (.../DeviceError.h) (revision f0c8b8720a2e314268445a4a20fe701292026f6f) +++ sources/device/DeviceError.h (.../DeviceError.h) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -74,8 +74,8 @@ eDevice_Brightness_Error , eDevice_WifiList_Error , eDevice_WifiInfo_Error , - eDevice_ConnectWifi_Error , - eDevice_DisconnectWifi_Error , + eDevice_WifiConnect_Error , + eDevice_WifiDisconnect_Error , eDevice_USBMount_Error , eDevice_Error_End Index: sources/device/DeviceGlobals.h =================================================================== diff -u -r25c40729f182b567f22e01a4c6f3eda7ccaac04d -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision 25c40729f182b567f22e01a4c6f3eda7ccaac04d) +++ sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -205,7 +205,7 @@ DEVICE_DEV_PARENT ( USBMount ) \ DEVICE_DEV_PARENT ( WifiList ) \ DEVICE_DEV_PARENT ( WifiInfo ) \ - DEVICE_DEV_PARENT ( ConnectWifi ) \ + DEVICE_DEV_PARENT ( WifiConnect ) \ /* DEVICE_DEV_PARENT ( BluetoothPairedReset ) \ @@ -222,7 +222,7 @@ DEVICE_DEV_INIT_CONNECTIONS ( USBMount ) \ DEVICE_DEV_INIT_CONNECTIONS ( WifiList ) \ DEVICE_DEV_INIT_CONNECTIONS ( WifiInfo ) \ - DEVICE_DEV_INIT_CONNECTIONS ( ConnectWifi ) \ + DEVICE_DEV_INIT_CONNECTIONS ( WifiConnect ) \ /* DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ @@ -238,7 +238,7 @@ DEVICE_DEV_DEFINITION ( USBMount ) \ DEVICE_DEV_DEFINITION ( WifiList ) \ DEVICE_DEV_DEFINITION ( WifiInfo ) \ - DEVICE_DEV_DEFINITION ( ConnectWifi ) \ + DEVICE_DEV_DEFINITION ( WifiConnect ) \ /* DEVICE_DEV_DEFINITION ( BluetoothPairedReset ) \ DEVICE_DEV_DEFINITION ( BluetoothPairedQuery ) \ @@ -254,7 +254,7 @@ DEVICE_DEV_DECLARATION ( USBMount ) \ DEVICE_DEV_DECLARATION ( WifiList ) \ DEVICE_DEV_DECLARATION ( WifiInfo ) \ - DEVICE_DEV_DECLARATION ( ConnectWifi ) \ + DEVICE_DEV_DECLARATION ( WifiConnect ) \ /* DEVICE_DEV_DECLARATION ( BluetoothPairedReset ) \ DEVICE_DEV_DECLARATION ( BluetoothPairedQuery ) \ @@ -271,7 +271,7 @@ DEVICE_APP_INIT_CONNECTIONS ( Brightness ) \ DEVICE_APP_INIT_CONNECTIONS ( WifiList ) \ DEVICE_APP_INIT_CONNECTIONS ( WifiInfo ) \ - DEVICE_APP_INIT_CONNECTIONS ( ConnectWifi ) \ + DEVICE_APP_INIT_CONNECTIONS ( WifiConnect ) \ /* DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ @@ -286,7 +286,7 @@ DEVICE_APP_BRIDGE_DEFINITION( USBMount ) \ DEVICE_APP_BRIDGE_DEFINITION( WifiList ) \ DEVICE_APP_BRIDGE_DEFINITION( WifiInfo ) \ - DEVICE_APP_BRIDGE_DEFINITION( ConnectWifi ) \ + DEVICE_APP_BRIDGE_DEFINITION( WifiConnect ) \ /* DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedReset ) \ DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedQuery ) \ @@ -303,7 +303,7 @@ DEVICE_GUI_INIT_CONNECTIONS ( Brightness ) \ DEVICE_GUI_INIT_CONNECTIONS ( WifiList ) \ DEVICE_GUI_INIT_CONNECTIONS ( WifiInfo ) \ - DEVICE_GUI_INIT_CONNECTIONS ( ConnectWifi ) \ + DEVICE_GUI_INIT_CONNECTIONS ( WifiConnect ) \ /* DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ @@ -317,7 +317,7 @@ DEVICE_GUI_BRIDGE_DEFINITION( Brightness ) \ DEVICE_GUI_BRIDGE_DEFINITION( WifiList ) \ DEVICE_GUI_BRIDGE_DEFINITION( WifiInfo ) \ - DEVICE_GUI_BRIDGE_DEFINITION( ConnectWifi ) \ + DEVICE_GUI_BRIDGE_DEFINITION( WifiConnect ) \ /* DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedReset ) \ DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedQuery ) \ @@ -334,7 +334,7 @@ DEVICE_VIEW_INIT_CONNECTIONS( Brightness ) \ DEVICE_VIEW_INIT_CONNECTIONS( WifiList ) \ DEVICE_VIEW_INIT_CONNECTIONS( WifiInfo ) \ - DEVICE_VIEW_INIT_CONNECTIONS( ConnectWifi ) \ + DEVICE_VIEW_INIT_CONNECTIONS( WifiConnect ) \ /* DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedReset ) \ DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedQuery ) \ Index: sources/device/DeviceModels.cpp =================================================================== diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision f0c8b8720a2e314268445a4a20fe701292026f6f) +++ sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -303,12 +303,12 @@ } /*! - * \brief MDeviceConnectWifiResponse::fromByteArray + * \brief MDeviceWifiConnectResponse::fromByteArray * \details Checks the response and sets up the model data. * \param vExitCode - Passed script exit code * \return true if passed. */ -bool MDeviceConnectWifiResponse::fromByteArray(const QByteArray &vByteArray, int *vExitCode) +bool MDeviceWifiConnectResponse::fromByteArray(const QByteArray &vByteArray, int *vExitCode) { // initialize data bool ok = false; @@ -321,8 +321,8 @@ // check if the vExitCode passed and it has a value other than zero if ( ! ok ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type ; goto lError; } // there is not a valid value - if ( vExitCode && *vExitCode ){ _data.mReason = _data.mConnect ? Device::DeviceError::eDevice_ConnectWifi_Error : - Device::DeviceError::eDevice_DisconnectWifi_Error; goto lApply; } // there still a valid value + if ( vExitCode && *vExitCode ){ _data.mReason = _data.mConnect ? Device::DeviceError::eDevice_WifiConnect_Error : + Device::DeviceError::eDevice_WifiDisconnect_Error; goto lApply; } // there still a valid value // Now everything is good to extract the data _data.mAccepted = true; Index: sources/device/DeviceModels.h =================================================================== diff -u -r25c40729f182b567f22e01a4c6f3eda7ccaac04d -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceModels.h (.../DeviceModels.h) (revision 25c40729f182b567f22e01a4c6f3eda7ccaac04d) +++ sources/device/DeviceModels.h (.../DeviceModels.h) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -434,12 +434,12 @@ bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; -// ================================================= MDeviceConnectWifi +// ================================================= MDeviceWifiConnect /*! - * \brief The MDeviceConnectWifiRequest class + * \brief The MDeviceWifiConnectRequest class * \details The model for the Wifi connnect/disconnect script call. */ -class MDeviceConnectWifiRequest : public MDeviceRequestBase { +class MDeviceWifiConnectRequest : public MDeviceRequestBase { public: struct Data { bool mConnect = true; // set true = connect/ false = disconnect @@ -448,23 +448,23 @@ } _data; QString toString() { - return MDeviceRequestBase::toString("ConnectWifi", { _data.mConnect, _data.mSsid, _data.mPassword }); + return MDeviceRequestBase::toString("WifiConnect", { _data.mConnect, _data.mSsid, _data.mPassword }); } QByteArray toByteArray(Device::DeviceError::Scripts_Error_Enum * = nullptr) override { return ""; } }; /*! - * \brief The MDeviceConnectWifiResponse class + * \brief The MDeviceWifiConnectResponse class * \details The model for the Wifi connect/disconnect script call returned value / response. */ -class MDeviceConnectWifiResponse : public MDeviceResponseBase { +class MDeviceWifiConnectResponse : public MDeviceResponseBase { public: struct Data : MDeviceResponseBase::Data { bool mConnect = false; } _data; QVariantList parameters ( ) const override { return { }; } - QString infoText ( ) const override { return QString("ConnectWifi"); } + QString infoText ( ) const override { return QString("WifiConnect"); } Data data ( ) const { return _data; } bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; @@ -503,5 +503,5 @@ typedef Model::MDeviceWifiInfoRequest ::Data DeviceWifiInfoRequestData ; typedef Model::MDeviceWifiInfoResponse ::Data DeviceWifiInfoResponseData; -typedef Model::MDeviceConnectWifiRequest ::Data DeviceConnectWifiRequestData ; -typedef Model::MDeviceConnectWifiResponse ::Data DeviceConnectWifiResponseData; +typedef Model::MDeviceWifiConnectRequest ::Data DeviceWifiConnectRequestData ; +typedef Model::MDeviceWifiConnectResponse ::Data DeviceWifiConnectResponseData; Index: sources/device/DeviceView.cpp =================================================================== diff -u -r01f614b7ab188f9e0b56f10bb9d3632ad9d0aa99 -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 01f614b7ab188f9e0b56f10bb9d3632ad9d0aa99) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -365,7 +365,6 @@ QStringList fields = lines[row].split(','); // qDebug() << fields.join("-"); -// LOG_DEBUG(fields.join("-")); // this will never fail since even an empty string in split at least has index 0=eSSID; mSSID = fields[eSSID].trimmed(); if ( mSSID.isEmpty() ) continue; //hidden networks, or an incorrect entry @@ -433,7 +432,6 @@ data.mWifiSignalLevel = ssid.mSIGNAL_Max; data.mWifiSupported = ssid.mSupported; data.mWifiConnected = ssid.mInUse ; - dataAppend( data, ssid.mInUse, ssid.mSupported); } } @@ -480,6 +478,36 @@ return QString("Wifi %1").arg(vIndex.row()); } +bool View::VDevice::setData(const QModelIndex &vIndex, const QVariant& vValue, int vRole) { + if (! vIndex.isValid() || vIndex.row() >= _dataList.count()) { + return false; + } + + DataModel &dataItem = _dataList[vIndex.row()]; + + switch (vRole) { + case eRole_WifiConnected: { + if (dataItem.mWifiConnected != vValue.toBool()) { + dataItem.mWifiConnected = vValue.toBool(); + } + break; + } + default: + return false; + } + + // explicitly emit a dataChanged signal to notify anybody bound to this property (vRole) +// emit dataChanged(vIndex, vIndex, {vRole}); + emit dataChanged(vIndex, vIndex, QVector(1, vRole)); + return true; +} + +QModelIndex View::VDevice::index(int vRow, int vColumn, const QModelIndex &vParent) const { + return hasIndex(vRow, vColumn, vParent) + ? createIndex(vRow, vColumn) + : QModelIndex(); +} + // ================================================= WifiInfo void VDevice::doInitWifiInfo() { wifiInfoRequest({}); @@ -527,60 +555,61 @@ QString mResult = vResult; QStringList fields = mResult.split(','); - ssid(fields[eSSID].trimmed()); - ipAddress(fields[eIPADDRESS].trimmed()); - subnetMask(fields[eSUBNETMASK].trimmed()); - gateway(fields[eGATEWAY].trimmed()); - QString dnsString = fields[eDNS]; - // Iterate from index 5 to the end to get any extra DNS - for (int i = 5; i < fields.size(); ++i) { - dnsString.append(QStringLiteral(",\n%1").arg(fields.at(i))); + if (! fields[eSSID].trimmed().isEmpty()) { + ssid(fields[eSSID].trimmed()); + ipAddress(fields[eIPADDRESS].trimmed()); + subnetMask(fields[eSUBNETMASK].trimmed()); + gateway(fields[eGATEWAY].trimmed()); + QStringList dnsList = fields.mid(eDNS); + dns(dnsList.join('\n').trimmed()); } - dns(dnsString.trimmed()); + else { + ssid(""); + ipAddress(""); + gateway(""); + subnetMask(""); + dns(""); + } + + updateWifiList(); } -// ================================================= ConnectWifi -void VDevice::doInitConnectWifi() { +void VDevice::updateWifiList() { + for (int row = 0; row < rowCount(); row++) { + setData(index(row,0), _dataList[row].mWifiSSID == ssid(), eRole_WifiConnected); + } +} + +// ================================================= WifiConnect +void VDevice::doInitWifiConnect() { // Nothing for now. } -void VDevice::connectWifiRequest(const bool &) { +void VDevice::wifiConnectRequest(const bool &) { // Nothing for now. } /*! - * \brief Network::doConnectWifi + * \brief Network::doWifiConnect * \details Method to connect/disconnect to desired Wi-Fi with SSID and password * \param vConnect - (bool) determine if user wants to connect or disconnect Wi-Fi * \param vSsid - (QString) SSID to connect or disconnect * \param vPassword - (QString) SSID password */ -void VDevice::doConnectWifi(const bool &vConnect, const QString &vSsid, const QString &vPassword) { - DeviceConnectWifiRequestData data; +void VDevice::doWifiConnect(bool vConnect, const QString &vSsid, const QString &vPassword) { + DeviceWifiConnectRequestData data; data.mConnect = vConnect; data.mSsid = vSsid; data.mPassword = vPassword; - connectWifi(false); emit didAttributeRequest(data); } -void VDevice::onAttributeResponse(const DeviceConnectWifiResponseData &vData) { +void VDevice::onAttributeResponse(const DeviceWifiConnectResponseData &vData) { if ( vData.mCompleted ) { if ( vData.mAccepted ) { - // rescan once connect/disconnect has completed - doInitWifiList(); - connectWifi(true); - status(vData.mConnect ? "WiFi Connected" : "WiFi Disconnected"); - - if ( !vData.mConnect ) { - ssid(""); - ipAddress(""); - gateway(""); - subnetMask(""); - dns(""); - } + wifiInfoRequest({}); } } @@ -591,3 +620,4 @@ // has to be the last one response(true); } + Index: sources/device/DeviceView.h =================================================================== diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/device/DeviceView.h (.../DeviceView.h) (revision f0c8b8720a2e314268445a4a20fe701292026f6f) +++ sources/device/DeviceView.h (.../DeviceView.h) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -96,6 +96,8 @@ QVariant data (const QModelIndex &vIndex , int vRole = Qt::DisplayRole ) const override ; void dataAppend (const DataModel &vData , bool vFirst , bool vSecond); void dataClear ( ); + bool setData (const QModelIndex &vIndex, const QVariant& vValue, int vRole = Qt::EditRole) override; + QModelIndex index (int vRow, int vColumn, const QModelIndex &vParent = QModelIndex()) const override; private: @@ -126,25 +128,30 @@ ATTRIBUTE ( QStringList , wifiList , {}, WifiList ) READONLY ( bool , wifiListEnabled , true ) + ATTRIBUTE ( QStringList , wifiInfo , {}, WifiInfo ) + + ATTRIBUTE ( bool , wifiConnect , false, WifiConnect ) + READONLY ( QString , ssid , "" ) READONLY ( QString , ipAddress , "" ) READONLY ( QString , gateway , "" ) READONLY ( QString , subnetMask , "" ) READONLY ( QString , dns , "" ) - ATTRIBUTE ( bool , connectWifi , false, ConnectWifi ) VIEW_DEC_CLASS_EX(VDevice, QAbstractListModel) public slots: - void doConnectWifi(const bool &vConnect, const QString &vSsid, const QString &vPassword); + void doWifiConnect(bool vConnect, const QString &vSsid, const QString &vPassword); private slots: void onPOSTOSVersionData (const QString &vOSVersion); private: void parseWifiListResult(const QString &vResult); void parseWifiInfoResult(const QString &vResult); + void updateWifiList(); + bool isCompleteResponse(Model::MDeviceResponseBase::Data vData) { // Either the script exited successfully or the script failed and the reason is provided // There are situations that the script is using the attribute response to update the UI Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision f0c8b8720a2e314268445a4a20fe701292026f6f) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -86,7 +86,7 @@ textInput.width : entryWidth label.width : labelWidth label.text : qsTr("Gateway") - hasCursor : false // set false for now to disable the static IP entry for phase 1 + hasCursor : false // set false for now to disable the static IP entry for phase 1 validator : ipValidator } @@ -107,6 +107,7 @@ label.width : labelWidth label.text : qsTr("DNS") hasCursor : false // set false for now to disable the static IP entry for phase 1 +// validator : ipValidator // Will fail the validor if there are more than 1 ip } } @@ -205,11 +206,11 @@ onConfirmClicked : { if ( isPassword ) { if( passwordCurrent.length > 0 ) { - vDevice.doConnectWifi( true, ssid, passwordCurrent ) + vDevice.doWifiConnect( true, ssid, passwordCurrent ) pop() } } else { - vDevice.doConnectWifi( false, ssid, "" ) + vDevice.doWifiConnect( false, ssid, "" ) pop() } } Index: sources/model/MModel.h =================================================================== diff -u -rbf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634 -ra2a273600d25e863214833ead3324a63fb4759f1 --- sources/model/MModel.h (.../MModel.h) (revision bf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634) +++ sources/model/MModel.h (.../MModel.h) (revision a2a273600d25e863214833ead3324a63fb4759f1) @@ -311,8 +311,8 @@ REGISTER_METATYPE( DeviceWifiListResponseData ) \ REGISTER_METATYPE( DeviceWifiInfoRequestData ) \ REGISTER_METATYPE( DeviceWifiInfoResponseData ) \ - REGISTER_METATYPE( DeviceConnectWifiRequestData ) \ - REGISTER_METATYPE( DeviceConnectWifiResponseData ) \ + REGISTER_METATYPE( DeviceWifiConnectRequestData ) \ + REGISTER_METATYPE( DeviceWifiConnectResponseData ) \ /* Settings */ \ REGISTER_METATYPE( SettingsData ) \ REGISTER_METATYPE( BluetoothData ) \