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

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:
Cristian Maglie 2014-10-21 17:47:59 +02:00
parent 5e2b7aa876 02f5b99958
commit 0f7a0ec4ed
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/arduino/HardwareSerial.cpp
View File

@ -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)

2
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 // 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