From a146a6bc4bc97f28d8883fdef375e75a1503620a Mon Sep 17 00:00:00 2001 From: Bas Delfos Date: Sat, 12 Nov 2016 08:45:57 +0100 Subject: [PATCH] Added ESC Telemetry to all targets that support DSHOT --- src/main/target/ANYFCF7/target.h | 1 + src/main/target/BETAFLIGHTF3/target.h | 3 ++- src/main/target/BLUEJAYF4/target.h | 2 +- src/main/target/DOGE/target.h | 2 +- src/main/target/FURYF3/target.h | 2 +- src/main/target/FURYF4/target.h | 2 +- src/main/target/FURYF7/target.h | 3 ++- src/main/target/IMPULSERCF3/target.h | 2 +- src/main/target/LUX_RACE/target.h | 2 +- src/main/target/MOTOLAB/target.h | 2 +- src/main/target/MULTIFLITEPICO/target.h | 1 + src/main/target/OMNIBUS/target.h | 1 + src/main/target/OMNIBUSF4/target.h | 1 + src/main/target/REVO/target.h | 1 + src/main/target/SOULF4/target.h | 1 + src/main/target/SPARKY2/target.h | 2 +- src/main/target/SPRACINGF3/target.h | 1 + src/main/target/SPRACINGF3EVO/target.h | 2 +- src/main/target/STM32F3DISCOVERY/target.h | 2 +- 19 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h index f1c5546a53..bea085ae93 100644 --- a/src/main/target/ANYFCF7/target.h +++ b/src/main/target/ANYFCF7/target.h @@ -24,6 +24,7 @@ #define USBD_PRODUCT_STRING "AnyFCF7" #define USE_DSHOT +#define USE_ESC_TELEMETRY #define LED0 PB7 #define LED1 PB6 diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index 7c911b3669..cb581a2f78 100755 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -45,6 +45,7 @@ #define USE_EXTI #define USE_DSHOT +#define USE_ESC_TELEMETRY #define REMAP_TIM16_DMA #define REMAP_TIM17_DMA @@ -137,4 +138,4 @@ #define TARGET_IO_PORTC (BIT(13)|BIT(14)|BIT(15)) #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) -#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(15) | TIM_N(16) | TIM_N(17) ) \ No newline at end of file +#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(15) | TIM_N(16) | TIM_N(17) ) diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index 7244af85a7..921861a11c 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -145,6 +145,7 @@ #define VBAT_ADC_PIN PC3 #define USE_DSHOT +#define USE_ESC_TELEMETRY #define LED_STRIP #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT @@ -166,4 +167,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 7 #define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) | TIM_N(9)) - diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h index fd2ea81494..ed75d987e8 100644 --- a/src/main/target/DOGE/target.h +++ b/src/main/target/DOGE/target.h @@ -126,6 +126,7 @@ #define LED_STRIP #define USE_DSHOT +#define USE_ESC_TELEMETRY #define DEFAULT_RX_FEATURE FEATURE_RX_PPM @@ -146,4 +147,3 @@ // only 6 outputs available on hardware #define USABLE_TIMER_CHANNEL_COUNT 10 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(15)) - diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index 52c673af86..696f373c10 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -162,6 +162,7 @@ #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_DSHOT +#define USE_ESC_TELEMETRY #define REMAP_TIM17_DMA #define TARGET_IO_PORTA 0xffff @@ -171,4 +172,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 8 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(16) | TIM_N(17)) - diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 741866e772..1317168a70 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -176,6 +176,7 @@ #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_DSHOT +#define USE_ESC_TELEMETRY #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff @@ -184,4 +185,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 6 #define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) ) - diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h index ae25088955..35410dff5c 100644 --- a/src/main/target/FURYF7/target.h +++ b/src/main/target/FURYF7/target.h @@ -24,6 +24,7 @@ #define USBD_PRODUCT_STRING "FuryF7" #define USE_DSHOT +#define USE_ESC_TELEMETRY #define LED0 PB5 #define LED1 PB4 @@ -152,4 +153,4 @@ #define TARGET_IO_PORTE 0xffff #define USABLE_TIMER_CHANNEL_COUNT 5 -#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(8)) \ No newline at end of file +#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(8)) diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h index b28658ebd9..ed5475b30e 100644 --- a/src/main/target/IMPULSERCF3/target.h +++ b/src/main/target/IMPULSERCF3/target.h @@ -47,6 +47,7 @@ #define USE_FLASH_M25P16 #define USE_DSHOT +#define USE_ESC_TELEMETRY #define REMAP_TIM17_DMA #define USE_VCP @@ -105,4 +106,3 @@ #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(16) |TIM_N(17)) - diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index 4a3f30cbc7..2fe4428e82 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -47,6 +47,7 @@ #define ENSURE_MPU_DATA_READY_IS_LOW #define USE_DSHOT +#define USE_ESC_TELEMETRY #define USE_SPI #define USE_SPI_DEVICE_1 @@ -173,4 +174,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 12 #endif #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15)) - diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index a2739251a7..295bab37da 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -103,6 +103,7 @@ #define LED_STRIP #define USE_DSHOT +#define USE_ESC_TELEMETRY #define SPEKTRUM_BIND // USART2, PB4 @@ -120,4 +121,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 10 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(15) | TIM_N(17)) - diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h index 884d847dbd..aebdde196f 100755 --- a/src/main/target/MULTIFLITEPICO/target.h +++ b/src/main/target/MULTIFLITEPICO/target.h @@ -106,6 +106,7 @@ #define RSSI_ADC_PIN PB2 #define USE_DSHOT +#define USE_ESC_TELEMETRY #define REMAP_TIM17_DMA // UART1 TX uses DMA1_Channel4, which is also used by dshot on motor 4 diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index beadee7a0d..7b9c187dbe 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -138,6 +138,7 @@ #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 #define USE_DSHOT +#define USE_ESC_TELEMETRY // DSHOT output 4 uses DMA1_Channel5, so don't use it for the SDCARD until we find an alternative #ifndef USE_DSHOT diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 0fba1225a4..db70896b67 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -123,6 +123,7 @@ //#define RSSI_ADC_PIN PA0 #define USE_DSHOT +#define USE_ESC_TELEMETRY #define LED_STRIP diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 341c73dfa6..773c381a42 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -38,6 +38,7 @@ #endif #define USE_DSHOT +#define USE_ESC_TELEMETRY #define LED0 PB5 // Disable LED1, conflicts with AirbotF4/Flip32F4/Revolt beeper diff --git a/src/main/target/SOULF4/target.h b/src/main/target/SOULF4/target.h index 410841e747..db3d32eef9 100644 --- a/src/main/target/SOULF4/target.h +++ b/src/main/target/SOULF4/target.h @@ -105,6 +105,7 @@ #define LED_STRIP #define USE_DSHOT +#define USE_ESC_TELEMETRY #define SPEKTRUM_BIND // USART3, diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h index db6e953bb0..8ca1f6b3bd 100644 --- a/src/main/target/SPARKY2/target.h +++ b/src/main/target/SPARKY2/target.h @@ -36,6 +36,7 @@ #define INVERTER_USART USART6 #define USE_DSHOT +#define USE_ESC_TELEMETRY // MPU9250 interrupt #define USE_EXTI @@ -132,4 +133,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 11 #define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(12) | TIM_N(8) | TIM_N(9)) - diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index 6c71d1072b..40da2a9c74 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -116,6 +116,7 @@ #define RSSI_ADC_PIN PB2 #define USE_DSHOT +#define USE_ESC_TELEMETRY #define REMAP_TIM17_DMA // UART1 TX uses DMA1_Channel4, which is also used by dshot on motor 4 diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h index 516d023dba..7162121190 100755 --- a/src/main/target/SPRACINGF3EVO/target.h +++ b/src/main/target/SPRACINGF3EVO/target.h @@ -36,6 +36,7 @@ #define ENSURE_MAG_DATA_READY_IS_HIGH #define USE_DSHOT +#define USE_ESC_TELEMETRY #define GYRO #define USE_GYRO_SPI_MPU6500 @@ -156,4 +157,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 12 // PPM, 8 PWM, UART3 RX/TX, LED Strip #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15)) - diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index b761aa215b..a5ddc38d02 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -170,6 +170,7 @@ #define EXTERNAL1_ADC_PIN PC3 #define USE_DSHOT +#define USE_ESC_TELEMETRY #define LED_STRIP @@ -192,4 +193,3 @@ #define USABLE_TIMER_CHANNEL_COUNT 14 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(16) | TIM_N(17)) -