From be079c5ddc8e4b60d48affd8eb0f167ee140da88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Grome=C5=A1?= Date: Mon, 2 Apr 2018 13:22:06 +0200 Subject: [PATCH] Extracted common serial code into ISerial class --- src/ISerial.cpp | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ src/ISerial.h | 56 +++++++++++++++++++ 2 files changed, 198 insertions(+) create mode 100644 src/ISerial.cpp create mode 100644 src/ISerial.h diff --git a/src/ISerial.cpp b/src/ISerial.cpp new file mode 100644 index 00000000..21c1e331 --- /dev/null +++ b/src/ISerial.cpp @@ -0,0 +1,142 @@ +#include "ISerial.h" + +ISerial::ISerial() { + +} + +void ISerial::begin(long speed) { + _mod->ModuleSerial->begin(speed); +} + +bool ISerial::listen() { + return(_mod->ModuleSerial->listen()); +} + +void ISerial::end() { + _mod->ModuleSerial->end(); +} + +bool ISerial::isListening() { + return(_mod->ModuleSerial->isListening()); +} + +bool ISerial::stopListening() { + return(_mod->ModuleSerial->stopListening()); +} + +bool ISerial::overflow() { + return(_mod->ModuleSerial->overflow()); +} + +int ISerial::peek() { + return(_mod->ModuleSerial->peek()); +} + +size_t ISerial::write(uint8_t b) { + return(_mod->ModuleSerial->write(b)); +} + +int ISerial::read() { + return(_mod->ModuleSerial->read()); +} + +int ISerial::available() { + return(_mod->ModuleSerial->available()); +} + +void ISerial::flush() { + _mod->ModuleSerial->flush(); +} + +size_t ISerial::print(const __FlashStringHelper *ifsh) { + return(_mod->ModuleSerial->print(ifsh)); +} + +size_t ISerial::print(const String &s) { + return(_mod->ModuleSerial->print(s)); +} + +size_t ISerial::print(const char str[]) { + return(_mod->ModuleSerial->print(str)); +} + +size_t ISerial::print(char c) { + return(_mod->ModuleSerial->print(c)); +} + +size_t ISerial::print(unsigned char b, int base) { + return(_mod->ModuleSerial->print(b, base)); +} + +size_t ISerial::print(int n, int base) { + return(_mod->ModuleSerial->print(n, base)); +} + +size_t ISerial::print(unsigned int n, int base) { + return(_mod->ModuleSerial->print(n, base)); +} + +size_t ISerial::print(long n, int base) { + return(_mod->ModuleSerial->print(n, base)); +} + +size_t ISerial::print(unsigned long n, int base) { + return(_mod->ModuleSerial->print(n, base)); +} + +size_t ISerial::print(double n, int digits) { + return(_mod->ModuleSerial->print(n, digits)); +} + +size_t ISerial::print(const Printable& x) { + return(_mod->ModuleSerial->print(x)); +} + +size_t ISerial::println(const __FlashStringHelper *ifsh) { + return(_mod->ModuleSerial->println(ifsh)); +} + +size_t ISerial::println(const String &s) { + return(_mod->ModuleSerial->println(s)); +} + +size_t ISerial::println(const char str[]) { + return(_mod->ModuleSerial->println(str)); +} + +size_t ISerial::println(char c) { + return(_mod->ModuleSerial->println(c)); +} + +size_t ISerial::println(unsigned char b, int base) { + return(_mod->ModuleSerial->println(b, base)); +} + +size_t ISerial::println(int n, int base) { + return(_mod->ModuleSerial->println(n, base)); +} + +size_t ISerial::println(unsigned int n, int base) { + return(_mod->ModuleSerial->println(n, base)); +} + +size_t ISerial::println(long n, int base) { + return(_mod->ModuleSerial->println(n, base)); +} + +size_t ISerial::println(unsigned long n, int base) { + return(_mod->ModuleSerial->println(n, base)); +} + +size_t ISerial::println(double n, int digits) { + return(_mod->ModuleSerial->println(n, digits)); +} + +size_t ISerial::println(const Printable& x) { + return(_mod->ModuleSerial->println(x)); +} + +size_t ISerial::println(void) { + return(_mod->ModuleSerial->println()); +} + \ No newline at end of file diff --git a/src/ISerial.h b/src/ISerial.h new file mode 100644 index 00000000..27520412 --- /dev/null +++ b/src/ISerial.h @@ -0,0 +1,56 @@ +#ifndef _KITELIB_ISERIAL_H +#define _KITELIB_ISERIAL_H + +#include "Module.h" + +#include + +#include "WString.h" +#include "Printable.h" + +class ISerial { + public: + ISerial(); + + void begin(long); + bool listen(); + void end(); + bool isListening(); + bool stopListening(); + bool overflow(); + int peek(); + size_t write(uint8_t); + int read(); + int available(); + void flush(); + + size_t print(const __FlashStringHelper *); + size_t print(const String &); + size_t print(const char[]); + size_t print(char); + size_t print(unsigned char, int = DEC); + size_t print(int, int = DEC); + size_t print(unsigned int, int = DEC); + size_t print(long, int = DEC); + size_t print(unsigned long, int = DEC); + size_t print(double, int = 2); + size_t print(const Printable&); + + size_t println(const __FlashStringHelper *); + size_t println(const String &s); + size_t println(const char[]); + size_t println(char); + size_t println(unsigned char, int = DEC); + size_t println(int, int = DEC); + size_t println(unsigned int, int = DEC); + size_t println(long, int = DEC); + size_t println(unsigned long, int = DEC); + size_t println(double, int = 2); + size_t println(const Printable&); + size_t println(void); + + protected: + Module* _mod; +}; + +#endif