Move direct connection mode file deletion into loop - see #763

Author: PaulZC

Firmware/RTK_Everywhere/GNSS.ino

@@ -343,7 +343,8 @@ void gnssFirmwareBeginUpdate()
     serialGNSS->begin(serialBaud, SERIAL_8N1, pin_GnssUart_RX, pin_GnssUart_TX);
 
     // Echo everything to/from GNSS
-    while (1)
+    task.endDirectConnectMode = false;
+    while (!task.endDirectConnectMode)
     {
         static unsigned long lastSerial = millis(); // Temporary fix for buttonless Flex
 
@@ -356,7 +357,7 @@ void gnssFirmwareBeginUpdate()
         if (serialGNSS->available()) // Note: use if, not while
             Serial.write(serialGNSS->read());
 
-        // Button task will gnssFirmwareRemoveUpdate and restart
+        // Button task will set task.endDirectConnectMode true
 
         // Temporary fix for buttonless Flex. TODO - remove
         if ((productVariant == RTK_FLEX) && ((millis() - lastSerial) > 30000))
@@ -378,6 +379,13 @@ void gnssFirmwareBeginUpdate()
             ESP.restart();
         }
     }
+
+    // Remove all the special file. See #763 . Do the file removal in the loop
+    gnssFirmwareRemoveUpdate();
+
+    systemFlush(); // Complete prints
+
+    ESP.restart();
 }
 
 //----------------------------------------

Firmware/RTK_Everywhere/GNSS_UM980.ino

@@ -2101,7 +2101,8 @@ void um980FirmwareBeginUpdate()
     bool inBootMode = false;
 
     // Echo everything to/from UM980
-    while (1)
+    task.endDirectConnectMode = false;
+    while (!task.endDirectConnectMode)
     {
         // Data coming from UM980 to external USB
         if (serialGNSS->available()) // Note: use if, not while
@@ -2129,8 +2130,15 @@ void um980FirmwareBeginUpdate()
             }
         }
 
-        // Button task will um980FirmwareRemoveUpdate and restart
+        // Button task will set task.endDirectConnectMode true
     }
+
+    // Remove the special file. See #763 . Do the file removal in the loop
+    um980FirmwareRemoveUpdate();
+
+    systemFlush(); // Complete prints
+
+    ESP.restart();
 }
 
 //----------------------------------------
@@ -2146,7 +2154,7 @@ bool um980FirmwareCheckUpdate()
 //----------------------------------------
 void um980FirmwareRemoveUpdate()
 {
-    return gnssFirmwareRemoveUpdateFile("/updateUm980Firmware.txt");
+    gnssFirmwareRemoveUpdateFile("/updateUm980Firmware.txt");
 }
 
 //----------------------------------------

Firmware/RTK_Everywhere/LoRa.ino

@@ -554,7 +554,8 @@ void beginLoraFirmwareUpdate()
 
     // Push any incoming ESP32 UART0 to UART1 or UART2 and vice versa
     // Infinite loop until button is pressed
-    while (1)
+    task.endDirectConnectMode = false;
+    while (!task.endDirectConnectMode)
     {
         static unsigned long lastSerial = millis(); // Temporary fix for buttonless Flex
 
@@ -567,7 +568,7 @@ void beginLoraFirmwareUpdate()
         if (serialGNSS->available()) // Note: use if, not while
             Serial.write(serialGNSS->read());
 
-        // Button task will removeUpdateLoraFirmware and restart
+        // Button task will set task.endDirectConnectMode true
 
         // Temporary fix for buttonless Flex. TODO - remove
         if ((productVariant == RTK_FLEX) && ((millis() - lastSerial) > 30000))
@@ -589,6 +590,13 @@ void beginLoraFirmwareUpdate()
                 ESP.restart();
         }
     }
+
+    // Remove the special file. See #763 . Do the file removal in the loop
+    removeUpdateLoraFirmware();
+
+    systemFlush(); // Complete prints
+
+    ESP.restart();
 }
 
 void loraSetupTransmit()

Firmware/RTK_Everywhere/Tasks.ino

@@ -2077,15 +2077,11 @@ void buttonCheckTask(void *e)
                 delay(300);
                 beepOff();
 
-                // Remove all the special files
-                removeUpdateLoraFirmware();
-                um980FirmwareRemoveUpdate();
-                gnssFirmwareRemoveUpdate();
-
                 systemPrintln("Exiting direct connection (passthrough) mode");
                 systemFlush(); // Complete prints
 
-                ESP.restart();
+                // See #763 . Do the file removal in the loop
+                task.endDirectConnectMode = true; // Indicate to loop that direct connection should be ended
             }
         }
         // Torch is a special case. Handle tilt stop and web config mode

Firmware/RTK_Everywhere/settings.h

@@ -2148,6 +2148,8 @@ struct struct_tasks
     bool sdSizeCheckTaskStopRequest = false;
     bool updatePplTaskStopRequest = false;
     bool updateWebServerTaskStopRequest = false;
+
+    volatile bool endDirectConnectMode = false; // Set true by e.g. button task
 } task;
 
 #ifdef COMPILE_NETWORK