Skip to content

Commit 1b0f93d

Browse files
nseidlenseidle
committed
Change line endings to \r\n
Fix #331
1 parent b9d63c3 commit 1b0f93d

20 files changed

+223
-223
lines changed

‎Firmware/RTK_Surveyor/Base.ino‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ bool beginSurveyIn()
113113
return (false);
114114
}
115115

116-
Serial.printf("Survey started. This will run until %d seconds have passed and less than %0.03f meter accuracy is achieved.\n\r",
116+
Serial.printf("Survey started. This will run until %d seconds have passed and less than %0.03f meter accuracy is achieved.\r\n",
117117
settings.observationSeconds,
118118
settings.observationPositionAccuracy
119119
);
@@ -173,9 +173,9 @@ bool startFixedBase()
173173
long majorEcefZ = floor((settings.fixedEcefZ * 100) + 0.5);
174174
long minorEcefZ = floor((((settings.fixedEcefZ * 100.0) - majorEcefZ) * 100.0) + 0.5);
175175

176-
// Serial.printf("fixedEcefY (should be -4716808.5807): %0.04f\n\r", settings.fixedEcefY);
177-
// Serial.printf("major (should be -471680858): %ld\n\r", majorEcefY);
178-
// Serial.printf("minor (should be -7): %ld\n\r", minorEcefY);
176+
// Serial.printf("fixedEcefY (should be -4716808.5807): %0.04f\r\n", settings.fixedEcefY);
177+
// Serial.printf("major (should be -471680858): %ld\r\n", majorEcefY);
178+
// Serial.printf("minor (should be -7): %ld\r\n", minorEcefY);
179179

180180
//Units are cm with a high precision extension so -1234.5678 should be called: (-123456, -78)
181181
//-1280208.308,-4716803.847,4086665.811 is SparkFun HQ so...
@@ -202,17 +202,17 @@ bool startFixedBase()
202202
int32_t majorAlt = totalFixedAltitude * 100;
203203
int32_t minorAlt = ((totalFixedAltitude * 100) - majorAlt) * 100;
204204

205-
// Serial.printf("fixedLong (should be -105.184774720): %0.09f\n\r", settings.fixedLong);
206-
// Serial.printf("major (should be -1051847747): %lld\n\r", majorLat);
207-
// Serial.printf("minor (should be -20): %lld\n\r", minorLat);
205+
// Serial.printf("fixedLong (should be -105.184774720): %0.09f\r\n", settings.fixedLong);
206+
// Serial.printf("major (should be -1051847747): %lld\r\n", majorLat);
207+
// Serial.printf("minor (should be -20): %lld\r\n", minorLat);
208208
//
209-
// Serial.printf("fixedLat (should be 40.090335429): %0.09f\n\r", settings.fixedLat);
210-
// Serial.printf("major (should be 400903354): %lld\n\r", majorLong);
211-
// Serial.printf("minor (should be 29): %lld\n\r", minorLong);
209+
// Serial.printf("fixedLat (should be 40.090335429): %0.09f\r\n", settings.fixedLat);
210+
// Serial.printf("major (should be 400903354): %lld\r\n", majorLong);
211+
// Serial.printf("minor (should be 29): %lld\r\n", minorLong);
212212
//
213-
// Serial.printf("fixedAlt (should be 1560.2284): %0.04f\n\r", settings.fixedAltitude);
214-
// Serial.printf("major (should be 156022): %ld\n\r", majorAlt);
215-
// Serial.printf("minor (should be 84): %ld\n\r", minorAlt);
213+
// Serial.printf("fixedAlt (should be 1560.2284): %0.04f\r\n", settings.fixedAltitude);
214+
// Serial.printf("major (should be 156022): %ld\r\n", majorAlt);
215+
// Serial.printf("minor (should be 84): %ld\r\n", minorAlt);
216216

217217
response = i2cGNSS.setStaticPosition(
218218
majorLat, minorLat,

‎Firmware/RTK_Surveyor/Begin.ino‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void beginBoard()
167167
if (settings.enableResetDisplay == true)
168168
{
169169
settings.resetCount++;
170-
Serial.printf("resetCount: %d\n\r", settings.resetCount);
170+
Serial.printf("resetCount: %d\r\n", settings.resetCount);
171171
recordSystemSettingsToFileLFS(settingsFileName); //Avoid overwriting LittleFS settings onto SD
172172
}
173173

@@ -455,7 +455,7 @@ void beginGNSS()
455455
zedFirmwareVersionInt = 132;
456456
else
457457
{
458-
Serial.printf("Unknown firmware version: %s\n\r", zedFirmwareVersion);
458+
Serial.printf("Unknown firmware version: %s\r\n", zedFirmwareVersion);
459459
zedFirmwareVersionInt = 99; //0.99 invalid firmware version
460460
}
461461

@@ -466,7 +466,7 @@ void beginGNSS()
466466
zedModuleType = PLATFORM_F9R;
467467
else
468468
{
469-
Serial.printf("Unknown ZED module: %s\n\r", i2cGNSS.minfo.extension[3]);
469+
Serial.printf("Unknown ZED module: %s\r\n", i2cGNSS.minfo.extension[3]);
470470
zedModuleType = PLATFORM_F9P;
471471
}
472472

‎Firmware/RTK_Surveyor/Display.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void updateDisplay()
342342
displayShutdown();
343343
break;
344344
default:
345-
Serial.printf("Unknown display: %d\n\r", systemState);
345+
Serial.printf("Unknown display: %d\r\n", systemState);
346346
displayError("Display");
347347
break;
348348
}

‎Firmware/RTK_Surveyor/ESPNOW.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void espnowStart()
150150
{
151151
esp_err_t result = espnowAddPeer(settings.espnowPeers[x]);
152152
if (result != ESP_OK)
153-
log_d("Failed to add peer #%d\n\r", x);
153+
log_d("Failed to add peer #%d", x);
154154
}
155155
}
156156
}
@@ -166,7 +166,7 @@ void espnowStart()
166166
{
167167
esp_err_t result = espnowAddPeer(broadcastMac, false); //Encryption not support for broadcast MAC
168168
if (result != ESP_OK)
169-
log_d("Failed to add broadcast peer\n\r");
169+
log_d("Failed to add broadcast peer");
170170
}
171171
}
172172

‎Firmware/RTK_Surveyor/Form.ino‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,13 @@ static void handleFirmwareFileUpload(AsyncWebServerRequest *request, String file
193193
}
194194
else
195195
{
196-
Serial.printf("Unknown: %s\n\r", fname);
196+
Serial.printf("Unknown: %s\r\n", fname);
197197
return request->send(400, "text/html", "<b>Error:</b> Unknown file type");
198198
}
199199
}
200200
else
201201
{
202-
Serial.printf("Unknown: %s\n\r", fname);
202+
Serial.printf("Unknown: %s\r\n", fname);
203203
return request->send(400, "text/html", "<b>Error:</b> Unknown file type");
204204
}
205205
}
@@ -221,12 +221,12 @@ static void handleFirmwareFileUpload(AsyncWebServerRequest *request, String file
221221
char bytesSentMsg[100];
222222
sprintf(bytesSentMsg, "%'d bytes sent", binBytesSent);
223223

224-
Serial.printf("bytesSentMsg: %s\n\r", bytesSentMsg);
224+
Serial.printf("bytesSentMsg: %s\r\n", bytesSentMsg);
225225

226226
char statusMsg[200] = {'\0'};
227227
stringRecord(statusMsg, "firmwareUploadStatus", bytesSentMsg); //Convert to "firmwareUploadMsg,11214 bytes sent,"
228228

229-
Serial.printf("msg: %s\n\r", statusMsg);
229+
Serial.printf("msg: %s\r\n", statusMsg);
230230
ws.textAll(statusMsg);
231231
}
232232

@@ -263,7 +263,7 @@ void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventT
263263
memset(settingsCSV, 0, AP_CONFIG_SETTING_SIZE); //Clear any garbage from settings array
264264

265265
createSettingsString(settingsCSV);
266-
log_d("Sending command: %s\n\r", settingsCSV);
266+
log_d("Sending command: %s", settingsCSV);
267267
client->text(settingsCSV);
268268
wifiSetState(WIFI_CONNECTED);
269269
free(settingsCSV);
@@ -481,8 +481,8 @@ void createSettingsString(char* settingsCSV)
481481
//...
482482

483483
strcat(settingsCSV, "\0");
484-
Serial.printf("settingsCSV len: %d\n\r", strlen(settingsCSV));
485-
Serial.printf("settingsCSV: %s\n\r", settingsCSV);
484+
Serial.printf("settingsCSV len: %d\r\n", strlen(settingsCSV));
485+
Serial.printf("settingsCSV: %s\r\n", settingsCSV);
486486
#endif
487487
}
488488

@@ -656,7 +656,7 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
656656
settingsCSV = (char*)malloc(AP_CONFIG_SETTING_SIZE);
657657
memset(settingsCSV, 0, AP_CONFIG_SETTING_SIZE); //Clear any garbage from settings array
658658
createSettingsString(settingsCSV);
659-
log_d("Sending command: %s\n\r", settingsCSV);
659+
log_d("Sending command: %s", settingsCSV);
660660
ws.textAll(String(settingsCSV));
661661
free(settingsCSV);
662662
}
@@ -673,7 +673,7 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
673673
settingsCSV = (char*)malloc(AP_CONFIG_SETTING_SIZE);
674674
memset(settingsCSV, 0, AP_CONFIG_SETTING_SIZE); //Clear any garbage from settings array
675675
createSettingsString(settingsCSV);
676-
log_d("Sending command: %s\n\r", settingsCSV);
676+
log_d("Sending command: %s", settingsCSV);
677677
ws.textAll(String(settingsCSV));
678678
free(settingsCSV);
679679
}
@@ -725,7 +725,7 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
725725
//Last catch
726726
if (knownSetting == false)
727727
{
728-
Serial.printf("Unknown '%s': %0.3lf\n\r", settingName, settingValue);
728+
Serial.printf("Unknown '%s': %0.3lf\r\n", settingName, settingValue);
729729
}
730730
} //End last strcpy catch
731731
#endif

0 commit comments

Comments
 (0)