mirror of
https://github.com/arduino/Arduino.git
synced 2025-02-20 14:54:31 +01:00
Merge branch 'master' into ide-1.5.x
Conflicts: hardware/arduino/cores/arduino/HardwareSerial.cpp hardware/arduino/cores/robot/Arduino.h
This commit is contained in:
commit
0824abfee5
@ -9,6 +9,9 @@ The following changes are included also in the Arduino IDE 1.0.7:
|
|||||||
[libraries]
|
[libraries]
|
||||||
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
|
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
|
||||||
|
|
||||||
|
[core]
|
||||||
|
* Fixed regression in HardwareSerial::available() introduced with https://github.com/arduino/Arduino/pull/2057
|
||||||
|
|
||||||
ARDUINO 1.5.8 BETA - 2014.10.01
|
ARDUINO 1.5.8 BETA - 2014.10.01
|
||||||
|
|
||||||
[ide]
|
[ide]
|
||||||
@ -346,6 +349,10 @@ ARDUINO 1.0.7
|
|||||||
* Backported GSM from IDE 1.5.x
|
* Backported GSM from IDE 1.5.x
|
||||||
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
|
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
|
||||||
|
|
||||||
|
[core]
|
||||||
|
* Fixed missing NOT_AN_INTERRUPT constant in digitalPinToInterrupt() macro
|
||||||
|
* Fixed regression in HardwareSerial::available() introduced with https://github.com/arduino/Arduino/pull/2057
|
||||||
|
|
||||||
ARDUINO 1.0.6 - 2014.09.16
|
ARDUINO 1.0.6 - 2014.09.16
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
|
@ -152,7 +152,7 @@ void HardwareSerial::end()
|
|||||||
|
|
||||||
int HardwareSerial::available(void)
|
int HardwareSerial::available(void)
|
||||||
{
|
{
|
||||||
return (int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_RX_BUFFER_SIZE;
|
return ((unsigned int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail)) % SERIAL_RX_BUFFER_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
int HardwareSerial::peek(void)
|
int HardwareSerial::peek(void)
|
||||||
|
@ -32,6 +32,8 @@
|
|||||||
// using a ring buffer (I think), in which head is the index of the location
|
// using a ring buffer (I think), in which head is the index of the location
|
||||||
// to which to write the next incoming character and tail is the index of the
|
// to which to write the next incoming character and tail is the index of the
|
||||||
// location from which to read.
|
// location from which to read.
|
||||||
|
// NOTE: a "power of 2" buffer size is reccomended to dramatically
|
||||||
|
// optimize all the modulo operations for ring buffers.
|
||||||
#if !(defined(SERIAL_TX_BUFFER_SIZE) && defined(SERIAL_RX_BUFFER_SIZE))
|
#if !(defined(SERIAL_TX_BUFFER_SIZE) && defined(SERIAL_RX_BUFFER_SIZE))
|
||||||
#if (RAMEND < 1000)
|
#if (RAMEND < 1000)
|
||||||
#define SERIAL_TX_BUFFER_SIZE 16
|
#define SERIAL_TX_BUFFER_SIZE 16
|
||||||
|
Loading…
x
Reference in New Issue
Block a user