when no wifi than wait only 100000 ms

set sleep time to 2 min define backend port to 80
error23 · Jul 14, 2021 · 0ca37c3 · 0ca37c3
1 parent 3c7d741
commit 0ca37c3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/include/core/Defines.hpp b/include/core/Defines.hpp
@@ -10,7 +10,7 @@
 #define MAX_JSON_DOCUMENT_SIZE 1024
 
 #define BACKEND_HOST "192.168.0.1"
-#define BACKEND_PORT 8080
+#define BACKEND_PORT 80
 #define BACKEND_BASE_PATH "/"
 
 #define BACKEND_USER_USERNAME "defineme"

diff --git a/include/core/SmartWifi.hpp b/include/core/SmartWifi.hpp
@@ -60,7 +60,7 @@ namespace CrowOs {
 			void reconnect();
 
 			/**
-			 * Wait for connection for 130000ms than fail
+			 * Wait for connection for 100000 ms than fail
 			 */
 			const bool waitUntilReconnect();
 

diff --git a/src/Main.cpp b/src/Main.cpp
@@ -13,7 +13,7 @@ OneButton homeButton(BUTTON_A_PIN, true);
 OneButton upButton(BUTTON_B_PIN, true);
 
 /** Time helper */
-Time timeHelper(60, 30);
+Time timeHelper(120, 30);
 
 /** Led helper */
 Led ledHelper;
@@ -141,7 +141,7 @@ void sleep() {
 	sleeping = true;
 	if(LOG_DEBUG) Serial.println("Debug : [Main] sleep sleeping = true");
 	saveFeatureDataToServer(false);
-	killCurrentFeature();
+	if(currentFeature != NULL) killCurrentFeature();
 	M5.Axp.SetSleep();
 	smartWifi.disconnect();
 }
@@ -159,7 +159,7 @@ void wakeUp() {
 	M5.Lcd.setSwapBytes(true);
 	screenHelper.setUp();
 	smartWifi.connect();
-	currentFeature = startFeature(currentFeatureIndex);
+	if(currentFeatureIndex != -1) currentFeature = startFeature(currentFeatureIndex);
 
 	sleeping = false;
 }
@@ -173,6 +173,7 @@ void initialiseFeatureData() {
 
 	if(!smartWifi.waitUntilReconnect()) {
 		screenHelper.showError("Init failed !!", 10000);
+		return;
 	}
 
 	DynamicJsonDocument responseBody(MAX_JSON_DOCUMENT_SIZE * (FeatureFactory::featureFactories.size() + 1));

diff --git a/src/core/SmartWifi.cpp b/src/core/SmartWifi.cpp
@@ -75,7 +75,7 @@ namespace CrowOs {
 		}
 
 		/**
-		 * Wait for connection for 130000ms than fail
+		 * Wait for connection for 100000 ms than fail
 		 */
 		const bool SmartWifi::waitUntilReconnect() {
 
@@ -84,7 +84,7 @@ namespace CrowOs {
 			while(!checkStatus()) {
 
 				reconnect();
-				if(millis() - now >= 130000) {
+				if(millis() - now >= 100000) {
 					if(LOG_INFO) Serial.println("Info : [SmartWifi] waitUntilReconnect failed");
 					return false;
 				}