Merge pull request #732 from sparkfun/nsUpdates

Add CLI commands and control

Author: nseidle

.github/workflows/non-release-build.yml

@@ -51,7 +51,7 @@ jobs:
               echo "JSON_ENDING=-${{ steps.dateNoScores.outputs.dateNoScores }}" >> "$GITHUB_ENV"
               echo "JSON_FILE_NAME=RTK-Everywhere-RC-Firmware.json" >> "$GITHUB_ENV"
               echo "ENABLE_DEVELOPER=true" >> "$GITHUB_ENV"
-              echo "DEBUG_LEVEL=debug" >> "$GITHUB_ENV"
+              echo "DEBUG_LEVEL=error" >> "$GITHUB_ENV"
           fi
 
       - name: Setup Arduino CLI

Firmware/RTK_Everywhere/Bluetooth.ino

@@ -118,6 +118,36 @@ bool bluetoothIsConnected()
     return (false);
 }
 
+// Return true if the BLE Command channel is connected
+bool bluetoothCommandIsConnected()
+{
+#ifdef COMPILE_BT
+    if (bluetoothGetState() == BT_OFF)
+        return (false);
+
+    if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_AND_BLE)
+    {
+        if (bluetoothSerialBleCommands->connected() == true)
+            return (true);
+    }
+    else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP)
+    {
+        return (false);
+    }
+    else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_BLE)
+    {
+        if (bluetoothSerialBleCommands->connected() == true)
+            return (true);
+    }
+    else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_ACCESSORY_MODE)
+    {
+        return (false);
+    }
+#endif // COMPILE_BT
+
+    return (false);
+}
+
 // Return the Bluetooth state
 byte bluetoothGetState()
 {
@@ -254,23 +284,19 @@ int bluetoothCommandAvailable()
 }
 
 // Pass a command string to the BLE Serial interface
-void bluetoothProcessCommand(char *rxData)
+void bluetoothSendCommand(char *rxData)
 {
 #ifdef COMPILE_BT
     // Direct output to Bluetooth Command
     PrintEndpoint originalPrintEndpoint = printEndpoint;
 
-    printEndpoint = PRINT_ENDPOINT_BLUETOOTH_COMMAND;
-    if (settings.debugCLI == true)
-        printEndpoint = PRINT_ENDPOINT_ALL;
-    else
-        printEndpoint = PRINT_ENDPOINT_BLUETOOTH_COMMAND;
+    printEndpoint = PRINT_ENDPOINT_ALL;
 
-    processCommand(rxData); // Send command proccesor output to BLE
+    systemPrint(rxData); // Send command output to BLE, SPP, and Serial
     printEndpoint = originalPrintEndpoint;
 
 #else  // COMPILE_BT
-    processCommand(rxData); // Send command proccesor output to Serial
+    systemPrint(rxData); // Send command output to Serial
 #endif // COMPILE_BT
 }
 
@@ -534,9 +560,9 @@ void bluetoothStart()
                 memcpy(record.uuid.uuid.uuid128, UUID_IAP2, sizeof(UUID_IAP2));
                 record.service_name_length = strlen(sdp_service_name) + 1;
                 record.service_name = (char *)sdp_service_name;
-                //record.service_name_length = strlen(deviceName) + 1; // Doesn't seem to help the failed connects
-                //record.service_name = (char *)deviceName;
-                //record.rfcomm_channel_number = 1; // Doesn't seem to help the failed connects
+                // record.service_name_length = strlen(deviceName) + 1; // Doesn't seem to help the failed connects
+                // record.service_name = (char *)deviceName;
+                // record.rfcomm_channel_number = 1; // Doesn't seem to help the failed connects
                 esp_sdp_create_record((esp_bluetooth_sdp_record_t *)&record);
             }
         }

Firmware/RTK_Everywhere/Display.ino

@@ -666,15 +666,15 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
         if (present.display_type == DISPLAY_64x48)
         {
             // There are three spots for icons in the Wireless area, left/center/right
-            // There are three radios that could be active: Bluetooth (always indicated), WiFi (if enabled), ESP-Now (if
+            // There are three radios that could be active: Bluetooth (always indicated), WiFi (if enabled), ESP-NOW (if
             // enabled) Because of lack of space we will indicate the Base/Rover if only two radios or less are active
             //
             // Top left corner - Radio icon indicators take three spots (left/center/right)
             // Allowed icon combinations:
             // Bluetooth + Rover/Base
             // WiFi + Bluetooth + Rover/Base
-            // ESP-Now + Bluetooth + Rover/Base
-            // ESP-Now + Bluetooth + WiFi
+            // ESP-NOW + Bluetooth + Rover/Base
+            // ESP-NOW + Bluetooth + WiFi
 
             // Count the number of radios in use
             uint8_t numberOfRadios = 1; // Bluetooth always indicated.
@@ -3091,14 +3091,14 @@ void paintKeyProvisionFail(uint16_t displayTime)
     }
 }
 
-// Show screen while ESP-Now is pairing
+// Show screen while ESP-NOW is pairing
 void paintEspNowPairing()
 {
-    displayMessage("ESP-Now Pairing", 0);
+    displayMessage("ESP-NOW Pairing", 0);
 }
 void paintEspNowPaired()
 {
-    displayMessage("ESP-Now Paired", 2000);
+    displayMessage("ESP-NOW Paired", 2000);
 }
 
 void displayNtpStart(uint16_t displayTime)

Firmware/RTK_Everywhere/ESPNOW.ino

@@ -83,7 +83,7 @@ esp_err_t espNowAddPeer(const uint8_t *peerMac)
 }
 
 //*********************************************************************
-// Start ESP-Now if needed, put ESP-Now into broadcast state
+// Start ESP-NOW if needed, put ESP-NOW into broadcast state
 void espNowBeginPairing()
 {
     if (settings.enableEspNow == false)
@@ -155,7 +155,7 @@ void espNowOnDataReceived(const esp_now_recv_info *mac, const uint8_t *incomingD
     {
         espNowRSSI = packetRSSI; // Record this packet's RSSI as an ESP NOW packet
 
-        // We've just received ESP-Now data. We assume this is RTCM and push it directly to the GNSS.
+        // We've just received ESP-NOW data. We assume this is RTCM and push it directly to the GNSS.
         // Determine if ESPNOW is the correction source
         if (correctionLastSeen(CORR_ESPNOW))
         {
@@ -492,7 +492,7 @@ void espNowStaticPairing()
 {
     systemPrintln("Begin ESP NOW Pairing");
 
-    // Start ESP-Now if needed, put ESP-Now into broadcast state
+    // 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

Firmware/RTK_Everywhere/GNSS.h

@@ -321,7 +321,7 @@ class GNSS
   // If LBand is being used, ignore any RTCM that may come in from the GNSS
   virtual void rtcmOnGnssDisable();
 
-  // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-Now) to GNSS receiver
+  // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-NOW) to GNSS receiver
   virtual void rtcmOnGnssEnable();
 
   virtual uint16_t rtcmRead(uint8_t *rtcmBuffer, int rtcmBytesToRead);

Firmware/RTK_Everywhere/GNSS_LG290P.h

@@ -422,7 +422,7 @@ class GNSS_LG290P : GNSS
   // If LBand is being used, ignore any RTCM that may come in from the GNSS
   void rtcmOnGnssDisable();
 
-  // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-Now) to GNSS receiver
+  // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-NOW) to GNSS receiver
   void rtcmOnGnssEnable();
 
   uint16_t rtcmRead(uint8_t *rtcmBuffer, int rtcmBytesToRead);

Firmware/RTK_Everywhere/GNSS_LG290P.ino

@@ -2185,7 +2185,7 @@ void GNSS_LG290P::rtcmOnGnssDisable()
 }
 
 //----------------------------------------
-// If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-Now) to GNSS receiver
+// If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-NOW) to GNSS receiver
 //----------------------------------------
 void GNSS_LG290P::rtcmOnGnssEnable()
 {

Firmware/RTK_Everywhere/GNSS_Mosaic.h

@@ -941,7 +941,7 @@ class GNSS_MOSAIC : GNSS
     // If LBand is being used, ignore any RTCM that may come in from the GNSS
     void rtcmOnGnssDisable();
 
-    // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-Now) to GNSS receiver
+    // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-NOW) to GNSS receiver
     void rtcmOnGnssEnable();
 
     uint16_t rtcmRead(uint8_t *rtcmBuffer, int rtcmBytesToRead);

Firmware/RTK_Everywhere/GNSS_Mosaic.ino

@@ -2051,7 +2051,7 @@ void GNSS_MOSAIC::rtcmOnGnssDisable()
 }
 
 //----------------------------------------
-// If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-Now) to GNSS receiver
+// If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-NOW) to GNSS receiver
 //----------------------------------------
 void GNSS_MOSAIC::rtcmOnGnssEnable()
 {

Firmware/RTK_Everywhere/GNSS_None.h

@@ -511,7 +511,7 @@ class GNSS_None : public GNSS
     {
     }
 
-    // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-Now) to GNSS receiver
+    // If L-Band is available, but encrypted, allow RTCM through other sources (radio, ESP-NOW) to GNSS receiver
     void rtcmOnGnssEnable()
     {
     }