Merge pull request #450 from sparkfun/addLoRa

Add LoRa Radio control

Author: nseidle

Firmware/RTK_Everywhere/Base.ino

@@ -12,6 +12,8 @@ void processRTCM(uint8_t *rtcmData, uint16_t dataLength)
     for (int x = 0; x < dataLength; x++)
         espnowProcessRTCM(rtcmData[x]);
 
+    loraProcessRTCM(rtcmData, dataLength);
+
     rtcmLastPacketSent = millis();
     rtcmPacketsSent++;
 

Firmware/RTK_Everywhere/Begin.ino

@@ -219,7 +219,8 @@ void beginBoard()
 
         pin_GNSS_TimePulse = 39; // PPS on UM980
 
-        pin_muxA = 18; // Controls U12 switch between ESP UART1 to UM980 or LoRa
+        pin_muxA = 18; // Controls U12 switch between ESP UART1 to UM980 UART3 or LoRa UART0
+        pin_muxB = 12; // Controls U18 switch between ESP UART0 to LoRa UART2 or UM980 UART1
         pin_usbSelect = 21;
         pin_powerAdapterDetect = 36; // Goes low when USB cable is plugged in
 
@@ -270,18 +271,21 @@ void beginBoard()
         digitalWrite(pin_usbSelect, HIGH); // Keep CH340 connected to USB bus
 
         pinMode(pin_muxA, OUTPUT);
-        digitalWrite(pin_muxA, LOW); // Keep ESP UART1 connected to UM980
+        muxSelectUm980(); // Connect ESP UART1 to UM980
+
+        pinMode(pin_muxB, OUTPUT);
+        muxSelectUsb(); // Connect ESP UART0 to CH340 Serial
 
         settings.dataPortBaud = 115200; // Override settings. Use UM980 at 115200bps.
 
         pinMode(pin_loraRadio_power, OUTPUT);
-        digitalWrite(pin_loraRadio_power, LOW); // Keep LoRa powered down
+        loraPowerOff(); // Keep LoRa powered down for now
 
         pinMode(pin_loraRadio_boot, OUTPUT);
-        digitalWrite(pin_loraRadio_boot, LOW);
+        digitalWrite(pin_loraRadio_boot, LOW); //Exit bootloader, run program
 
         pinMode(pin_loraRadio_reset, OUTPUT);
-        digitalWrite(pin_loraRadio_reset, LOW); // Keep LoRa in reset
+        digitalWrite(pin_loraRadio_reset, LOW); // Reset STM32/radio
     }
 
     else if (productVariant == RTK_EVK)
@@ -1389,15 +1393,6 @@ bool i2cBusInitialization(TwoWire *i2cBus, int sda, int scl, int clockKHz)
     return true;
 }
 
-// Depending on radio settings, begin hardware
-void radioStart()
-{
-    if (settings.enableEspNow == true)
-        espnowStart();
-    else
-        espnowStop();
-}
-
 // Start task to determine SD card size
 void beginSDSizeCheckTask()
 {

Firmware/RTK_Everywhere/ESPNOW.ino

@@ -13,6 +13,47 @@
       few seconds so a single dropped frame is not critical.
 */
 
+// Called from main loop
+// Control incoming/outgoing RTCM data from internal ESP NOW radio
+// Use the ESP32 to directly transmit/receive RTCM over 2.4GHz (no WiFi needed)
+void updateEspnow()
+{
+#ifdef COMPILE_ESPNOW
+    if (settings.enableEspNow == true)
+    {
+        if (espnowState == ESPNOW_PAIRED)
+        {
+            // If it's been longer than a few ms since we last added a byte to the buffer
+            // then we've reached the end of the RTCM stream. Send partial buffer.
+            if (espnowOutgoingSpot > 0 && (millis() - espnowLastAdd) > 50)
+            {
+                if (settings.espnowBroadcast == false)
+                    esp_now_send(0, (uint8_t *)&espnowOutgoing, espnowOutgoingSpot); // Send partial packet to all peers
+                else
+                {
+                    uint8_t broadcastMac[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+                    esp_now_send(broadcastMac, (uint8_t *)&espnowOutgoing,
+                                 espnowOutgoingSpot); // Send packet via broadcast
+                }
+
+                if (!inMainMenu)
+                {
+                    if (settings.debugEspNow == true)
+                        systemPrintf("ESPNOW transmitted %d RTCM bytes\r\n", espnowBytesSent + espnowOutgoingSpot);
+                }
+                espnowBytesSent = 0;
+                espnowOutgoingSpot = 0; // Reset
+            }
+
+            // If we don't receive an ESP NOW packet after some time, set RSSI to very negative
+            // This removes the ESPNOW icon from the display when the link goes down
+            if (millis() - lastEspnowRssiUpdate > 5000 && espnowRSSI > -255)
+                espnowRSSI = -255;
+        }
+    }
+#endif // COMPILE_ESPNOW
+}
+
 // Create a struct for ESP NOW pairing
 typedef struct PairMessage
 {
@@ -115,6 +156,12 @@ void promiscuous_rx_cb(void *buf, wifi_promiscuous_pkt_type_t type)
 // If the radio is off entirely, start the radio, turn on only the LR protocol
 void espnowStart()
 {
+    if (settings.enableEspNow == false)
+    {
+        espnowStop();
+        return;
+    }
+
 #ifdef COMPILE_ESPNOW
 
     // Before we can issue esp_wifi_() commands WiFi must be started