From 9c5f071e86141debc95fd764a060b7e1ea102292 Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 13 Jul 2020 12:03:40 +0700 Subject: [PATCH 1/3] fix SERIAL_BUFFER_SIZE for samd --- utility/SerialFirmata.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utility/SerialFirmata.cpp b/utility/SerialFirmata.cpp index 02efcf73..77dd0a59 100644 --- a/utility/SerialFirmata.cpp +++ b/utility/SerialFirmata.cpp @@ -26,6 +26,10 @@ #define SERIAL_RX_BUFFER_SIZE UART_TX_FIFO_SIZE #endif +#if !defined(SERIAL_RX_BUFFER_SIZE) && defined(SERIAL_BUFFER_SIZE) +#define SERIAL_RX_BUFFER_SIZE SERIAL_BUFFER_SIZE +#endif + SerialFirmata::SerialFirmata() { From 1fae58a8a729ab66a816725ae6ef4339a9d8a9b7 Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 13 Jul 2020 12:22:32 +0700 Subject: [PATCH 2/3] add comment --- utility/SerialFirmata.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/utility/SerialFirmata.cpp b/utility/SerialFirmata.cpp index 77dd0a59..70fa090d 100644 --- a/utility/SerialFirmata.cpp +++ b/utility/SerialFirmata.cpp @@ -26,6 +26,7 @@ #define SERIAL_RX_BUFFER_SIZE UART_TX_FIFO_SIZE #endif +// For SAMD and nRF5x core #if !defined(SERIAL_RX_BUFFER_SIZE) && defined(SERIAL_BUFFER_SIZE) #define SERIAL_RX_BUFFER_SIZE SERIAL_BUFFER_SIZE #endif From e0cf051714dee70e7e34ce43e02369de17fb158b Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 13 Jul 2020 13:58:18 +0700 Subject: [PATCH 3/3] update per review --- utility/SerialFirmata.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/utility/SerialFirmata.cpp b/utility/SerialFirmata.cpp index 70fa090d..7563fb96 100644 --- a/utility/SerialFirmata.cpp +++ b/utility/SerialFirmata.cpp @@ -19,16 +19,16 @@ #include "SerialFirmata.h" -// The RX and TX hardware FIFOs of the ESP8266 hold 128 bytes that can be -// extended using interrupt handlers. The Arduino constants are not available -// for the ESP8266 platform. -#if !defined(SERIAL_RX_BUFFER_SIZE) && defined(UART_TX_FIFO_SIZE) -#define SERIAL_RX_BUFFER_SIZE UART_TX_FIFO_SIZE -#endif - -// For SAMD and nRF5x core -#if !defined(SERIAL_RX_BUFFER_SIZE) && defined(SERIAL_BUFFER_SIZE) -#define SERIAL_RX_BUFFER_SIZE SERIAL_BUFFER_SIZE +#if !defined(SERIAL_RX_BUFFER_SIZE) + #if defined(UART_TX_FIFO_SIZE) + // The RX and TX hardware FIFOs of the ESP8266 hold 128 bytes that can be + // extended using interrupt handlers. The Arduino constants are not available + // for the ESP8266 platform. + #define SERIAL_RX_BUFFER_SIZE UART_TX_FIFO_SIZE + #elif defined(SERIAL_BUFFER_SIZE) + // For SAMD and nRF5x core + #define SERIAL_RX_BUFFER_SIZE SERIAL_BUFFER_SIZE + #endif #endif