From d8f433bd3e1af61a681186e24263faec87be469a Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Fri, 6 Dec 2024 19:38:34 +0700
Subject: [PATCH] WiFi reconnection with indicator

---
 docs/local-storage-experimental.md |  3 +-
 examples/OneOpenAir/OneOpenAir.ino | 44 ++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/docs/local-storage-experimental.md b/docs/local-storage-experimental.md
index 3140440..44376b6 100644
--- a/docs/local-storage-experimental.md
+++ b/docs/local-storage-experimental.md
@@ -15,7 +15,8 @@
     - ssid ➝ `airgradient`
     - password ➝ `cleanair`
 2. Maximum measurements file is around 113kb. If assume each measurements is 60 bytes, with write schedule 2 minutes, SPIFFS will be full in around 5 days
-3. Tips. If monitor already connected to wifi once on boot, no need to restart the monitor for reconnection, it will automatically connect to AP once it is available
+3. WiFi connection attempt on boot wait for 10s before considering timeout, and continue 
+4. Tips. If monitor not connected to wifi on boot, no need to restart the monitor for reconnection, it will automatically connect to AP once it is available
 
 ### Local Storage Endpoinds
 
diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index 3b95903..e81fae6 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -93,6 +93,7 @@ static AgFirmwareMode fwMode = FW_MODE_I_9PSL;
 
 static bool ledBarButtonTest = false;
 static String fwNewVersion;
+static bool isLocalServerInitialized = false;
 
 static void boardInit(void);
 static void failedHandler(String msg);
@@ -193,8 +194,6 @@ void setup() {
 
   // Attempt connect to default wifi
   Serial.println("Connecting to default wifi " + String(wifiConnector.defaultSsid));
-  WiFi.begin();
-  /** Set wifi connect */
   WiFi.begin(wifiConnector.defaultSsid, wifiConnector.defaultPassword);
 
   /** Wait for wifi connect to AP */
@@ -202,7 +201,7 @@ void setup() {
   while (WiFi.status() != WL_CONNECTED) {
     delay(1000);
     count++;
-    if (count >= 15) {
+    if (count >= 10) {
       Serial.println("Try connect to default wifi \"" + String(wifiConnector.defaultSsid) +
                      "\"failed, ignore");
       Serial.println();
@@ -212,10 +211,13 @@ void setup() {
 
   // Notify and wait
   if (WiFi.status() == WL_CONNECTED) {
+    Serial.println("WiFi connected");
     oledDisplay.setText("WiFi connected", "", "");
     mdnsInit();
     localServer.begin();
+    isLocalServerInitialized = true;
   } else {
+    Serial.println("WiFi not connect");
     oledDisplay.setText("WiFi not connect", "", "");
   }
   delay(3000);
@@ -265,6 +267,13 @@ void loop() {
 
   watchdogFeedSchedule.run();
 
+  if (WiFi.status() == WL_CONNECTED && !isLocalServerInitialized) {
+    Serial.println("WiFi connected and local server has not initialized, initializing...");
+    mdnsInit();
+    localServer.begin();
+    isLocalServerInitialized = true;
+  }
+
   /** Check for handle WiFi reconnect */
   wifiConnector.handle();
 
@@ -921,8 +930,13 @@ static void updateDisplayAndLedBar(void) {
 
   if (configuration.isOfflineMode()) {
     // Ignore network related status when in offline mode
-    stateMachine.displayHandle(AgStateMachineNormal);
+    if (wifiConnector.isConnected()) {
+      stateMachine.displayHandle(AgStateMachineNormal);
+    } else {
+      stateMachine.displayHandle(AgStateMachineWiFiLost);
+    }
     stateMachine.handleLeds(AgStateMachineNormal);
+
     return;
   }
 
@@ -1182,17 +1196,17 @@ int calculateMaxPeriod(int updateInterval) {
 void offlineStorageUpdate() {
   if (measurements.saveLocalStorage(*ag)) {
     // blue
-  ag->ledBar.setColor(0, 0, 255, 0);
-  ag->ledBar.show();
-  delay(250);
-  ag->ledBar.setColor(0, 0, 0, 0);
-  ag->ledBar.show();
-  delay(250);
-  ag->ledBar.setColor(0, 0, 255, 0);
-  ag->ledBar.show();
-  delay(250);
-  ag->ledBar.setColor(0, 0, 0, 0);
-  ag->ledBar.show();
+    ag->ledBar.setColor(0, 0, 255, 0);
+    ag->ledBar.show();
+    delay(250);
+    ag->ledBar.setColor(0, 0, 0, 0);
+    ag->ledBar.show();
+    delay(250);
+    ag->ledBar.setColor(0, 0, 255, 0);
+    ag->ledBar.show();
+    delay(250);
+    ag->ledBar.setColor(0, 0, 0, 0);
+    ag->ledBar.show();
   } else {
     // red
     ag->ledBar.setColor(255, 0, 0, 0);