From d12d1952ebcb8c59de71ba8ad080448baea94ff6 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Thu, 12 Feb 2015 01:58:59 +0000 Subject: [PATCH] Fix PWM/UART2 clash on F1 targets caused by using wrong #define value. --- src/main/main.c | 2 +- src/main/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/main.c b/src/main/main.c index b3f01f9e6..d99a40fdc 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -295,7 +295,7 @@ void init(void) pwm_params.airplane = true; else pwm_params.airplane = false; -#if defined(SERIAL_PORT_USART2) && defined(STM32F10X) +#if defined(USE_USART2) && defined(STM32F10X) pwm_params.useUART2 = doesConfigurationUsePort(SERIAL_PORT_USART2); #endif pwm_params.useVbat = feature(FEATURE_VBAT); diff --git a/src/main/version.h b/src/main/version.h index faf7da75e..eb315aaae 100644 --- a/src/main/version.h +++ b/src/main/version.h @@ -17,7 +17,7 @@ #define FC_VERSION_MAJOR 1 // increment when a major release is made (big new feature, etc) #define FC_VERSION_MINOR 7 // increment when a minor release is made (small new feature, change etc) -#define FC_VERSION_PATCH_LEVEL 1 // increment when a bug is fixed +#define FC_VERSION_PATCH_LEVEL 2 // increment when a bug is fixed #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x)