From dbc33951a4ff950186f5467fb8a2cbc86ce57c3b Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Sat, 13 Mar 2021 18:18:07 +0100 Subject: [PATCH] Fix for module boot issue? --- Multiprotocol/HOTT_cc2500.ino | 2 +- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/Multiprotocol.ino | 2 ++ Multiprotocol/Telemetry.ino | 6 ++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Multiprotocol/HOTT_cc2500.ino b/Multiprotocol/HOTT_cc2500.ino index a4ee0e4..f913d3e 100644 --- a/Multiprotocol/HOTT_cc2500.ino +++ b/Multiprotocol/HOTT_cc2500.ino @@ -350,7 +350,7 @@ uint16_t HOTT_callback() CC2500_Strobe(CC2500_SFRX); //RX if(packet[29] & 0xF8) - {// binary telemetry + {// Sync telemetry CC2500_WriteReg(CC2500_04_SYNC1, 0x2C); CC2500_WriteReg(CC2500_05_SYNC0, 0x6E); } diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index f5d0b99..32a9be2 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 2 -#define VERSION_PATCH_LEVEL 59 +#define VERSION_PATCH_LEVEL 60 #define MODE_SERIAL 0 diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 2563ea3..2fae10b 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -1676,6 +1676,7 @@ void modules_reset() usart_config_gpios_async(USART2,GPIOA,PIN_MAP[PA3].gpio_bit,GPIOA,PIN_MAP[PA2].gpio_bit,config); LED2_output; usart_set_baud_rate(USART2, STM32_PCLK1, baud); + USART2_BASE->CR1 &= ~ USART_CR1_TE; // Disable transmit usart_enable(USART2); } void usart3_begin(uint32_t baud,uint32_t config ) @@ -1683,6 +1684,7 @@ void modules_reset() usart_init(USART3); usart_config_gpios_async(USART3,GPIOB,PIN_MAP[PB11].gpio_bit,GPIOB,PIN_MAP[PB10].gpio_bit,config); usart_set_baud_rate(USART3, STM32_PCLK1, baud); + USART3_BASE->CR1 &= ~ USART_CR1_RE; // Disable receive usart_enable(USART3); } void init_HWTimer() diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino index e1aef48..c6b19f0 100644 --- a/Multiprotocol/Telemetry.ino +++ b/Multiprotocol/Telemetry.ino @@ -1159,6 +1159,12 @@ void TelemetryUpdate() } #ifdef STM32_BOARD } + else if(USART3_BASE->SR & USART_SR_RXNE) + { //Should not get here... + uint8_t dummy = USART3_BASE->DR; + dummy++; + USART3_BASE->CR1 &= ~ USART_CR1_RE; // Disable receive + } #endif } #else //BASH_SERIAL