Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 01:35:35 +03:00
Code Issues Wiki Activity

Merge pull request #2817 from AlienFlightINAV/F35PPM

Browse source 
FuriousFPV F35 Lightning PPM and configuration update
This commit is contained in:
Konstantin Sharlaimov 2018-02-23 14:05:34 +10:00 • committed by GitHub
commit 6071b88a2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/target/FF_F35_LIGHTNING/config.c
View file

@ -20,7 +20,6 @@
#include <platform.h> #include <platform.h>
#include "config/config_master.h" #include "config/config_master.h"
#include "config/feature.h"
#include "flight/mixer.h" #include "flight/mixer.h"
@ -33,9 +32,6 @@
// alternative defaults settings for FF_F35_LIGHTNING targets // alternative defaults settings for FF_F35_LIGHTNING targets
void targetConfiguration(void) void targetConfiguration(void)
{ {
featureSet(FEATURE_GPS);
featureSet(FEATURE_TELEMETRY);
motorConfigMutable()->maxthrottle = 2000; motorConfigMutable()->maxthrottle = 2000;
serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP; serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP;

3
src/main/target/FF_F35_LIGHTNING/target.c
View file

@ -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 { 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(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 { 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
};

6
src/main/target/FF_F35_LIGHTNING/target.h
View file

@ -125,13 +125,13 @@
#define USE_PITOT_MS4525 #define USE_PITOT_MS4525
#define PITOT_I2C_BUS BUS_I2C1 #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 #define CURRENT_METER_SCALE 250
// Number of available PWM outputs // Number of available PWM outputs
#define MAX_PWM_OUTPUT_PORTS 6 #define MAX_PWM_OUTPUT_PORTS 6
#define USABLE_TIMER_CHANNEL_COUNT 6 #define USABLE_TIMER_CHANNEL_COUNT 7
#define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_SERIAL_4WAY_BLHELI_INTERFACE
@ -140,5 +140,5 @@
#define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD (BIT(2)) #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) )