Unverified Commit 826a4269 authored by Lucas Saavedra Vaz's avatar Lucas Saavedra Vaz Committed by GitHub

Add printf method with FlashStringHelper argument (#8677)

parent 6091d526
...@@ -44,13 +44,11 @@ size_t Print::write(const uint8_t *buffer, size_t size) ...@@ -44,13 +44,11 @@ size_t Print::write(const uint8_t *buffer, size_t size)
return n; return n;
} }
size_t Print::printf(const char *format, ...) size_t Print::vprintf(const char *format, va_list arg)
{ {
char loc_buf[64]; char loc_buf[64];
char * temp = loc_buf; char * temp = loc_buf;
va_list arg;
va_list copy; va_list copy;
va_start(arg, format);
va_copy(copy, arg); va_copy(copy, arg);
int len = vsnprintf(temp, sizeof(loc_buf), format, copy); int len = vsnprintf(temp, sizeof(loc_buf), format, copy);
va_end(copy); va_end(copy);
...@@ -74,6 +72,25 @@ size_t Print::printf(const char *format, ...) ...@@ -74,6 +72,25 @@ size_t Print::printf(const char *format, ...)
return len; return len;
} }
size_t Print::printf(const __FlashStringHelper *ifsh, ...)
{
va_list arg;
va_start(arg, ifsh);
const char * format = (reinterpret_cast<const char *>(ifsh));
size_t ret = vprintf(format, arg);
va_end(arg);
return ret;
}
size_t Print::printf(const char *format, ...)
{
va_list arg;
va_start(arg, format);
size_t ret = vprintf(format, arg);
va_end(arg);
return ret;
}
size_t Print::print(const String &s) size_t Print::print(const String &s)
{ {
return write(s.c_str(), s.length()); return write(s.c_str(), s.length());
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define Print_h #define Print_h
#include <stdint.h> #include <stdint.h>
#include <stdio.h>
#include <stddef.h> #include <stddef.h>
#include "WString.h" #include "WString.h"
...@@ -72,7 +73,10 @@ public: ...@@ -72,7 +73,10 @@ public:
return write((const uint8_t *) buffer, size); return write((const uint8_t *) buffer, size);
} }
size_t vprintf(const char *format, va_list arg);
size_t printf(const char * format, ...) __attribute__ ((format (printf, 2, 3))); size_t printf(const char * format, ...) __attribute__ ((format (printf, 2, 3)));
size_t printf(const __FlashStringHelper *ifsh, ...);
// add availableForWrite to make compatible with Arduino Print.h // add availableForWrite to make compatible with Arduino Print.h
// default to zero, meaning "a single write may block" // default to zero, meaning "a single write may block"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment