From b364a0ea3155e6213762748b1f252868f90d25ee Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Mon, 30 Jun 2014 00:21:48 +0100
Subject: [PATCH] Fix initialisation of useUart2 when Parallel PWM is used. 
 Additionally we now ensure that pwm_params is initialized before use.

---
 src/main/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/main.c b/src/main/main.c
index a7ec86288c..05abc311b4 100755
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -18,6 +18,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "platform.h"
 
@@ -168,6 +169,7 @@ void init(void)
 
     serialInit(&masterConfig.serialConfig);
 
+    memset(&pwm_params, 0, sizeof(pwm_params));
     // when using airplane/wing mixer, servo/motor outputs are remapped
     if (masterConfig.mixerConfiguration == MULTITYPE_AIRPLANE || masterConfig.mixerConfiguration == MULTITYPE_FLYING_WING)
         pwm_params.airplane = true;
@@ -175,7 +177,9 @@ void init(void)
         pwm_params.airplane = false;
 
 #ifdef STM32F10X_MD
-    pwm_params.useUART2 = doesConfigurationUsePort(&masterConfig.serialConfig, SERIAL_PORT_USART2);
+    if (!feature(FEATURE_RX_PARALLEL_PWM)) {
+        pwm_params.useUART2 = doesConfigurationUsePort(&masterConfig.serialConfig, SERIAL_PORT_USART2);
+    }
 #endif
 
     pwm_params.useSoftSerial = feature(FEATURE_SOFTSERIAL);