diff options
| author | Cristian Maglie <c.maglie@arduino.cc> | 2015-11-18 10:03:05 +0100 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-11-18 10:06:01 +0100 |
| commit | b15e001b0d1b78caf3475c004d993fda58fcebef (patch) | |
| tree | b513756458eb5423b910db26cb247c206aa93608 /libraries/SoftwareSerial | |
| parent | 5a56dd34ea8ddba8de58f7235e1a26c177395011 (diff) | |
| parent | 7bd71f04b0ad70ffb8470fb77052b7f4e0d5b91f (diff) | |
Merge branch 'fix-flush' of https://github.com/cmaglie/Arduino
Diffstat (limited to 'libraries/SoftwareSerial')
| -rw-r--r-- | libraries/SoftwareSerial/SoftwareSerial.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libraries/SoftwareSerial/SoftwareSerial.cpp b/libraries/SoftwareSerial/SoftwareSerial.cpp index 80df664..0a16ff7 100644 --- a/libraries/SoftwareSerial/SoftwareSerial.cpp +++ b/libraries/SoftwareSerial/SoftwareSerial.cpp @@ -469,13 +469,7 @@ size_t SoftwareSerial::write(uint8_t b) void SoftwareSerial::flush()
{
- if (!isListening())
- return;
-
- uint8_t oldSREG = SREG;
- cli();
- _receive_buffer_head = _receive_buffer_tail = 0;
- SREG = oldSREG;
+ // There is no tx buffering, simply return
}
int SoftwareSerial::peek()
|