diff --git a/app/src/views/Wifi.vue b/app/src/views/Wifi.vue
index 61d403c..1ac4065 100644
--- a/app/src/views/Wifi.vue
+++ b/app/src/views/Wifi.vue
@@ -21,8 +21,6 @@
@@ -75,57 +73,7 @@
-
-
-
- $signalWifi3Lock
-
- xd-design.info
-
-
-
-
- connected to
-
- xd-design.info
-
-
-
-
-
-
- $signalWifi3Lock
-
-
- xd-design.info
- connected to
-
-
-
-
-
-
-
- {{ key }}
-
-
- {{ value }}
-
-
-
-
-
-
+
@@ -201,12 +149,14 @@
import apiDevice from '../api/device'
export default {
- name: "Settings",
+ name: "Wifi",
data: () => ({
isLoading: true,
isSnackbar: false,
isConnecting: false,
+ mode: 'AP_initial', // AP_initial, AP_lost, Default
+ // todo load
wifiStats: {
connected: true,
ip: 'xxx.xxx.xxx.xxx',
diff --git a/src/app.cpp b/src/app.cpp
index 5612919..864e4d7 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -47,11 +47,11 @@ void setupApp()
doc["wifi"]["ssid"] = WiFi.SSID();
doc["wifi"]["connected"] = WiFi.isConnected();
- doc["wifi"]["ip"] = WiFi.localIP();
+ doc["wifi"]["ip"] = WiFi.localIP().toString();
doc["wifi"]["mac"] = WiFi.macAddress();
doc["wifi"]["channel"] = WiFi.channel();
- doc["wifi"]["dns"] = WiFi.dnsIP();
- doc["wifi"]["gateway"] = WiFi.gatewayIP();
+ doc["wifi"]["dns"] = WiFi.dnsIP().toString();
+ doc["wifi"]["gateway"] = WiFi.gatewayIP().toString();
doc["device"]["heap"] = ESP.getFreeHeap();
doc["device"]["bootCycle"] = deviceGetBootCount();
diff --git a/src/wlan.cpp b/src/wlan.cpp
index 3dc0213..3c0edfe 100644
--- a/src/wlan.cpp
+++ b/src/wlan.cpp
@@ -55,16 +55,12 @@ void ___connectToNetwork()
void initClientMode(const char *ssid, const char *password)
{
- uint8_t veces = 10;
+ uint8_t veces = 5;
long startMills = millis();
Serial.print(" Connecting to: ");
Serial.print(ssid);
-
- // print try count
- Serial.print(" (");
- Serial.print(wifiFailedCount);
- Serial.print("x)");
+ Serial.print(" ");
// connecting
WiFi.mode(WIFI_STA);
@@ -74,28 +70,17 @@ void initClientMode(const char *ssid, const char *password)
while (WiFi.status() != WL_CONNECTED)
{
delay(500);
- Serial.println(veces);
+ Serial.print(".");
if (!veces--)
{
- veces = 10;
+ veces = 5;
WiFi.disconnect();
- Serial.println("Wifi reset...");
+ Serial.println(" wifi reset...");
delay(500);
WiFi.begin(ssid, password);
- Serial.println("Establishing connection to WiFi..");
}
}
- /*
- while (WiFi.waitForConnectResult() != WL_CONNECTED)
- {
- wifiFailedCount++;
- Serial.println("Connection Failed! Rebooting...");
- delay(100);
- ESP.restart();
- }
- */
-
Serial.println(" ...connected");
Serial.print(" IP address: ");
Serial.println(WiFi.localIP());