Skip to content

Commit 2058a06

Browse files
committed
Merge branch 'release_candidate' into Add_Ref_Stn_Ethernet
2 parents 6079733 + 725fd3e commit 2058a06

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Firmware/RTK_Surveyor/System.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ bool commandSupported(const uint32_t key)
552552
}
553553
if (commandNumber == MAX_UBX_CMD)
554554
{
555-
Serial.printf("commandSupported: Unknown command key 0x%02X\r\n", key);
555+
systemPrintf("commandSupported: Unknown command key 0x%02X\r\n", key);
556556
commandSupported = false;
557557
}
558558
else

Firmware/RTK_Surveyor/menuEthernet.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void beginEthernet()
5454
}
5555
else
5656
{
57-
Serial.println("Ethernet started with static IP");
57+
systemPrintln("Ethernet started with static IP");
5858
online.ethernetStatus = ETH_CONNECTED;
5959
}
6060
}

Firmware/RTK_Surveyor/menuMessages.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,10 @@ void menuMessagesBaseRTCM()
267267
int incoming = getNumber(); //Returns EXIT, TIMEOUT, or long
268268

269269
if (incoming == 1)
270+
{
270271
menuMessagesSubtype(settings.ubxMessageRatesBase, "RTCM-Base");
272+
restartBase = true;
273+
}
271274
else if (incoming == 2)
272275
{
273276
settings.ubxMessageRatesBase[getMessageNumberByName("UBX_RTCM_1005")] = 1; //1105
@@ -334,7 +337,6 @@ void menuMessagesSubtype(uint8_t *localMessageRate, const char* messageType)
334337

335338
if (strcmp(messageType, "RTCM-Base") == 0) //The ubxMessageRatesBase array is 0 to MAX_UBX_MSG_RTCM - 1
336339
{
337-
Serial.println("Special handling");
338340
startOfBlock = 0;
339341
endOfBlock = MAX_UBX_MSG_RTCM;
340342
rtcmOffset = getMessageNumberByName("UBX_RTCM_1005");

0 commit comments

Comments
 (0)