formatting

This commit is contained in:
Proddy
2023-01-12 17:41:24 +01:00
parent e3f51b34b5
commit 7841b44b43
4 changed files with 184 additions and 155 deletions

View File

@@ -30,46 +30,85 @@
#include <Printable.h>
#include <WString.h>
int vsnprintf_P(char *str, size_t size, const char *format, va_list ap);
int vsnprintf_P(char * str, size_t size, const char * format, va_list ap);
class Print {
public:
virtual size_t write(uint8_t c) = 0;
virtual size_t write(const uint8_t *buffer, size_t size) { for (size_t i = 0; i < size; i++) { write(*buffer); buffer++; }; return size; };
void setWriteError(int err = 1) { err_ = err; }
int getWriteError() { return err_; }
void clearWriteError() {}
size_t print(char c) { return write((uint8_t)c); }
size_t print(const char *data) { return write(reinterpret_cast<const uint8_t *>(data), strlen(data)); }
size_t print(const Printable &printable) { return printable.printTo(*this); }
size_t print(int value) { return print(std::to_string(value).c_str()); }
size_t print(unsigned int value) { return print(std::to_string(value).c_str()); }
size_t print(long value) { return print(std::to_string(value).c_str()); }
size_t print(unsigned long value) { return print(std::to_string(value).c_str()); }
size_t printf(const char * format, ...) {
char str[4096] = { 0 };
va_list ap;
public:
virtual size_t write(uint8_t c) = 0;
virtual size_t write(const uint8_t * buffer, size_t size) {
for (size_t i = 0; i < size; i++) {
write(*buffer);
buffer++;
};
return size;
};
void setWriteError(int err = 1) {
err_ = err;
}
int getWriteError() {
return err_;
}
void clearWriteError() {
}
size_t print(char c) {
return write((uint8_t)c);
}
size_t print(const char * data) {
return write(reinterpret_cast<const uint8_t *>(data), strlen(data));
}
size_t print(const Printable & printable) {
return printable.printTo(*this);
}
size_t print(int value) {
return print(std::to_string(value).c_str());
}
size_t print(unsigned int value) {
return print(std::to_string(value).c_str());
}
size_t print(long value) {
return print(std::to_string(value).c_str());
}
size_t print(unsigned long value) {
return print(std::to_string(value).c_str());
}
size_t printf(const char * format, ...) {
char str[4096] = {0};
va_list ap;
va_start(ap, format);
int ret = vsnprintf_P(str, sizeof(str), format, ap);
va_end(ap);
va_start(ap, format);
int ret = vsnprintf_P(str, sizeof(str), format, ap);
va_end(ap);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
return print(str);
}
size_t println() { return print("\r\n"); }
size_t println(const char *data) { return print(data) + println(); }
size_t println(const Printable &printable) { return printable.printTo(*this) + println(); }
size_t println(int value) { return print(std::to_string(value).c_str()) + println(); }
size_t println(unsigned int value) { return print(std::to_string(value).c_str()) + println(); }
size_t println(long value) { return print(std::to_string(value).c_str()) + println(); }
size_t println(unsigned long value) { return print(std::to_string(value).c_str()) + println(); }
virtual void flush() { };
return print(str);
}
size_t println() {
return print("\r\n");
}
size_t println(const char * data) {
return print(data) + println();
}
size_t println(const Printable & printable) {
return printable.printTo(*this) + println();
}
size_t println(int value) {
return print(std::to_string(value).c_str()) + println();
}
size_t println(unsigned int value) {
return print(std::to_string(value).c_str()) + println();
}
size_t println(long value) {
return print(std::to_string(value).c_str()) + println();
}
size_t println(unsigned long value) {
return print(std::to_string(value).c_str()) + println();
}
virtual void flush(){};
private:
int err_{0};
private:
int err_{0};
};
#endif