noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Toggle SoftwareSerial interrupts when starting / stopping to listen 

This prevents interrupts from triggering when the SoftwareSerial
instance is not even listening.

Additionally, this removes the need to disable interrupts in
SoftwareSerial::listen, since no interrupts are active while it touches
the variables.
This commit is contained in:
Matthijs Kooijman 2013-06-04 11:30:26 +02:00
parent 09f0092949
commit d6ad699c84
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/SoftwareSerial/SoftwareSerial.cpp
View File

@ -183,12 +183,14 @@ bool SoftwareSerial::listen()
if (active_object != this) if (active_object != this)
{ {
if (active_object)
active_object->stopListening();
_buffer_overflow = false; _buffer_overflow = false;
uint8_t oldSREG = SREG;
cli();
_receive_buffer_head = _receive_buffer_tail = 0; _receive_buffer_head = _receive_buffer_tail = 0;
active_object = this; active_object = this;
SREG = oldSREG;
setRxIntMsk(true);
return true; return true;
} }
@ -200,6 +202,7 @@ bool SoftwareSerial::stopListening()
{ {
if (active_object == this) if (active_object == this)
{ {
setRxIntMsk(false);
active_object = NULL; active_object = NULL;
return true; return true;
} }
@ -418,7 +421,6 @@ void SoftwareSerial::begin(long speed)
// (others might also need it, so we disable the interrupt by using // (others might also need it, so we disable the interrupt by using
// the per-pin PCMSK register). // the per-pin PCMSK register).
*digitalPinToPCICR(_receivePin) |= _BV(digitalPinToPCICRbit(_receivePin)); *digitalPinToPCICR(_receivePin) |= _BV(digitalPinToPCICRbit(_receivePin));
setRxIntMsk(true);
tunedDelay(_tx_delay); // if we were low this establishes the end tunedDelay(_tx_delay); // if we were low this establishes the end
} }