Adding Pair submenu

Author: nseidle

Firmware/RTK_Surveyor/Display.ino

@@ -331,6 +331,10 @@ void updateDisplay()
           //Do nothing. Quick, fall through state.
           break;
 
+        case (STATE_ESPNOW_PAIR):
+          paintEspNowPair();
+          break;
+
         case (STATE_SHUTDOWN):
           displayShutdown();
           break;
@@ -2147,6 +2151,13 @@ void paintDisplaySetup()
       printTextCenter("Bubble", 12 * 2, QW_FONT_8X16, 1, false);
       printTextCenter("Config", 12 * 3, QW_FONT_8X16, 1, true);
     }
+    else if (setupState == STATE_ESPNOW_PAIR)
+    {
+      printTextCenter("Base", 12 * 0, QW_FONT_8X16, 1, false);
+      printTextCenter("Bubble", 12 * 1, QW_FONT_8X16, 1, false);
+      printTextCenter("Config", 12 * 2, QW_FONT_8X16, 1, false);
+      printTextCenter("Pair", 12 * 3, QW_FONT_8X16, 1, true);
+    }
     else if (setupState == STATE_PROFILE)
       paintDisplaySetupProfile("Base");
   } //end type F9P
@@ -2180,6 +2191,13 @@ void paintDisplaySetup()
       printTextCenter("Bubble", 12 * 2, QW_FONT_8X16, 1, false);
       printTextCenter("Config", 12 * 3, QW_FONT_8X16, 1, true);
     }
+    else if (setupState == STATE_ESPNOW_PAIR)
+    {
+      printTextCenter("Rover", 12 * 0, QW_FONT_8X16, 1, false);
+      printTextCenter("Bubble", 12 * 1, QW_FONT_8X16, 1, false);
+      printTextCenter("Config", 12 * 2, QW_FONT_8X16, 1, false);
+      printTextCenter("Pair", 12 * 3, QW_FONT_8X16, 1, true);
+    }
     else if (setupState == STATE_PROFILE)
       paintDisplaySetupProfile("Rover");
   } //end type F9R
@@ -2501,3 +2519,9 @@ void paintKeyProvisionFail(uint16_t displayTime)
     delay(displayTime);
   }
 }
+
+//Show screen while ESP-Now is pairing
+void paintEspNowPair()
+{
+  displayMessage("ESP-Now Pairing", 0);
+}

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -188,7 +188,6 @@ void espnowStop()
 void espnowBeginPairing()
 {
   espnowStart();
-  Serial.println("1");
 
   // To begin pairing, we must add the broadcast MAC to the peer list
   uint8_t broadcastMac[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};

Firmware/RTK_Surveyor/States.ino

@@ -898,6 +898,17 @@ void updateSystemState()
         }
         break;
 
+      case (STATE_ESPNOW_PAIR):
+        {
+          if(espnowState == ESPNOW_OFF)
+          {
+            espnowBeginPairing();
+          }
+
+          //Display 'ESP-Now Pairing' while we wait
+        }
+        break;
+
       case (STATE_SHUTDOWN):
         {
           forceDisplayUpdate = true;
@@ -1038,6 +1049,10 @@ void changeState(SystemState newState)
         Serial.print("State: Keys Provision - WiFi Timeout");
         break;
 
+      case (STATE_ESPNOW_PAIR):
+        Serial.print("State: ESP-Now Pair");
+        break;
+
       case (STATE_SHUTDOWN):
         Serial.print("State: Shut Down");
         break;

Firmware/RTK_Surveyor/Tasks.ino

@@ -412,6 +412,7 @@ void ButtonCheckTask(void *e)
           case STATE_BUBBLE_LEVEL:
           case STATE_WIFI_CONFIG_NOT_STARTED:
           case STATE_WIFI_CONFIG:
+          case STATE_ESPNOW_PAIR:
             lastSystemState = systemState; //Remember this state to return after we mark an event
             requestChangeState(STATE_DISPLAY_SETUP);
             setupState = STATE_MARK_EVENT;
@@ -463,6 +464,9 @@ void ButtonCheckTask(void *e)
                 setupState = STATE_WIFI_CONFIG_NOT_STARTED;
                 break;
               case STATE_WIFI_CONFIG_NOT_STARTED:
+                setupState = STATE_ESPNOW_PAIR;
+                break;
+              case STATE_ESPNOW_PAIR:
                 //If only one active profile do not show any profiles
                 index = getProfileNumberFromUnit(0);
                 displayProfile = getProfileNumberFromUnit(1);
@@ -527,6 +531,7 @@ void ButtonCheckTask(void *e)
           case STATE_BUBBLE_LEVEL:
           case STATE_WIFI_CONFIG_NOT_STARTED:
           case STATE_WIFI_CONFIG:
+          case STATE_ESPNOW_PAIR:
             lastSystemState = systemState; //Remember this state to return after we mark an event
             requestChangeState(STATE_DISPLAY_SETUP);
             setupState = STATE_MARK_EVENT;
@@ -578,6 +583,9 @@ void ButtonCheckTask(void *e)
                 setupState = STATE_WIFI_CONFIG_NOT_STARTED;
                 break;
               case STATE_WIFI_CONFIG_NOT_STARTED:
+                setupState = STATE_ESPNOW_PAIR;
+                break;
+              case STATE_ESPNOW_PAIR:
                 //If only one active profile do not show any profiles
                 index = getProfileNumberFromUnit(0);
                 displayProfile = getProfileNumberFromUnit(1);

Firmware/RTK_Surveyor/settings.h

@@ -33,6 +33,7 @@ typedef enum
   STATE_KEYS_PROVISION_WIFI_STARTED,
   STATE_KEYS_PROVISION_WIFI_CONNECTED,
   STATE_KEYS_PROVISION_WIFI_TIMEOUT,
+  STATE_ESPNOW_PAIR,
   STATE_SHUTDOWN,
 } SystemState;
 volatile SystemState systemState = STATE_ROVER_NOT_STARTED;