ESP Now working. Fix Radio icons.

Added support for ESP Now
Add WiFi RSSI to WiFi icon
Add ESP Now RSSI to ESP Now Icon
Add Up/Down arrow indication of RTCM to WiFi, BT, and ESP Now

Author: nseidle

Firmware/RTK_Surveyor/Base.ino

@@ -230,19 +230,6 @@ void SFE_UBLOX_GNSS::processRTCM(uint8_t incoming)
   ntripServerProcessRTCM(incoming);
 
 #ifdef COMPILE_ESPNOW
-  if (espnowState == ESPNOW_PAIRED)
-  {
-    //Move this byte into ESP NOW to send buffer
-    espnowOutgoing[espnowOutgoingSpot++] = incoming;
-    espnowLastAdd = millis();
-
-    if (espnowOutgoingSpot == sizeof(espnowOutgoing))
-    {
-      espnowOutgoingSpot = 0; //Wrap
-      esp_now_send(0, (uint8_t *) &espnowOutgoing, sizeof(espnowOutgoing)); //Send packet to all peers
-      delay(10); //We need a small delay between sending multiple packets
-      log_d("ESPNOW: Sending %d bytes", sizeof(espnowOutgoing));
-    }
-  }
+  espnowProcessRTCM(incoming);
 #endif
 }

Firmware/RTK_Surveyor/Bluetooth.ino

@@ -183,7 +183,7 @@ void bluetoothStop()
     reportHeapNow();
   }
 #endif  //COMPILE_BT
-  online.rxRtcmCorrectionData = false;
+  bluetoothIncomingRTCM = false;
 }
 
 //Write data to the Bluetooth device

Firmware/RTK_Surveyor/Display.ino

@@ -63,7 +63,7 @@ void espnowOnDataRecieved(const uint8_t *mac, const uint8_t *incomingData, int l
     serialGNSS.write(incomingData, len);
     log_d("ESPNOW: Received %d bytes, RSSI: %d", len, espnowRSSI);
 
-    online.rxRtcmCorrectionData = true;
+    espnowIncomingRTCM = true;
     lastEspnowRssiUpdate = millis();
   }
 }
@@ -327,4 +327,24 @@ void espnowSetState(ESPNOWState newState)
   }
 }
 
+void espnowProcessRTCM(byte incoming)
+{
+  if (espnowState == ESPNOW_PAIRED)
+  {
+    //Move this byte into ESP NOW to send buffer
+    espnowOutgoing[espnowOutgoingSpot++] = incoming;
+    espnowLastAdd = millis();
+
+    if (espnowOutgoingSpot == sizeof(espnowOutgoing))
+    {
+      espnowOutgoingSpot = 0; //Wrap
+      esp_now_send(0, (uint8_t *) &espnowOutgoing, sizeof(espnowOutgoing)); //Send packet to all peers
+      delay(10); //We need a small delay between sending multiple packets
+      log_d("ESPNOW: Sending %d bytes", sizeof(espnowOutgoing));
+
+      espnowOutgoingRTCM = true;
+    }
+  }
+}
+
 #endif //ifdef COMPILE_ESPNOW

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -290,7 +290,7 @@ void ntripClientStop(bool done)
   //Determine the next NTRIP client state
   ntripClientSetState((ntripClient && (!done)) ? NTRIP_CLIENT_ON : NTRIP_CLIENT_OFF);
   online.ntripClient = false;
-  online.rxRtcmCorrectionData = false;
+  wifiIncomingRTCM = false;
 #endif  //COMPILE_WIFI
 }
 
@@ -446,7 +446,7 @@ void ntripClientUpdate()
 
           //Push RTCM to GNSS module over I2C
           i2cGNSS.pushRawData(rtcmData, rtcmCount);
-          online.rxRtcmCorrectionData = true;
+          wifiIncomingRTCM = true;
 
           log_d("NTRIP Client pushed %d RTCM bytes to ZED", rtcmCount);
         }

Firmware/RTK_Surveyor/NtripClient.ino

@@ -365,7 +365,7 @@ void ntripServerProcessRTCM(uint8_t incoming)
       ntripServer->write(incoming); //Send this byte to socket
       ntripServerBytesSent++;
       ntripServerTimer = millis();
-      online.txNtripDataCasting = true;
+      wifiOutgoingRTCM = true;
     }
   }
 
@@ -445,7 +445,7 @@ void ntripServerUpdate()
   }
 
   //If user turns off NTRIP Server via settings, stop server
-  if (settings.enableNtripServer == false)
+  if (settings.enableNtripServer == false && ntripServerState > NTRIP_SERVER_OFF)
     ntripServerStop(true);  //Don't allocate new wifiClient
 
   //Enable WiFi and the NTRIP server if requested

Firmware/RTK_Surveyor/NtripServer.ino

@@ -28,7 +28,7 @@ const int FIRMWARE_VERSION_MINOR = 4;
 #define COMPILE_WIFI //Comment out to remove WiFi functionality
 #define COMPILE_BT //Comment out to remove Bluetooth functionality
 #define COMPILE_AP //Comment out to remove Access Point functionality
-//#define COMPILE_ESPNOW //Comment out to remove ESP-Now functionality
+#define COMPILE_ESPNOW //Comment out to remove ESP-Now functionality
 #define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
 
 //Define the RTK board identifier:
@@ -151,6 +151,8 @@ LoggingType loggingType = LOGGING_UNKNOWN;
 #include <WiFiClientSecure.h> //Built-in.
 #include <PubSubClient.h> //Built-in. Used for MQTT obtaining of keys
 
+#include "esp_wifi.h" //Needed for esp_wifi_set_protocol()
+
 #include "base64.h" //Built-in. Needed for NTRIP Client credential encoding.
 
 #endif
@@ -351,7 +353,6 @@ float lBandEBNO = 0.0; //Used on system status menu
 #ifdef COMPILE_ESPNOW
 
 #include <esp_now.h>
-#include "esp_wifi.h" //Needed for esp_wifi_set_protocol()
 
 uint8_t espnowOutgoing[250]; //ESP NOW has max of 250 characters
 unsigned long espnowLastAdd; //Tracks how long since last byte was added to the outgoing buffer
@@ -456,6 +457,20 @@ uint32_t max_idle_count = MAX_IDLE_TIME_COUNT;
 
 unsigned long lastWifiRSSIUpdate = 0; //Print RSSI when connected every few seconds
 
+bool firstRadioSpotBlink = false; //Controls when the shared icon space is toggled
+unsigned long firstRadioSpotTimer = 0;
+bool secondRadioSpotBlink = false; //Controls when the shared icon space is toggled
+unsigned long secondRadioSpotTimer = 0;
+bool thirdRadioSpotBlink = false; //Controls when the shared icon space is toggled
+unsigned long thirdRadioSpotTimer = 0;
+
+bool bluetoothIncomingRTCM = false;
+bool bluetoothOutgoingRTCM = false;
+bool wifiIncomingRTCM = false;
+bool wifiOutgoingRTCM = false;
+bool espnowIncomingRTCM = false;
+bool espnowOutgoingRTCM = false;
+
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 /*
                      +---------------------------------------+      +----------+
@@ -552,7 +567,7 @@ void setup()
 
   loadSettings(); //Attempt to load settings after SD is started so we can read the settings file if available
 
-  beginIdleTasks(); //Enable processor load calculations
+  //beginIdleTasks(); //Enable processor load calculations
 
   beginUART2(); //Start UART2 on core 0, used to receive serial from ZED and pass out over SPP
 

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -14,8 +14,10 @@ void F9PSerialWriteTask(void *e)
       {
         //Pass bytes to GNSS receiver
         int s = bluetoothReadBytes(wBuffer, sizeof(wBuffer));
+        
+        //TODO - control if this RTCM source should be listened to or not
         serialGNSS.write(wBuffer, s);
-        online.rxRtcmCorrectionData = true;
+        bluetoothIncomingRTCM = true;
 
         if (settings.enableTaskReports == true)
           Serial.printf("SerialWriteTask High watermark: %d\n\r",  uxTaskGetStackHighWaterMark(NULL));
@@ -172,7 +174,11 @@ void F9PSerialReadTask(void *e)
           //Push new data to BT SPP if not congested or not throttling
           btBytesToSend = bluetoothWriteBytes(&rBuffer[btTail], btBytesToSend);
           if (btBytesToSend > 0)
-            online.txNtripDataCasting = true;
+          {
+            //If we are in base mode, assume part of the outgoing data is RTCM
+            if(systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
+              bluetoothOutgoingRTCM = true;
+          }
           else
             log_w("BT failed to send");
         }

Firmware/RTK_Surveyor/Tasks.ino

@@ -16,7 +16,7 @@
 
                                   WIFI_OFF
                                     |   ^
-                           Use WiFi |   | 
+                           Use WiFi |   |
                                     |   | WL_CONNECT_FAILED (Bad password)
                                     |   | WL_NO_SSID_AVAIL (Out of range)
                                     v   |
@@ -219,7 +219,11 @@ void wifiStart(char* ssid, char* pw)
     {
       //Radio is off, turn it on
       WiFi.mode(WIFI_STA);
+      esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
     }
+#else
+    //Be sure the standard protocols are turned on. ESP Now have have previously turned them off.
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
 #endif
 
     Serial.printf("Wi-Fi connecting to %s\r\n", ssid);

Firmware/RTK_Surveyor/WiFi.ino

@@ -41,10 +41,22 @@ int BT_Symbol_Width = 7;
 
 */
 
-uint8_t WiFi_Symbol [] = {
+uint8_t WiFi_Symbol_3 [] = {
   0x08, 0x04, 0x12, 0x09, 0x25, 0x95, 0xD5, 0x95, 0x25, 0x09, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
+uint8_t WiFi_Symbol_2 [] = {
+  0x00, 0x00, 0x10, 0x08, 0x24, 0x94, 0xD4, 0x94, 0x24, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+uint8_t WiFi_Symbol_1 [] = {
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x90, 0xD0, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+uint8_t WiFi_Symbol_0 [] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 int WiFi_Symbol_Height = 9;
 int WiFi_Symbol_Width = 13;