arduino/arduino-esp32
1
0
Fork 0
mirror of https://github.com/espressif/arduino-esp32 synced 2024-09-21 18:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add printf method with FlashStringHelper argument (#8677)

Browse Source
This commit is contained in:
Lucas Saavedra Vaz 2023-10-06 07:56:56 -03:00 committed by GitHub
parent 6091d526f6
commit 826a426905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cores/esp32/Print.cpp
View File

@ -44,13 +44,11 @@ size_t Print::write(const uint8_t *buffer, size_t size)
return n;
}
size_t Print::printf(const char *format, ...)
size_t Print::vprintf(const char *format, va_list arg)
{
char loc_buf[64];
char * temp = loc_buf;
va_list arg;
va_list copy;
va_start(arg, format);
va_copy(copy, arg);
int len = vsnprintf(temp, sizeof(loc_buf), format, copy);
va_end(copy);
@ -74,6 +72,25 @@ size_t Print::printf(const char *format, ...)
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)
{
return write(s.c_str(), s.length());

4
cores/esp32/Print.h
View File

@ -21,6 +21,7 @@
#define Print_h
#include <stdint.h>
#include <stdio.h>
#include <stddef.h>
#include "WString.h"
@ -72,7 +73,10 @@ public:
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 __FlashStringHelper *ifsh, ...);
// add availableForWrite to make compatible with Arduino Print.h
// default to zero, meaning "a single write may block"