Skip to content

Add build flag to disable line end defines #5

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

Open
mattbaker-digital wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add build flag to disable line end defines #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0a25e0
Add build flag to disable line end defines
matt-baker-agd-systems Aug 16, 2024
a7078ff
Replace reference to CR with Logging::lineEnd constant
matt-baker-agd-systems Aug 16, 2024
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
24 changes: 21 additions & 3 deletions src/ArduinoLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,25 @@ typedef void (*printfunction)(Print*, int);
#define LOG_COLOR_WHITE "\033[;37m"
#define LOG_COLOR_BLACK "\033[;38;5;240m"
#define LOG_COLOR_END "\033[0m"

#ifndef ARDUINOLOG_DISABLE_LINE_END_DEFINES
#ifndef CR
#define CR "\n"
#else
#warning "CR already defined"
#endif
#ifndef LF
#define LF "\r"
#else
#warning "LF already defined"
#endif
#ifndef NL
#define NL "\n\r"
#else
#warning "NL already defined"
#endif
#endif

#define LOGGING_VERSION 1_0_4

/**
Expand Down Expand Up @@ -107,6 +123,8 @@ typedef void (*printfunction)(Print*, int);

class Logging {
public:
static constexpr char lineEnd[] = "\n";

explicit Logging();

/**
Expand Down Expand Up @@ -374,7 +392,7 @@ class Logging {

void printFormat(const char format, va_list *args);

template <class T> void printLevel(int level, bool cr, T msg, ...) {
template <class T> void printLevel(int level, bool newLine, T msg, ...) {
#ifndef DISABLE_LOGGING
if (level > _level) {
return;
Expand Down Expand Up @@ -428,8 +446,8 @@ class Logging {
}
}

if (cr) {
writeLog(CR);
if (newLine) {
writeLog(lineEnd);
}

if (_showColors) {
Expand Down