rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added default features and default rx that can be set in the target.h file.

This commit is contained in:
Martin Budden 2016-06-07 20:16:06 +01:00
parent b016d51473
commit b20dbfb801
14 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/config/config.c
View File

@ -73,6 +73,10 @@
#include "config/config_profile.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 BRUSHLESS_MOTORS_PWM_RATE 400
@ -382,25 +386,20 @@ static void resetConf(void)
memset(&masterConfig, 0, sizeof(master_t));
setProfile(0);
masterConfig.version = EEPROM_CONF_VERSION;
masterConfig.mixerMode = MIXER_QUADX;
featureClearAll();
#if defined(CJMCU) || defined(SPARKY) || defined(COLIBRI_RACE) || defined(MOTOLAB) || defined(SPRACINGF3MINI) || defined(LUX_RACE) || defined(DOGE) || defined(SINGULARITY) || defined(FURYF3)
featureSet(FEATURE_RX_PPM);
featureSet(DEFAULT_RX_FEATURE | FEATURE_FAILSAFE | FEATURE_SUPEREXPO_RATES);
#ifdef DEFAULT_FEATURES
featureSet(DEFAULT_FEATURES);
#endif
//#if defined(SPRACINGF3MINI)
// featureSet(FEATURE_DISPLAY);
//#endif
#ifdef BOARD_HAS_VOLTAGE_DIVIDER
// only enable the VBAT feature by default if the board has a voltage divider otherwise
// the user may see incorrect readings and unexpected issues with pin mappings may occur.
featureSet(FEATURE_VBAT);
#endif
featureSet(FEATURE_FAILSAFE);
featureSet(FEATURE_SUPEREXPO_RATES);
masterConfig.version = EEPROM_CONF_VERSION;
masterConfig.mixerMode = MIXER_QUADX;
// global settings
masterConfig.current_profile_index = 0; // default profile
@ -574,7 +573,6 @@ static void resetConf(void)
#endif
#ifdef SPRACINGF3
featureSet(FEATURE_BLACKBOX);
masterConfig.blackbox_device = 1;
#ifdef TRANSPONDER
static const uint8_t defaultTransponderData[6] = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC }; // Note, this is NOT a valid transponder code, it's just for testing production hardware
@ -597,7 +595,6 @@ static void resetConf(void)
#endif
#if defined(FURYF3)
featureSet(FEATURE_BLACKBOX);
masterConfig.blackbox_device = 2;
masterConfig.blackbox_rate_num = 1;
masterConfig.blackbox_rate_denom = 1;
@ -609,16 +606,6 @@ static void resetConf(void)
masterConfig.escAndServoConfig.maxthrottle = 1980;
masterConfig.batteryConfig.vbatmaxcellvoltage = 45;
masterConfig.batteryConfig.vbatmincellvoltage = 30;
featureSet(FEATURE_VBAT);
featureSet(FEATURE_FAILSAFE);
#endif
#ifdef SPRACINGF3EVO
featureSet(FEATURE_TRANSPONDER);
featureSet(FEATURE_RSSI_ADC);
featureSet(FEATURE_CURRENT_METER);
featureSet(FEATURE_TELEMETRY);
#endif
// alternative defaults settings for ALIENFLIGHTF1 and ALIENFLIGHTF3 targets
@ -699,14 +686,12 @@ static void resetConf(void)
// alternative defaults settings for SINGULARITY target
#if defined(SINGULARITY)
featureSet(FEATURE_BLACKBOX);
masterConfig.blackbox_device = 1;
masterConfig.blackbox_rate_num = 1;
masterConfig.blackbox_rate_denom = 1;
masterConfig.batteryConfig.vbatscale = 77;
featureSet(FEATURE_RX_SERIAL);
masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL;
#endif
@ -823,7 +808,7 @@ void activateConfig(void)
void validateAndFixConfig(void)
{
if (!(featureConfigured(FEATURE_RX_PARALLEL_PWM) || featureConfigured(FEATURE_RX_PPM) || featureConfigured(FEATURE_RX_SERIAL) || featureConfigured(FEATURE_RX_MSP))) {
featureSet(FEATURE_RX_PARALLEL_PWM); // Consider changing the default to PPM
featureSet(FEATURE_RX_PARALLEL_PWM);
}
if (featureConfigured(FEATURE_RX_PPM)) {

1
src/main/target/ALIENFLIGHTF3/target.h
View File

@ -157,6 +157,7 @@
//#define DISPLAY
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define SPEKTRUM_BIND
// USART2, PA3

1
src/main/target/CC3D/target.h
View File

@ -128,6 +128,7 @@
#define SERIAL_RX
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define SONAR
//#define GPS

1
src/main/target/CJMCU/target.h
View File

@ -60,6 +60,7 @@
#define SERIAL_RX
//#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define SPEKTRUM_BIND
// USART2, PA3

1
src/main/target/COLIBRI_RACE/target.h
View File

@ -192,5 +192,6 @@
#define SERIAL_RX
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define USE_SERIAL_4WAY_BLHELI_INTERFACE

1
src/main/target/DOGE/target.h
View File

@ -190,6 +190,7 @@
#define SERIAL_RX
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define SPEKTRUM_BIND
// Use UART3 for speksat

2
src/main/target/FURYF3/target.h
View File

@ -212,6 +212,8 @@
#define USE_SERVOS
#define USE_CLI
#define SONAR
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES FEATURE_BLACKBOX
#define SPEKTRUM_BIND
// USART3,

1
src/main/target/LUX_RACE/target.h
View File

@ -154,6 +154,7 @@
#define TELEMETRY
#define SERIAL_RX
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define USE_SERVOS
#define USE_CLI

1
src/main/target/MOTOLAB/target.h
View File

@ -121,6 +121,7 @@
#define TELEMETRY
#define BLACKBOX
#define SERIAL_RX
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
//#define GPS
//#define GTUNE
#define DISPLAY

2
src/main/target/SINGULARITY/target.h
View File

@ -127,6 +127,8 @@
#define GPS
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_RX_SERIAL)
#define SPEKTRUM_BIND
// USART2, PA15

1
src/main/target/SPARKY/target.h
View File

@ -126,6 +126,7 @@
#define TELEMETRY
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define LED_STRIP
#if 1

3
src/main/target/SPRACINGF3/target.h
View File

@ -158,6 +158,9 @@
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES FEATURE_BLACKBOX
#define SPEKTRUM_BIND
// USART3,
#define BIND_PORT GPIOB

5
src/main/target/SPRACINGF3EVO/target.h
View File

@ -206,8 +206,6 @@
#define TRANSPONDER_DMA_TC_FLAG DMA1_FLAG_TC2
#define TRANSPONDER_DMA_HANDLER_IDENTIFER DMA1_CH2_HANDLER
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define GPS
#define BLACKBOX
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
@ -217,6 +215,9 @@
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY)
#define SPEKTRUM_BIND
// USART3,
#define BIND_PORT GPIOB

2
src/main/target/SPRACINGF3MINI/target.h
View File

@ -212,10 +212,10 @@
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define TELEMETRY
#define SERIAL_RX
#define AUTOTUNE
#define DISPLAY
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define BUTTONS
#define BUTTON_A_PORT GPIOB