From 97a855f6080211a87f412295b60a0e54684b35f5 Mon Sep 17 00:00:00 2001 From: MJ666 Date: Sat, 10 Feb 2018 12:46:27 +0100 Subject: [PATCH 1/2] FuriousFPV F35 Lightning PPM support --- src/main/target/FF_F35_LIGHTNING/target.c | 3 ++- src/main/target/FF_F35_LIGHTNING/target.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/target/FF_F35_LIGHTNING/target.c b/src/main/target/FF_F35_LIGHTNING/target.c index ab6c50a946..548ffedacb 100644 --- a/src/main/target/FF_F35_LIGHTNING/target.c +++ b/src/main/target/FF_F35_LIGHTNING/target.c @@ -28,5 +28,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { { TIM4, IO_TAG(PB9), TIM_Channel_4, 1, IOCFG_AF_PP, GPIO_AF_TIM4, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO }, // S4_OUT { TIM3, IO_TAG(PB0), TIM_Channel_3, 1, IOCFG_AF_PP, GPIO_AF_TIM3, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO }, // S5_OUT { TIM3, IO_TAG(PB1), TIM_Channel_4, 1, IOCFG_AF_PP, GPIO_AF_TIM3, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO }, // S6_OUT -}; + { TIM2, IO_TAG(PB10), TIM_Channel_3, 0, IOCFG_AF_PP, GPIO_AF_TIM2, TIM_USE_PPM }, // PPM IN +}; diff --git a/src/main/target/FF_F35_LIGHTNING/target.h b/src/main/target/FF_F35_LIGHTNING/target.h index 0a1c95be77..329f03d1af 100644 --- a/src/main/target/FF_F35_LIGHTNING/target.h +++ b/src/main/target/FF_F35_LIGHTNING/target.h @@ -131,7 +131,7 @@ // Number of available PWM outputs #define MAX_PWM_OUTPUT_PORTS 6 -#define USABLE_TIMER_CHANNEL_COUNT 6 +#define USABLE_TIMER_CHANNEL_COUNT 7 #define USE_SERIAL_4WAY_BLHELI_INTERFACE @@ -140,5 +140,5 @@ #define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTD (BIT(2)) -#define USED_TIMERS ( TIM_N(3) | TIM_N(4) | TIM_N(8)) +#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) ) From 4309cd767d0fd3fc454da3bbc8a90e8e14ec853e Mon Sep 17 00:00:00 2001 From: MJ666 Date: Thu, 22 Feb 2018 21:04:21 +0100 Subject: [PATCH 2/2] FuriousFPV F35 Lightning configuration clean up --- src/main/target/FF_F35_LIGHTNING/config.c | 4 ---- src/main/target/FF_F35_LIGHTNING/target.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/target/FF_F35_LIGHTNING/config.c b/src/main/target/FF_F35_LIGHTNING/config.c index 84d9fc98d5..4edb0b6f7b 100644 --- a/src/main/target/FF_F35_LIGHTNING/config.c +++ b/src/main/target/FF_F35_LIGHTNING/config.c @@ -20,7 +20,6 @@ #include #include "config/config_master.h" -#include "config/feature.h" #include "flight/mixer.h" @@ -33,9 +32,6 @@ // alternative defaults settings for FF_F35_LIGHTNING targets void targetConfiguration(void) { - featureSet(FEATURE_GPS); - featureSet(FEATURE_TELEMETRY); - motorConfigMutable()->maxthrottle = 2000; serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP; diff --git a/src/main/target/FF_F35_LIGHTNING/target.h b/src/main/target/FF_F35_LIGHTNING/target.h index 329f03d1af..1be122e6b0 100644 --- a/src/main/target/FF_F35_LIGHTNING/target.h +++ b/src/main/target/FF_F35_LIGHTNING/target.h @@ -125,7 +125,7 @@ #define USE_PITOT_MS4525 #define PITOT_I2C_BUS BUS_I2C1 -#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_CURRENT_METER | FEATURE_OSD ) +#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_CURRENT_METER | FEATURE_OSD | FEATURE_GPS | FEATURE_TELEMETRY) #define CURRENT_METER_SCALE 250