From f35abf3fcfb2fefb8d16314b2af4e0e83b2b7659 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:50:54 +0300 Subject: [PATCH 01/25] Update board.cpp --- STM32F1/variants/STM32VLD/board.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/STM32F1/variants/STM32VLD/board.cpp b/STM32F1/variants/STM32VLD/board.cpp index 1cecbd932..0e69c7ba7 100644 --- a/STM32F1/variants/STM32VLD/board.cpp +++ b/STM32F1/variants/STM32VLD/board.cpp @@ -143,19 +143,6 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - - DEFINE_HWSERIAL(Serial2, 2); - - DEFINE_HWSERIAL(Serial3, 3); - -#else - DEFINE_HWSERIAL(Serial, 1); - - DEFINE_HWSERIAL(Serial1, 2); - - DEFINE_HWSERIAL(Serial2, 3); - - -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); From d04f9c85ee0491ff556f7cb5ee248beb59c6b510 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:51:51 +0300 Subject: [PATCH 02/25] Update board.cpp --- STM32F1/variants/generic_gd32f103c/board.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/STM32F1/variants/generic_gd32f103c/board.cpp b/STM32F1/variants/generic_gd32f103c/board.cpp index 8b136f2a1..7e26dd7e2 100644 --- a/STM32F1/variants/generic_gd32f103c/board.cpp +++ b/STM32F1/variants/generic_gd32f103c/board.cpp @@ -124,16 +124,6 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - - DEFINE_HWSERIAL(Serial2, 2); - - DEFINE_HWSERIAL(Serial3, 3); -#else - DEFINE_HWSERIAL(Serial, 1); - - DEFINE_HWSERIAL(Serial1, 2); - - DEFINE_HWSERIAL(Serial2, 3); -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); From b42121acf6f8cb22e200d50e89b4622323cfd7d7 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:52:19 +0300 Subject: [PATCH 03/25] Update board.cpp --- STM32F1/variants/generic_stm32f103c/board.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103c/board.cpp b/STM32F1/variants/generic_stm32f103c/board.cpp index 7102adb9c..900e11816 100644 --- a/STM32F1/variants/generic_stm32f103c/board.cpp +++ b/STM32F1/variants/generic_stm32f103c/board.cpp @@ -124,16 +124,6 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - - DEFINE_HWSERIAL(Serial2, 2); - - DEFINE_HWSERIAL(Serial3, 3); -#else - DEFINE_HWSERIAL(Serial, 1); - - DEFINE_HWSERIAL(Serial1, 2); - - DEFINE_HWSERIAL(Serial2, 3); -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); From aa0f0f73c6f7c91533bf0226adc9dcee4a1d7bee Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:52:55 +0300 Subject: [PATCH 04/25] Update board.cpp --- STM32F1/variants/generic_stm32f103r/board.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103r/board.cpp b/STM32F1/variants/generic_stm32f103r/board.cpp index 891e4e944..6fe63b0a8 100644 --- a/STM32F1/variants/generic_stm32f103r/board.cpp +++ b/STM32F1/variants/generic_stm32f103r/board.cpp @@ -153,18 +153,9 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN }; - -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - DEFINE_HWSERIAL(Serial2, 2); - DEFINE_HWSERIAL(Serial3, 3); - DEFINE_HWSERIAL_UART(Serial4, 4); - DEFINE_HWSERIAL_UART(Serial5, 5); -#else - DEFINE_HWSERIAL(Serial, 1); - DEFINE_HWSERIAL(Serial1, 2); - DEFINE_HWSERIAL(Serial2, 3); - DEFINE_HWSERIAL_UART(Serial3, 4); - DEFINE_HWSERIAL_UART(Serial4, 5); -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); +DEFINE_HWSERIAL_UART(Serial4, 4); +DEFINE_HWSERIAL_UART(Serial5, 5); From 2c6451d039d179a3631a55acc68e9e778f39e121 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:53:21 +0300 Subject: [PATCH 05/25] Update board.cpp --- .../variants/generic_stm32f103r8/board.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103r8/board.cpp b/STM32F1/variants/generic_stm32f103r8/board.cpp index 05f85a5cc..c9d6b98f3 100644 --- a/STM32F1/variants/generic_stm32f103r8/board.cpp +++ b/STM32F1/variants/generic_stm32f103r8/board.cpp @@ -138,20 +138,7 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Moved definitions for Hardware Serial devices from HardwareSerial.cpp so that each board can define which Arduino "Serial" instance * Maps to which hardware serial port on the microprocessor */ - -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - DEFINE_HWSERIAL(Serial2, 2); - - DEFINE_HWSERIAL(Serial3, 3); - -#else - DEFINE_HWSERIAL(Serial, 1); - - DEFINE_HWSERIAL(Serial1, 2); - - DEFINE_HWSERIAL(Serial2, 3); - - -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); From 17604cc32817a1d6e14c38776093126593de7376 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:53:42 +0300 Subject: [PATCH 06/25] Update board.cpp --- STM32F1/variants/generic_stm32f103t/board.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103t/board.cpp b/STM32F1/variants/generic_stm32f103t/board.cpp index e7a1dc0e0..5c08b90f7 100644 --- a/STM32F1/variants/generic_stm32f103t/board.cpp +++ b/STM32F1/variants/generic_stm32f103t/board.cpp @@ -109,12 +109,5 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - - DEFINE_HWSERIAL(Serial2, 2); -#else - DEFINE_HWSERIAL(Serial, 1); - - DEFINE_HWSERIAL(Serial1, 2); -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); From 857315e58a75f4d9816acb70d792ff0def23dd9e Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:54:12 +0300 Subject: [PATCH 07/25] Update board.cpp --- STM32F1/variants/generic_stm32f103v/board.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103v/board.cpp b/STM32F1/variants/generic_stm32f103v/board.cpp index d5596a2b5..ec2e68b15 100644 --- a/STM32F1/variants/generic_stm32f103v/board.cpp +++ b/STM32F1/variants/generic_stm32f103v/board.cpp @@ -183,17 +183,8 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN }; - -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - DEFINE_HWSERIAL(Serial2, 2); - DEFINE_HWSERIAL(Serial3, 3); - DEFINE_HWSERIAL_UART(Serial4, 4); - DEFINE_HWSERIAL_UART(Serial5, 5); -#else - DEFINE_HWSERIAL(Serial, 1); - DEFINE_HWSERIAL(Serial1, 2); - DEFINE_HWSERIAL(Serial2, 3); - DEFINE_HWSERIAL_UART(Serial3, 4); - DEFINE_HWSERIAL_UART(Serial4, 5); -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); +DEFINE_HWSERIAL_UART(Serial4, 4); +DEFINE_HWSERIAL_UART(Serial5, 5); From f2081499b3045d93460a11c5d78999d53e38085c Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:54:59 +0300 Subject: [PATCH 08/25] Update board.cpp --- .../variants/generic_stm32f103vb/board.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103vb/board.cpp b/STM32F1/variants/generic_stm32f103vb/board.cpp index e0b03b8f2..6f9ce6a7e 100644 --- a/STM32F1/variants/generic_stm32f103vb/board.cpp +++ b/STM32F1/variants/generic_stm32f103vb/board.cpp @@ -172,19 +172,6 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - - DEFINE_HWSERIAL(Serial2, 2); - - DEFINE_HWSERIAL(Serial3, 3); - -#else - DEFINE_HWSERIAL(Serial, 1); - - DEFINE_HWSERIAL(Serial1, 2); - - DEFINE_HWSERIAL(Serial2, 3); - - -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); From 957238e209b511a213a526dbf8108f193ce6f02a Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:55:25 +0300 Subject: [PATCH 09/25] Update board.cpp --- STM32F1/variants/generic_stm32f103z/board.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103z/board.cpp b/STM32F1/variants/generic_stm32f103z/board.cpp index 500f9b86d..a6cceebd9 100644 --- a/STM32F1/variants/generic_stm32f103z/board.cpp +++ b/STM32F1/variants/generic_stm32f103z/board.cpp @@ -217,17 +217,8 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN }; - -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - DEFINE_HWSERIAL(Serial2, 2); - DEFINE_HWSERIAL(Serial3, 3); - DEFINE_HWSERIAL_UART(Serial4, 4); - DEFINE_HWSERIAL_UART(Serial5, 5); -#else - DEFINE_HWSERIAL(Serial, 1); - DEFINE_HWSERIAL(Serial1, 2); - DEFINE_HWSERIAL(Serial2, 3); - DEFINE_HWSERIAL_UART(Serial3, 4); - DEFINE_HWSERIAL_UART(Serial4, 5); -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); +DEFINE_HWSERIAL_UART(Serial4, 4); +DEFINE_HWSERIAL_UART(Serial5, 5); From fb13c19317c4a5302bf8f409010db9b472664ff3 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:55:46 +0300 Subject: [PATCH 10/25] Update board.cpp --- STM32F1/variants/hytiny_stm32f103t/board.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/STM32F1/variants/hytiny_stm32f103t/board.cpp b/STM32F1/variants/hytiny_stm32f103t/board.cpp index f1fb44f07..337967fe4 100644 --- a/STM32F1/variants/hytiny_stm32f103t/board.cpp +++ b/STM32F1/variants/hytiny_stm32f103t/board.cpp @@ -109,14 +109,6 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Moved definitions for Hardware Serial devices from HardwareSerial.cpp so that each board can define which Arduino "Serial" instance * Maps to which hardware serial port on the microprocessor */ - -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - DEFINE_HWSERIAL(Serial2, 2); - -#else - DEFINE_HWSERIAL(Serial, 1); - - DEFINE_HWSERIAL(Serial1, 2); -#endif +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); From 70c7fb771338883e9e4c1627b82eb016709ee4d9 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 01:57:01 +0300 Subject: [PATCH 11/25] Update board.cpp --- STM32F1/variants/nucleo_f103rb/board.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/STM32F1/variants/nucleo_f103rb/board.cpp b/STM32F1/variants/nucleo_f103rb/board.cpp index 9f3e08ae7..b7d82f7ca 100644 --- a/STM32F1/variants/nucleo_f103rb/board.cpp +++ b/STM32F1/variants/nucleo_f103rb/board.cpp @@ -248,12 +248,6 @@ MOSI alternate functions on the GPIO ports. * Maps to which hardware serial port on the microprocessor */ -#ifdef SERIAL_USB - DEFINE_HWSERIAL(Serial1, 1); - DEFINE_HWSERIAL(Serial2, 2); - DEFINE_HWSERIAL(Serial3, 3); -#else - DEFINE_HWSERIAL(Serial, 3);// Use HW Serial 2 as "Serial" - DEFINE_HWSERIAL(Serial1, 2); - DEFINE_HWSERIAL(Serial2, 1); -#endif \ No newline at end of file +DEFINE_HWSERIAL(Serial1, 1); +DEFINE_HWSERIAL(Serial2, 2); +DEFINE_HWSERIAL(Serial3, 3); From f6540ecb7a4131a1aaeb232eed42e6b8b40031c0 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 23 Sep 2019 02:01:26 +0300 Subject: [PATCH 12/25] Update HardwareSerial.h --- STM32F1/cores/maple/HardwareSerial.h | 59 ++++++++++------------------ 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/STM32F1/cores/maple/HardwareSerial.h b/STM32F1/cores/maple/HardwareSerial.h index b8b8dd6fd..620e14cf2 100644 --- a/STM32F1/cores/maple/HardwareSerial.h +++ b/STM32F1/cores/maple/HardwareSerial.h @@ -181,44 +181,27 @@ class HardwareSerial : public Stream { #endif }; -#ifdef SERIAL_USB - #if BOARD_HAVE_USART1 - extern HardwareSerial Serial1; - #endif - #if BOARD_HAVE_USART2 - extern HardwareSerial Serial2; - #endif - #if BOARD_HAVE_USART3 - extern HardwareSerial Serial3; - #endif - #if BOARD_HAVE_UART4 - extern HardwareSerial Serial4; - #endif - #if BOARD_HAVE_UART5 - extern HardwareSerial Serial5; - #endif - #if BOARD_HAVE_USART6 - extern HardwareSerial Serial6; - #endif -#else - #if BOARD_HAVE_USART1 - extern HardwareSerial Serial; - #endif - #if BOARD_HAVE_USART2 - extern HardwareSerial Serial1; - #endif - #if BOARD_HAVE_USART3 - extern HardwareSerial Serial2; - #endif - #if BOARD_HAVE_UART4 - extern HardwareSerial Serial3; - #endif - #if BOARD_HAVE_UART5 - extern HardwareSerial Serial4; - #endif - #if BOARD_HAVE_USART6 - extern HardwareSerial Serial5; - #endif +#ifndef SERIAL_USB +#define Serial Serial1 #endif +#if BOARD_HAVE_USART1 +extern HardwareSerial Serial1; +#endif +#if BOARD_HAVE_USART2 +extern HardwareSerial Serial2; +#endif +#if BOARD_HAVE_USART3 +extern HardwareSerial Serial3; +#endif +#if BOARD_HAVE_UART4 +extern HardwareSerial Serial4; #endif +#if BOARD_HAVE_UART5 +extern HardwareSerial Serial5; +#endif +#if BOARD_HAVE_USART6 +extern HardwareSerial Serial6; +#endif + +#endif //_WIRISH_HARDWARESERIAL_H_ From 6fb15b3b4321bb9d368d22f77e80bbd302b7b877 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Wed, 2 Oct 2019 02:07:35 +0300 Subject: [PATCH 13/25] Some compiler warning removed. Now it compiles --- STM32F1/libraries/SDIO/SdioF1.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/STM32F1/libraries/SDIO/SdioF1.cpp b/STM32F1/libraries/SDIO/SdioF1.cpp index e8a15f9a1..a4beb4de5 100644 --- a/STM32F1/libraries/SDIO/SdioF1.cpp +++ b/STM32F1/libraries/SDIO/SdioF1.cpp @@ -102,7 +102,7 @@ static uint8_t m_dir = TRX_RD; static bool (*m_busyFcn)() = 0; static bool m_initDone = false; //static uint32_t m_lba; // for raw non-DMA read(write)Start, read(write)Data, read(write)Stop -static uint32_t m_cnt; // for raw non-DMA read(write)Start, read(write)Data, read(write)Stop +//static uint32_t m_cnt; // for raw non-DMA read(write)Start, read(write)Data, read(write)Stop static bool m_version2; static bool m_highCapacity; static uint8_t m_errorCode = SD_CARD_ERROR_INIT_NOT_CALLED; @@ -645,9 +645,9 @@ delay(100); return true; } //----------------------------------------------------------------------------- -uint32_t SdioCard::cardSize(void) { - return sdCardCapacity(&m_csd); -} +//uint32_t SdioCard::cardSize(void) { +// return sdCardCapacity(&m_csd); +//} /*---------------------------------------------------------------------------*/ bool SdioCard::erase(uint32_t firstBlock, uint32_t lastBlock) { // check for single block erase @@ -895,7 +895,6 @@ bool SdioCard::readData(uint8_t *dst) } } while ( !(STA & (SDIO_STA_DATAEND | SDIO_STA_TRX_ERROR_FLAGS)) ); // <---- TIME CRITICAL SECTION END ----> - // read data still available in FIFO while ( (SDIO->STA & SDIO_STA_RXDAVL) && (cnt--) ) { *ptr++ = SDIO->FIFO; @@ -1012,7 +1011,7 @@ bool SdioCard::readStop() sdio_setup_transfer(0x00FFFFFF, 0, 0); // Empty SDIO FIFO while ( SDIO->STA & SDIO_STA_RXDAVL) { - volatile uint32 _unused = SDIO->FIFO; + volatile __attribute__((unused)) uint32 _unused = SDIO->FIFO; } //Serial.println("readStop."); //m_lba = 0; From 134cc17ca4facc770f567370e7c79b621a1a5d07 Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:22 +0300 Subject: [PATCH 14/25] Revert "Update HardwareSerial.h" This reverts commit f6540ecb7a4131a1aaeb232eed42e6b8b40031c0. --- STM32F1/cores/maple/HardwareSerial.h | 59 ++++++++++++++++++---------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/STM32F1/cores/maple/HardwareSerial.h b/STM32F1/cores/maple/HardwareSerial.h index 620e14cf2..b8b8dd6fd 100644 --- a/STM32F1/cores/maple/HardwareSerial.h +++ b/STM32F1/cores/maple/HardwareSerial.h @@ -181,27 +181,44 @@ class HardwareSerial : public Stream { #endif }; -#ifndef SERIAL_USB -#define Serial Serial1 +#ifdef SERIAL_USB + #if BOARD_HAVE_USART1 + extern HardwareSerial Serial1; + #endif + #if BOARD_HAVE_USART2 + extern HardwareSerial Serial2; + #endif + #if BOARD_HAVE_USART3 + extern HardwareSerial Serial3; + #endif + #if BOARD_HAVE_UART4 + extern HardwareSerial Serial4; + #endif + #if BOARD_HAVE_UART5 + extern HardwareSerial Serial5; + #endif + #if BOARD_HAVE_USART6 + extern HardwareSerial Serial6; + #endif +#else + #if BOARD_HAVE_USART1 + extern HardwareSerial Serial; + #endif + #if BOARD_HAVE_USART2 + extern HardwareSerial Serial1; + #endif + #if BOARD_HAVE_USART3 + extern HardwareSerial Serial2; + #endif + #if BOARD_HAVE_UART4 + extern HardwareSerial Serial3; + #endif + #if BOARD_HAVE_UART5 + extern HardwareSerial Serial4; + #endif + #if BOARD_HAVE_USART6 + extern HardwareSerial Serial5; + #endif #endif -#if BOARD_HAVE_USART1 -extern HardwareSerial Serial1; -#endif -#if BOARD_HAVE_USART2 -extern HardwareSerial Serial2; -#endif -#if BOARD_HAVE_USART3 -extern HardwareSerial Serial3; -#endif -#if BOARD_HAVE_UART4 -extern HardwareSerial Serial4; #endif -#if BOARD_HAVE_UART5 -extern HardwareSerial Serial5; -#endif -#if BOARD_HAVE_USART6 -extern HardwareSerial Serial6; -#endif - -#endif //_WIRISH_HARDWARESERIAL_H_ From 559c70b1af758340b6809474afefbbe39619af56 Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:24 +0300 Subject: [PATCH 15/25] Revert "Update board.cpp" This reverts commit 70c7fb771338883e9e4c1627b82eb016709ee4d9. --- STM32F1/variants/nucleo_f103rb/board.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/STM32F1/variants/nucleo_f103rb/board.cpp b/STM32F1/variants/nucleo_f103rb/board.cpp index b7d82f7ca..9f3e08ae7 100644 --- a/STM32F1/variants/nucleo_f103rb/board.cpp +++ b/STM32F1/variants/nucleo_f103rb/board.cpp @@ -248,6 +248,12 @@ MOSI alternate functions on the GPIO ports. * Maps to which hardware serial port on the microprocessor */ -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + DEFINE_HWSERIAL(Serial2, 2); + DEFINE_HWSERIAL(Serial3, 3); +#else + DEFINE_HWSERIAL(Serial, 3);// Use HW Serial 2 as "Serial" + DEFINE_HWSERIAL(Serial1, 2); + DEFINE_HWSERIAL(Serial2, 1); +#endif \ No newline at end of file From 5b184ed4f8f212a0ee16630ebe3ada1f02e5c61d Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:27 +0300 Subject: [PATCH 16/25] Revert "Update board.cpp" This reverts commit fb13c19317c4a5302bf8f409010db9b472664ff3. --- STM32F1/variants/hytiny_stm32f103t/board.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/STM32F1/variants/hytiny_stm32f103t/board.cpp b/STM32F1/variants/hytiny_stm32f103t/board.cpp index 337967fe4..f1fb44f07 100644 --- a/STM32F1/variants/hytiny_stm32f103t/board.cpp +++ b/STM32F1/variants/hytiny_stm32f103t/board.cpp @@ -109,6 +109,14 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Moved definitions for Hardware Serial devices from HardwareSerial.cpp so that each board can define which Arduino "Serial" instance * Maps to which hardware serial port on the microprocessor */ + +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); + DEFINE_HWSERIAL(Serial2, 2); + +#else + DEFINE_HWSERIAL(Serial, 1); + + DEFINE_HWSERIAL(Serial1, 2); +#endif From d433f52c4332825d3396872100f7fc2624fb3871 Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:29 +0300 Subject: [PATCH 17/25] Revert "Update board.cpp" This reverts commit 957238e209b511a213a526dbf8108f193ce6f02a. --- STM32F1/variants/generic_stm32f103z/board.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103z/board.cpp b/STM32F1/variants/generic_stm32f103z/board.cpp index a6cceebd9..500f9b86d 100644 --- a/STM32F1/variants/generic_stm32f103z/board.cpp +++ b/STM32F1/variants/generic_stm32f103z/board.cpp @@ -217,8 +217,17 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN }; -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); -DEFINE_HWSERIAL_UART(Serial4, 4); -DEFINE_HWSERIAL_UART(Serial5, 5); + +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + DEFINE_HWSERIAL(Serial2, 2); + DEFINE_HWSERIAL(Serial3, 3); + DEFINE_HWSERIAL_UART(Serial4, 4); + DEFINE_HWSERIAL_UART(Serial5, 5); +#else + DEFINE_HWSERIAL(Serial, 1); + DEFINE_HWSERIAL(Serial1, 2); + DEFINE_HWSERIAL(Serial2, 3); + DEFINE_HWSERIAL_UART(Serial3, 4); + DEFINE_HWSERIAL_UART(Serial4, 5); +#endif From a0ae6d71647d84e33e5d1d9233be72e11ecd653b Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:31 +0300 Subject: [PATCH 18/25] Revert "Update board.cpp" This reverts commit f2081499b3045d93460a11c5d78999d53e38085c. --- .../variants/generic_stm32f103vb/board.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103vb/board.cpp b/STM32F1/variants/generic_stm32f103vb/board.cpp index 6f9ce6a7e..e0b03b8f2 100644 --- a/STM32F1/variants/generic_stm32f103vb/board.cpp +++ b/STM32F1/variants/generic_stm32f103vb/board.cpp @@ -172,6 +172,19 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + + DEFINE_HWSERIAL(Serial2, 2); + + DEFINE_HWSERIAL(Serial3, 3); + +#else + DEFINE_HWSERIAL(Serial, 1); + + DEFINE_HWSERIAL(Serial1, 2); + + DEFINE_HWSERIAL(Serial2, 3); + + +#endif From 13e7314ab4d048e6361d35a497697b2f32bd4e43 Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:34 +0300 Subject: [PATCH 19/25] Revert "Update board.cpp" This reverts commit 857315e58a75f4d9816acb70d792ff0def23dd9e. --- STM32F1/variants/generic_stm32f103v/board.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103v/board.cpp b/STM32F1/variants/generic_stm32f103v/board.cpp index ec2e68b15..d5596a2b5 100644 --- a/STM32F1/variants/generic_stm32f103v/board.cpp +++ b/STM32F1/variants/generic_stm32f103v/board.cpp @@ -183,8 +183,17 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN }; -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); -DEFINE_HWSERIAL_UART(Serial4, 4); -DEFINE_HWSERIAL_UART(Serial5, 5); + +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + DEFINE_HWSERIAL(Serial2, 2); + DEFINE_HWSERIAL(Serial3, 3); + DEFINE_HWSERIAL_UART(Serial4, 4); + DEFINE_HWSERIAL_UART(Serial5, 5); +#else + DEFINE_HWSERIAL(Serial, 1); + DEFINE_HWSERIAL(Serial1, 2); + DEFINE_HWSERIAL(Serial2, 3); + DEFINE_HWSERIAL_UART(Serial3, 4); + DEFINE_HWSERIAL_UART(Serial4, 5); +#endif From 4e9bf92578cf88b70d6eaf37b2507e795975f489 Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:36 +0300 Subject: [PATCH 20/25] Revert "Update board.cpp" This reverts commit 17604cc32817a1d6e14c38776093126593de7376. --- STM32F1/variants/generic_stm32f103t/board.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103t/board.cpp b/STM32F1/variants/generic_stm32f103t/board.cpp index 5c08b90f7..e7a1dc0e0 100644 --- a/STM32F1/variants/generic_stm32f103t/board.cpp +++ b/STM32F1/variants/generic_stm32f103t/board.cpp @@ -109,5 +109,12 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + + DEFINE_HWSERIAL(Serial2, 2); +#else + DEFINE_HWSERIAL(Serial, 1); + + DEFINE_HWSERIAL(Serial1, 2); +#endif From 89acab00410b292cf2b328a0bae47343258bcc27 Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:39 +0300 Subject: [PATCH 21/25] Revert "Update board.cpp" This reverts commit 2c6451d039d179a3631a55acc68e9e778f39e121. --- .../variants/generic_stm32f103r8/board.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103r8/board.cpp b/STM32F1/variants/generic_stm32f103r8/board.cpp index c9d6b98f3..05f85a5cc 100644 --- a/STM32F1/variants/generic_stm32f103r8/board.cpp +++ b/STM32F1/variants/generic_stm32f103r8/board.cpp @@ -138,7 +138,20 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Moved definitions for Hardware Serial devices from HardwareSerial.cpp so that each board can define which Arduino "Serial" instance * Maps to which hardware serial port on the microprocessor */ + +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); + DEFINE_HWSERIAL(Serial2, 2); + + DEFINE_HWSERIAL(Serial3, 3); + +#else + DEFINE_HWSERIAL(Serial, 1); + + DEFINE_HWSERIAL(Serial1, 2); + + DEFINE_HWSERIAL(Serial2, 3); + + +#endif From 44a0f55f89b31208f9f5e88b76d1972cce11572d Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:41 +0300 Subject: [PATCH 22/25] Revert "Update board.cpp" This reverts commit aa0f0f73c6f7c91533bf0226adc9dcee4a1d7bee. --- STM32F1/variants/generic_stm32f103r/board.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103r/board.cpp b/STM32F1/variants/generic_stm32f103r/board.cpp index 6fe63b0a8..891e4e944 100644 --- a/STM32F1/variants/generic_stm32f103r/board.cpp +++ b/STM32F1/variants/generic_stm32f103r/board.cpp @@ -153,9 +153,18 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN }; -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); -DEFINE_HWSERIAL_UART(Serial4, 4); -DEFINE_HWSERIAL_UART(Serial5, 5); + +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + DEFINE_HWSERIAL(Serial2, 2); + DEFINE_HWSERIAL(Serial3, 3); + DEFINE_HWSERIAL_UART(Serial4, 4); + DEFINE_HWSERIAL_UART(Serial5, 5); +#else + DEFINE_HWSERIAL(Serial, 1); + DEFINE_HWSERIAL(Serial1, 2); + DEFINE_HWSERIAL(Serial2, 3); + DEFINE_HWSERIAL_UART(Serial3, 4); + DEFINE_HWSERIAL_UART(Serial4, 5); +#endif From 558cdd64d15fe7046131cba6ea7df15f9829ec7e Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:44 +0300 Subject: [PATCH 23/25] Revert "Update board.cpp" This reverts commit b42121acf6f8cb22e200d50e89b4622323cfd7d7. --- STM32F1/variants/generic_stm32f103c/board.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/STM32F1/variants/generic_stm32f103c/board.cpp b/STM32F1/variants/generic_stm32f103c/board.cpp index 900e11816..7102adb9c 100644 --- a/STM32F1/variants/generic_stm32f103c/board.cpp +++ b/STM32F1/variants/generic_stm32f103c/board.cpp @@ -124,6 +124,16 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + + DEFINE_HWSERIAL(Serial2, 2); + + DEFINE_HWSERIAL(Serial3, 3); +#else + DEFINE_HWSERIAL(Serial, 1); + + DEFINE_HWSERIAL(Serial1, 2); + + DEFINE_HWSERIAL(Serial2, 3); +#endif From 9857883c0a932f2bb7e1b355e68d3fbbc1772e5b Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:45 +0300 Subject: [PATCH 24/25] Revert "Update board.cpp" This reverts commit d04f9c85ee0491ff556f7cb5ee248beb59c6b510. --- STM32F1/variants/generic_gd32f103c/board.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/STM32F1/variants/generic_gd32f103c/board.cpp b/STM32F1/variants/generic_gd32f103c/board.cpp index 7e26dd7e2..8b136f2a1 100644 --- a/STM32F1/variants/generic_gd32f103c/board.cpp +++ b/STM32F1/variants/generic_gd32f103c/board.cpp @@ -124,6 +124,16 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + + DEFINE_HWSERIAL(Serial2, 2); + + DEFINE_HWSERIAL(Serial3, 3); +#else + DEFINE_HWSERIAL(Serial, 1); + + DEFINE_HWSERIAL(Serial1, 2); + + DEFINE_HWSERIAL(Serial2, 3); +#endif From 4cef862586205ed081ea023a1e54fe5ae6504dec Mon Sep 17 00:00:00 2001 From: Saloid Date: Wed, 2 Oct 2019 02:11:48 +0300 Subject: [PATCH 25/25] Revert "Update board.cpp" This reverts commit f35abf3fcfb2fefb8d16314b2af4e0e83b2b7659. --- STM32F1/variants/STM32VLD/board.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/STM32F1/variants/STM32VLD/board.cpp b/STM32F1/variants/STM32VLD/board.cpp index 0e69c7ba7..1cecbd932 100644 --- a/STM32F1/variants/STM32VLD/board.cpp +++ b/STM32F1/variants/STM32VLD/board.cpp @@ -143,6 +143,19 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { * Maps to which hardware serial port on the microprocessor */ -DEFINE_HWSERIAL(Serial1, 1); -DEFINE_HWSERIAL(Serial2, 2); -DEFINE_HWSERIAL(Serial3, 3); +#ifdef SERIAL_USB + DEFINE_HWSERIAL(Serial1, 1); + + DEFINE_HWSERIAL(Serial2, 2); + + DEFINE_HWSERIAL(Serial3, 3); + +#else + DEFINE_HWSERIAL(Serial, 1); + + DEFINE_HWSERIAL(Serial1, 2); + + DEFINE_HWSERIAL(Serial2, 3); + + +#endif