From 02d88263023c73151ae12654b153bcacdc2861a1 Mon Sep 17 00:00:00 2001
From: Thomas Ballmann <mail@i-2xdream.de>
Date: Sat, 22 Feb 2020 15:33:27 +0100
Subject: [PATCH] some fixes #3

---
 app/src/views/Wifi.vue | 58 +++---------------------------------------
 src/app.cpp            |  6 ++---
 src/wlan.cpp           | 25 ++++--------------
 3 files changed, 12 insertions(+), 77 deletions(-)

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 @@
 				<v-card
 					max-width="344"
 					class="mx-auto"
-					_color="grey lighten-4"
-					_flat _height="200px"
 					>
 					<v-template v-if="!wifiStats.connected">
 						<v-card-text>
@@ -75,57 +73,7 @@
 				</v-card>
 
 
-				<v-card
-					style="display:none"
-					max-width="344"
-					class="mx-auto"
-				>
-					<v-card-title>
-						<v-icon
-							large
-							left
-						>
-							$signalWifi3Lock
-						</v-icon>
-						<span class="title font-weight-light">xd-design.info</span>
-						</v-card-title>
-
-					<v-divider></v-divider>
-						<v-card-text>
-						<div>connected to</div>
-						<p class="display-1 text--primary">
-							xd-design.info
-						</p>
-						</v-card-text>
-
-					<v-divider></v-divider>
-					<v-list-item>
-						<v-list-item-avatar color="grey_">
-							<v-icon size="25">$signalWifi3Lock</v-icon>
-						</v-list-item-avatar>
-						<v-list-item-content>
-							<v-list-item-title class="headline">xd-design.info</v-list-item-title>
-							<v-list-item-subtitle>connected to</v-list-item-subtitle>
-						</v-list-item-content>
-					</v-list-item>
-
-					<v-divider class="mx-4"></v-divider>
-
-					<v-list dense>
-						<v-list-item
-							v-for="(value, key) in wifiStats"
-							:key="key"
-						>
-							<v-list-item-title>{{ key }}</v-list-item-title>
-
-							<v-list-item-subtitle class="text-right">
-								{{ value }}
-							</v-list-item-subtitle>
-						</v-list-item>
-					</v-list>
-				</v-card>
-
-<br/><br/>
+				<br/><br/>
 
 				<!-- connect to wifi -->
 
@@ -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());