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

Merge pull request #239 from martinbudden/inav_default_features

Browse source 
Added setting of default features from target.h file
This commit is contained in:
Martin Budden 2016-05-22 15:24:00 +01:00
commit 04fe9c3284
6 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/config/config.c
View file

@ -72,6 +72,10 @@
#include "config/config_profile.h" #include "config/config_profile.h"
#include "config/config_master.h" #include "config/config_master.h"
#ifndef DEFAULT_RX_FEATURE
#define DEFAULT_RX_FEATURE FEATURE_RX_PARALLEL_PWM
#endif
#define BRUSHED_MOTORS_PWM_RATE 16000 #define BRUSHED_MOTORS_PWM_RATE 16000
#define BRUSHLESS_MOTORS_PWM_RATE 400 #define BRUSHLESS_MOTORS_PWM_RATE 400
@ -424,8 +428,9 @@ static void resetConf(void)
masterConfig.mixerMode = MIXER_QUADX; masterConfig.mixerMode = MIXER_QUADX;
featureClearAll(); featureClearAll();
persistentFlagClearAll(); persistentFlagClearAll();
#if defined(CJMCU) || defined(SPARKY) || defined(COLIBRI_RACE) || defined(MOTOLAB) || defined(LUX_RACE) featureSet(DEFAULT_RX_FEATURE | FEATURE_FAILSAFE);
featureSet(FEATURE_RX_PPM); #ifdef DEFAULT_FEATURES
featureSet(DEFAULT_FEATURES);
#endif #endif
#ifdef BOARD_HAS_VOLTAGE_DIVIDER #ifdef BOARD_HAS_VOLTAGE_DIVIDER
@ -434,8 +439,6 @@ static void resetConf(void)
featureSet(FEATURE_VBAT); featureSet(FEATURE_VBAT);
#endif #endif
featureSet(FEATURE_FAILSAFE);
// global settings // global settings
masterConfig.current_profile_index = 0; // default profile masterConfig.current_profile_index = 0; // default profile
masterConfig.dcm_kp_acc = 2500; // 0.25 * 10000 masterConfig.dcm_kp_acc = 2500; // 0.25 * 10000
@ -605,8 +608,6 @@ static void resetConf(void)
// alternative defaults settings for ALIENWIIF1 and ALIENWIIF3 targets // alternative defaults settings for ALIENWIIF1 and ALIENWIIF3 targets
#ifdef ALIENWII32 #ifdef ALIENWII32
featureSet(FEATURE_RX_SERIAL);
featureSet(FEATURE_MOTOR_STOP);
#ifdef ALIENWIIF3 #ifdef ALIENWIIF3
masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL; masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL;
masterConfig.batteryConfig.vbatscale = 20; masterConfig.batteryConfig.vbatscale = 20;

2
src/main/target/CJMCU/target.h
View file

@ -64,6 +64,8 @@
#define BIND_PORT GPIOA #define BIND_PORT GPIOA
#define BIND_PIN Pin_3 #define BIND_PIN Pin_3
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
// Since the CJMCU PCB has holes for 4 motors in each corner we can save same flash space by disabling support for other mixers. // Since the CJMCU PCB has holes for 4 motors in each corner we can save same flash space by disabling support for other mixers.
#define USE_QUAD_MIXER_ONLY #define USE_QUAD_MIXER_ONLY
#undef USE_SERVOS #undef USE_SERVOS

2
src/main/target/COLIBRI_RACE/target.h
View file

@ -162,3 +162,5 @@
#define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_SERIAL_4WAY_BLHELI_INTERFACE
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM

2
src/main/target/LUX_RACE/target.h
View file

@ -155,3 +155,5 @@
#undef GPS_PROTO_I2C_NAV #undef GPS_PROTO_I2C_NAV
#undef GPS_PROTO_NAZA #undef GPS_PROTO_NAZA
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM

5
src/main/target/NAZE/target.h
View file

@ -206,8 +206,11 @@
#undef TARGET_BOARD_IDENTIFIER #undef TARGET_BOARD_IDENTIFIER
#define TARGET_BOARD_IDENTIFIER "AWF1" // AlienWii32 F1. #define TARGET_BOARD_IDENTIFIER "AWF1" // AlienWii32 F1.
#undef BOARD_HAS_VOLTAGE_DIVIDER #undef BOARD_HAS_VOLTAGE_DIVIDER
#define HARDWARE_BIND_PLUG
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define DEFAULT_FEATURES FEATURE_MOTOR_STOP
#define HARDWARE_BIND_PLUG
// Hardware bind plug at PB5 (Pin 41) // Hardware bind plug at PB5 (Pin 41)
#define BINDPLUG_PORT GPIOB #define BINDPLUG_PORT GPIOB
#define BINDPLUG_PIN Pin_5 #define BINDPLUG_PIN Pin_5

3
src/main/target/SPARKY/target.h
View file

@ -163,3 +163,6 @@
// USART2, PA3 // USART2, PA3
#define BIND_PORT GPIOA #define BIND_PORT GPIOA
#define BIND_PIN Pin_3 #define BIND_PIN Pin_3
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM