Merge pull request #538 from sparkfun/release_candidate

Merge v3.6 changes
sparkfun · Jul 27, 2023 · 3d5677d · 3d5677d
2 parents 1c6ffc5 + 5e9ed31
commit 3d5677d
Show file tree

Hide file tree

Showing 30 changed files with 2,223 additions and 807 deletions.
diff --git a/.github/workflows/compile-rtk-firmware.yml b/.github/workflows/compile-rtk-firmware.yml
@@ -6,7 +6,7 @@ on:
 env:
   FILENAME_PREFIX: RTK_Surveyor_Firmware
   FIRMWARE_VERSION_MAJOR: 3
-  FIRMWARE_VERSION_MINOR: 5
+  FIRMWARE_VERSION_MINOR: 6
   POINTPERFECT_TOKEN: ${{ secrets.POINTPERFECT_TOKEN }}
 
 jobs:

diff --git a/Firmware/RTK_Surveyor/Begin.ino b/Firmware/RTK_Surveyor/Begin.ino
@@ -230,8 +230,9 @@ void beginBoard()
         strncpy(platformPrefix, "Reference Station", sizeof(platformPrefix) - 1);
     }
 
-    systemPrintf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR,
-                 __DATE__);
+    char versionString[21];
+    getFirmwareVersion(versionString, sizeof(versionString), true);
+    systemPrintf("SparkFun RTK %s %s\r\n", platformPrefix, versionString);
 
     // Get unit MAC address
     esp_read_mac(wifiMACAddress, ESP_MAC_WIFI_STA);
@@ -980,7 +981,7 @@ void beginSystemState()
     if (systemState > STATE_NOT_SET)
     {
         systemPrintln("Unknown state - factory reset");
-        factoryReset();
+        factoryReset(false); //We do not have the SD semaphore
     }
 
     if (productVariant == RTK_SURVEYOR)

diff --git a/Firmware/RTK_Surveyor/Bluetooth.ino b/Firmware/RTK_Surveyor/Bluetooth.ino
@@ -180,7 +180,8 @@ void bluetoothStart()
         // while (bluetoothPinned == false) // Wait for task to run once
         //     delay(1);
 
-        if (bluetoothSerial->begin(deviceName) == false)
+        if (bluetoothSerial->begin(deviceName, false, settings.sppRxQueueSize, settings.sppTxQueueSize) ==
+            false) // localName, isMaster, rxBufferSize, txBufferSize
         {
             systemPrintln("An error occurred initializing Bluetooth");
 
@@ -235,7 +236,8 @@ void bluetoothStart()
 void pinBluetoothTask(void *pvParameters)
 {
 #ifdef COMPILE_BT
-    if (bluetoothSerial->begin(deviceName) == false)
+    if (bluetoothSerial->begin(deviceName, false, settings.sppRxQueueSize, settings.sppTxQueueSize) ==
+        false) // localName, isMaster, rxBufferSize,
     {
         systemPrintln("An error occurred initializing Bluetooth");
 
@@ -246,7 +248,7 @@ void pinBluetoothTask(void *pvParameters)
     bluetoothPinned = true;
 
     vTaskDelete(nullptr); // Delete task once it has run once
-#endif // COMPILE_BT
+#endif                    // COMPILE_BT
 }
 
 // This function stops BT so that it can be restarted later

diff --git a/Firmware/RTK_Surveyor/Display.ino b/Firmware/RTK_Surveyor/Display.ino
@@ -636,11 +636,7 @@ void displaySplash()
 
         yPos = yPos + fontHeight + 7;
         char unitFirmware[50];
-        if (ENABLE_DEVELOPER)
-            snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d-DEV", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
-        else
-            snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
-
+        getFirmwareVersion(unitFirmware, sizeof(unitFirmware), false);
         printTextCenter(unitFirmware, yPos, QW_FONT_5X7, 1, false);
 
         oled.display();
@@ -1006,7 +1002,7 @@ uint32_t setWiFiIcon_TwoRadios()
         {
             firstRadioSpotTimer = millis();
 
-            if (wifiIncomingRTCM == true || wifiOutgoingRTCM == true)
+            if (netIncomingRTCM == true || netOutgoingRTCM == true)
                 firstRadioSpotBlink ^= 1; // Share the spot
             else
                 firstRadioSpotBlink = false;
@@ -1032,15 +1028,15 @@ uint32_t setWiFiIcon_TwoRadios()
         else
         {
             // Share the spot. Determine if we need to indicate Up, or Down
-            if (wifiIncomingRTCM == true)
+            if (netIncomingRTCM == true)
             {
                 icons |= ICON_DOWN_ARROW_LEFT;
-                wifiIncomingRTCM = false; // Reset, set during NTRIP Client
+                netIncomingRTCM = false; // Reset, set during NTRIP Client
             }
-            else if (wifiOutgoingRTCM == true)
+            else if (netOutgoingRTCM == true)
             {
                 icons |= ICON_UP_ARROW_LEFT;
-                wifiOutgoingRTCM = false; // Reset, set during NTRIP Server
+                netOutgoingRTCM = false; // Reset, set during NTRIP Server
             }
             else
             {
@@ -1093,7 +1089,7 @@ uint32_t setWiFiIcon_ThreeRadios()
         {
             thirdRadioSpotTimer = millis();
 
-            if (wifiIncomingRTCM == true || wifiOutgoingRTCM == true)
+            if (netIncomingRTCM == true || netOutgoingRTCM == true)
                 thirdRadioSpotBlink ^= 1; // Share the spot
             else
                 thirdRadioSpotBlink = false;
@@ -1119,15 +1115,15 @@ uint32_t setWiFiIcon_ThreeRadios()
         else
         {
             // Share the spot. Determine if we need to indicate Up, or Down
-            if (wifiIncomingRTCM == true)
+            if (netIncomingRTCM == true)
             {
                 icons |= ICON_DOWN_ARROW_RIGHT;
-                wifiIncomingRTCM = false; // Reset, set during NTRIP Client
+                netIncomingRTCM = false; // Reset, set during NTRIP Client
             }
-            else if (wifiOutgoingRTCM == true)
+            else if (netOutgoingRTCM == true)
             {
                 icons |= ICON_UP_ARROW_RIGHT;
-                wifiOutgoingRTCM = false; // Reset, set during NTRIP Server
+                netOutgoingRTCM = false; // Reset, set during NTRIP Server
             }
             else
             {

diff --git a/Firmware/RTK_Surveyor/Form.ino b/Firmware/RTK_Surveyor/Form.ino
@@ -573,8 +573,7 @@ void createSettingsString(char *newSettings)
     stringRecord(newSettings, "platformPrefix", platformPrefix);
 
     char apRtkFirmwareVersion[86];
-    snprintf(apRtkFirmwareVersion, sizeof(apRtkFirmwareVersion), "v%d.%d-%s", FIRMWARE_VERSION_MAJOR,
-             FIRMWARE_VERSION_MINOR, __DATE__);
+    getFirmwareVersion(apRtkFirmwareVersion, sizeof(apRtkFirmwareVersion), true);
     stringRecord(newSettings, "rtkFirmwareVersion", apRtkFirmwareVersion);
 
     if (!configureViaEthernet) // ZED type is unknown if we are in configure-via-ethernet mode
@@ -652,10 +651,6 @@ void createSettingsString(char *newSettings)
     stringRecord(newSettings, "ntripClient_MountPointPW", settings.ntripClient_MountPointPW);
     stringRecord(newSettings, "ntripClient_TransmitGGA", settings.ntripClient_TransmitGGA);
 
-    // stringRecord(newSettings, "ntripServerUseWiFiNotEthernet", settings.ntripServerUseWiFiNotEthernet); //For future
-    // expansion stringRecord(newSettings, "ntripClientUseWiFiNotEthernet", settings.ntripClientUseWiFiNotEthernet);
-    // //For future expansion
-
     // Sensor Fusion Config
     stringRecord(newSettings, "enableSensorFusion", settings.enableSensorFusion);
     stringRecord(newSettings, "autoIMUmountAlignment", settings.autoIMUmountAlignment);
@@ -1163,12 +1158,6 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
     else if (strcmp(settingName, "ntripClient_TransmitGGA") == 0)
         settings.ntripClient_TransmitGGA = settingValueBool;
 
-    // For future expansion
-    // else if (strcmp(settingName, "ntripServerUseWiFiNotEthernet") == 0)
-    //   settings.ntripServerUseWiFiNotEthernet = settingValueBool;
-    // else if (strcmp(settingName, "ntripClientUseWiFiNotEthernet") == 0)
-    //   settings.ntripClientUseWiFiNotEthernet = settingValueBool;
-
     else if (strcmp(settingName, "serialTimeoutGNSS") == 0)
         settings.serialTimeoutGNSS = settingValue;
     else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)
@@ -1350,7 +1339,7 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
             requestChangeState(STATE_ROVER_NOT_STARTED); // If update failed, return to Rover mode.
     }
     else if (strcmp(settingName, "factoryDefaultReset") == 0)
-        factoryReset();
+        factoryReset(false); //We do not have the sdSemaphore
     else if (strcmp(settingName, "exitAndReset") == 0)
     {
         // Confirm receipt
@@ -1457,14 +1446,8 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
         if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))
         {
             // We got a version number, now determine if it's newer or not
-            char currentVersion[20];
-            if (enableRCFirmware == false)
-                snprintf(currentVersion, sizeof(currentVersion), "%d.%d", FIRMWARE_VERSION_MAJOR,
-                         FIRMWARE_VERSION_MINOR);
-            else
-                snprintf(currentVersion, sizeof(currentVersion), "%d.%d-%s", FIRMWARE_VERSION_MAJOR,
-                         FIRMWARE_VERSION_MINOR, __DATE__);
-
+            char currentVersion[21];
+            getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
             if (isReportedVersionNewer(reportedVersion, currentVersion) == true)
             {
                 log_d("New version detected");