Skip to content

Commit 12a94b3

Browse files
committed
Fix line endings
1 parent 6d3937b commit 12a94b3

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

Firmware/RTK_Surveyor/Tasks.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ void handleGNSSDataTask(void *e)
350350
if (settings.enablePrintSDBuffers && !inMainMenu)
351351
{
352352
int availableUARTSpace = settings.uartReceiveBufferSize - serialGNSS.available();
353-
systemPrintf("SD Incoming Serial: %04d\tToRead: %04d\tMovedToBuffer: %04d\tavailableUARTSpace: %04d\tavailableHandlerSpace: %04d\tToRecord: %04d\tRecorded: %04d\tBO: %d\n\r", serialGNSS.available(), 0, 0, availableUARTSpace, availableHandlerSpace, sliceToRecord, 0, bufferOverruns);
353+
systemPrintf("SD Incoming Serial: %04d\tToRead: %04d\tMovedToBuffer: %04d\tavailableUARTSpace: %04d\tavailableHandlerSpace: %04d\tToRecord: %04d\tRecorded: %04d\tBO: %d\r\n", serialGNSS.available(), 0, 0, availableUARTSpace, availableHandlerSpace, sliceToRecord, 0, bufferOverruns);
354354
}
355355

356356
//Write the data to the file
@@ -379,7 +379,7 @@ void handleGNSSDataTask(void *e)
379379
if (settings.enablePrintBufferOverrun)
380380
{
381381
if (endTime - startTime > 150)
382-
systemPrintf("Long Write! Time: %ld ms / Location: %ld / Recorded %d bytes / spaceRemaining %d bytes\n\r", endTime - startTime, fileSize, sdBytesToRecord, combinedSpaceRemaining);
382+
systemPrintf("Long Write! Time: %ld ms / Location: %ld / Recorded %d bytes / spaceRemaining %d bytes\r\n", endTime - startTime, fileSize, sdBytesToRecord, combinedSpaceRemaining);
383383
}
384384

385385
xSemaphoreGive(sdCardSemaphore);

Firmware/RTK_Surveyor/menuBase.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ void recordLineToLFS(const char* fileName, const char* lineData)
596596
File file = LittleFS.open(fileName, FILE_APPEND);
597597
if (!file)
598598
{
599-
systemPrintf("File %s failed to create\n\r", fileName);
599+
systemPrintf("File %s failed to create\r\n", fileName);
600600
return;
601601
}
602602

Firmware/RTK_Surveyor/menuFirmware.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ bool otaCheckVersion(char *versionAvailable, uint8_t versionAvailableLength)
404404
}
405405

406406
if (gotVersion == true)
407-
log_d("Available OTA firmware version: %s\n\r", versionAvailable);
407+
log_d("Available OTA firmware version: %s\r\n", versionAvailable);
408408

409409
#endif
410410
return (gotVersion);

Firmware/RTK_Surveyor/menuMessages.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ void menuLog()
2626
else
2727
systemPrintln("No microSD card is detected");
2828

29-
systemPrintf("Buffer overruns: %d\n\r", bufferOverruns);
29+
if(bufferOverruns)
30+
systemPrintf("Buffer overruns: %d\r\n", bufferOverruns);
3031

3132
systemPrint("1) Log to microSD: ");
3233
if (settings.enableLogging == true) systemPrintln("Enabled");

Firmware/RTK_Surveyor/menuPorts.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void menuPortsMultiplexed()
166166
}
167167
else if (incoming == 2)
168168
{
169-
systemPrintln("\n\rEnter the pin connection to use (1 to 4) for Data Port: ");
169+
systemPrintln("\r\nEnter the pin connection to use (1 to 4) for Data Port: ");
170170
systemPrintln("1) NMEA TX Out/RX In");
171171
systemPrintln("2) PPS OUT/Event Trigger In");
172172
if (zedModuleType == PLATFORM_F9P)

Firmware/RTK_Surveyor/support.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ byte getCharacterNumber()
323323
}
324324
else if (response == INPUT_RESPONSE_TIMEOUT)
325325
{
326-
systemPrintln("\n\rNo user response - Do you have line endings turned on?");
326+
systemPrintln("\r\nNo user response - Do you have line endings turned on?");
327327
userByte = 255; //Timeout
328328
}
329329
else if (response == INPUT_RESPONSE_EMPTY)
@@ -352,7 +352,7 @@ long getNumber()
352352
}
353353
else if (response == INPUT_RESPONSE_TIMEOUT)
354354
{
355-
systemPrintln("\n\rNo user response - Do you have line endings turned on?");
355+
systemPrintln("\r\nNo user response - Do you have line endings turned on?");
356356
userNumber = INPUT_RESPONSE_GETNUMBER_TIMEOUT; //Timeout
357357
}
358358
else if (response == INPUT_RESPONSE_EMPTY)

0 commit comments

Comments
 (0)