Merge branch 'fix-flush' of https://github.com/cmaglie/Arduino

2015-11-18 10:03:05 +01:00 · 2015-11-18 10:03:05 +01:00 · b15e001b0d
parent 5a56dd34ea 7bd71f04b0
commit b15e001b0d
1 changed files with 1 additions and 7 deletions
--- 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()