rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Clear SoftwareSerial rx delay if no interrupt register is found

Browse Source 
Before enabling interupts, begin would see if the given receive pin
actually has an associated PCINT register. If not, the interrupts would
not be enabled.

Now, the same check is done, but when no register is available, the rx
parameters are not loaded at all (which in turn prevents the interrupt
from being enabled). This allows all code to use the same "is rx
enabled" (which will be added next).
This commit is contained in:
Matthijs Kooijman 2013-06-04 11:04:30 +02:00
parent 136c04ad28
commit 937cc51c69
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
View File

@ -385,9 +385,13 @@ void SoftwareSerial::begin(long speed)
long baud = pgm_read_dword(&table[i].baud);
if (baud == speed)
{
if (digitalPinToPCICR(_receivePin))
{
// Only setup rx when we have a valid PCINT for this pin
_rx_delay_centering = pgm_read_word(&table[i].rx_delay_centering);
_rx_delay_intrabit = pgm_read_word(&table[i].rx_delay_intrabit);
_rx_delay_stopbit = pgm_read_word(&table[i].rx_delay_stopbit);
}
_tx_delay = pgm_read_word(&table[i].tx_delay);
break;
}
@ -395,12 +399,9 @@ void SoftwareSerial::begin(long speed)
// Set up RX interrupts, but only if we have a valid RX baud rate
if (_rx_delay_stopbit)
{
if (digitalPinToPCICR(_receivePin))
{
*digitalPinToPCICR(_receivePin) |= _BV(digitalPinToPCICRbit(_receivePin));
*digitalPinToPCMSK(_receivePin) |= _BV(digitalPinToPCMSKbit(_receivePin));
}
tunedDelay(_tx_delay); // if we were low this establishes the end
}