From 539819fa0c13a2c8ca9a08216261f55ee3cb1fec Mon Sep 17 00:00:00 2001 From: Ben Lye Date: Fri, 6 Sep 2019 13:05:57 +0100 Subject: [PATCH] Accomodate new Debug Option setting in Arduino IDE (#255) Thanks, that's perfect! --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/Validate.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 3305fa7..bc21ed1 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -401,7 +401,7 @@ enum MultiPacketTypes //******************** //** Debug messages ** //******************** -#if defined(STM32_BOARD) && defined (DEBUG_SERIAL) +#if defined(STM32_BOARD) && (defined (DEBUG_SERIAL) || defined (ARDUINO_MULTI_DEBUG)) uint16_t debug_time=0; #define debug(msg, ...) {char debug_buf[64]; sprintf(debug_buf, msg, ##__VA_ARGS__); Serial.write(debug_buf);} #define debugln(msg, ...) {char debug_buf[64]; sprintf(debug_buf, msg "\r\n", ##__VA_ARGS__); Serial.write(debug_buf);} diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index bf5f678..8235714 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -35,6 +35,11 @@ #error You need to update your Multi 4-in-1 board definition. Open Boards Manager and update to the latest version of the Multi 4-in-1 STM32 Board. #endif +// Enable serial debugging if a debugging option was chosen in the IDE +#ifdef ARDUINO_MULTI_DEBUG + #define DEBUG_SERIAL +#endif + // Error if CHECK_FOR_BOOTLOADER is not enabled but a FLASH_FROM_TX board is selected #if (defined(ARDUINO_MULTI_FLASH_FROM_TX) || defined(ARDUINO_MULTI_STM32_FLASH_FROM_TX)) &! defined(CHECK_FOR_BOOTLOADER) #if defined(STM32_BOARD)