Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix new line code to "\r\n" #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix new line code to "\r\n" #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions bGeigieNano.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;

Expand Down Expand Up @@ -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 <avr/pgmspace.h>
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -1306,4 +1307,4 @@ void truncate_100m(char *latitude, char *longitude)
longitude[9] = '0' + (minutes%10);

}
#endif /* JAPAN_POST */
#endif /* JAPAN_POST */