Skip to content

Commit 3d5677d

Browse files
nseidlenseidle
authored
Merge pull request #538 from sparkfun/release_candidate
Merge v3.6 changes
2 parents 1c6ffc5 + 5e9ed31 commit 3d5677d

30 files changed

+2223
-807
lines changed

‎.github/workflows/compile-rtk-firmware.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
env:
77
FILENAME_PREFIX: RTK_Surveyor_Firmware
88
FIRMWARE_VERSION_MAJOR: 3
9-
FIRMWARE_VERSION_MINOR: 5
9+
FIRMWARE_VERSION_MINOR: 6
1010
POINTPERFECT_TOKEN: ${{ secrets.POINTPERFECT_TOKEN }}
1111

1212
jobs:

‎Firmware/RTK_Surveyor/Begin.ino‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ void beginBoard()
230230
strncpy(platformPrefix, "Reference Station", sizeof(platformPrefix) - 1);
231231
}
232232

233-
systemPrintf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR,
234-
__DATE__);
233+
char versionString[21];
234+
getFirmwareVersion(versionString, sizeof(versionString), true);
235+
systemPrintf("SparkFun RTK %s %s\r\n", platformPrefix, versionString);
235236

236237
// Get unit MAC address
237238
esp_read_mac(wifiMACAddress, ESP_MAC_WIFI_STA);
@@ -980,7 +981,7 @@ void beginSystemState()
980981
if (systemState > STATE_NOT_SET)
981982
{
982983
systemPrintln("Unknown state - factory reset");
983-
factoryReset();
984+
factoryReset(false); //We do not have the SD semaphore
984985
}
985986

986987
if (productVariant == RTK_SURVEYOR)

‎Firmware/RTK_Surveyor/Bluetooth.ino‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ void bluetoothStart()
180180
// while (bluetoothPinned == false) // Wait for task to run once
181181
// delay(1);
182182

183-
if (bluetoothSerial->begin(deviceName) == false)
183+
if (bluetoothSerial->begin(deviceName, false, settings.sppRxQueueSize, settings.sppTxQueueSize) ==
184+
false) // localName, isMaster, rxBufferSize, txBufferSize
184185
{
185186
systemPrintln("An error occurred initializing Bluetooth");
186187

@@ -235,7 +236,8 @@ void bluetoothStart()
235236
void pinBluetoothTask(void *pvParameters)
236237
{
237238
#ifdef COMPILE_BT
238-
if (bluetoothSerial->begin(deviceName) == false)
239+
if (bluetoothSerial->begin(deviceName, false, settings.sppRxQueueSize, settings.sppTxQueueSize) ==
240+
false) // localName, isMaster, rxBufferSize,
239241
{
240242
systemPrintln("An error occurred initializing Bluetooth");
241243

@@ -246,7 +248,7 @@ void pinBluetoothTask(void *pvParameters)
246248
bluetoothPinned = true;
247249

248250
vTaskDelete(nullptr); // Delete task once it has run once
249-
#endif // COMPILE_BT
251+
#endif // COMPILE_BT
250252
}
251253

252254
// This function stops BT so that it can be restarted later

‎Firmware/RTK_Surveyor/Display.ino‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -636,11 +636,7 @@ void displaySplash()
636636

637637
yPos = yPos + fontHeight + 7;
638638
char unitFirmware[50];
639-
if (ENABLE_DEVELOPER)
640-
snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d-DEV", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
641-
else
642-
snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
643-
639+
getFirmwareVersion(unitFirmware, sizeof(unitFirmware), false);
644640
printTextCenter(unitFirmware, yPos, QW_FONT_5X7, 1, false);
645641

646642
oled.display();
@@ -1006,7 +1002,7 @@ uint32_t setWiFiIcon_TwoRadios()
10061002
{
10071003
firstRadioSpotTimer = millis();
10081004

1009-
if (wifiIncomingRTCM == true || wifiOutgoingRTCM == true)
1005+
if (netIncomingRTCM == true || netOutgoingRTCM == true)
10101006
firstRadioSpotBlink ^= 1; // Share the spot
10111007
else
10121008
firstRadioSpotBlink = false;
@@ -1032,15 +1028,15 @@ uint32_t setWiFiIcon_TwoRadios()
10321028
else
10331029
{
10341030
// Share the spot. Determine if we need to indicate Up, or Down
1035-
if (wifiIncomingRTCM == true)
1031+
if (netIncomingRTCM == true)
10361032
{
10371033
icons |= ICON_DOWN_ARROW_LEFT;
1038-
wifiIncomingRTCM = false; // Reset, set during NTRIP Client
1034+
netIncomingRTCM = false; // Reset, set during NTRIP Client
10391035
}
1040-
else if (wifiOutgoingRTCM == true)
1036+
else if (netOutgoingRTCM == true)
10411037
{
10421038
icons |= ICON_UP_ARROW_LEFT;
1043-
wifiOutgoingRTCM = false; // Reset, set during NTRIP Server
1039+
netOutgoingRTCM = false; // Reset, set during NTRIP Server
10441040
}
10451041
else
10461042
{
@@ -1093,7 +1089,7 @@ uint32_t setWiFiIcon_ThreeRadios()
10931089
{
10941090
thirdRadioSpotTimer = millis();
10951091

1096-
if (wifiIncomingRTCM == true || wifiOutgoingRTCM == true)
1092+
if (netIncomingRTCM == true || netOutgoingRTCM == true)
10971093
thirdRadioSpotBlink ^= 1; // Share the spot
10981094
else
10991095
thirdRadioSpotBlink = false;
@@ -1119,15 +1115,15 @@ uint32_t setWiFiIcon_ThreeRadios()
11191115
else
11201116
{
11211117
// Share the spot. Determine if we need to indicate Up, or Down
1122-
if (wifiIncomingRTCM == true)
1118+
if (netIncomingRTCM == true)
11231119
{
11241120
icons |= ICON_DOWN_ARROW_RIGHT;
1125-
wifiIncomingRTCM = false; // Reset, set during NTRIP Client
1121+
netIncomingRTCM = false; // Reset, set during NTRIP Client
11261122
}
1127-
else if (wifiOutgoingRTCM == true)
1123+
else if (netOutgoingRTCM == true)
11281124
{
11291125
icons |= ICON_UP_ARROW_RIGHT;
1130-
wifiOutgoingRTCM = false; // Reset, set during NTRIP Server
1126+
netOutgoingRTCM = false; // Reset, set during NTRIP Server
11311127
}
11321128
else
11331129
{

‎Firmware/RTK_Surveyor/Form.ino‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,7 @@ void createSettingsString(char *newSettings)
573573
stringRecord(newSettings, "platformPrefix", platformPrefix);
574574

575575
char apRtkFirmwareVersion[86];
576-
snprintf(apRtkFirmwareVersion, sizeof(apRtkFirmwareVersion), "v%d.%d-%s", FIRMWARE_VERSION_MAJOR,
577-
FIRMWARE_VERSION_MINOR, __DATE__);
576+
getFirmwareVersion(apRtkFirmwareVersion, sizeof(apRtkFirmwareVersion), true);
578577
stringRecord(newSettings, "rtkFirmwareVersion", apRtkFirmwareVersion);
579578

580579
if (!configureViaEthernet) // ZED type is unknown if we are in configure-via-ethernet mode
@@ -652,10 +651,6 @@ void createSettingsString(char *newSettings)
652651
stringRecord(newSettings, "ntripClient_MountPointPW", settings.ntripClient_MountPointPW);
653652
stringRecord(newSettings, "ntripClient_TransmitGGA", settings.ntripClient_TransmitGGA);
654653

655-
// stringRecord(newSettings, "ntripServerUseWiFiNotEthernet", settings.ntripServerUseWiFiNotEthernet); //For future
656-
// expansion stringRecord(newSettings, "ntripClientUseWiFiNotEthernet", settings.ntripClientUseWiFiNotEthernet);
657-
// //For future expansion
658-
659654
// Sensor Fusion Config
660655
stringRecord(newSettings, "enableSensorFusion", settings.enableSensorFusion);
661656
stringRecord(newSettings, "autoIMUmountAlignment", settings.autoIMUmountAlignment);
@@ -1163,12 +1158,6 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
11631158
else if (strcmp(settingName, "ntripClient_TransmitGGA") == 0)
11641159
settings.ntripClient_TransmitGGA = settingValueBool;
11651160

1166-
// For future expansion
1167-
// else if (strcmp(settingName, "ntripServerUseWiFiNotEthernet") == 0)
1168-
// settings.ntripServerUseWiFiNotEthernet = settingValueBool;
1169-
// else if (strcmp(settingName, "ntripClientUseWiFiNotEthernet") == 0)
1170-
// settings.ntripClientUseWiFiNotEthernet = settingValueBool;
1171-
11721161
else if (strcmp(settingName, "serialTimeoutGNSS") == 0)
11731162
settings.serialTimeoutGNSS = settingValue;
11741163
else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)
@@ -1350,7 +1339,7 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
13501339
requestChangeState(STATE_ROVER_NOT_STARTED); // If update failed, return to Rover mode.
13511340
}
13521341
else if (strcmp(settingName, "factoryDefaultReset") == 0)
1353-
factoryReset();
1342+
factoryReset(false); //We do not have the sdSemaphore
13541343
else if (strcmp(settingName, "exitAndReset") == 0)
13551344
{
13561345
// Confirm receipt
@@ -1457,14 +1446,8 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
14571446
if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))
14581447
{
14591448
// We got a version number, now determine if it's newer or not
1460-
char currentVersion[20];
1461-
if (enableRCFirmware == false)
1462-
snprintf(currentVersion, sizeof(currentVersion), "%d.%d", FIRMWARE_VERSION_MAJOR,
1463-
FIRMWARE_VERSION_MINOR);
1464-
else
1465-
snprintf(currentVersion, sizeof(currentVersion), "%d.%d-%s", FIRMWARE_VERSION_MAJOR,
1466-
FIRMWARE_VERSION_MINOR, __DATE__);
1467-
1449+
char currentVersion[21];
1450+
getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
14681451
if (isReportedVersionNewer(reportedVersion, currentVersion) == true)
14691452
{
14701453
log_d("New version detected");

0 commit comments

Comments
 (0)