Merge pull request #3414 from jflyper/bfdev-configurable-escserial-pin

Make esc serial tx timer pin configurable

Makefile

@@ -1024,6 +1024,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 \

src/main/config/parameter_group_ids.h

@@ -109,7 +109,8 @@
 #define PG_I2C_CONFIG 518
 #define PG_DASHBOARD_CONFIG 519
 #define PG_SPI_PIN_CONFIG 520
-#define PG_BETAFLIGHT_END 520
+#define PG_ESCSERIAL_CONFIG 521
+#define PG_BETAFLIGHT_END 521
 
 
 // OSD configuration (subject to change)

src/main/drivers/resource.c

@@ -64,5 +64,6 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = {
     "COMPASS_CS",
     "SPI_PREINIT",
     "RX_BIND_PLUG",
+    "ESCSERIAL",
 };
 

src/main/drivers/resource.h

@@ -64,6 +64,7 @@ typedef enum {
     OWNER_COMPASS_CS,
     OWNER_SPI_PREINIT,
     OWNER_RX_BIND_PLUG,
+    OWNER_ESCSERIAL,
     OWNER_TOTAL_COUNT
 } resourceOwner_e;
 

src/main/drivers/serial_escserial.c

@@ -28,6 +28,9 @@
 
 #include "common/utils.h"
 
+#include "config/parameter_group.h"
+#include "config/parameter_group_ids.h"
+
 #include "drivers/io.h"
 #include "drivers/light_led.h"
 #include "drivers/nvic.h"
@@ -111,6 +114,16 @@ const struct serialPortVTable escSerialVTable[];
 
 escSerial_t escSerialPorts[MAX_ESCSERIAL_PORTS];
 
+PG_REGISTER_WITH_RESET_TEMPLATE(escSerialConfig_t, escSerialConfig, PG_ESCSERIAL_CONFIG, 0);
+
+#ifndef ESCSERIAL_TIMER_TX_PIN
+#define ESCSERIAL_TIMER_TX_PIN NONE
+#endif
+
+PG_RESET_TEMPLATE(escSerialConfig_t, escSerialConfig,
+    .ioTag = IO_TAG(ESCSERIAL_TIMER_TX_PIN),
+);
+
 enum {
     TRAILING,
     LEADING
@@ -653,7 +666,7 @@ static serialPort_t *openEscSerial(escSerialPortIndex_e portIndex, serialReceive
     }
 
     escSerial->mode = mode;
-    escSerial->txTimerHardware = &(timerHardware[ESCSERIAL_TIMER_TX_HARDWARE]);
+    escSerial->txTimerHardware = timerGetByTag(escSerialConfig()->ioTag, TIM_USE_ANY);
 
 #ifdef USE_HAL_DRIVER
     escSerial->txTimerHandle = timerFindTimerHandle(escSerial->txTimerHardware->tim);
@@ -945,6 +958,11 @@ void escEnablePassthrough(serialPort_t *escPassthroughPort, uint16_t output, uin
     }
 
     escPort = openEscSerial(ESCSERIAL1, NULL, motor_output, escBaudrate, 0, mode);
+
+    if (!escPort) {
+        return;
+    }
+
     uint8_t ch;
     while (1) {
         if (mode!=2)

src/main/drivers/serial_escserial.h

@@ -35,3 +35,9 @@ typedef enum {
 
 // serialPort API
 void escEnablePassthrough(serialPort_t *escPassthroughPort, uint16_t output, uint8_t mode);
+
+typedef struct escSerialConfig_s {
+    ioTag_t ioTag;
+} escSerialConfig_t;
+
+PG_DECLARE(escSerialConfig_t, escSerialConfig);

src/main/fc/cli.c

@@ -2861,6 +2861,9 @@ const cliResourceValue_t resourceTable[] = {
     { OWNER_SPI_MISO,      PG_SPI_PIN_CONFIG, offsetof(spiPinConfig_t, ioTagMiso[0]), SPIDEV_COUNT },
     { OWNER_SPI_MOSI,      PG_SPI_PIN_CONFIG, offsetof(spiPinConfig_t, ioTagMosi[0]), SPIDEV_COUNT },
 #endif
+#ifdef USE_ESCSERIAL
+    { OWNER_ESCSERIAL,     PG_ESCSERIAL_CONFIG, offsetof(escSerialConfig_t, ioTag), 0 },
+#endif
 };
 
 static ioTag_t *getIoTag(const cliResourceValue_t value, uint8_t index)

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

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

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

src/main/target/ALIENFLIGHTF4/target.h

@@ -113,7 +113,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

src/main/target/ALIENFLIGHTNGF7/target.h

@@ -123,8 +123,7 @@
 #define SERIAL_PORT_COUNT       6
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PPM/LED_STRIP
+#define ESCSERIAL_TIMER_TX_PIN  PA8 // (Hardware=0, PPM/LED_STRIP) XXX Crash if using an LED strip.
-#define ESCSERIAL_TIMER_TX_PIN  PA8 // XXX Provisional (Hardware=0, PPM) XXX Crash if using an LED strip.
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1

src/main/target/ANYFCF7/target.h

@@ -95,8 +95,7 @@
 #define SERIAL_PORT_COUNT 11 //VCP, USART1, USART2, USART3, UART4, UART5, USART6, USART7, USART8, SOFTSERIAL x 2
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PB14 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PB14 // XXX Provisional (Hardware=0, PPM)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1

src/main/target/ANYFCM7/target.h

@@ -89,8 +89,7 @@
 #define SERIAL_PORT_COUNT 7 //VCP, USART1, UART4, UART5, USART6, SOFTSERIAL x 2
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PB14 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PB14 // XXX Provisional (Hardware=0, PPM)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1

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
 

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

src/main/target/BETAFLIGHTF4/target.h

@@ -92,8 +92,7 @@
 #define SERIAL_PORT_COUNT       5 //VCP, USART1, USART2, USART3, USART6
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PB8 // (Hardware=0, PPM)
-
 
 #define USE_SPI
 

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
 

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

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

src/main/target/CLRACINGF7/target.h

@@ -105,8 +105,7 @@
 #define SERIAL_PORT_COUNT       5
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PB8 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PB8 // XXX Provisional (Hardware=0, PPM)
 
 // XXX To target maintainer: Bus device to configure must be specified.
 //#define USE_I2C

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
 

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

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

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

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-----------*/

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

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-----------*/

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

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
 

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

src/main/target/FURYF3/target.h

@@ -144,12 +144,12 @@
 #define SOFTSERIAL1_RX_PIN      PB0
 #define SOFTSERIAL1_TX_PIN      PB1
     
-    #define SONAR
+#define SONAR
-    #define SONAR_ECHO_PIN          PB1
+#define SONAR_ECHO_PIN          PB1
-    #define SONAR_TRIGGER_PIN       PB0
+#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

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
 

src/main/target/FURYF7/target.h

@@ -114,8 +114,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 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PC9 // XXX Provisional (Hardware=0, PPM)
 
 #define USE_I2C
 #define USE_I2C_DEVICE_1

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

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

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

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
 

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

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
 

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

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

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

src/main/target/NERO/target.h

@@ -95,8 +95,7 @@
 #define SERIAL_PORT_COUNT       6
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PC7 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PC7 // XXX Provisional (Hardware=0, PPM)
 
 #define USE_SPI
 

src/main/target/NUCLEOF7/target.h

@@ -94,8 +94,7 @@
 #define SERIAL_PORT_COUNT 10 //VCP, USART2, USART3, UART4, UART5, USART6, USART7, USART8, SOFTSERIAL x 2
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PPM
+#define ESCSERIAL_TIMER_TX_PIN  PB15 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PB15 // XXX Provisional (Hardware=0, PPM)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1

src/main/target/NUCLEOF722/target.h

@@ -96,8 +96,7 @@
 #define SERIAL_PORT_COUNT 6 //VCP, USART2, USART3, UART4,SOFTSERIAL x 2
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PPM
+#define ESCSERIAL_TIMER_TX_PIN  PB15 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PB15 // XXX Provisional (Hardware=0, PPM)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1

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

src/main/target/OMNIBUSF4/target.h

@@ -142,7 +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
+#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

src/main/target/OMNIBUSF7/target.h

@@ -79,8 +79,7 @@
 #define SERIAL_PORT_COUNT 4
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PPM
+#define ESCSERIAL_TIMER_TX_PIN  PE13 // (Hardware=0, PPM)
-#define ESCSERIAL_TIMER_TX_PIN  PE13 // XXX Provisional (Hardware=0, PPM)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1

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

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

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
 

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

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

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

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

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
 

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

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

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
 

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

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

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

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)

src/main/target/VRRACE/target.h

@@ -119,7 +119,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

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

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