AlienFlight cleanups

This commit is contained in:
Michael Jakob 2016-06-16 21:44:49 +02:00
parent ff5223f208
commit fd759a573c
5 changed files with 23 additions and 26 deletions

View File

@ -648,18 +648,16 @@ static void resetConf(void)
#endif
masterConfig.rxConfig.serialrx_provider = 1;
masterConfig.rxConfig.spektrum_sat_bind = 5;
masterConfig.rxConfig.spektrum_sat_bind_autoreset = 1;
masterConfig.rxConfig.spektrum_sat_bind_autoreset = 1;
masterConfig.escAndServoConfig.minthrottle = 1000;
masterConfig.escAndServoConfig.maxthrottle = 2000;
masterConfig.motor_pwm_rate = 32000;
masterConfig.motor_pwm_protocol = PWM_TYPE_BRUSHED;
currentProfile->pidProfile.pidController = 2;
masterConfig.failsafeConfig.failsafe_delay = 2;
masterConfig.failsafeConfig.failsafe_off_delay = 0;
currentControlRateProfile->rcRate8 = 100;
currentControlRateProfile->rates[FD_PITCH] = 20;
currentControlRateProfile->rates[FD_ROLL] = 20;
currentControlRateProfile->rates[FD_YAW] = 20;
currentControlRateProfile->rates[FD_PITCH] = 40;
currentControlRateProfile->rates[FD_ROLL] = 40;
currentControlRateProfile->rates[FD_YAW] = 40;
parseRcChannels("TAER1234", &masterConfig.rxConfig);
masterConfig.customMotorMixer[0] = (motorMixer_t){ 1.0f, -0.414178f, 1.0f, -1.0f }; // REAR_R

View File

@ -18,7 +18,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "AFF3" // AlienFlight F3.
#define ALIENFLIGHT
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
@ -128,23 +127,23 @@
#define VBAT_ADC_GPIO_PIN GPIO_Pin_4
#define VBAT_ADC_CHANNEL ADC_Channel_1
#undef BLACKBOX
#undef GPS
#undef DISPLAY
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
// alternative defaults for AlienFlight F3 target
#define ALIENFLIGHT
#define SPEKTRUM_BIND
// USART2, PA3
#define BIND_PIN PA3
// alternative defaults for AlienFlight F3 target
#define ALIENFLIGHT
#define HARDWARE_BIND_PLUG
// Hardware bind plug at PB12 (Pin 25)
#define BINDPLUG_PIN PB12
#define BRUSHED_MOTORS
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
// IO - assuming 303 in 64pin package, TODO
#define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff

View File

@ -4,7 +4,6 @@ FEATURES = VCP
TARGET_SRC = \
drivers/accgyro_mpu.c \
drivers/accgyro_mpu6050.c \
drivers/accgyro_mpu.c \
drivers/accgyro_mpu6500.c \
drivers/accgyro_spi_mpu6500.c \
drivers/compass_ak8963.c \

View File

@ -17,7 +17,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "AFF4"
#define ALIENFLIGHT
#define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)
#define CONFIG_SERIALRX_PROVIDER SERIALRX_SPEKTRUM2048
@ -181,19 +180,18 @@
//#define WS2811_DMA_CHANNEL DMA1_Channel3
//#define WS2811_IRQ DMA1_Channel3_IRQn
#define SPEKTRUM_BIND
// USART2, PA3
#define BIND_PORT GPIOA
#define BIND_PIN PA3
// alternative defaults for AlienFlight F4 target
#define ALIENFLIGHT
// Hardware bind plug at PB2 (Pin 28)
#define SPEKTRUM_BIND
// USART2, PA3
#define BIND_PIN PA3
#define HARDWARE_BIND_PLUG
#define BINDPLUG_PORT GPIOB
// Hardware bind plug at PB2 (Pin 28)
#define BINDPLUG_PIN PB2
#define BRUSHED_MOTORS
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)

View File

@ -175,15 +175,18 @@
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
// alternative defaults for AlienFlight F1 target
#ifdef ALIENFLIGHT
#ifdef ALIENFLIGHTF1
#undef TARGET_BOARD_IDENTIFIER
#define TARGET_BOARD_IDENTIFIER "AFF1" // AlienFlight F1.
#undef BOARD_HAS_VOLTAGE_DIVIDER
// alternative defaults for AlienFlight F1 target
#define ALIENFLIGHT
#define BRUSHED_MOTORS
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
#define HARDWARE_BIND_PLUG
// Hardware bind plug at PB5 (Pin 41)
#define BINDPLUG_PIN PB5
#endif