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

cmaglie · cmaglie · commit b15e001b0d1b · 2015-11-18T10:06:01.000+01:00
diff --git 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()

Original file line number	Diff line number	Diff line change
`@@ -469,13 +469,7 @@ size_t SoftwareSerial::write(uint8_t b)`
`469`	`469`
`470`	`470`	`void SoftwareSerial::flush()`
`471`	`471`	`{`
`472`		`- if (!isListening())`
`473`		`- return;`
`474`		`-`
`475`		`- uint8_t oldSREG = SREG;`
`476`		`- cli();`
`477`		`- _receive_buffer_head = _receive_buffer_tail = 0;`
`478`		`- SREG = oldSREG;`
	`472`	`+ // There is no tx buffering, simply return`
`479`	`473`	`}`
`480`	`474`
`481`	`475`	`int SoftwareSerial::peek()`