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

Making naming of UART / USART inverter defines consistent again.

Browse source
This commit is contained in:
Michael Keller 2017-02-28 10:35:19 +13:00 • committed by Martin Budden
parent 9b62a4e38f
commit de7e72df14
18 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/main/drivers/inverter.c
View file

@ -43,16 +43,16 @@ static void initInverter(ioTag_t ioTag)
void initInverters(void) void initInverters(void)
{ {
#ifdef INVERTER_PIN_USART1 #ifdef INVERTER_PIN_UART1
initInverter(IO_TAG(INVERTER_PIN_USART1)); initInverter(IO_TAG(INVERTER_PIN_UART1));
#endif #endif
#ifdef INVERTER_PIN_USART2 #ifdef INVERTER_PIN_UART2
initInverter(IO_TAG(INVERTER_PIN_USART2)); initInverter(IO_TAG(INVERTER_PIN_UART2));
#endif #endif
#ifdef INVERTER_PIN_USART3 #ifdef INVERTER_PIN_UART3
initInverter(IO_TAG(INVERTER_PIN_USART3)); initInverter(IO_TAG(INVERTER_PIN_UART3));
#endif #endif
#ifdef INVERTER_PIN_UART4 #ifdef INVERTER_PIN_UART4
@ -63,8 +63,8 @@ void initInverters(void)
initInverter(IO_TAG(INVERTER_PIN_UART5)); initInverter(IO_TAG(INVERTER_PIN_UART5));
#endif #endif
#ifdef INVERTER_PIN_USART6 #ifdef INVERTER_PIN_UART6
initInverter(IO_TAG(INVERTER_PIN_USART6)); initInverter(IO_TAG(INVERTER_PIN_UART6));
#endif #endif
} }
@ -73,21 +73,21 @@ void enableInverter(USART_TypeDef *USARTx, bool on)
#ifdef USE_INVERTER #ifdef USE_INVERTER
IO_t pin = IO_NONE; IO_t pin = IO_NONE;
#ifdef INVERTER_PIN_USART1 #ifdef INVERTER_PIN_UART1
if (USARTx == USART1) { if (USARTx == USART1) {
pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART1)); pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART1));
} }
#endif #endif
#ifdef INVERTER_PIN_USART2 #ifdef INVERTER_PIN_UART2
if (USARTx == USART2) { if (USARTx == USART2) {
pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART2)); pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART2));
} }
#endif #endif
#ifdef INVERTER_PIN_USART3 #ifdef INVERTER_PIN_UART3
if (USARTx == USART3) { if (USARTx == USART3) {
pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART3)); pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART3));
} }
#endif #endif
@ -103,9 +103,9 @@ void enableInverter(USART_TypeDef *USARTx, bool on)
} }
#endif #endif
#ifdef INVERTER_PIN_USART6 #ifdef INVERTER_PIN_UART6
if (USARTx == USART6) { if (USARTx == USART6) {
pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART6)); pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART6));
} }
#endif #endif

2
src/main/drivers/inverter.h
View file

@ -17,7 +17,7 @@
#pragma once #pragma once
#if defined(INVERTER_PIN_USART1) || defined(INVERTER_PIN_USART2) || defined(INVERTER_PIN_USART3) || defined(INVERTER_PIN_UART4) || defined(INVERTER_PIN_UART5) || defined(INVERTER_PIN_USART6) #if defined(INVERTER_PIN_UART1) || defined(INVERTER_PIN_UART2) || defined(INVERTER_PIN_UART3) || defined(INVERTER_PIN_UART4) || defined(INVERTER_PIN_UART5) || defined(INVERTER_PIN_UART6)
#define USE_INVERTER #define USE_INVERTER
#endif #endif

2
src/main/target/ALIENFLIGHTF4/target.h
View file

@ -31,7 +31,7 @@
#define BEEPER PC13 #define BEEPER PC13
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define INVERTER_PIN_USART2 PC15 #define INVERTER_PIN_UART2 PC15
// MPU interrupt // MPU interrupt
#define USE_EXTI #define USE_EXTI

4
src/main/target/BLUEJAYF4/target.h
View file

@ -36,8 +36,8 @@
#define BEEPER_OPT PB7 #define BEEPER_OPT PB7
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define INVERTER_PIN_USART6 PB15 #define INVERTER_PIN_UART6 PB15
//#define INVERTER_PIN_USART1 PC9 //#define INVERTER_PIN_UART1 PC9
#define UART1_INVERTER PC9 #define UART1_INVERTER PC9

2
src/main/target/CC3D/target.h
View file

@ -19,7 +19,7 @@
#define LED0 PB3 #define LED0 PB3
#define INVERTER_PIN_USART1 PB2 // PB2 (BOOT1) used as inverter select GPIO #define INVERTER_PIN_UART1 PB2 // PB2 (BOOT1) used as inverter select GPIO
#define BEEPER PA15 #define BEEPER PA15
#define BEEPER_OPT PA2 #define BEEPER_OPT PA2

2
src/main/target/COLIBRI/target.h
View file

@ -31,7 +31,7 @@
#define BEEPER PC5 #define BEEPER PC5
#define INVERTER_PIN_USART2 PB2 // PB2 used as inverter select GPIO #define INVERTER_PIN_UART2 PB2 // PB2 used as inverter select GPIO
#define MPU6000_CS_PIN PC4 #define MPU6000_CS_PIN PC4
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1

2
src/main/target/F4BY/target.h
View file

@ -26,7 +26,7 @@
#define BEEPER PE5 #define BEEPER PE5
#define INVERTER_PIN_USART6 PD3 #define INVERTER_PIN_UART6 PD3

2
src/main/target/FISHDRONEF4/target.h
View file

@ -27,7 +27,7 @@
#define BEEPER PC15 #define BEEPER PC15
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define INVERTER_PIN_USART6 PC8 #define INVERTER_PIN_UART6 PC8
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC4 #define MPU_INT_EXTI PC4

2
src/main/target/FURYF4/target.h
View file

@ -27,7 +27,7 @@
#define BEEPER PA8 #define BEEPER PA8
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define INVERTER_PIN_USART1 PC0 // PC0 used as inverter select GPIO #define INVERTER_PIN_UART1 PC0 // PC0 used as inverter select GPIO
// MPU6000 interrupts // MPU6000 interrupts
#define USE_EXTI #define USE_EXTI

2
src/main/target/KIWIF4/target.h
View file

@ -27,7 +27,7 @@
#define BEEPER PA8 #define BEEPER PA8
#define INVERTER_PIN_USART1 PC0 // PC0 used as inverter select GPIO #define INVERTER_PIN_UART1 PC0 // PC0 used as inverter select GPIO
// MPU6000 interrupts // MPU6000 interrupts
#define USE_EXTI #define USE_EXTI

2
src/main/target/MICROSCISKY/target.h
View file

@ -27,7 +27,7 @@
#define BARO_XCLR_PIN PC13 #define BARO_XCLR_PIN PC13
#define BARO_EOC_PIN PC14 #define BARO_EOC_PIN PC14
#define INVERTER_PIN_USART2 PB2 // PB2 (BOOT1) abused as inverter select GPIO #define INVERTER_PIN_UART2 PB2 // PB2 (BOOT1) abused as inverter select GPIO
#define USE_EXTI #define USE_EXTI
#define MAG_INT_EXTI PC14 #define MAG_INT_EXTI PC14

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

@ -45,7 +45,7 @@
//#define BARO_XCLR_PIN PC13 //#define BARO_XCLR_PIN PC13
//#define BARO_EOC_PIN PC14 //#define BARO_EOC_PIN PC14
#define INVERTER_PIN_USART2 PB2 // PB2 (BOOT1) abused as inverter select GPIO #define INVERTER_PIN_UART2 PB2 // PB2 (BOOT1) abused as inverter select GPIO
#define USE_EXTI #define USE_EXTI
#define MAG_INT_EXTI PC14 #define MAG_INT_EXTI PC14

2
src/main/target/OMNIBUSF4/target.h
View file

@ -33,7 +33,7 @@
#define BEEPER PB4 #define BEEPER PB4
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define INVERTER_PIN_USART1 PC0 // PC0 used as inverter select GPIO #define INVERTER_PIN_UART1 PC0 // PC0 used as inverter select GPIO
#define MPU6000_CS_PIN PA4 #define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1

2
src/main/target/REVO/target.h
View file

@ -68,7 +68,7 @@
#endif #endif
// PC0 used as inverter select GPIO // PC0 used as inverter select GPIO
#define INVERTER_PIN_USART1 PC0 #define INVERTER_PIN_UART1 PC0
#define MPU6000_CS_PIN PA4 #define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1

2
src/main/target/REVONANO/target.h
View file

@ -28,7 +28,7 @@
#define BEEPER PC13 #define BEEPER PC13
#define INVERTER_PIN_USART2 PC15 //Sbus on USART 2 of nano. #define INVERTER_PIN_UART2 PC15 //Sbus on USART 2 of nano.
#define MPU6500_CS_PIN PB12 #define MPU6500_CS_PIN PB12
#define MPU6500_SPI_INSTANCE SPI2 #define MPU6500_SPI_INSTANCE SPI2

2
src/main/target/SPARKY2/target.h
View file

@ -30,7 +30,7 @@
#define BEEPER PC9 #define BEEPER PC9
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define INVERTER_PIN_USART6 PC6 #define INVERTER_PIN_UART6 PC6
#define USE_ESC_SENSOR #define USE_ESC_SENSOR

2
src/main/target/VRRACE/target.h
View file

@ -26,7 +26,7 @@
#define BEEPER PA0 #define BEEPER PA0
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define INVERTER_PIN_USART6 PD7 #define INVERTER_PIN_UART6 PD7
#define MPU6500_CS_PIN PE10 #define MPU6500_CS_PIN PE10
#define MPU6500_SPI_INSTANCE SPI2 #define MPU6500_SPI_INSTANCE SPI2

3
src/main/target/YUPIF4/target.h
View file

@ -27,8 +27,7 @@
#define BEEPER PC9 #define BEEPER PC9
//#define BEEPER_INVERTED //#define BEEPER_INVERTED
#define INVERTER_PIN_USART6 PB15 #define INVERTER_PIN_UART6 PB15
// Gyro interrupt // Gyro interrupt
#define USE_EXTI #define USE_EXTI