diff --git a/hardware/arduino/avr/cores/arduino/Print.cpp b/hardware/arduino/avr/cores/arduino/Print.cpp index 1e4c99a6552..c877302b710 100644 --- a/hardware/arduino/avr/cores/arduino/Print.cpp +++ b/hardware/arduino/avr/cores/arduino/Print.cpp @@ -264,3 +264,56 @@ size_t Print::printFloat(double number, uint8_t digits) return n; } + +//---------------------------------------- +//printf begin + +#include +#include + +//non class function for callback from stdio.FILE steam. +//in field FILE.udata passed class->this +static int dummy_putchar(char c, FILE *stream ) +{ + Print* pPrint = (Print*)(stream->udata); + if(c=='\n') pPrint->print('\r'); + pPrint->print(c); + return 1; +} + +size_t Print::printf(const char *fmt, ...) +{ + FILE oStream; //size 12 bytes on Stack + oStream.put = dummy_putchar; + oStream.flags |= __SWR; + oStream.udata = (void*) this; + //---- + oStream.flags &= ~__SPGM; + // + va_list ap; + va_start( (ap), (fmt) ); + size_t i = vfprintf(&oStream, fmt, ap); + va_end(ap); + return i; +} + +size_t Print::printf(const __FlashStringHelper *fmt_P, ...) +{ + PGM_P fmt = reinterpret_cast(fmt_P); + + FILE oStream; //size 12 bytes on Stack + oStream.put = dummy_putchar; + oStream.flags |= __SWR; + oStream.udata = (void*)this; + //---- + oStream.flags |= __SPGM; + // + va_list ap; + va_start( (ap), (fmt_P) ); + size_t i = vfprintf(&oStream, fmt, ap); + va_end(ap); + return i; +} + +//printf end +//---------------------------------------- diff --git a/hardware/arduino/avr/cores/arduino/Print.h b/hardware/arduino/avr/cores/arduino/Print.h index 7b53aa4d17e..590bdeca907 100644 --- a/hardware/arduino/avr/cores/arduino/Print.h +++ b/hardware/arduino/avr/cores/arduino/Print.h @@ -79,6 +79,9 @@ class Print size_t println(double, int = 2); size_t println(const Printable&); size_t println(void); + + size_t printf (const char *szFormat, ...); + size_t printf (const __FlashStringHelper *szFormat, ...); }; #endif pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy