From 905ee4b1edabdc3693e17e2e2451333a83a9c743 Mon Sep 17 00:00:00 2001
From: Pascal Langer <pascal_langer@yahoo.fr>
Date: Sun, 14 Mar 2021 11:15:24 +0100
Subject: [PATCH] Fix module boot issue?

---
 Multiprotocol/Multiprotocol.h   |  2 +-
 Multiprotocol/Multiprotocol.ino | 23 +++++++++++------------
 Multiprotocol/Telemetry.ino     |  9 ---------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 32a9be2..9ba165f 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	60
+#define VERSION_PATCH_LEVEL	61
 
 #define MODE_SERIAL 0
 
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index 2fae10b..73ea7d0 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -1636,9 +1636,8 @@ void modules_reset()
 			usart2_begin(100000,SERIAL_8E2);
 			USART2_BASE->CR1 |= USART_CR1_PCE_BIT;
 		}
-		usart3_begin(100000,SERIAL_8E2);
-		USART3_BASE->CR1 &= ~ USART_CR1_RE;		//disable receive
 		USART2_BASE->CR1 &= ~ USART_CR1_TE;		//disable transmit
+		usart3_begin(100000,SERIAL_8E2);
 	#else
 		//ATMEGA328p
 		#include <util/setbaud.h>	
@@ -1676,7 +1675,6 @@ 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 )
@@ -1684,18 +1682,19 @@ 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);
+		USART3_BASE->CR3 &= ~USART_CR3_EIE & ~USART_CR3_CTSIE;	// Disable receive
+		USART3_BASE->CR1 &= ~USART_CR1_RE & ~USART_CR1_RXNEIE & ~USART_CR1_PEIE & ~USART_CR1_IDLEIE ; // Disable RX and interrupts
+    	USART3_BASE->CR1 |= (USART_CR1_TE | USART_CR1_UE);		// Enable USART3 and TX
 	}
 	void init_HWTimer()
 	{	
-		HWTimer2.pause();									// Pause the timer2 while we're configuring it
-		TIMER2_BASE->PSC = 35;								// 36-1;for 72 MHZ /0.5sec/(35+1)
-		TIMER2_BASE->ARR = 0xFFFF;							// Count until 0xFFFF
-		HWTimer2.setMode(TIMER_CH1, TIMER_OUTPUT_COMPARE);	// Main scheduler
-		TIMER2_BASE->SR = 0x1E5F & ~TIMER_SR_CC2IF;			// Clear Timer2/Comp2 interrupt flag
-		TIMER2_BASE->DIER &= ~TIMER_DIER_CC2IE;				// Disable Timer2/Comp2 interrupt
-		HWTimer2.refresh();									// Refresh the timer's count, prescale, and overflow
+		HWTimer2.pause();										// Pause the timer2 while we're configuring it
+		TIMER2_BASE->PSC = 35;									// 36-1;for 72 MHZ /0.5sec/(35+1)
+		TIMER2_BASE->ARR = 0xFFFF;								// Count until 0xFFFF
+		HWTimer2.setMode(TIMER_CH1, TIMER_OUTPUT_COMPARE);		// Main scheduler
+		TIMER2_BASE->SR = 0x1E5F & ~TIMER_SR_CC2IF;				// Clear Timer2/Comp2 interrupt flag
+		TIMER2_BASE->DIER &= ~TIMER_DIER_CC2IE;					// Disable Timer2/Comp2 interrupt
+		HWTimer2.refresh();										// Refresh the timer's count, prescale, and overflow
 		HWTimer2.resume();
 
 		#ifdef ENABLE_SERIAL
diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino
index c6b19f0..322aa80 100644
--- a/Multiprotocol/Telemetry.ino
+++ b/Multiprotocol/Telemetry.ino
@@ -1066,7 +1066,6 @@ void TelemetryUpdate()
 				#else
 					#ifdef STM32_BOARD
 						usart3_begin(9600,SERIAL_8N1);		//USART3 
-						USART3_BASE->CR1 &= ~ USART_CR1_RE;	//disable RX leave TX enabled
 					#else
 						UBRR0H = 0x00;
 						UBRR0L = 0x67;
@@ -1087,7 +1086,6 @@ void TelemetryUpdate()
 				#else
 					#ifdef STM32_BOARD
 						usart3_begin(57600,SERIAL_8N1);		//USART3 
-						USART3_BASE->CR1 &= ~ USART_CR1_RE;	//disable RX leave TX enabled
 					#else
 						UBRR0H = 0x00;
 						UBRR0L = 0x22;
@@ -1108,7 +1106,6 @@ void TelemetryUpdate()
 				#else
 					#ifdef STM32_BOARD
 						usart3_begin(125000,SERIAL_8N1);	//USART3 
-						USART3_BASE->CR1 &= ~ USART_CR1_RE;	//disable RX leave TX enabled
 					#else
 						UBRR0H = 0x00;
 						UBRR0L = 0x07;
@@ -1159,12 +1156,6 @@ 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