Skip to content

feat: enhance Print class with float support and printf functionality #7

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
Aymane-ST wants to merge 1 commit into
base: api-patches
Choose a base branch
from
Open

feat: enhance Print class with float support and printf functionality #7

Show file tree
Hide file tree
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
40 changes: 40 additions & 0 deletions api/Print.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ size_t Print::print(unsigned long long n, int base)
else return printULLNumber(n, base);
}

size_t Print::print(float n, int digits)
{
return printFloat(n, digits);
}

size_t Print::print(double n, int digits)
{
return printFloat(n, digits);
Expand Down Expand Up @@ -222,6 +227,13 @@ size_t Print::println(unsigned long long num, int base)
return n;
}

size_t Print::println(float num, int digits)
{
size_t n = print(num, digits);
n += println();
return n;
}

size_t Print::println(double num, int digits)
{
size_t n = print(num, digits);
Expand All @@ -236,6 +248,34 @@ size_t Print::println(const Printable& x)
return n;
}

int Print::printf(const char *format, ...)
{
va_list ap;
va_start(ap, format);
int retval = vdprintf((int)this, format, ap);
va_end(ap);
return retval;
}

int Print::printf(const __FlashStringHelper *format, ...)
{
va_list ap;
va_start(ap, format);
int retval = vdprintf((int)this, (const char *)format, ap);
va_end(ap);
return retval;
}

int Print::vprintf(const char *format, va_list ap)
{
return vdprintf((int)this, format, ap);
}

int Print::vprintf(const __FlashStringHelper *format, va_list ap)
{
return vdprintf((int)this, (const char *)format, ap);
}

// Private Methods /////////////////////////////////////////////////////////////

size_t Print::printNumber(unsigned long n, uint8_t base)
Expand Down
8 changes: 8 additions & 0 deletions api/Print.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include <inttypes.h>
#include <stdio.h> // for size_t
#include <stdarg.h> // for printf

#include "String.h"
#include "Printable.h"
Expand Down Expand Up @@ -72,6 +73,7 @@ class Print
size_t print(unsigned long, int = DEC);
size_t print(long long, int = DEC);
size_t print(unsigned long long, int = DEC);
size_t print(float, int = 2);
size_t print(double, int = 2);
size_t print(const Printable&);

Expand All @@ -86,10 +88,16 @@ class Print
size_t println(unsigned long, int = DEC);
size_t println(long long, int = DEC);
size_t println(unsigned long long, int = DEC);
size_t println(float, int = 2);
size_t println(double, int = 2);
size_t println(const Printable&);
size_t println(void);

int printf(const char *format, ...);
int printf(const __FlashStringHelper *format, ...);
int vprintf(const __FlashStringHelper *format, va_list ap);
int vprintf(const char *format, va_list ap);

virtual void flush() { /* Empty implementation for backward compatibility */ }
};

Expand Down