Begin adding Pair submenu

Author: nseidle

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -149,7 +149,7 @@ void espnowStart()
 //If WiFi is off, stop the radio entirely
 void espnowStop()
 {
-  if(espnowState == ESPNOW_OFF) return;
+  if (espnowState == ESPNOW_OFF) return;
 
   if (wifiState == WIFI_OFF)
   {
@@ -184,7 +184,7 @@ void espnowStop()
   Serial.println("ESP NOW Off");
 }
 
-//Begin broadcasting our MAC and wait for remote unit to respond
+//Start ESP-Now if needed, put ESP-Now into broadcast state
 void espnowBeginPairing()
 {
   espnowStart();
@@ -194,55 +194,37 @@ void espnowBeginPairing()
   espnowAddPeer(broadcastMac, false); // Encryption is not supported for multicast addresses
 
   espnowSetState(ESPNOW_PAIRING);
+}
 
-  //Begin sending our MAC every 250ms until a remote device sends us there info
-  randomSeed(millis());
-
-  Serial.println("Begin pairing. Place other unit in pairing mode. Press any key to exit.");
-  while (Serial.available()) Serial.read();
-
-  while (1)
+//Regularly call during pairing to see if we've received a Pairing message
+bool espnowIsPaired()
+{
+  if (espnowState == ESPNOW_MAC_RECEIVED)
   {
-    if (Serial.available()) break;
+    //Remove broadcast peer
+    espnowRemovePeer(broadcastMac);
 
-    int timeout = 1000 + random(0, 100); //Delay 1000 to 1100ms
-    for (int x = 0 ; x < timeout ; x++)
+    if (esp_now_is_peer_exist(receivedMAC) == true)
+      log_d("Peer already exists");
+    else
     {
-      delay(1);
+      //Add new peer to system
+      espnowAddPeer(receivedMAC);
 
-      if (espnowState == ESPNOW_MAC_RECEIVED)
-      {
-        //Remove broadcast peer
-        espnowRemovePeer(broadcastMac);
-
-        if (esp_now_is_peer_exist(receivedMAC) == true)
-          log_d("Peer already exists");
-        else
-        {
-          //Add new peer to system
-          espnowAddPeer(receivedMAC);
-
-          //Record this MAC to peer list
-          memcpy(settings.espnowPeers[settings.espnowPeerCount], receivedMAC, 6);
-          settings.espnowPeerCount++;
-          settings.espnowPeerCount %= ESPNOW_MAX_PEERS;
-        }
-
-        //Send message directly to the received MAC (not unicast), then exit
-        espnowSendPairMessage(receivedMAC);
-
-        espnowSetState(ESPNOW_PAIRED);
-        Serial.println("Pairing compete");
-        return;
-      }
+      //Record this MAC to peer list
+      memcpy(settings.espnowPeers[settings.espnowPeerCount], receivedMAC, 6);
+      settings.espnowPeerCount++;
+      settings.espnowPeerCount %= ESPNOW_MAX_PEERS;
     }
 
-    espnowSendPairMessage(broadcastMac); //Send unit's MAC address over broadcast, no ack, no encryption
+    //Send message directly to the received MAC (not unicast), then exit
+    espnowSendPairMessage(receivedMAC);
 
-    Serial.println("Scanning for other radio...");
+    espnowSetState(ESPNOW_PAIRED);
+    Serial.println("Pairing compete");
+    return(true);
   }
-
-  Serial.println("User pressed button. Pairing canceled.");
+  return(false);
 }
 
 //Create special pair packet to a given MAC

Firmware/RTK_Surveyor/NtripServer.ino

@@ -581,7 +581,7 @@ void ntripServerUpdate()
         Serial.println("NTRIP Server connection dropped");
         ntripServerStop(false); //Allocate new wifiClient
       }
-      else if ((millis() - ntripServerTimer) > 1000)
+      else if ((millis() - ntripServerTimer) > 3000)
       {
         //GNSS stopped sending RTCM correction data
         Serial.println("NTRIP Server breaking caster connection due to lack of RTCM data!");

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -467,7 +467,7 @@ bool espnowOutgoingRTCM = false;
   |        RTCM |--->|-->|           |--------->|        |-->|----->|TXD, MISO |     |
   |             |    |   | Bluetooth |          | UART 2 |   |      | UART1    |     |
   | NMEA + RTCM |<---|<--|           |<-------+-|        |<--|<-----|RXD, MOSI |<----'
-  +-------------+    |   '-----------'        | '--------'   |28  42|          |
+  +-------------+    |   '-----------'        | '--------'   |28  43|          |
                      |                        |              |      |          |
       .---------+    |                        |              |      |          |
      / uSD Card |    |                        |              |      |          |

Firmware/RTK_Surveyor/States.ino

@@ -902,10 +902,8 @@ void updateSystemState()
 
       case (STATE_ESPNOW_PAIR):
         {
-          if(espnowState == ESPNOW_OFF)
-          {
-            espnowBeginPairing();
-          }
+
+espnowIsPaired()
 
           //Display 'ESP-Now Pairing' while we wait
         }

Firmware/RTK_Surveyor/Tasks.ino

@@ -618,6 +618,11 @@ void ButtonCheckTask(void *e)
   }
 }
 
+TODO once a user has selected 'Pair', send this once
+  //Start ESP-Now if needed, put ESP-Now into broadcast state
+  espnowBeginPairing();
+
+
 void idleTask(void *e)
 {
   int cpu = xPortGetCoreID();

Firmware/RTK_Surveyor/menuMain.ino

@@ -334,7 +334,7 @@ void menuRadio()
       }
       else
         Serial.println("  No Paired Radios");
-      
+
 
       Serial.println("2) Pair radios");
       Serial.println("3) Forget all radios");
@@ -352,7 +352,33 @@ void menuRadio()
     else if (settings.radioType == RADIO_ESPNOW && incoming == 2)
     {
       Serial.println("Begin ESP NOW Pairing");
+
+      //Start ESP-Now if needed, put ESP-Now into broadcast state
       espnowBeginPairing();
+
+      //Begin sending our MAC every 250ms until a remote device sends us there info
+      randomSeed(millis());
+
+      Serial.println("Begin pairing. Place other unit in pairing mode. Press any key to exit.");
+      while (Serial.available()) Serial.read();
+
+      while (1)
+      {
+        if (Serial.available()) break;
+
+        int timeout = 1000 + random(0, 100); //Delay 1000 to 1100ms
+        for (int x = 0 ; x < timeout ; x++)
+        {
+          delay(1);
+          if (espnowIsPaired()) break; //Check if we've received a pairing message
+        }
+
+        espnowSendPairMessage(broadcastMac); //Send unit's MAC address over broadcast, no ack, no encryption
+
+        Serial.println("Scanning for other radio...");
+      }
+
+      Serial.println("User pressed button. Pairing canceled.");
     }
     else if (settings.radioType == RADIO_ESPNOW && incoming == 3)
     {