rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-17 11:54:33 +01:00
Code Issues Releases Activity

Merge branch 'master' into ide-1.5.x

Browse Source 
Conflicts:
	hardware/arduino/cores/arduino/HardwareSerial.cpp
	hardware/arduino/cores/robot/Arduino.h
This commit is contained in:
Cristian Maglie 2014-10-21 17:47:59 +02:00
commit 0824abfee5
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/shared/revisions.txt
View File

@ -9,6 +9,9 @@ The following changes are included also in the Arduino IDE 1.0.7:
[libraries]
* 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
[ide]
@ -346,6 +349,10 @@ ARDUINO 1.0.7
* Backported GSM from IDE 1.5.x
* 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
[core]

2
hardware/arduino/avr/cores/arduino/HardwareSerial.cpp
View File

@ -152,7 +152,7 @@ void HardwareSerial::end()
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)

2
hardware/arduino/avr/cores/arduino/HardwareSerial.h
View File

@ -32,6 +32,8 @@
// 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
// 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 (RAMEND < 1000)
#define SERIAL_TX_BUFFER_SIZE 16