diff options
| author | Cristian Maglie <c.maglie@arduino.cc> | 2015-09-21 12:03:26 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-09-21 12:03:26 +0200 |
| commit | 987b9bf2a86ba7dfa8c8c24128e19e2048a837b8 (patch) | |
| tree | 88666c42fc15e328aafb5cef3f0ae1e8b5d65e19 | |
| parent | 2453337d85e6eb07a7287c8d09adf9afb1bf13ca (diff) | |
| parent | 7f2ca6ee281fe12e8f25e71cf59f561e81e63fd8 (diff) | |
Merge branch 'patch-7' of https://github.com/NicoHood/Arduino
| -rw-r--r-- | cores/arduino/HardwareSerial.h | 4 | ||||
| -rw-r--r-- | cores/arduino/USBAPI.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h index 1beafc5..8a5bf95 100644 --- a/cores/arduino/HardwareSerial.h +++ b/cores/arduino/HardwareSerial.h @@ -40,14 +40,14 @@ // often work, but occasionally a race condition can occur that makes // Serial behave erratically. See https://github.com/arduino/Arduino/issues/2405 #if !defined(SERIAL_TX_BUFFER_SIZE) -#if (RAMEND < 1000) +#if ((RAMEND - RAMSTART) < 1023) #define SERIAL_TX_BUFFER_SIZE 16 #else #define SERIAL_TX_BUFFER_SIZE 64 #endif #endif #if !defined(SERIAL_RX_BUFFER_SIZE) -#if (RAMEND < 1000) +#if ((RAMEND - RAMSTART) < 1023) #define SERIAL_RX_BUFFER_SIZE 16 #else #define SERIAL_RX_BUFFER_SIZE 64 diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h index 4072772..f22ab6a 100644 --- a/cores/arduino/USBAPI.h +++ b/cores/arduino/USBAPI.h @@ -75,7 +75,7 @@ extern USBDevice_ USBDevice; struct ring_buffer; #ifndef SERIAL_BUFFER_SIZE -#if (RAMEND < 1000) +#if ((RAMEND - RAMSTART) < 1023) #define SERIAL_BUFFER_SIZE 16 #else #define SERIAL_BUFFER_SIZE 64 |