From f78ced9a4d71e5f2549173636f7268b5a8662e21 Mon Sep 17 00:00:00 2001 From: jflyper Date: Mon, 3 Jul 2017 00:37:00 +0900 Subject: [PATCH] Converted target.h [Converted] AIR32: entry 0 PA4 AIRHEROF3: entry 0 PA0 (PPM) ALIENFLIGHTF3: entry 0 PB14 ALIENFLIGHTF4: entry 0 PA8 (PPM) BEEROTORF4: entry 0 PA3 (PPM) BETAFLIGHTF3: entry 0 PB7 (PPM) BLUEJAYF4: entry 0 PC7 (PPM) CHEBUZZF3: entry 0 PA8 CLRACINGF4: entry 0 PB9 (PPM) COLIBRI: entry 0 PA10 (PPM) COLIBRI_RACE: entry 0 PA8 (PPM) DOGE: entry 0 PA8 (PPM) F4BY: entry 8 8 PA0 FF_FORTINIF4: entry 0 PB0 FF_PIKOBLX: entry 0 FF_RADIANCE||FF_KOMBINI PA7 else PA4 FF_PIKOF4: entry 0 PA3 FISHDRONEF4: entry 0 PB0 (PPM) FRSKYF3: entry 0 PB9 FRSKYF4: entry 0 PB8 (PPM) FURYF3: entry 0 PB3 (PPM) FURYF4: entry 0 PC9 (PPM) IMPULSERCF3: entry 0 PA15 (PPM) IRCFUSIONF3: entry 0 PA0 (PPM) ISHAPEDF3: entry 0 PA0 (PPM) KAKUTEF4: entry 0 PC7 (PPM) KISSFC: entry 6 PA13 (Common to KISSFC & KISSCC) KIWIF4: entry 0 PA3 LUX_RACE: entry 0 PA8 (PPM) MOTOLAB: entry 0 PA4 MULTIFLITEPICO: entry 0 PA0 (PPM) OMNIBUS: entry 0 PB4 (PPM) OMNIBUSF4: entry 0 PB8 (OMNIBUSF4SD,PPM) PB14 (else, PPM) RACEBASE: entry 0 PA0 (PPM) RCEXPLORERF3: entry 0 PA8 REVO: entry 0 PB14 (PPM) REVONANO: entry 0 PB10 (PPM) SINGULARITY: entry 0 PA15 (PPM) SIRINFPV: entry 0 PB11 (PPM) SPARKY: entry 0 PB15 SPARKY2: entry 0 PC7 (PPM) SPRACINGF3: entry 0 PA0 (PPM) SPRACINGF3EVO: entry 0 PA15 (PPM) SPRACINGF3MINI: entry SPRACINGF3NEO: entry 0 PA3 (PPM) SPRACINGF4EVO: entry 0 PA3 (PPM) SPRACINGF4NEO: entry 0 PA3 (PPM) STM32F3DISCOVERY: entry 0 PB8 (PPM) VRRACE: entry 0 PE9 (PPM) X_RACERSPI: entry 0 PA0 (PPM) YUPIF4: entry 0 PC8 (PPM) [No ESCSERIAL defined (non-F7)] ALIENFLIGHTF1 CC3D CJMCU CRAZYFLIE2 ELLE0 KROOZX LUMBAF3 MATEKF405 MICROSCISKY NAZE RG_SSD_F3 SITL SPRACINGF3OSD TINYFISH [No ESCSERIAL defined (F7)] ANYFCF7 ANYFCM7 CLRACINGF7 FURYF7 NUCLEOF7 NUCLEOF722 OMNIBUSF7 [ESCSERIAL disabled] ALIENFLIGHTNGF7: entry 0 PA8 (PPM) DISABLED NERO: entry 0 PC7 (PPM) DISABLED --- Makefile | 1 + src/main/drivers/serial_escserial.c | 6 +++--- src/main/target/AIR32/target.h | 2 +- src/main/target/AIRHEROF3/target.h | 2 +- src/main/target/ALIENFLIGHTF3/target.h | 2 +- src/main/target/ALIENFLIGHTF4/target.h | 2 +- src/main/target/ALIENFLIGHTNGF7/target.h | 2 +- src/main/target/BEEROTORF4/target.h | 2 +- src/main/target/BETAFLIGHTF3/target.h | 2 +- src/main/target/BLUEJAYF4/target.h | 2 +- src/main/target/CHEBUZZF3/target.h | 2 +- src/main/target/CLRACINGF4/target.h | 2 +- src/main/target/COLIBRI/target.h | 2 +- src/main/target/COLIBRI_RACE/target.h | 2 +- src/main/target/DOGE/target.h | 5 +---- src/main/target/F4BY/target.h | 2 +- src/main/target/FF_FORTINIF4/target.h | 2 +- src/main/target/FF_PIKOBLX/target.h | 6 +++++- src/main/target/FF_PIKOF4/target.h | 2 +- src/main/target/FISHDRONEF4/target.h | 2 +- src/main/target/FRSKYF3/target.h | 2 +- src/main/target/FRSKYF4/target.h | 2 +- src/main/target/FURYF3/target.h | 8 ++++---- src/main/target/FURYF4/target.h | 2 +- src/main/target/IMPULSERCF3/target.h | 2 +- src/main/target/IRCFUSIONF3/target.h | 2 +- src/main/target/ISHAPEDF3/target.h | 2 +- src/main/target/KAKUTEF4/target.h | 2 +- src/main/target/KISSFC/target.h | 2 +- src/main/target/KIWIF4/target.c | 2 +- src/main/target/KIWIF4/target.h | 2 +- src/main/target/LUX_RACE/target.h | 2 +- src/main/target/MOTOLAB/target.h | 2 +- src/main/target/MULTIFLITEPICO/target.h | 2 +- src/main/target/NERO/target.h | 2 +- src/main/target/OMNIBUS/target.h | 2 +- src/main/target/OMNIBUSF4/target.h | 7 +++++-- src/main/target/RACEBASE/target.h | 2 +- src/main/target/RCEXPLORERF3/target.h | 2 +- src/main/target/REVO/target.h | 2 +- src/main/target/REVONANO/target.h | 2 +- src/main/target/SINGULARITY/target.h | 2 +- src/main/target/SIRINFPV/target.h | 2 +- src/main/target/SPARKY/target.h | 2 +- src/main/target/SPARKY2/target.h | 2 +- src/main/target/SPRACINGF3/target.h | 2 +- src/main/target/SPRACINGF3EVO/target.h | 2 +- src/main/target/SPRACINGF3MINI/target.h | 10 +++++++++- src/main/target/SPRACINGF3NEO/target.h | 2 +- src/main/target/SPRACINGF4EVO/target.h | 2 +- src/main/target/SPRACINGF4NEO/target.h | 2 +- src/main/target/STM32F3DISCOVERY/target.h | 2 +- src/main/target/VRRACE/target.h | 2 +- src/main/target/X_RACERSPI/target.h | 2 +- src/main/target/YUPIF4/target.h | 2 +- 55 files changed, 76 insertions(+), 63 deletions(-) mode change 100755 => 100644 src/main/target/AIRHEROF3/target.h mode change 100755 => 100644 src/main/target/BETAFLIGHTF3/target.h mode change 100755 => 100644 src/main/target/COLIBRI_RACE/target.h mode change 100755 => 100644 src/main/target/MULTIFLITEPICO/target.h mode change 100755 => 100644 src/main/target/RACEBASE/target.h mode change 100755 => 100644 src/main/target/SPARKY2/target.h mode change 100755 => 100644 src/main/target/SPRACINGF3EVO/target.h mode change 100755 => 100644 src/main/target/SPRACINGF3NEO/target.h diff --git a/Makefile b/Makefile index 35c83fa986..dc544a85ac 100644 --- a/Makefile +++ b/Makefile @@ -1042,6 +1042,7 @@ SITLEXCLUDES = \ drivers/light_led.c \ drivers/system.c \ drivers/rcc.c \ + drivers/serial_escserial.c \ drivers/serial_pinconfig.c \ drivers/serial_uart.c \ drivers/serial_uart_init.c \ diff --git a/src/main/drivers/serial_escserial.c b/src/main/drivers/serial_escserial.c index 2184b98963..30aad79a22 100644 --- a/src/main/drivers/serial_escserial.c +++ b/src/main/drivers/serial_escserial.c @@ -107,12 +107,12 @@ escSerial_t escSerialPorts[MAX_ESCSERIAL_PORTS]; PG_REGISTER_WITH_RESET_TEMPLATE(escSerialConfig_t, escSerialConfig, PG_ESCSERIAL_CONFIG, 0); -#ifndef ESCSERIAL_TIMER_PIN -#define ESCSERIAL_TIMER_PIN NONE +#ifndef ESCSERIAL_TIMER_TX_PIN +define ESCSERIAL_TIMER_TX_PIN NONE #endif PG_RESET_TEMPLATE(escSerialConfig_t, escSerialConfig, - .ioTag = IO_TAG(ESCSERIAL_TIMER_PIN), + .ioTag = IO_TAG(ESCSERIAL_TIMER_TX_PIN), ); void onSerialTimerEsc(timerCCHandlerRec_t *cbRec, captureCompare_t capture); diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h index 317f1a940e..a6486095b9 100644 --- a/src/main/target/AIR32/target.h +++ b/src/main/target/AIR32/target.h @@ -63,7 +63,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA4 // (HARDARE=0) #define UART1_TX_PIN PB6 #define UART1_RX_PIN PB7 diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h old mode 100755 new mode 100644 index 3872e070b9..56999cec8e --- a/src/main/target/AIRHEROF3/target.h +++ b/src/main/target/AIRHEROF3/target.h @@ -61,7 +61,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=0,PPM) #define SOFTSERIAL1_RX_PIN PA6 // PWM 5 #define SOFTSERIAL1_TX_PIN PA7 // PWM 6 diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h index 41bf661728..f6e7bbcaff 100644 --- a/src/main/target/ALIENFLIGHTF3/target.h +++ b/src/main/target/ALIENFLIGHTF3/target.h @@ -77,7 +77,7 @@ #define AVOID_UART2_FOR_PWM_PPM #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB15 // (HARDARE=0) #define UART1_TX_PIN PB6 #define UART1_RX_PIN PB7 diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index d149a32e7c..b069a88c3c 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -118,7 +118,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA8 // (HARDARE=0,PPM) #define USE_SPI #define USE_SPI_DEVICE_1 diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index 685d997757..815471d6ac 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -128,7 +128,7 @@ #define SERIAL_PORT_COUNT 6 //#define USE_ESCSERIAL -//#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA8 // (HARDARE=0,PPM) #define USE_SPI #define USE_SPI_DEVICE_1 diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h index 01bcfc995c..17a4e98ed7 100644 --- a/src/main/target/BEEROTORF4/target.h +++ b/src/main/target/BEEROTORF4/target.h @@ -99,7 +99,7 @@ #define SERIAL_PORT_COUNT 4 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA3 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h old mode 100755 new mode 100644 index fb617e44f1..71deeba8b5 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -57,7 +57,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB7 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index e6d7e7b1f3..1337a7b027 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -119,7 +119,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PC7 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h index 848cfd3c66..c2af417258 100644 --- a/src/main/target/CHEBUZZF3/target.h +++ b/src/main/target/CHEBUZZF3/target.h @@ -97,7 +97,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA8 // (HARDARE=0) #define USE_I2C #define USE_I2C_DEVICE_1 diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h index c76ca7bc59..8f637440bf 100644 --- a/src/main/target/CLRACINGF4/target.h +++ b/src/main/target/CLRACINGF4/target.h @@ -93,7 +93,7 @@ #define SERIAL_PORT_COUNT 5 //VCP, USART1, USART3,USART4, USART6, #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB9 // (HARDARE=0,PPM) #define USE_SPI #define USE_SPI_DEVICE_1 diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h index 14df4b4594..76790b6a56 100644 --- a/src/main/target/COLIBRI/target.h +++ b/src/main/target/COLIBRI/target.h @@ -97,7 +97,7 @@ #define SERIAL_PORT_COUNT 6 //VCP, UART1, UART2, UART3, SOFTSERIAL x 2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA10 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h old mode 100755 new mode 100644 index 73843b2e52..e38884f8c9 --- a/src/main/target/COLIBRI_RACE/target.h +++ b/src/main/target/COLIBRI_RACE/target.h @@ -88,7 +88,7 @@ #define SERIAL_PORT_COUNT 4 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA8 // (HARDARE=0,PPM) #define UART1_TX_PIN PC4 #define UART1_RX_PIN PC5 diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h index 519f61c14e..16fb58f349 100644 --- a/src/main/target/DOGE/target.h +++ b/src/main/target/DOGE/target.h @@ -69,9 +69,6 @@ #define M25P16_CS_PIN PC15 #define M25P16_SPI_INSTANCE SPI2 -#define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 - #define GYRO #define USE_GYRO_MPU6500 #define USE_GYRO_SPI_MPU6500 @@ -101,7 +98,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA8 // (Hardware=0) #define UART1_TX_PIN PB6 #define UART1_RX_PIN PB7 diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h index 2e6f518e9f..d2b9b27b90 100644 --- a/src/main/target/F4BY/target.h +++ b/src/main/target/F4BY/target.h @@ -104,7 +104,7 @@ #define SERIAL_PORT_COUNT 8 //VCP, UART1, UART2, UART3, UART4, UART6, SOFTSERIAL x 2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 8 // PWM 9 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=8) #define USE_SPI #define USE_SPI_DEVICE_1 diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h index d754e40d60..039b89dddf 100644 --- a/src/main/target/FF_FORTINIF4/target.h +++ b/src/main/target/FF_FORTINIF4/target.h @@ -135,7 +135,7 @@ #define USE_ESC_SENSOR #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB0 // (HARDARE=0) /*---------------------------------*/ /*--------DEFAULT VALUES-----------*/ diff --git a/src/main/target/FF_PIKOBLX/target.h b/src/main/target/FF_PIKOBLX/target.h index b42237047e..2eb4f03b2b 100644 --- a/src/main/target/FF_PIKOBLX/target.h +++ b/src/main/target/FF_PIKOBLX/target.h @@ -65,7 +65,11 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#if defined(FF_RADIANCE) || defined(FF_KOMBINI) +#define ESCSERIAL_TIMER_TX_PIN PA7 // (Hardware=0) +#else +#define ESCSERIAL_TIMER_TX_PIN PA4 // (Hardware=0) +#endif #define UART1_TX_PIN PB6 #define UART1_RX_PIN PB7 diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h index 4d34b84f11..96f88b69a0 100644 --- a/src/main/target/FF_PIKOF4/target.h +++ b/src/main/target/FF_PIKOF4/target.h @@ -129,7 +129,7 @@ #define USE_ESC_SENSOR #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA3 // (HARDARE=0) /*---------------------------------*/ /*--------DEFAULT VALUES-----------*/ diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h index 027919a90d..e9d1985736 100644 --- a/src/main/target/FISHDRONEF4/target.h +++ b/src/main/target/FISHDRONEF4/target.h @@ -71,7 +71,7 @@ #define SERIAL_PORT_COUNT 6 // VCP, USART1, USART3, USART6, SOFTSERIAL x 2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB0 // (HARDARE=0,PPM) // *************** OSD ***************************** #define USE_SPI_DEVICE_2 diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h index 9e73b25663..9c7aafeca4 100644 --- a/src/main/target/FRSKYF3/target.h +++ b/src/main/target/FRSKYF3/target.h @@ -76,7 +76,7 @@ #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 +#define ESCSERIAL_TIMER_TX_PIN PB9 // (HARDARE=0) #define USE_SPI #define OSD diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h index 06470b0ace..bbf5f94d54 100644 --- a/src/main/target/FRSKYF4/target.h +++ b/src/main/target/FRSKYF4/target.h @@ -93,7 +93,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 +#define ESCSERIAL_TIMER_TX_PIN PB8 // (HARDARE=0,PPM) #define USE_SPI #define USE_SPI_DEVICE_1 diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index 5785dde8d6..f2bf481871 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -144,12 +144,12 @@ #define SOFTSERIAL1_RX_PIN PB0 #define SOFTSERIAL1_TX_PIN PB1 - #define SONAR - #define SONAR_ECHO_PIN PB1 - #define SONAR_TRIGGER_PIN PB0 +#define SONAR +#define SONAR_ECHO_PIN PB1 +#define SONAR_TRIGGER_PIN PB0 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB3 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 69d47398cd..0e27b07b10 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -144,7 +144,7 @@ #define SERIAL_PORT_COUNT 6 //VCP, USART1, USART3, USART6, SOFTSERIAL x 2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PC9 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h index 5efa651d02..3e2213b3cf 100644 --- a/src/main/target/IMPULSERCF3/target.h +++ b/src/main/target/IMPULSERCF3/target.h @@ -57,7 +57,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA15 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h index 18454b71b0..703b9a0f25 100644 --- a/src/main/target/IRCFUSIONF3/target.h +++ b/src/main/target/IRCFUSIONF3/target.h @@ -51,7 +51,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h index 3d3040bdcd..6813d2094e 100644 --- a/src/main/target/ISHAPEDF3/target.h +++ b/src/main/target/ISHAPEDF3/target.h @@ -61,7 +61,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index 759594ea58..87839003c7 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -96,7 +96,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PC7 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h index 0509f46404..8c7512be95 100644 --- a/src/main/target/KISSFC/target.h +++ b/src/main/target/KISSFC/target.h @@ -26,7 +26,7 @@ #define USE_ESC_SENSOR #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 6 +#define ESCSERIAL_TIMER_TX_PIN PA13 // (Hardware=6, common to KISSFC & KISSCC) #define REMAP_TIM17_DMA #define LED0_PIN PB1 diff --git a/src/main/target/KIWIF4/target.c b/src/main/target/KIWIF4/target.c index b51617197c..6e8b258762 100644 --- a/src/main/target/KIWIF4/target.c +++ b/src/main/target/KIWIF4/target.c @@ -30,7 +30,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 1, 0), DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 1, 0), #if defined(PLUMF4) || defined(KIWIF4V2) - DEF_TIM(TIM2, CH1, PA0, TIM_USE_LED, 1, 0), //LED + DEF_TIM(TIM2, CH1, PA0, TIM_USE_LED, 1, 0), //LED #else DEF_TIM(TIM4, CH2, PB7, TIM_USE_LED, 0, 0), // LED #endif diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h index ce21303499..ab70a3486d 100644 --- a/src/main/target/KIWIF4/target.h +++ b/src/main/target/KIWIF4/target.h @@ -132,7 +132,7 @@ #define SERIAL_PORT_COUNT 6 //VCP, USART1, USART3, USART6, SOFTSERIAL x 2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA3 // (HARDARE=0) #define USE_SPI diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index d8b8d4e127..02971c7b98 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -160,7 +160,7 @@ #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA8 // (HARDARE=0,PPM) // IO - assuming 303 in 64pin package, TODO #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index c9c60b6f55..68f4249093 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -63,7 +63,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA4 // (HARDARE=0) #define UART1_TX_PIN PB6 #define UART1_RX_PIN PB7 diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h old mode 100755 new mode 100644 index 38caeb8f0e..f7d4feb663 --- a/src/main/target/MULTIFLITEPICO/target.h +++ b/src/main/target/MULTIFLITEPICO/target.h @@ -70,7 +70,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h index 225f3c03c4..cc59f45bcc 100644 --- a/src/main/target/NERO/target.h +++ b/src/main/target/NERO/target.h @@ -95,7 +95,7 @@ #define SERIAL_PORT_COUNT 6 //#define USE_ESCSERIAL //TODO: make ESC serial F7 compatible -//#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +//#define ESCSERIAL_TIMER_TX_PIN PC7 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index d929657e6c..2ce0593dec 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -87,7 +87,7 @@ #define I2C_DEVICE (I2CDEV_1) #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB4 // (HARDARE=0,PPM) #define USE_SPI #define USE_SPI_DEVICE_1 diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 4f7e17a488..87a604ac7d 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -142,8 +142,11 @@ #define SERIAL_PORT_COUNT 6 //VCP, USART1, USART3, USART6, SOFTSERIAL x 2 #define USE_ESCSERIAL -//#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 -#define ESCSERIAL_TIMER_PIN PB0 // One of motor pin (most cases). +#if defined(OMNIBUSF4SD) +#define ESCSERIAL_TIMER_TX_PIN PB8 // (Hardware=0) +#else +#define ESCSERIAL_TIMER_TX_PIN PB14 // (Hardware=0) +#endif #define USE_SPI #define USE_SPI_DEVICE_1 diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h old mode 100755 new mode 100644 index 139d760d08..0c86cd22c4 --- a/src/main/target/RACEBASE/target.h +++ b/src/main/target/RACEBASE/target.h @@ -57,7 +57,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h index 2aa351b0d2..01659299ba 100644 --- a/src/main/target/RCEXPLORERF3/target.h +++ b/src/main/target/RCEXPLORERF3/target.h @@ -66,7 +66,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA8 // (HARDARE=0) #define UART1_TX_PIN PB6 #define UART1_RX_PIN PB7 diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index c9ddb3d1a6..5db3a250de 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -212,7 +212,7 @@ #endif #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB14 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h index 178d782f66..98974574a5 100644 --- a/src/main/target/REVONANO/target.h +++ b/src/main/target/REVONANO/target.h @@ -68,7 +68,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 +#define ESCSERIAL_TIMER_TX_PIN PB10 // (HARDARE=0,PPM) #define USE_SPI #define USE_SPI_DEVICE_2 diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h index 4d2a62ea7f..2f77e9031e 100644 --- a/src/main/target/SINGULARITY/target.h +++ b/src/main/target/SINGULARITY/target.h @@ -50,7 +50,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA15 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h index 287612fb08..9e2fc543d5 100644 --- a/src/main/target/SIRINFPV/target.h +++ b/src/main/target/SIRINFPV/target.h @@ -62,7 +62,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB11 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h index 8730eb9260..6267d3f371 100644 --- a/src/main/target/SPARKY/target.h +++ b/src/main/target/SPARKY/target.h @@ -62,7 +62,7 @@ #define AVOID_UART2_FOR_PWM_PPM #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB15 // (HARDARE=0) #define UART1_TX_PIN PB6 #define UART1_RX_PIN PB7 diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h old mode 100755 new mode 100644 index 626b10dd2b..854333d684 --- a/src/main/target/SPARKY2/target.h +++ b/src/main/target/SPARKY2/target.h @@ -92,7 +92,7 @@ #define SERIAL_PORT_COUNT 4 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PC7 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index b2c5f4875c..bf7030432d 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -141,7 +141,7 @@ #endif #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h old mode 100755 new mode 100644 index 19c19b478c..dc8ca8bd2d --- a/src/main/target/SPRACINGF3EVO/target.h +++ b/src/main/target/SPRACINGF3EVO/target.h @@ -97,7 +97,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA15 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h index cc6af1328c..5ad36027cf 100644 --- a/src/main/target/SPRACINGF3MINI/target.h +++ b/src/main/target/SPRACINGF3MINI/target.h @@ -96,7 +96,15 @@ #endif #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#ifdef TINYBEEF3 +#define ESCSERIAL_TIMER_TX_PIN PA15 // (Hardware=0) +#else +#if defined(SPRACINGF3MINI_REV) && (SPRACINGF3MINI_REV <= 1) +#define ESCSERIAL_TIMER_TX_PIN PB5 // (Hardware=0) +#else +#define ESCSERIAL_TIMER_TX_PIN PB4 // (Hardware=0) +#endif +#endif #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h old mode 100755 new mode 100644 index 3986fcc095..f22407d59e --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -74,7 +74,7 @@ #define UART3_RX_PIN PB11 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA3 // (HARDARE=0,PPM) #define USE_I2C #define USE_I2C_DEVICE_1 diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h index 14fc279bdb..027e9c3f8a 100644 --- a/src/main/target/SPRACINGF4EVO/target.h +++ b/src/main/target/SPRACINGF4EVO/target.h @@ -85,7 +85,7 @@ #define UART5_RX_PIN PD2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA3 // (HARDARE=0,PPM) #define USE_I2C #define USE_I2C_DEVICE_1 diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h index 01960602e2..b687037715 100644 --- a/src/main/target/SPRACINGF4NEO/target.h +++ b/src/main/target/SPRACINGF4NEO/target.h @@ -100,7 +100,7 @@ #define UART5_RX_PIN PD2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA3 // (Hardware=0) #define USE_I2C #define USE_I2C_DEVICE_1 diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index a5fefed4d1..24add1590b 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -157,7 +157,7 @@ #define SERIAL_PORT_COUNT 6 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PB8 // (HARDARE=0,PPM) #define UART3_TX_PIN PB10 // PB10 (AF7) #define UART3_RX_PIN PB11 // PB11 (AF7) diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h index 20a96924ad..2657b98f1f 100644 --- a/src/main/target/VRRACE/target.h +++ b/src/main/target/VRRACE/target.h @@ -123,7 +123,7 @@ #define SERIAL_PORT_COUNT 8 //VCP, USART1, USART2, USART3, USART6, SOFTSERIAL x 2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PE9 // (HARDARE=0,PPM) #define USE_SPI diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h index 8762fac962..b4d17f43f5 100644 --- a/src/main/target/X_RACERSPI/target.h +++ b/src/main/target/X_RACERSPI/target.h @@ -59,7 +59,7 @@ #define SERIAL_PORT_COUNT 5 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PA0 // (HARDARE=0,PPM) #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h index 9ab590d7c4..e5a457aa8c 100644 --- a/src/main/target/YUPIF4/target.h +++ b/src/main/target/YUPIF4/target.h @@ -83,7 +83,7 @@ #define SERIAL_PORT_COUNT 6 // VCP, UART1, UART3, UART6, SOFTSERIAL x 2 #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 +#define ESCSERIAL_TIMER_TX_PIN PC8 // (HARDARE=0,PPM) // SD Card #define USE_SDCARD