diff --git a/src/main/config/config_eeprom.h b/src/main/config/config_eeprom.h index b48961f91f..3202389bdd 100644 --- a/src/main/config/config_eeprom.h +++ b/src/main/config/config_eeprom.h @@ -17,7 +17,7 @@ #pragma once -#define EEPROM_CONF_VERSION 143 +#define EEPROM_CONF_VERSION 144 void initEEPROM(void); void writeEEPROM(); diff --git a/src/main/fc/config.c b/src/main/fc/config.c index c72dabbca6..b38d31c9cb 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -381,7 +381,11 @@ void resetSerialConfig(serialConfig_t *serialConfig) for (index = 0; index < SERIAL_PORT_COUNT; index++) { serialConfig->portConfigs[index].identifier = serialPortIdentifiers[index]; +#ifdef USE_VCP serialConfig->portConfigs[index].msp_baudrateIndex = BAUD_500000; +#else + serialConfig->portConfigs[index].msp_baudrateIndex = BAUD_115200; +#endif serialConfig->portConfigs[index].gps_baudrateIndex = BAUD_57600; serialConfig->portConfigs[index].telemetry_baudrateIndex = BAUD_AUTO; serialConfig->portConfigs[index].blackbox_baudrateIndex = BAUD_115200; diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h index ec9358222c..eb8ab5503a 100644 --- a/src/main/target/NAZE/target.h +++ b/src/main/target/NAZE/target.h @@ -122,10 +122,11 @@ #define USE_UART1 #define USE_UART2 -#define USE_UART3 +/* only 2 uarts available on the NAZE, add ifdef here if present on other boards */ +//#define USE_UART3 //#define USE_SOFTSERIAL1 //#define USE_SOFTSERIAL2 -#define SERIAL_PORT_COUNT 3 +#define SERIAL_PORT_COUNT 2 //#define SOFTSERIAL_1_TIMER TIM3 //#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5 @@ -134,7 +135,6 @@ //#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7 //#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8 -// USART3 only on NAZE32_SP - Flex Port #define UART3_RX_PIN PB11 #define UART3_TX_PIN PB10