From 8b5bb0d35818834e35e77a06702a4752afd07d9a Mon Sep 17 00:00:00 2001
From: Pascal Langer <planger@mathworks.com>
Date: Sun, 10 Dec 2017 15:41:50 +0100
Subject: [PATCH] Fix compilation errors based on config def

---
 Multiprotocol/FrSkyX_cc2500.ino |  6 +++++-
 Multiprotocol/Multiprotocol.ino | 17 +++++++++++++++++
 Multiprotocol/Telemetry.ino     | 16 ----------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino
index 103ca23..6f3c8d7 100644
--- a/Multiprotocol/FrSkyX_cc2500.ino
+++ b/Multiprotocol/FrSkyX_cc2500.ino
@@ -162,7 +162,11 @@ static void __attribute__((unused)) frskyX_data_frame()
 	//packet[7] = FLAGS 00 - standard packet
 	//10, 12, 14, 16, 18, 1A, 1C, 1E - failsafe packet
 	//20 - range check packet
-	packet[7] = FS_flag;
+	#ifdef FAILSAFE_ENABLE
+		packet[7] = FS_flag;
+	#else
+		packet[7] = 0;
+	#endif
 	packet[8] = 0;		
 	//
 	uint8_t startChan = chan_offset;	for(uint8_t i = 0; i <12 ; i+=3)
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index 7c02dcc..188e5c3 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -1265,6 +1265,23 @@ void modules_reset()
 	#endif //ORANGE_TX
 }
 
+#ifdef STM32_BOARD
+	void usart2_begin(uint32_t baud,uint32_t config )
+	{
+		usart_init(USART2); 
+		usart_config_gpios_async(USART2,GPIOA,PIN_MAP[PA3].gpio_bit,GPIOA,PIN_MAP[PA2].gpio_bit,config);
+		usart_set_baud_rate(USART2, STM32_PCLK1, baud);
+		usart_enable(USART2);
+	}
+	void usart3_begin(uint32_t baud,uint32_t config )
+	{
+		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);
+		usart_enable(USART3);
+	}
+#endif
+
 #ifdef CHECK_FOR_BOOTLOADER
 void pollBoot()
 {
diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino
index a89e56e..11034f0 100644
--- a/Multiprotocol/Telemetry.ino
+++ b/Multiprotocol/Telemetry.ino
@@ -1071,22 +1071,6 @@ void TelemetryUpdate()
 			}
 		#endif		
 	}
-	#ifdef STM32_BOARD
-		void usart2_begin(uint32_t baud,uint32_t config )
-		{
-			usart_init(USART2); 
-			usart_config_gpios_async(USART2,GPIOA,PIN_MAP[PA3].gpio_bit,GPIOA,PIN_MAP[PA2].gpio_bit,config);
-			usart_set_baud_rate(USART2, STM32_PCLK1, baud);
-			usart_enable(USART2);
-		}
-		void usart3_begin(uint32_t baud,uint32_t config )
-		{
-			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);
-			usart_enable(USART3);
-		}
-	#endif
 #else	//BASH_SERIAL
 // Routines for bit-bashed serial output