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

Merge pull request #4376 from mikeller/remove_f1_targets_from_ci

Browse source 
Removed F1 targets from the target lists used for CI, added warning about deprecation.
This commit is contained in:
Michael Keller 2017-10-19 02:41:41 +13:00 • committed by GitHub
commit 7b6ac7577e
3 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Makefile
View file

@ -16,7 +16,7 @@
# #
# The target to build, see VALID_TARGETS below # The target to build, see VALID_TARGETS below
TARGET ?= NAZE TARGET ?= BETAFLIGHTF3
# Compile-time options # Compile-time options
OPTIONS ?= OPTIONS ?=
@ -315,8 +315,14 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S
$(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $< $(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $<
## all : Build all valid targets ## all : Build all targets (excluding unsupported)
all: $(VALID_TARGETS) all: $(SUPPORTED_TARGETS)
## all_with_unsupported : Build all targets (excluding unsupported)
all_with_unsupported: $(VALID_TARGETS)
## unsupported : Build unsupported targets
unsupported: $(UNSUPPORTED_TARGETS)
## official : Build all official (travis) targets ## official : Build all official (travis) targets
official: $(OFFICIAL_TARGETS) official: $(OFFICIAL_TARGETS)
@ -442,14 +448,16 @@ help: Makefile make/tools.mk
## targets : print a list of all valid target platforms (for consumption by scripts) ## targets : print a list of all valid target platforms (for consumption by scripts)
targets: targets:
$(V0) @echo "Valid targets: $(VALID_TARGETS)" $(V0) @echo "Valid targets: $(VALID_TARGETS)"
$(V0) @echo "Target: $(TARGET)" $(V0) @echo "Supported targets: $(SUPPORTED_TARGETS)"
$(V0) @echo "Base target: $(BASE_TARGET)" $(V0) @echo "Unsupported targets: $(UNSUPPORTED_TARGETS)"
$(V0) @echo "targets-group-1: $(GROUP_1_TARGETS)" $(V0) @echo "Target: $(TARGET)"
$(V0) @echo "targets-group-2: $(GROUP_2_TARGETS)" $(V0) @echo "Base target: $(BASE_TARGET)"
$(V0) @echo "targets-group-3: $(GROUP_3_TARGETS)" $(V0) @echo "targets-group-1: $(GROUP_1_TARGETS)"
$(V0) @echo "targets-group-4: $(GROUP_4_TARGETS)" $(V0) @echo "targets-group-2: $(GROUP_2_TARGETS)"
$(V0) @echo "targets-group-rest: $(GROUP_OTHER_TARGETS)" $(V0) @echo "targets-group-3: $(GROUP_3_TARGETS)"
$(V0) @echo "targets-group-4: $(GROUP_4_TARGETS)"
$(V0) @echo "targets-group-rest: $(GROUP_OTHER_TARGETS)"
## test : run the cleanflight test suite ## test : run the cleanflight test suite
## junittest : run the cleanflight test suite, producing Junit XML result files. ## junittest : run the cleanflight test suite, producing Junit XML result files.

26
make/targets.mk
View file

@ -1,4 +1,4 @@
OFFICIAL_TARGETS = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 CC3D FURYF4 NAZE REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO SPRACINGF3NEO SPRACINGF4EVO STM32F3DISCOVERY OFFICIAL_TARGETS = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 FURYF4 REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO SPRACINGF3NEO SPRACINGF4EVO STM32F3DISCOVERY
SKIP_TARGETS := ALIENWHOOP MOTOLABF4 SKIP_TARGETS := ALIENWHOOP MOTOLABF4
ALT_TARGETS = $(sort $(filter-out target, $(basename $(notdir $(wildcard $(ROOT)/src/main/target/*/*.mk))))) ALT_TARGETS = $(sort $(filter-out target, $(basename $(notdir $(wildcard $(ROOT)/src/main/target/*/*.mk)))))
OPBL_TARGETS = $(filter %_OPBL, $(ALT_TARGETS)) OPBL_TARGETS = $(filter %_OPBL, $(ALT_TARGETS))
@ -15,30 +15,36 @@ ALTERNATES := $(sort $(filter-out target, $(basename $(notdir $(wildcard $(RO
$(error The target specified, $(TARGET), cannot be built. Use one of the ALT targets: $(ALTERNATES)) $(error The target specified, $(TARGET), cannot be built. Use one of the ALT targets: $(ALTERNATES))
endif endif
GROUP_1_TARGETS := \ UNSUPPORTED_TARGETS := \
AFROMINI \ AFROMINI \
ALIENFLIGHTF1 \
BEEBRAIN \
CC3D \
CC3D_OPBL \
CJMCU \
MICROSCISKY \
NAZE
SUPPORTED_TARGETS := $(filter-out $(UNSUPPORTED_TARGETS), $(VALID_TARGETS))
GROUP_1_TARGETS := \
AIORACERF3 \ AIORACERF3 \
AIR32 \ AIR32 \
AIRBOTF4 \ AIRBOTF4 \
AIRBOTF4SD \ AIRBOTF4SD \
AIRHEROF3 \ AIRHEROF3 \
ALIENFLIGHTF1 \
ALIENFLIGHTF3 \ ALIENFLIGHTF3 \
ALIENFLIGHTF4 \ ALIENFLIGHTF4 \
ALIENFLIGHTNGF7 \ ALIENFLIGHTNGF7 \
ALIENWHOOPF4 \ ALIENWHOOPF4 \
ALIENWHOOPF7 \ ALIENWHOOPF7 \
ANYFCF7 \ ANYFCF7 \
BEEBRAIN \
BEEROTORF4 \ BEEROTORF4 \
BETAFLIGHTF3 \ BETAFLIGHTF3 \
BLUEJAYF4 \ BLUEJAYF4
CC3D \
CC3D_OPBL
GROUP_2_TARGETS := \ GROUP_2_TARGETS := \
CHEBUZZF3 \ CHEBUZZF3 \
CJMCU \
CLRACINGF4 \ CLRACINGF4 \
COLIBRI \ COLIBRI \
COLIBRI_OPBL \ COLIBRI_OPBL \
@ -69,12 +75,10 @@ GROUP_3_TARGETS := \
KIWIF4 \ KIWIF4 \
LUX_RACE \ LUX_RACE \
LUXV2_RACE \ LUXV2_RACE \
MICROSCISKY \
MLTEMPF4 \ MLTEMPF4 \
MLTYPHF4 \ MLTYPHF4 \
MOTOLAB \ MOTOLAB \
MULTIFLITEPICO \ MULTIFLITEPICO \
NAZE \
NERO \ NERO \
NUCLEOF7 \ NUCLEOF7 \
OMNIBUS \ OMNIBUS \
@ -106,7 +110,7 @@ GROUP_4_TARGETS := \
STM32F3DISCOVERY \ STM32F3DISCOVERY \
TINYBEEF3 TINYBEEF3
GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS), $(VALID_TARGETS)) GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS), $(SUPPORTED_TARGETS))
ifeq ($(filter $(TARGET),$(ALT_TARGETS)), $(TARGET)) ifeq ($(filter $(TARGET),$(ALT_TARGETS)), $(TARGET))
BASE_TARGET := $(firstword $(subst /,, $(subst ./src/main/target/,, $(dir $(wildcard $(ROOT)/src/main/target/*/$(TARGET).mk))))) BASE_TARGET := $(firstword $(subst /,, $(subst ./src/main/target/,, $(dir $(wildcard $(ROOT)/src/main/target/*/$(TARGET).mk)))))

4
src/main/build/version.c
View file

@ -21,3 +21,7 @@ const char * const targetName = __TARGET__;
const char * const shortGitRevision = __REVISION__; const char * const shortGitRevision = __REVISION__;
const char * const buildDate = __DATE__; const char * const buildDate = __DATE__;
const char * const buildTime = __TIME__; const char * const buildTime = __TIME__;
#ifdef STM32F1
#warning STM32F1 based targets are unsupported as of Betaflight 3.3.
#endif