Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r719bd896dd47db720ee00ca476a3a27a8ddf6ea4 -rb38e1590d137f607b982d336e60b614c2ae685c2
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 719bd896dd47db720ee00ca476a3a27a8ddf6ea4)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision b38e1590d137f607b982d336e60b614c2ae685c2)
@@ -21,6 +21,7 @@
 // Qt
 #include <QApplication>
 #include <QFileInfo>
+#include <QNetworkInterface>
 #include <QStorageInfo>
 
 // Project
@@ -252,30 +253,24 @@
  */
 void DeviceController::checkWiFi()
 {
-    struct WiFiData {
-        QString  mSSID      ;
-        QString  mIP        ;
-        QString  mSTRENGTH  ;
-        QString  mSECURITY  ;
+    QString mIP  = tr("No WiFi");
 
-        QString toString() {
-            QStringList fields = QStringList()
-                                 <<  mSSID
-                                 <<  mIP
-                                 <<  mSTRENGTH
-                                 <<  mSECURITY;
-            return fields.join(',');
-        }
-    } ;
+    const QNetworkInterface dev = QNetworkInterface::interfaceFromName("wlan0");
 
+    if ( dev.isValid() ) {
+        auto addresses = dev.addressEntries();
 
-    WiFiData mWifiData;
-    mWifiData.mSSID = "TEST";
-    mWifiData.mIP = "1925.3168.0.31";
-    mWifiData.mSECURITY = "max";
-    mWifiData.mSTRENGTH = "150";
+        if ( addresses.count() ) {
+            if ( dev.flags().testFlag(QNetworkInterface::IsUp) && dev.flags().testFlag(QNetworkInterface::IsRunning) ) {
+                mIP = addresses.first().ip().toString();
+            }
+            else {
+                mIP = tr("WiFi Not Connected");
+            }
+        }
+    }
 
-    emit didWiFiData(mWifiData.toString());
+    emit didWiFiData(mIP);
 }
 
 /*!
@@ -622,6 +617,7 @@
     }
     _hasThread = true;
     checkConfugurationMountReady();
+    checkWifiConnectionReady();
 }
 
 /*!
@@ -834,7 +830,6 @@
     return;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////////////////////////   DeviceUSBMounting
 void DeviceController::onAttributeRequest(const DeviceUSBMountRequestData &vData)
 {
@@ -1110,6 +1105,15 @@
     }
 }
 
+/*!
+ * \brief   DeviceController::checkWifiConnectionReady
+ * \details This function will run the wifi_info.sh at start up when the
+ *          device controller thread is ready
+ */
+void DeviceController::checkWifiConnectionReady()
+{
+    wifiInfoRequest();
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////////////   DeviceWifiConnect
 void DeviceController::onAttributeRequest(const DeviceWifiConnectRequestData &vData)