Skip to content

Make ArduinoLog work on native (x86_64) environments for testing #16

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

Merged
thijse merged 1 commit into from
May 22, 2021
Merged

Make ArduinoLog work on native (x86_64) environments for testing #16

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
26 changes: 26 additions & 0 deletions ArduinoLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,36 +104,62 @@ void Logging::print(const __FlashStringHelper *format, va_list args)
{
#ifndef DISABLE_LOGGING
PGM_P p = reinterpret_cast<PGM_P>(format);
// This copy is only necessary on some architectures (x86) to change a passed
// array in to a va_list.
#ifdef __x86_64__
va_list args_copy;
va_copy(args_copy, args);
#endif
char c = pgm_read_byte(p++);
for(;c != 0; c = pgm_read_byte(p++))
{
if (c == '%')
{
c = pgm_read_byte(p++);
#ifdef __x86_64__
printFormat(c, &args_copy);
#else
printFormat(c, &args);
#endif
}
else
{
_logOutput->print(c);
}
}
#ifdef __x86_64__
va_end(args_copy);
#endif
#endif
}

void Logging::print(const char *format, va_list args) {
#ifndef DISABLE_LOGGING
// This copy is only necessary on some architectures (x86) to change a passed
// array in to a va_list.
#ifdef __x86_64__
va_list args_copy;
va_copy(args_copy, args);
#endif
for (; *format != 0; ++format)
{
if (*format == '%')
{
++format;
#ifdef __x86_64__
printFormat(*format, &args_copy);
#else
printFormat(*format, &args);
#endif
}
else
{
_logOutput->print(*format);
}
}
#ifdef __x86_64__
va_end(args_copy);
#endif
#endif
}

Expand Down