From 36b121acbfb39605d98594be6538333bad2da13b Mon Sep 17 00:00:00 2001 From: Eric Wieser Date: Mon, 2 Jan 2017 11:17:30 +0000 Subject: [PATCH] Add Print::availableForWrite If available() is in the base Stream class, then availableForWrite() should be in the base Print class --- hardware/arduino/avr/cores/arduino/HardwareSerial.h | 2 +- hardware/arduino/avr/cores/arduino/Print.h | 7 ++++++- hardware/arduino/avr/cores/arduino/USBAPI.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial.h b/hardware/arduino/avr/cores/arduino/HardwareSerial.h index 8a5bf95e660..17000c2ccca 100644 --- a/hardware/arduino/avr/cores/arduino/HardwareSerial.h +++ b/hardware/arduino/avr/cores/arduino/HardwareSerial.h @@ -124,7 +124,7 @@ class HardwareSerial : public Stream virtual int available(void); virtual int peek(void); virtual int read(void); - int availableForWrite(void); + virtual int availableForWrite(void); virtual void flush(void); virtual size_t write(uint8_t); inline size_t write(unsigned long n) { return write((uint8_t)n); } diff --git a/hardware/arduino/avr/cores/arduino/Print.h b/hardware/arduino/avr/cores/arduino/Print.h index d099a3b7e14..4d8a2f58c83 100644 --- a/hardware/arduino/avr/cores/arduino/Print.h +++ b/hardware/arduino/avr/cores/arduino/Print.h @@ -22,6 +22,7 @@ #include #include // for size_t +#include // for INT_MAX #include "WString.h" #include "Printable.h" @@ -57,7 +58,11 @@ class Print size_t write(const char *buffer, size_t size) { return write((const uint8_t *)buffer, size); } - + + // default to zero, meaning "a single write may block" + // should be overriden by subclasses with buffering + virtual int availableForWrite() { return 0; } + size_t print(const __FlashStringHelper *); size_t print(const String &); size_t print(const char[]); diff --git a/hardware/arduino/avr/cores/arduino/USBAPI.h b/hardware/arduino/avr/cores/arduino/USBAPI.h index 358444ed238..479ced9c84c 100644 --- a/hardware/arduino/avr/cores/arduino/USBAPI.h +++ b/hardware/arduino/avr/cores/arduino/USBAPI.h @@ -98,7 +98,7 @@ class Serial_ : public Stream virtual int available(void); virtual int peek(void); virtual int read(void); - int availableForWrite(void); + virtual int availableForWrite(void); virtual void flush(void); virtual size_t write(uint8_t); virtual size_t write(const uint8_t*, size_t);