Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 12:55:19 +03:00
Code Issues Wiki Activity

Renamed to 'FEATURE_CUT_LEVEL', added 'FORCE_FEATURE_CUT_LEVEL' command line option.

Browse source
This commit is contained in:
mikeller 2019-01-17 01:38:04 +13:00 • committed by Michael Keller
parent 776549785d
commit 2e000506c8
3 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -90,8 +90,9 @@ HSE_VALUE ?= 8000000
# used for turning on features like VCP and SDCARD # used for turning on features like VCP and SDCARD
FEATURES = FEATURES =
# used to disable features based on flash space shortage (larger => more features disabled) # used to disable features based on flash space shortage (larger number => more features disabled)
FLASH_RESTRICTEDNESS_LEVEL = FEATURE_CUT_LEVEL_SUPPLIED := $(FEATURE_CUT_LEVEL)
FEATURE_CUT_LEVEL =
include $(ROOT)/make/targets.mk include $(ROOT)/make/targets.mk
@ -158,8 +159,10 @@ ifneq ($(HSE_VALUE),)
DEVICE_FLAGS := $(DEVICE_FLAGS) -DHSE_VALUE=$(HSE_VALUE) DEVICE_FLAGS := $(DEVICE_FLAGS) -DHSE_VALUE=$(HSE_VALUE)
endif endif
ifneq ($(FLASH_RESTRICTEDNESS_LEVEL),) ifneq ($(FEATURE_CUT_LEVEL_SUPPLIED),)
DEVICE_FLAGS := $(DEVICE_FLAGS) -DFLASH_RESTRICTEDNESS_LEVEL=$(FLASH_RESTRICTEDNESS_LEVEL) DEVICE_FLAGS := $(DEVICE_FLAGS) -DFEATURE_CUT_LEVEL=$(FEATURE_CUT_LEVEL_SUPPLIED)
else ifneq ($(FEATURE_CUT_LEVEL),)
DEVICE_FLAGS := $(DEVICE_FLAGS) -DFEATURE_CUT_LEVEL=$(FEATURE_CUT_LEVEL)
endif endif
TARGET_DIR = $(ROOT)/src/main/target/$(BASE_TARGET) TARGET_DIR = $(ROOT)/src/main/target/$(BASE_TARGET)

2
src/main/target/SPRACINGF3NEO/target.mk
View file

@ -1,7 +1,7 @@
F3_TARGETS += $(TARGET) F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD_SPI FEATURES = VCP SDCARD_SPI
FLASH_RESTRICTEDNESS_LEVEL = 8 FEATURE_CUT_LEVEL = 8
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu.c \

36
src/main/target/common_pre.h
View file

@ -164,58 +164,60 @@
#if (FLASH_SIZE > 128) #if (FLASH_SIZE > 128)
#define USE_GYRO_OVERFLOW_CHECK #define USE_GYRO_OVERFLOW_CHECK
#define USE_CAMERA_CONTROL
#define USE_CMS
#define USE_DSHOT_DMAR
#define USE_YAW_SPIN_RECOVERY #define USE_YAW_SPIN_RECOVERY
#define USE_MSP_DISPLAYPORT #define USE_DSHOT_DMAR
#define USE_MSP_OVER_TELEMETRY
#define USE_RCDEVICE
#define USE_SERIALRX_FPORT // FrSky FPort #define USE_SERIALRX_FPORT // FrSky FPort
#define USE_TELEMETRY_CRSF #define USE_TELEMETRY_CRSF
#define USE_TELEMETRY_SRXL #define USE_TELEMETRY_SRXL
#define USE_SERIAL_4WAY_BLHELI_BOOTLOADER //TODO: Fix this conditional.
#define USE_CMS //TODO: Fix this conditional.
#if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 10))
#define USE_CAMERA_CONTROL
#define USE_MSP_DISPLAYPORT
#define USE_MSP_OVER_TELEMETRY
#define USE_RCDEVICE
#define USE_VIRTUAL_CURRENT_METER #define USE_VIRTUAL_CURRENT_METER
#define USE_VTX_COMMON #define USE_VTX_COMMON
#define USE_VTX_CONTROL #define USE_VTX_CONTROL
#define USE_VTX_SMARTAUDIO #define USE_VTX_SMARTAUDIO
#define USE_VTX_TRAMP #define USE_VTX_TRAMP
#define USE_ESC_SENSOR #define USE_ESC_SENSOR
#define USE_SERIAL_4WAY_BLHELI_BOOTLOADER //TODO: Fix this conditional. #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 9)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 9))
#define USE_GYRO_LPF2 #define USE_GYRO_LPF2
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 8)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 8))
#define USE_LAUNCH_CONTROL #define USE_LAUNCH_CONTROL
#define USE_DYN_LPF #define USE_DYN_LPF
#define USE_D_CUT #define USE_D_CUT
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 7)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 7))
#define USE_THROTTLE_BOOST #define USE_THROTTLE_BOOST
#define USE_INTEGRATED_YAW_CONTROL #define USE_INTEGRATED_YAW_CONTROL
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 6)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 6))
#define USE_ITERM_RELAX #define USE_ITERM_RELAX
#define USE_RC_SMOOTHING_FILTER #define USE_RC_SMOOTHING_FILTER
#define USE_THRUST_LINEARIZATION #define USE_THRUST_LINEARIZATION
#define USE_TPA_MODE #define USE_TPA_MODE
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 5)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 5))
#define USE_PWM #define USE_PWM
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 4)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 4))
#define USE_HUFFMAN #define USE_HUFFMAN
#define USE_PINIO #define USE_PINIO
#define USE_PINIOBOX #define USE_PINIOBOX
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 3)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 3))
#ifdef USE_SERIALRX_SPEKTRUM #ifdef USE_SERIALRX_SPEKTRUM
#define USE_SPEKTRUM_BIND #define USE_SPEKTRUM_BIND
#define USE_SPEKTRUM_BIND_PLUG #define USE_SPEKTRUM_BIND_PLUG
@ -228,14 +230,14 @@
#endif #endif
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 2)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 2))
#define USE_TELEMETRY_HOTT #define USE_TELEMETRY_HOTT
#define USE_TELEMETRY_LTM #define USE_TELEMETRY_LTM
#define USE_SERIALRX_SUMH // Graupner legacy protocol #define USE_SERIALRX_SUMH // Graupner legacy protocol
#define USE_SERIALRX_XBUS // JR #define USE_SERIALRX_XBUS // JR
#endif #endif
#if ((FLASH_SIZE > 256) || (FLASH_RESTRICTEDNESS_LEVEL < 1)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 1))
#define USE_BOARD_INFO #define USE_BOARD_INFO
#define USE_EXTENDED_CMS_MENUS #define USE_EXTENDED_CMS_MENUS
#define USE_RTC_TIME #define USE_RTC_TIME