diff options
author | Cristian Maglie <c.maglie@bug.st> | 2014-05-24 01:00:04 +0200 |
---|---|---|
committer | Cristian Maglie <c.maglie@bug.st> | 2014-05-26 13:38:07 +0200 |
commit | 2fd1c5b42898b8844a4e6ccea1be9f758e956bc7 (patch) | |
tree | fc5e95b73bf90aaf30ce62128d9e1329d546a09c /cores/arduino/USBAPI.h | |
parent | 1ee86b6bcb94961ffd8422820dc721d1b17434a7 (diff) | |
parent | 5962f155f70a5c67d14280d1b178f5197fb00df4 (diff) |
Merge branch 'usbcdc-improved' into ide-1.5.x
Diffstat (limited to 'cores/arduino/USBAPI.h')
-rw-r--r-- | cores/arduino/USBAPI.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h index 5a33002..c637fda 100644 --- a/cores/arduino/USBAPI.h +++ b/cores/arduino/USBAPI.h @@ -35,17 +35,19 @@ struct ring_buffer; class Serial_ : public Stream { +private: + int peek_buffer; public: void begin(unsigned long); void begin(unsigned long, uint8_t); void end(void); virtual int available(void); - virtual void accept(void); virtual int peek(void); virtual int read(void); virtual void flush(void); virtual size_t write(uint8_t); + virtual size_t write(const uint8_t*, size_t); using Print::write; // pull in write(str) and write(buf, size) from Print operator bool(); |