From 407eee6ab8f7d57ad01eecc97393a5f586b37a1f Mon Sep 17 00:00:00 2001 From: Hiroaki KAWAI Date: Wed, 8 Apr 2015 12:28:14 +0900 Subject: [PATCH] fix new line code to "\r\n" --- bGeigieNano.ino | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bGeigieNano.ino b/bGeigieNano.ino index 0aa41b0..c60671b 100755 --- a/bGeigieNano.ino +++ b/bGeigieNano.ino @@ -71,6 +71,7 @@ unsigned long int gps_distance = 0; // Geiger settings ------------------------------------------------------------ #define LINE_SZ 100 +#define NEW_LINE "\r\n" #define BUFFER_SZ 12 #define STRBUFFER_SZ 32 #define AVAILABLE 'A' // indicates geiger data are ready (available) @@ -81,7 +82,7 @@ unsigned long int gps_distance = 0; // log file headers -#define LOGFILE_HEADER "# NEW LOG\n# format=" +#define LOGFILE_HEADER "# NEW LOG" NEW_LINE "# format=" char logfile_name[13]; // placeholder for filename bool logfile_ready = false; @@ -149,8 +150,8 @@ static char lon[BUFFER_SZ]; #define PMTK_SET_NMEA_OUTPUT_RMCGGA "$PMTK314,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*28" #define PMTK_HOT_START "$PMTK101*32" #define PMTK_COLD_START "$PMTK104*37" -#define SBAS_ENABLE "$PMTK313,1*2E\r\n" -#define DGPS_WAAS_ON "$PMTK301,2*2E\r\n" +#define SBAS_ENABLE "$PMTK313,1*2E" NEW_LINE +#define DGPS_WAAS_ON "$PMTK301,2*2E" NEW_LINE #if ENABLE_STATIC_GPS #include @@ -555,9 +556,9 @@ void loop() DEBUG_PRINT(strbuffer); #ifdef ENABLE_LND_DEADTIME - sprintf_P(strbuffer, PSTR("nano\n# deadtime=on\n")); + sprintf_P(strbuffer, PSTR("nano" NEW_LINE "# deadtime=on" NEW_LINE)); #else - sprintf_P(strbuffer, PSTR("nano\n")); + sprintf_P(strbuffer, PSTR("nano" NEW_LINE)); #endif OpenLog.print(strbuffer); @@ -1306,4 +1307,4 @@ void truncate_100m(char *latitude, char *longitude) longitude[9] = '0' + (minutes%10); } -#endif /* JAPAN_POST */ \ No newline at end of file +#endif /* JAPAN_POST */