Merge pull request #712 from sparkfun/AddFlex

Merging AddFlex into release_candidate - with latest release_candidate updates

Author: PaulZC

Firmware/RTK_Everywhere/Begin.ino

@@ -598,7 +598,7 @@ void bluetoothStart()
 
         if (pin_bluetoothStatusLED != PIN_UNDEFINED)
         {
-            bluetoothLedTask.detach(); // Reset BT LED blinker task rate to 2Hz
+            bluetoothLedTask.detach();                                                  // Reset BT LED blinker task rate to 2Hz
             bluetoothLedTask.attach(bluetoothLedTaskPace2Hz, tickerBluetoothLedUpdate); // Rate in seconds, callback
         }
 
@@ -608,11 +608,11 @@ void bluetoothStart()
         {
             if (bluetoothCommandTaskHandle == nullptr)
                 xTaskCreatePinnedToCore(
-                    bluetoothCommandTask,   // Function to run
-                    "BluetoothCommandTask", // Just for humans
-                    4000,                   // Stack Size - must be ~4000
-                    nullptr,                // Task input parameter
-                    0, // Priority, with 3 (configMAX_PRIORITIES - 1) being the highest, and 0 being the lowest
+                    bluetoothCommandTask,              // Function to run
+                    "BluetoothCommandTask",            // Just for humans
+                    4000,                              // Stack Size - must be ~4000
+                    nullptr,                           // Task input parameter
+                    0,                                 // Priority, with 3 (configMAX_PRIORITIES - 1) being the highest, and 0 being the lowest
                     &bluetoothCommandTaskHandle,       // Task handle
                     settings.bluetoothInterruptsCore); // Core where task should run, 0 = core, 1 = Arduino
         }
@@ -696,53 +696,10 @@ void bluetoothStop()
     bluetoothIncomingRTCM = false;
 }
 
-// Test the bidirectional communication through UART connected to GNSS
-// TODO Make this not ZED centric
-void bluetoothTest(bool runTest)
+// Print the current Bluetooth radio configuration and connection status
+void bluetoothPrintStatus()
 {
-    // Verify the ESP UART can communicate TX/RX to ZED UART1
-    const char *bluetoothStatusText;
-
-    if (online.gnss == true)
-    {
-        if (runTest && (zedUartPassed == false))
-        {
-            tasksStopGnssUart(); // Stop absorbing serial via task from GNSS receiver
-
-            gnss->setBaudrate(115200 * 2);
-
-            serialGNSS->begin(115200 * 2, SERIAL_8N1, pin_GnssUart_RX,
-                              pin_GnssUart_TX); // Start UART on platform depedent pins for SPP. The GNSS will be
-                                                // configured to output NMEA over its UART at the same rate.
-
-#ifdef COMPILE_ZED
-            SFE_UBLOX_GNSS_SERIAL myGNSS;
-            if (myGNSS.begin(*serialGNSS) == true) // begin() attempts 3 connections
-            {
-                zedUartPassed = true;
-                bluetoothStatusText = (settings.bluetoothRadioType == BLUETOOTH_RADIO_OFF) ? "Off" : "Online";
-            }
-            else
-                bluetoothStatusText = "Offline";
-#endif // COMPILE_ZED
-
-            gnss->setBaudrate(settings.dataPortBaud);
-
-            serialGNSS->begin(settings.dataPortBaud, SERIAL_8N1, pin_GnssUart_RX,
-                              pin_GnssUart_TX); // Start UART on platform depedent pins for SPP. The GNSS will be
-                                                // configured to output NMEA over its UART at the same rate.
-
-            tasksStartGnssUart(); // Return to normal operation
-        }
-        else
-            bluetoothStatusText = (settings.bluetoothRadioType == BLUETOOTH_RADIO_OFF) ? "Off" : "Online";
-    }
-    else
-        bluetoothStatusText = "GNSS Offline";
-
     // Display Bluetooth MAC address and test results
-    char macAddress[5];
-    snprintf(macAddress, sizeof(macAddress), "%02X%02X", btMACAddress[4], btMACAddress[5]);
     systemPrint("Bluetooth ");
     if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_AND_BLE)
         systemPrint("SPP and Low Energy ");
@@ -755,8 +712,19 @@ void bluetoothTest(bool runTest)
     else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_OFF)
         systemPrint("Off ");
 
+    char macAddress[5];
+    snprintf(macAddress, sizeof(macAddress), "%02X%02X", btMACAddress[4], btMACAddress[5]);
     systemPrint("(");
     systemPrint(macAddress);
-    systemPrint("): ");
-    systemPrintln(bluetoothStatusText);
+    systemPrint(")");
+
+    if (settings.bluetoothRadioType != BLUETOOTH_RADIO_OFF)
+    {
+        systemPrint(": ");
+        if (bluetoothIsConnected() == false)
+            systemPrint("Not ");
+        systemPrint("Connected");
+    }
+
+    systemPrintln();
 }

Firmware/RTK_Everywhere/Bluetooth.ino

@@ -82,7 +82,7 @@ void IRAM_ATTR gpioExpanderISR()
 }
 
 // Start the I2C expander if possible
-bool beginGpioExpander(uint8_t padAddress)
+bool beginGpioExpanderButtons(uint8_t padAddress)
 {
     // Initialize the PCA95xx with its default I2C address
     if (io.begin(padAddress, *i2c_0) == true)
@@ -99,7 +99,7 @@ bool beginGpioExpander(uint8_t padAddress)
 
         systemPrintln("Directional pad online");
 
-        online.gpioExpander = true;
+        online.gpioExpanderButtons = true;
         return (true);
     }
     return (false);
@@ -114,7 +114,7 @@ void buttonRead()
         userBtn->read();
 
     // Check directional pad once interrupt has occurred
-    if (online.gpioExpander == true && gpioChanged == true)
+    if (online.gpioExpanderButtons == true && gpioChanged == true)
     {
         gpioChanged = false;
 
@@ -155,7 +155,7 @@ bool buttonReleased()
         return (userBtn->wasReleased());
 
     // Check directional pad
-    if (online.gpioExpander == true)
+    if (online.gpioExpanderButtons == true)
     {
         // Check for any button press on the directional pad
         for (int buttonNumber = 0; buttonNumber < 5; buttonNumber++)
@@ -179,7 +179,7 @@ bool buttonReleased(uint8_t buttonNumber)
         return (false);
 
     // Check directional pad
-    if (online.gpioExpander == true)
+    if (online.gpioExpanderButtons == true)
     {
         if (gpioExpander_wasReleased[buttonNumber] == true)
         {
@@ -206,7 +206,7 @@ bool buttonPressedFor(uint16_t maxTime)
 bool buttonPressedFor(uint8_t buttonNumber, uint16_t maxTime)
 {
     // Check directional pad
-    if (online.gpioExpander == true)
+    if (online.gpioExpanderButtons == true)
     {
         // Check if the time has started for this button
         if (gpioExpander_holdStart[buttonNumber] > 0)

Firmware/RTK_Everywhere/Buttons.ino

@@ -291,10 +291,8 @@ void pointperfectPrintKeyInformation(const char *requestedBy) {systemPrintln("**
 
 #ifndef COMPILE_LG290P
 
-void lg290pBoot()       {}
 void lg290pHandler(uint8_t * buffer, int length) {}
 bool lg290pMessageEnabled(char *nmeaSentence, int sentenceLength)   {return false;}
-void lg290pReset()      {}
 
 #endif // COMPILE_LG290P