Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

Merge branch 'development' of https://github.com/borisbstyle/betaflight into development

Browse source
This commit is contained in:
borisbstyle 2016-10-25 14:41:34 +02:00
commit ae2129f943
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/config/config_eeprom.h
View file

@ -17,7 +17,7 @@
#pragma once #pragma once
#define EEPROM_CONF_VERSION 143 #define EEPROM_CONF_VERSION 144
void initEEPROM(void); void initEEPROM(void);
void writeEEPROM(); void writeEEPROM();

1
src/main/drivers/dma_stm32f4xx.c
View file

@ -99,4 +99,5 @@ uint32_t dmaFlag_IT_TCIF(const DMA_Stream_TypeDef *stream)
RETURN_TCIF_FLAG(stream, 5); RETURN_TCIF_FLAG(stream, 5);
RETURN_TCIF_FLAG(stream, 6); RETURN_TCIF_FLAG(stream, 6);
RETURN_TCIF_FLAG(stream, 7); RETURN_TCIF_FLAG(stream, 7);
return 0;
} }

4
src/main/fc/config.c
View file

@ -381,7 +381,11 @@ void resetSerialConfig(serialConfig_t *serialConfig)
for (index = 0; index < SERIAL_PORT_COUNT; index++) { for (index = 0; index < SERIAL_PORT_COUNT; index++) {
serialConfig->portConfigs[index].identifier = serialPortIdentifiers[index]; serialConfig->portConfigs[index].identifier = serialPortIdentifiers[index];
#ifdef USE_VCP
serialConfig->portConfigs[index].msp_baudrateIndex = BAUD_500000; 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].gps_baudrateIndex = BAUD_57600;
serialConfig->portConfigs[index].telemetry_baudrateIndex = BAUD_AUTO; serialConfig->portConfigs[index].telemetry_baudrateIndex = BAUD_AUTO;
serialConfig->portConfigs[index].blackbox_baudrateIndex = BAUD_115200; serialConfig->portConfigs[index].blackbox_baudrateIndex = BAUD_115200;

6
src/main/target/NAZE/target.h
View file

@ -122,10 +122,11 @@
#define USE_UART1 #define USE_UART1
#define USE_UART2 #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_SOFTSERIAL1
//#define USE_SOFTSERIAL2 //#define USE_SOFTSERIAL2
#define SERIAL_PORT_COUNT 3 #define SERIAL_PORT_COUNT 2
//#define SOFTSERIAL_1_TIMER TIM3 //#define SOFTSERIAL_1_TIMER TIM3
//#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5 //#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_RX_HARDWARE 6 // PWM 7
//#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8 //#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8
// USART3 only on NAZE32_SP - Flex Port
#define UART3_RX_PIN PB11 #define UART3_RX_PIN PB11
#define UART3_TX_PIN PB10 #define UART3_TX_PIN PB10