Added error message when something is wrong with wpa supplicant

Author: yurii-litvinov

translations/fr/trikGui_fr.ts

@@ -50,25 +50,25 @@
 <context>
     <name>trikGui::Controller</name>
     <message>
-        <location filename="../../trikGui/controller.cpp" line="155"/>
+        <location filename="../../trikGui/controller.cpp" line="165"/>
         <source>direct command</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>trikGui::FileManagerWidget</name>
     <message>
-        <location filename="../../trikGui/fileManagerWidget.cpp" line="94"/>
+        <location filename="../../trikGui/fileManagerWidget.cpp" line="101"/>
         <source>File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/fileManagerWidget.cpp" line="118"/>
+        <location filename="../../trikGui/fileManagerWidget.cpp" line="125"/>
         <source>Confirm deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/fileManagerWidget.cpp" line="119"/>
+        <location filename="../../trikGui/fileManagerWidget.cpp" line="126"/>
         <source>Are you sure you want to delete file?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -216,12 +216,12 @@
 <context>
     <name>trikGui::StartWidget</name>
     <message>
-        <location filename="../../trikGui/startWidget.cpp" line="50"/>
+        <location filename="../../trikGui/startWidget.cpp" line="49"/>
         <source>TRIK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/startWidget.cpp" line="55"/>
+        <location filename="../../trikGui/startWidget.cpp" line="54"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -318,52 +318,57 @@
 <context>
     <name>trikGui::WiFiClientWidget</name>
     <message>
-        <location filename="../../trikGui/wiFiClientWidget.cpp" line="61"/>
+        <location filename="../../trikGui/wiFiClientWidget.cpp" line="56"/>
         <source>IP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiClientWidget.cpp" line="64"/>
+        <location filename="../../trikGui/wiFiClientWidget.cpp" line="59"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiClientWidget.cpp" line="69"/>
+        <location filename="../../trikGui/wiFiClientWidget.cpp" line="64"/>
         <source>Available networks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiClientWidget.cpp" line="154"/>
+        <location filename="../../trikGui/wiFiClientWidget.cpp" line="169"/>
         <source>connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiClientWidget.cpp" line="159"/>
+        <location filename="../../trikGui/wiFiClientWidget.cpp" line="174"/>
         <source>no connection</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../trikGui/wiFiClientWidget.cpp" line="179"/>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>trikGui::WiFiInitWidget</name>
     <message>
-        <location filename="../../trikGui/wiFiInitWidget.cpp" line="31"/>
+        <location filename="../../trikGui/wiFiInitWidget.cpp" line="30"/>
         <source>Network initialization
 in process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiInitWidget.cpp" line="33"/>
+        <location filename="../../trikGui/wiFiInitWidget.cpp" line="32"/>
         <source>Please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiInitWidget.cpp" line="34"/>
+        <location filename="../../trikGui/wiFiInitWidget.cpp" line="33"/>
         <source>Press Escape
 for break</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiInitWidget.cpp" line="115"/>
+        <location filename="../../trikGui/wiFiInitWidget.cpp" line="114"/>
         <source>Network initialization
 failed</source>
         <translation type="unfinished"></translation>
@@ -372,23 +377,23 @@ failed</source>
 <context>
     <name>trikGui::WiFiModeWidget</name>
     <message>
-        <location filename="../../trikGui/wiFiModeWidget.cpp" line="35"/>
+        <location filename="../../trikGui/wiFiModeWidget.cpp" line="32"/>
         <source>Choose mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiModeWidget.cpp" line="37"/>
-        <location filename="../../trikGui/wiFiModeWidget.cpp" line="64"/>
+        <location filename="../../trikGui/wiFiModeWidget.cpp" line="34"/>
+        <location filename="../../trikGui/wiFiModeWidget.cpp" line="61"/>
         <source>Wi-Fi client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiModeWidget.cpp" line="38"/>
+        <location filename="../../trikGui/wiFiModeWidget.cpp" line="35"/>
         <source>Wi-Fi access point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikGui/wiFiModeWidget.cpp" line="52"/>
+        <location filename="../../trikGui/wiFiModeWidget.cpp" line="49"/>
         <source>Network Config</source>
         <translation type="unfinished"></translation>
     </message>

translations/ru/trikGui_ru.qm

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>QObject</name>
     <message>
@@ -329,6 +329,10 @@
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
+    <message>
+        <source>error</source>
+        <translation>ошибка</translation>
+    </message>
 </context>
 <context>
     <name>trikGui::WiFiInitWidget</name>

translations/ru/trikGui_ru.ts

@@ -136,6 +136,10 @@ void WiFiClientWidget::listNetworksReadySlot()
 void WiFiClientWidget::errorSlot(const QString &message)
 {
 	QLOG_ERROR() << message;
+	if (message == "statusRequest") {
+		mConnectionState = errored;
+		setConnectionStatus(trikWiFi::Status());
+	}
 }
 
 void WiFiClientWidget::keyPressEvent(QKeyEvent *event)
@@ -171,6 +175,11 @@ void WiFiClientWidget::setConnectionStatus(const trikWiFi::Status &status)
 		mIpValueLabel.setText(tr("no connection"));
 		mCurrentSsid = "";
 		break;
+	case errored:
+		pixmap.load("://resources/notConnected.png");
+		mIpValueLabel.setText(tr("error"));
+		mCurrentSsid = "";
+		break;
 	}
 
 	mConnectionIconLabel.setPixmap(pixmap);

trikGui/wiFiClientWidget.cpp

@@ -77,6 +77,7 @@ private slots:
 		notConnected
 		, connecting
 		, connected
+		, errored
 	};
 
 	QLabel mConnectionIconLabel;

trikGui/wiFiClientWidget.h

@@ -40,5 +40,5 @@ trikRun.depends = trikScriptRunner trikKernel qslog
 trikScriptRunner.depends = trikControl trikKernel trikNetwork qslog
 trikServer.depends = trikCommunicator qslog
 trikTelemetry.depends = trikControl trikNetwork trikKernel qslog
-trikWiFi.depends = qslog
+trikWiFi.depends = qslog trikKernel
 trikHal.depends = qslog

trikRuntime.pro

@@ -50,19 +50,25 @@ class TRIKWIFI_EXPORT TrikWiFi : public QObject
 	/// Disconnect from network if we are currently connected to one.
 	void disconnect();
 
-	/// Asynchronously scans for available WiFi networks. When done, sends scanFinished signal, then scan results
-	/// can be obtained via scanResults method.
+	/// Asynchronously gets conection status and connection information such as SSID and IP. Emits statusReady when
+	/// done, then status can be obtained by statusResult() call.
 	void statusRequest();
 
 	/// Returns last known connection status. To refresh, use statusRequest() method.
 	Status statusResult() const;
 
+	/// Asynchronously scans for available WiFi networks. When done, sends scanFinished() signal, then scan results
+	/// can be obtained via scanResult() method.
 	void scanRequest();
 
+	/// Returns a list of currently known available WiFi networks. Use scanRequest() method to refresh.
 	QList<ScanResult> scanResult() const;
 
+	/// Asynchronously gets registered networks from wpa_supplicant. When ready, listNetworksReady() signal and results
+	/// can be received by listNetworksResult() method. wpa_supplicant can connect only to registered networks.
 	void listNetworksRequest();
 
+	/// Returns a current list of registered networks. Use listNetworksRequest() method to refresh.
 	QList<NetworkConfiguration> listNetworksResult() const;
 
 	/// Disposes an old connection to wpa_supplicant and creates a new one.
@@ -73,7 +79,7 @@ class TRIKWIFI_EXPORT TrikWiFi : public QObject
 
 signals:
 	/// Emitted when scanning for available networks initiated by scan() is finished and results are available
-	/// and ready to be obtained by scanResults method.
+	/// and ready to be obtained by scanResults() method.
 	void scanFinished();
 
 	/// Emitted when wpa_supplicant connects to WiFi network. SSID of this network can be retrieved by status() method.
@@ -82,14 +88,22 @@ class TRIKWIFI_EXPORT TrikWiFi : public QObject
 	/// Emitted when wpa_supplicant disconnects from current network.
 	void disconnected();
 
+	/// Emitted when connection status requested by statusRequest() is ready and results can be obtained by
+	/// statusResult() method.
 	void statusReady();
 
+	/// Emitted when list of known networks requested by listNetworksRequest() is ready and its results can be obtained
+	/// by listNetworksResult() method.
 	void listNetworksReady();
 
+	/// Emitted when something goes wrong.
 	void error(const QString &message);
 
 private:
+	/// Worker in separate thread that communicates with wpa_supplicant.
 	QScopedPointer<TrikWiFiWorker> mWorker;
+
+	/// Thread for worker.
 	QThread mWorkerThread;
 };
 

trikWiFi/include/trikWiFi/trikWiFi.h

@@ -58,6 +58,10 @@ void TrikWiFiWorker::reinit()
 		QLOG_ERROR() << "Can not get monitor file descriptor";
 	}
 
+	statusRequest();
+	listNetworksRequest();
+	scanRequest();
+
 	QLOG_INFO() << "WiFi initialized";
 }
 

trikWiFi/src/trikWiFiWorker.cpp

@@ -55,19 +55,27 @@ class TrikWiFiWorker : public QObject
 	/// Closes the connection to wpa_supplicant.
 	Q_INVOKABLE void dispose();
 
-	Q_INVOKABLE void listNetworksRequest();
-
+	/// Gets conection status and connection information such as SSID and IP. Emits statusReady when
+	/// done, then status can be obtained by statusResult() call.
 	Q_INVOKABLE void statusRequest();
 
-	Q_INVOKABLE void scanRequest();
-
-	QList<NetworkConfiguration> listNetworksResult();
-
 	/// Returns last known connection status. To refresh, use statusRequest() method.
 	Status statusResult();
 
+	/// Scans for available WiFi networks. When done, sends scanFinished() signal, then scan results
+	/// can be obtained via scanResult() method.
+	Q_INVOKABLE void scanRequest();
+
+	/// Returns a list of currently known available WiFi networks. Use scanRequest() method to refresh.
 	QList<ScanResult> scanResult();
 
+	/// Gets registered networks from wpa_supplicant. When ready, listNetworksReady() signal and results
+	/// can be received by listNetworksResult() method. wpa_supplicant can connect only to registered networks.
+	Q_INVOKABLE void listNetworksRequest();
+
+	/// Returns a current list of registered networks. Use listNetworksRequest() method to refresh.
+	QList<NetworkConfiguration> listNetworksResult();
+
 signals:
 	/// Emitted when scanning for available networks initiated by scan() is finished and results are available
 	/// and ready to be obtained by scanResults method.
@@ -76,15 +84,20 @@ class TrikWiFiWorker : public QObject
 	/// Emitted when wpa_supplicant connects to WiFi network. SSID of this network can be retrieved by status() method.
 	void connected();
 
-	void error(const QString &message);
-
 	/// Emitted when wpa_supplicant disconnects from current network.
 	void disconnected();
 
+	/// Emitted when connection status requested by statusRequest() is ready and results can be obtained by
+	/// statusResult() method.
 	void statusReady();
 
+	/// Emitted when list of known networks requested by listNetworksRequest() is ready and its results can be obtained
+	/// by listNetworksResult() method.
 	void listNetworksReady();
 
+	/// Emitted when something goes wrong.
+	void error(const QString &message);
+
 private slots:
 	void receiveMessages();