Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

Removed 'MAX_AUX_CHANNELS', replaced with 'MAX_AUX_CHANNEL_COUNT'.

Browse source
This commit is contained in:
Michael Keller 2017-02-09 10:38:28 +13:00 • committed by borisbstyle
parent 4646f9df8f
commit f299b0d3d9
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/cli.c
View file

@ -507,7 +507,7 @@ const clivalue_t valueTable[] = {
{ "input_filtering_mode", VAR_INT8 | MASTER_VALUE | MODE_LOOKUP, &pwmConfig()->inputFilteringMode, .config.lookup = { TABLE_OFF_ON } }, { "input_filtering_mode", VAR_INT8 | MASTER_VALUE | MODE_LOOKUP, &pwmConfig()->inputFilteringMode, .config.lookup = { TABLE_OFF_ON } },
#endif #endif
{ "fpv_mix_degrees", VAR_UINT8 | MASTER_VALUE, &rxConfig()->fpvCamAngleDegrees, .config.minmax = { 0, 50 } }, { "fpv_mix_degrees", VAR_UINT8 | MASTER_VALUE, &rxConfig()->fpvCamAngleDegrees, .config.minmax = { 0, 50 } },
{ "max_aux_channels", VAR_UINT8 | MASTER_VALUE, &rxConfig()->max_aux_channel, .config.minmax = { 0, MAX_AUX_CHANNELS } }, { "max_aux_channels", VAR_UINT8 | MASTER_VALUE, &rxConfig()->max_aux_channel, .config.minmax = { 0, MAX_AUX_CHANNEL_COUNT } },
{ "debug_mode", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.debug_mode, .config.lookup = { TABLE_DEBUG } }, { "debug_mode", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.debug_mode, .config.lookup = { TABLE_DEBUG } },
{ "min_throttle", VAR_UINT16 | MASTER_VALUE, &motorConfig()->minthrottle, .config.minmax = { PWM_RANGE_ZERO, PWM_RANGE_MAX } }, { "min_throttle", VAR_UINT16 | MASTER_VALUE, &motorConfig()->minthrottle, .config.minmax = { PWM_RANGE_ZERO, PWM_RANGE_MAX } },

2
src/main/fc/config.c
View file

@ -710,7 +710,7 @@ void createDefaultConfig(master_t *config)
config->rxConfig.rcInterpolationChannels = 0; config->rxConfig.rcInterpolationChannels = 0;
config->rxConfig.rcInterpolationInterval = 19; config->rxConfig.rcInterpolationInterval = 19;
config->rxConfig.fpvCamAngleDegrees = 0; config->rxConfig.fpvCamAngleDegrees = 0;
config->rxConfig.max_aux_channel = MAX_AUX_CHANNELS; config->rxConfig.max_aux_channel = DEFAULT_AUX_CHANNEL_COUNT;
config->rxConfig.airModeActivateThreshold = 1350; config->rxConfig.airModeActivateThreshold = 1350;
resetAllRxChannelRangeConfigurations(config->rxConfig.channelRanges); resetAllRxChannelRangeConfigurations(config->rxConfig.channelRanges);

12
src/main/target/common.h
View file

@ -31,7 +31,6 @@
#define I2C2_OVERCLOCK true #define I2C2_OVERCLOCK true
#ifdef STM32F7 #ifdef STM32F7
#define STM_FAST_TARGET
#define I2C3_OVERCLOCK true #define I2C3_OVERCLOCK true
#define I2C4_OVERCLOCK true #define I2C4_OVERCLOCK true
#define TELEMETRY_IBUS #define TELEMETRY_IBUS
@ -41,7 +40,6 @@
STM32 F4 specific settings. STM32 F4 specific settings.
****************************/ ****************************/
#ifdef STM32F4 #ifdef STM32F4
#define STM_FAST_TARGET
#define USE_DSHOT #define USE_DSHOT
#define I2C3_OVERCLOCK true #define I2C3_OVERCLOCK true
#define TELEMETRY_IBUS #define TELEMETRY_IBUS
@ -73,16 +71,20 @@
#define USE_PWM #define USE_PWM
#define USE_PPM #define USE_PPM
#if defined(STM_FAST_TARGET) #if defined(STM32F4) || defined(STM32F7)
#define MAX_AUX_CHANNELS 20
#define TASK_GYROPID_DESIRED_PERIOD 125 #define TASK_GYROPID_DESIRED_PERIOD 125
#define SCHEDULER_DELAY_LIMIT 10 #define SCHEDULER_DELAY_LIMIT 10
#else #else
#define MAX_AUX_CHANNELS 6
#define TASK_GYROPID_DESIRED_PERIOD 1000 #define TASK_GYROPID_DESIRED_PERIOD 1000
#define SCHEDULER_DELAY_LIMIT 100 #define SCHEDULER_DELAY_LIMIT 100
#endif #endif
#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
#define DEFAULT_AUX_CHANNEL_COUNT MAX_AUX_CHANNEL_COUNT
#else
#define DEFAULT_AUX_CHANNEL_COUNT 6
#endif
#if (FLASH_SIZE > 64) #if (FLASH_SIZE > 64)
#define BLACKBOX #define BLACKBOX
#define GPS #define GPS