From 27b0ad0fbec27e2215368f48225f09c3c309f230 Mon Sep 17 00:00:00 2001
From: Thomas Ballmann <mail@i-2xdream.de>
Date: Wed, 20 May 2020 12:52:07 +0200
Subject: [PATCH] code clean up and small improvements

---
 README.md         |  5 +++-
 app/src/App.vue   | 36 ++++++++++++---------------
 include/wlan.h    |  2 +-
 partitions_pd.csv |  6 ++---
 src/main.cpp      |  4 +--
 src/wlan.cpp      | 62 ++++++++++++++++++-----------------------------
 6 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/README.md b/README.md
index effe61f..703021b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,10 @@ yarn --cwd app build
 platformio run --target uploadfs
 
 # send a picture to display over json
-curl -F 'myImage=@blackPNG.png' http://192.168.178.62/api/face
+curl -F '=@test3.png;filename=dithering' http://192.168.178.62/api/face
+
+# get current picture as bmp
+curl http://192.168.178.62/current-image --output current.bmp
 
 # erase flash memory
 pio run --target erase
diff --git a/app/src/App.vue b/app/src/App.vue
index 5754a70..4fc7529 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -15,13 +15,20 @@
 			</v-navigation-drawer>
 			-->
 
-			<v-system-bar app dark color="primary">
+			<v-system-bar app dark color="primary" _window _lights-out>
 				<span>paperdash.io</span>
 				<v-spacer></v-spacer>
-				<span>boxxi</span>
+				<span>{{ settings.device.name }}</span>
 				<v-spacer></v-spacer>
-				<v-icon>{{ stats.wifi.rssi | wifiIcon(stats.wifi.secure) }}</v-icon>
-				<span>{{ stats.device.time | moment("LT") }}</span>
+				<template v-if="stats.wifi.connected">
+					<v-icon>{{ stats.wifi.rssi | wifiIcon(0) }}</v-icon>
+					<span>{{ stats.device.time | moment("LT") }}</span>
+				</template>
+				<template v-else>
+					<v-btn to="/setup/wifi" icon>
+						<v-icon color="red">$signalWifiOff</v-icon>
+					</v-btn>
+				</template>
 			</v-system-bar>
 
 <!--
@@ -84,25 +91,14 @@
 		},
         data: () => ({
 			isLoading: true,
-
-			bottomNav: 3,
-
-            items: [
-                {title: 'Dashboard', icon: '$dashboard', to: '/'},
-                //{title: 'Sandbox', icon: '$sandbox', to: '/sandbox'},
-                {title: 'Wifi', icon: '$wifi', to: '/wifi'},
-                {title: 'Settings', icon: '$settings', to: '/settings'},
-			],
+			settings: null
 		}),
 		created () {
-			this.$vuetify.icons.values.device = {component: () => import(/* webpackChunkName: "icons" */'!vue-svg-loader!@material-icons/svg/svg/cast/baseline.svg')}
-			this.$vuetify.icons.values.dashboard = {component: () => import(/* webpackChunkName: "icons" */'!vue-svg-loader!@material-icons/svg/svg/dashboard/baseline.svg')}
-			this.$vuetify.icons.values.settings = {component: () => import(/* webpackChunkName: "icons" */'!vue-svg-loader!@material-icons/svg/svg/settings/baseline.svg')}
-			this.$vuetify.icons.values.wifi = {component: () => import(/* webpackChunkName: "icons" */'!vue-svg-loader!@material-icons/svg/svg/wifi/baseline.svg')}
-			this.$vuetify.icons.values.sandbox = {component: () => import(/* webpackChunkName: "icons" */'!vue-svg-loader!@material-icons/svg/svg/gesture/baseline.svg')}	// gesture, brush, palette,
-
+			apiDevice.getSettings(settings => {
+				this.settings = settings;
 
-			this.autoReloadStats();
+				this.autoReloadStats();
+			});
 		},
 		watch: {
 			stats () {
diff --git a/include/wlan.h b/include/wlan.h
index a3bb42c..c8993f4 100644
--- a/include/wlan.h
+++ b/include/wlan.h
@@ -2,8 +2,8 @@
 #define WLAN_H
 
 #include <WiFi.h>
+#include <ESPmDNS.h>
 
 void setupWlan();
-bool wlan_isConnected();
 
 #endif
\ No newline at end of file
diff --git a/partitions_pd.csv b/partitions_pd.csv
index e69fba5..8580a64 100644
--- a/partitions_pd.csv
+++ b/partitions_pd.csv
@@ -1,6 +1,6 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x5000,
 otadata,  data, ota,     0xe000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x150000,
-app1,     app,  ota_1,   0x160000,0x150000,
-spiffs,   data, spiffs,  0x2b0000,0x150000,
\ No newline at end of file
+app0,     app,  ota_0,   0x10000, 0x170000,
+app1,     app,  ota_1,   0x180000,0x170000,
+spiffs,   data, spiffs,  0x2f0000,0x110000,
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 22c9186..bfae634 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@ void setup()
 	setupImage();
 
 	setupWlan();
-	if (wlan_isConnected())
+	if (WiFi.isConnected())
 	{
 		setupDateTime();
 		setupPlaylist();
@@ -54,7 +54,7 @@ void loop()
 {
 	// put your main code here, to run repeatedly:
 
-	if (wlan_isConnected())
+	if (WiFi.isConnected())
 	{
 		loopDateTime();
 
diff --git a/src/wlan.cpp b/src/wlan.cpp
index 3c0edfe..8fbfcce 100644
--- a/src/wlan.cpp
+++ b/src/wlan.cpp
@@ -10,14 +10,13 @@ void initAPMode();
 void setupWlan()
 {
 	Serial.println("setup Wlan");
-	WiFi.setHostname(deviceName);
 
 	// load wifi settings
-	String ssid = NVS.getString("wifi_ssid");
-	String password = NVS.getString("wifi_password");
+	String ssid = NVS.getString("wifi.ssid");
+	String password = NVS.getString("wifi.password");
 
 	// TODO count failed connecting wifiFailedCount <=3
-	if (!ssid.isEmpty() && !password.isEmpty()) // && wifiFailedCount <=3
+	if (!ssid.isEmpty() && !password.isEmpty() && wifiFailedCount <=3) // && wifiFailedCount <=3
 	{
 		// client mode
 		initClientMode(ssid.c_str(), password.c_str());
@@ -28,34 +27,14 @@ void setupWlan()
 		initAPMode();
 	}
 
-	Serial.println("setup Wlan - done");
-}
+	WiFi.setHostname(deviceName);
 
-void ___connectToNetwork()
-{
-	uint8_t veces = 10;
-	WiFi.begin("ssid", "password");
-	Serial.println("Establishing connection to WiFi..");
-	while (WiFi.status() != WL_CONNECTED)
-	{
-		delay(1000);
-		Serial.println(veces);
-		if (!veces--)
-		{
-			veces = 10;
-			WiFi.disconnect();
-			Serial.println("Wifi reset...");
-			delay(1000);
-			WiFi.begin("ssid", "password");
-			Serial.println("Establishing connection to WiFi..");
-		}
-	}
-	Serial.println("Connected to network");
+	Serial.println("setup Wlan - done");
 }
 
 void initClientMode(const char *ssid, const char *password)
 {
-	uint8_t veces = 5;
+	uint8_t tryCount = 5;
 	long startMills = millis();
 
 	Serial.print("  Connecting to: ");
@@ -71,13 +50,21 @@ void initClientMode(const char *ssid, const char *password)
 	{
 		delay(500);
 		Serial.print(".");
-		if (!veces--)
+		if (!tryCount--)
 		{
-			veces = 5;
-			WiFi.disconnect();
-			Serial.println("  wifi reset...");
-			delay(500);
-			WiFi.begin(ssid, password);
+			// todo, hier passt was nicht
+			wifiFailedCount++;
+			if (wifiFailedCount > 3) {
+				Serial.println("  wifi is not reachable...");
+				initAPMode();
+				return;
+			} else {
+				tryCount = 5;
+				WiFi.disconnect();
+				Serial.println("  wifi reset...");
+				delay(500);
+				WiFi.begin(ssid, password);
+			}
 		}
 	}
 
@@ -85,6 +72,10 @@ void initClientMode(const char *ssid, const char *password)
 	Serial.print("  IP address: ");
 	Serial.println(WiFi.localIP());
 
+    if (!MDNS.begin(deviceName)) {
+        Serial.println("Error setting up MDNS responder!");
+    }
+
 	Serial.print("  connected in: ");
 	Serial.println(millis() - startMills);
 }
@@ -98,9 +89,4 @@ void initAPMode()
 	IPAddress IP = WiFi.softAPIP();
 	Serial.print("  AP IP address: ");
 	Serial.println(IP);
-}
-
-bool wlan_isConnected()
-{
-	return WiFi.isConnected();
 }
\ No newline at end of file