fix wifi fallover

SK21 · Feb 11, 2024 · 638cbbd · 638cbbd
1 parent 067b2d0
commit 638cbbd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/Modules/Teensy Rate/RCteensy/Send.ino b/Modules/Teensy Rate/RCteensy/Send.ino
@@ -86,20 +86,23 @@ void SendData()
             UDPcomm.write(Data, 13);
             UDPcomm.endPacket();
         }
-        else if (millis() - ESPtime > 4000)
+        else
         {
-            // send serial, ESP not connected
-            Serial.print(Data[0]);
-            for (int i = 1; i < 13; i++)
+            // send wifi
+            SerialESP->write(Data, 13);
+
+            if (millis() - ESPtime > 4000)
             {
-                Serial.print(",");
-                Serial.print(Data[i]);
+                // send serial, wifi not connected
+                Serial.print(Data[0]);
+                for (int i = 1; i < 13; i++)
+                {
+                    Serial.print(",");
+                    Serial.print(Data[i]);
+                }
+                Serial.println("");
             }
-            Serial.println("");
         }
-
-        // to wifi
-        SerialESP->write(Data, 13);
     }
 
     //PGN32401, module, analog info from module to RC
@@ -147,20 +150,23 @@ void SendData()
         UDPcomm.write(Data, 15);
         UDPcomm.endPacket();
     }
-    else if (millis() - ESPtime > 4000)
+    else
     {
-        // send serial, ESP not connected
-        Serial.print(Data[0]);
-        for (int i = 1; i < 15; i++)
+        // send wifi
+        SerialESP->write(Data, 15);
+
+        if (millis() - ESPtime > 4000)
         {
-            Serial.print(",");
-            Serial.print(Data[i]);
+            // send serial, wifi not connected
+            Serial.print(Data[0]);
+            for (int i = 1; i < 15; i++)
+            {
+                Serial.print(",");
+                Serial.print(Data[i]);
+            }
+            Serial.println("");
         }
-        Serial.println("");
     }
-
-    // to wifi
-    SerialESP->write(Data, 15);
 }
 
 

diff --git a/Modules/Wifi/WifiRC/WifiRC.ino b/Modules/Wifi/WifiRC/WifiRC.ino
@@ -7,8 +7,8 @@
 #include <EEPROM.h>
 
 // Wemos D1 mini Pro, ESP 12F    board: LOLIN(Wemos) D1 R2 & mini  or NodeMCU 1.0 (ESP-12E Module)
-# define InoDescription "WifiRC   09-Feb-2024"
-# define InoID 9024  // change to load default values
+# define InoDescription "WifiRC   10-Feb-2024"
+# define InoID 10024  // change to load default values
 
 struct WifiConnection
 {
@@ -37,9 +37,6 @@ char WifiBuffer[512];
 void setup()
 {
 	DoSetup();
-	//Serial.begin(38400);
-	//pinMode(LED_BUILTIN, OUTPUT);
-	//Serial.println("Done setup");
 }
 
 void loop()

diff --git a/Modules/Wifi/WifiRC/WifiRC.vcxproj b/Modules/Wifi/WifiRC/WifiRC.vcxproj