From 1e7b7868e98c8bd337c2f38123c4eb4521ae9df6 Mon Sep 17 00:00:00 2001 From: J Blackman Date: Sat, 18 Feb 2023 11:00:22 +1100 Subject: [PATCH] 4.4.1: Adding support for building by config (#12376) Adding support for config.h (FIX: SPRACING) --- Makefile | 126 +++++++++++++++++++--------- make/source.mk | 6 -- src/config/SPRACINGH7EXTREME/config.h | 105 +++++++++++++++++++++++ src/config/SPRACINGH7RF/config.h | 151 ++++++++++++++++++++++++++++++++++ src/main/build/version.h | 2 +- src/main/platform.h | 4 +- 6 files changed, 346 insertions(+), 48 deletions(-) create mode 100644 src/config/SPRACINGH7EXTREME/config.h create mode 100644 src/config/SPRACINGH7RF/config.h diff --git a/Makefile b/Makefile index 56132fb16..cfe682b13 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,9 @@ # # The target to build, see VALID_TARGETS below -TARGET ?= STM32F405 -BOARD ?= +DEFAULT_TARGET ?= STM32F405 +TARGET ?= +CONFIG ?= # Compile-time options OPTIONS ?= @@ -80,8 +81,9 @@ include $(ROOT)/make/system-id.mk include $(ROOT)/make/checks.mk # configure some directories that are relative to wherever ROOT_DIR is located -TOOLS_DIR ?= $(ROOT)/tools -DL_DIR := $(ROOT)/downloads +TOOLS_DIR ?= $(ROOT)/tools +DL_DIR := $(ROOT)/downloads +CONFIG_DIR ?= $(ROOT)/src/config export RM := rm @@ -97,13 +99,35 @@ HSE_VALUE ?= 8000000 # used for turning on features like VCP and SDCARD FEATURES = -ifneq ($(BOARD),) -# silently ignore if the file is not present. Allows for target defaults. --include $(ROOT)/src/main/board/$(BOARD)/board.mk +ifneq ($(CONFIG),) + +ifneq ($(TARGET),) +$(error TARGET or CONFIG should be specified. Not both.) +endif + +INCLUDE_DIRS += $(CONFIG_DIR)/$(CONFIG) +CONFIG_FILE := $(CONFIG_DIR)/$(CONFIG)/config.h + +ifeq ($(wildcard $(CONFIG_FILE)),) +$(error Config file not found: $(CONFIG_FILE)) endif +TARGET := $(shell grep " FC_TARGET_MCU" $(CONFIG_FILE) | awk '{print $$3}' ) + +ifeq ($(TARGET),) +$(error No TARGET identified. Is the config.h valid for $(CONFIG)?) +endif + +else +ifeq ($(TARGET),) +TARGET := $(DEFAULT_TARGET) +endif +endif #CONFIG + include $(ROOT)/make/targets.mk +BASE_CONFIGS = $(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(ROOT)/src/config/*/config.h))))) + REVISION := norevision ifeq ($(shell git diff --shortstat),) REVISION := $(shell git log -1 --format="%h") @@ -151,6 +175,10 @@ VPATH := $(VPATH):$(ROOT)/make # start specific includes include $(ROOT)/make/mcu/$(TARGET_MCU).mk +ifneq ($(CONFIG),) +TARGET_FLAGS += -DUSE_CONFIG +endif + # openocd specific includes include $(ROOT)/make/openocd.mk @@ -283,28 +311,38 @@ CPPCHECK = cppcheck $(CSOURCES) --enable=all --platform=unix64 \ $(addprefix -I,$(INCLUDE_DIRS)) \ -I/usr/include -I/usr/include/linux -TARGET_BASENAME = $(BIN_DIR)/$(FORKNAME)_$(FC_VER)_$(TARGET) +TARGET_NAME := $(TARGET) + +ifneq ($(CONFIG),) +TARGET_NAME := $(TARGET_NAME)_$(CONFIG) +endif + +ifeq ($(REV),yes) +TARGET_NAME := $(TARGET_NAME)_$(REVISION) +endif + +TARGET_FULLNAME = $(FORKNAME)_$(FC_VER)_$(TARGET_NAME) # # Things we will build # -TARGET_BIN = $(TARGET_BASENAME).bin -TARGET_HEX = $(TARGET_BASENAME).hex -TARGET_HEX_REV = $(TARGET_BASENAME)_$(REVISION).hex -TARGET_DFU = $(TARGET_BASENAME).dfu -TARGET_ZIP = $(TARGET_BASENAME).zip -TARGET_ELF = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).elf -TARGET_EXST_ELF = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET)_EXST.elf -TARGET_UNPATCHED_BIN = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET)_UNPATCHED.bin -TARGET_LST = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).lst -TARGET_OBJS = $(addsuffix .o,$(addprefix $(OBJECT_DIR)/$(TARGET)/,$(basename $(SRC)))) -TARGET_DEPS = $(addsuffix .d,$(addprefix $(OBJECT_DIR)/$(TARGET)/,$(basename $(SRC)))) -TARGET_MAP = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).map - -TARGET_EXST_HASH_SECTION_FILE = $(OBJECT_DIR)/$(TARGET)/exst_hash_section.bin +TARGET_BIN = $(BIN_DIR)/$(TARGET_FULLNAME).bin +TARGET_HEX = $(BIN_DIR)/$(TARGET_FULLNAME).hex +TARGET_DFU = $(BIN_DIR)/$(TARGET_FULLNAME).dfu +TARGET_ZIP = $(BIN_DIR)/$(TARGET_FULLNAME).zip +TARGET_OBJ_DIR = $(OBJECT_DIR)/$(TARGET_NAME) +TARGET_ELF = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET_NAME).elf +TARGET_EXST_ELF = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET_NAME)_EXST.elf +TARGET_UNPATCHED_BIN = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET_NAME)_UNPATCHED.bin +TARGET_LST = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET_NAME).lst +TARGET_OBJS = $(addsuffix .o,$(addprefix $(TARGET_OBJ_DIR)/,$(basename $(SRC)))) +TARGET_DEPS = $(addsuffix .d,$(addprefix $(TARGET_OBJ_DIR)/,$(basename $(SRC)))) +TARGET_MAP = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET_NAME).map + +TARGET_EXST_HASH_SECTION_FILE = $(TARGET_OBJ_DIR)/exst_hash_section.bin TARGET_EF_HASH := $(shell echo -n "$(EXTRA_FLAGS)" | openssl dgst -md5 | awk '{print $$2;}') -TARGET_EF_HASH_FILE := $(OBJECT_DIR)/$(TARGET)/.efhash_$(TARGET_EF_HASH) +TARGET_EF_HASH_FILE := $(TARGET_OBJ_DIR)/.efhash_$(TARGET_EF_HASH) CLEAN_ARTIFACTS := $(TARGET_BIN) CLEAN_ARTIFACTS += $(TARGET_HEX_REV) $(TARGET_HEX) @@ -313,7 +351,7 @@ CLEAN_ARTIFACTS += $(TARGET_LST) CLEAN_ARTIFACTS += $(TARGET_DFU) # Make sure build date and revision is updated on every incremental build -$(OBJECT_DIR)/$(TARGET)/build/version.o : $(SRC) +$(TARGET_OBJ_DIR)/build/version.o : $(SRC) # List of buildable ELF files and their object dependencies. # It would be nice to compute these lists, but that seems to be just beyond make. @@ -382,7 +420,7 @@ $(TARGET_HEX): $(TARGET_BIN) endif $(TARGET_ELF): $(TARGET_OBJS) $(LD_SCRIPT) $(LD_SCRIPTS) - @echo "Linking $(TARGET)" "$(STDOUT)" + @echo "Linking $(TARGET_NAME)" "$(STDOUT)" $(V1) $(CROSS_CC) -o $@ $(filter-out %.ld,$^) $(LD_FLAGS) $(V1) $(SIZE) $(TARGET_ELF) @@ -395,7 +433,7 @@ define compile_file endef ifeq ($(DEBUG),GDB) -$(OBJECT_DIR)/$(TARGET)/%.o: %.c +$(TARGET_OBJ_DIR)/%.o: %.c $(V1) mkdir -p $(dir $@) $(V1) $(if $(findstring $<,$(NOT_OPTIMISED_SRC)), \ $(call compile_file,not optimised, $(CC_NO_OPTIMISATION)) \ @@ -403,7 +441,7 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.c $(call compile_file,debug,$(CC_DEBUG_OPTIMISATION)) \ ) else -$(OBJECT_DIR)/$(TARGET)/%.o: %.c +$(TARGET_OBJ_DIR)/%.o: %.c $(V1) mkdir -p $(dir $@) $(V1) $(if $(findstring $<,$(NOT_OPTIMISED_SRC)), \ $(call compile_file,not optimised,$(CC_NO_OPTIMISATION)) \ @@ -421,12 +459,12 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.c endif # Assemble -$(OBJECT_DIR)/$(TARGET)/%.o: %.s +$(TARGET_OBJ_DIR)/%.o: %.s $(V1) mkdir -p $(dir $@) @echo "%% $(notdir $<)" "$(STDOUT)" $(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $< -$(OBJECT_DIR)/$(TARGET)/%.o: %.S +$(TARGET_OBJ_DIR)/%.o: %.S $(V1) mkdir -p $(dir $@) @echo "%% $(notdir $<)" "$(STDOUT)" $(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $< @@ -438,22 +476,28 @@ all: $(CI_TARGETS) ## all_all : Build all targets (including legacy / unsupported) all_all: $(VALID_TARGETS) -$(VALID_TARGETS): +$(BASE_TARGETS): $(V0) @echo "Building $@" && \ $(MAKE) hex TARGET=$@ && \ echo "Building $@ succeeded." +$(BASE_CONFIGS): + $(V0) @echo "Building config $@" && \ + $(MAKE) hex CONFIG=$@ && \ + echo "Building config $@ succeeded." + $(NOBUILD_TARGETS): $(MAKE) TARGET=$@ TARGETS_CLEAN = $(addsuffix _clean,$(VALID_TARGETS)) +CONFIGS_CLEAN = $(addsuffix _clean,$(BASE_CONFIGS)) ## clean : clean up temporary / machine-generated files clean: - @echo "Cleaning $(TARGET)" + @echo "Cleaning $(TARGET_NAME)" $(V0) rm -f $(CLEAN_ARTIFACTS) - $(V0) rm -rf $(OBJECT_DIR)/$(TARGET) - @echo "Cleaning $(TARGET) succeeded." + $(V0) rm -rf $(TARGET_OBJ_DIR) + @echo "Cleaning $(TARGET_NAME) succeeded." ## test_clean : clean up temporary / machine-generated files (tests) test-%_clean: @@ -466,6 +510,10 @@ test_clean: $(TARGETS_CLEAN): $(V0) $(MAKE) -j TARGET=$(subst _clean,,$@) clean +## _clean : clean up one specific config (alias for above) +$(CONFIGS_CLEAN): + $(V0) $(MAKE) -j CONFIG=$(subst _clean,,$@) clean + ## clean_all : clean all valid targets clean_all: $(TARGETS_CLEAN) test_clean @@ -526,10 +574,7 @@ hex: TARGETS_REVISION = $(addsuffix _rev,$(VALID_TARGETS)) ## _rev : build target and add revision to filename $(TARGETS_REVISION): - $(V0) $(MAKE) hex_rev TARGET=$(subst _rev,,$@) - -hex_rev: hex - $(V0) mv -f $(TARGET_HEX) $(TARGET_HEX_REV) + $(V0) $(MAKE) hex REV=yes TARGET=$(subst _rev,,$@) all_rev: $(addsuffix _rev,$(CI_TARGETS)) @@ -578,6 +623,9 @@ targets: @echo "Built targets: $(CI_TARGETS)" @echo "Default target: $(TARGET)" +configs: + @echo "Valid configs: $(BASE_CONFIGS)" + targets-ci-print: @echo $(CI_TARGETS) @@ -645,12 +693,12 @@ test_%: $(TARGET_EF_HASH_FILE): $(V1) mkdir -p $(dir $@) - $(V0) rm -f $(OBJECT_DIR)/$(TARGET)/.efhash_* + $(V0) rm -f $(TARGET_OBJ_DIR)/.efhash_* @echo "EF HASH -> $(TARGET_EF_HASH_FILE)" $(V1) touch $(TARGET_EF_HASH_FILE) # rebuild everything when makefile changes or the extra flags have changed -$(TARGET_OBJS): $(TARGET_EF_HASH_FILE) Makefile $(TARGET_DIR)/target.mk $(wildcard make/*) +$(TARGET_OBJS): $(TARGET_EF_HASH_FILE) Makefile $(TARGET_DIR)/target.mk $(wildcard make/*) $(CONFIG_FILE) # include auto-generated dependencies -include $(TARGET_DEPS) diff --git a/make/source.mk b/make/source.mk index 92ea4a2aa..e2c897cb2 100644 --- a/make/source.mk +++ b/make/source.mk @@ -451,12 +451,6 @@ SRC += $(MSC_SRC) endif # end target specific make file checks -ifneq ($(BOARD),) -SRC += board/$(BOARD)/board.c -INCLUDE_DIRS += $(ROOT)/src/main/board/$(BOARD) -TARGET_FLAGS := -D'__BOARD__="$(BOARD)"' $(TARGET_FLAGS) -endif - # Search path and source files for the ST stdperiph library VPATH := $(VPATH):$(STDPERIPH_DIR)/src diff --git a/src/config/SPRACINGH7EXTREME/config.h b/src/config/SPRACINGH7EXTREME/config.h new file mode 100644 index 000000000..a4bdfe2f7 --- /dev/null +++ b/src/config/SPRACINGH7EXTREME/config.h @@ -0,0 +1,105 @@ +/* + * This file is part of Betaflight. + * + * Betaflight is free software. You can redistribute this software + * and/or modify this software under the terms of the GNU General + * Public License as published by the Free Software Foundation, + * either version 3 of the License, or (at your option) any later + * version. + * + * Betaflight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software. + * + * If not, see . + */ + +/* + This file has been auto generated from unified-targets repo. + + The auto generation is transitional only. +*/ + +#define FC_TARGET_MCU STM32H750 + +#define BOARD_NAME SPRACINGH7EXTREME +#define MANUFACTURER_ID SPRO + +#define TARGET_BOARD_IDENTIFIER "SP7E" +#define USBD_PRODUCT_STRING "SPRacingH7EXTREME" +#define EEPROM_SIZE 8192 +#define USE_SPRACING_PERSISTENT_RTC_WORKAROUND +#define USE_BUTTONS +#define BUTTON_A_PIN PE4 +#define BUTTON_A_PIN_INVERTED +#define BUTTON_B_PIN PE4 +#define BUTTON_B_PIN_INVERTED +#define USE_QUADSPI +#define USE_QUADSPI_DEVICE_1 +#define QUADSPI1_SCK_PIN PB2 +#define QUADSPI1_BK1_IO0_PIN PD11 +#define QUADSPI1_BK1_IO1_PIN PD12 +#define QUADSPI1_BK1_IO2_PIN PE2 +#define QUADSPI1_BK1_IO3_PIN PD13 +#define QUADSPI1_BK1_CS_PIN PB10 +#define QUADSPI1_BK2_IO0_PIN PE7 +#define QUADSPI1_BK2_IO1_PIN PE8 +#define QUADSPI1_BK2_IO2_PIN PE9 +#define QUADSPI1_BK2_IO3_PIN PE10 +#define QUADSPI1_BK2_CS_PIN NONE +#define QUADSPI1_MODE QUADSPI_MODE_BK1_ONLY +#define QUADSPI1_CS_FLAGS (QUADSPI_BK1_CS_HARDWARE | QUADSPI_BK2_CS_NONE | QUADSPI_CS_MODE_LINKED) +#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT +#define FLASH_QUADSPI_INSTANCE QUADSPI +#define CONFIG_IN_EXTERNAL_FLASH +#define SDCARD_DETECT_PIN PD10 +#define SDCARD_DETECT_INVERTED +#define SDIO_DEVICE SDIODEV_1 +#define SDIO_USE_4BIT 1 +#define SDIO_CK_PIN PC12 +#define SDIO_CMD_PIN PD2 +#define SDIO_D0_PIN PC8 +#define SDIO_D1_PIN PC9 +#define SDIO_D2_PIN PC10 +#define SDIO_D3_PIN PC11 +#define USE_SPI +#define USE_SPI_DEVICE_2 +#define SPI2_SCK_PIN PD3 +#define SPI2_MISO_PIN PC2 +#define SPI2_MOSI_PIN PC3 +#define SPI2_NSS_PIN PB12 +#define USE_SPI_DEVICE_3 +#define SPI3_SCK_PIN PB3 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PD6 +#define SPI3_NSS_PIN PA15 +#define USE_SPI_DEVICE_4 +#define SPI4_SCK_PIN PE12 +#define SPI4_MISO_PIN PE13 +#define SPI4_MOSI_PIN PE14 +#define SPI4_NSS_PIN PE11 +#define USE_USB_ID +#define USE_I2C +#define USE_I2C_DEVICE_1 +#define I2C1_SCL PB8 +#define I2C1_SDA PB9 +#define I2C_DEVICE (I2CDEV_1) +#define ENSURE_MPU_DATA_READY_IS_LOW +#define USE_PID_AUDIO +#define VTX_RTC6705_OPTIONAL +#define ADC1_DMA_OPT 8 +#define ADC3_DMA_OPT 9 +#define USE_ACC_SPI_MPU6500 +#define USE_GYRO_SPI_MPU6500 +#define USE_BARO_BMP388 +#define USE_MAG_HMC5883 +#define USE_MAG_QMC5883 +#define USE_FLASH_W25N01G +#define USE_SDCARD +#define USE_CAMERA_CONTROL +#define USE_MAX7456 diff --git a/src/config/SPRACINGH7RF/config.h b/src/config/SPRACINGH7RF/config.h new file mode 100644 index 000000000..3436f0f19 --- /dev/null +++ b/src/config/SPRACINGH7RF/config.h @@ -0,0 +1,151 @@ +/* + * This file is part of Betaflight. + * + * Betaflight is free software. You can redistribute this software + * and/or modify this software under the terms of the GNU General + * Public License as published by the Free Software Foundation, + * either version 3 of the License, or (at your option) any later + * version. + * + * Betaflight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software. + * + * If not, see . + */ + +/* + This file has been auto generated from unified-targets repo. + + The auto generation is transitional only. +*/ + +#define FC_TARGET_MCU STM32H730 + +#define BOARD_NAME SPRACINGH7RF +#define MANUFACTURER_ID SPRO + +#define TARGET_BOARD_IDENTIFIER "SP7R" +#define USBD_PRODUCT_STRING "SPRacingH7RF" +#define EEPROM_SIZE 8192 +#define USE_SPRACING_PERSISTENT_RTC_WORKAROUND +#define USE_BUTTONS +#define BUTTON_A_PIN PE4 +#define BUTTON_A_PIN_INVERTED +#define BUTTON_B_PIN PE4 +#define BUTTON_B_PIN_INVERTED +#define USE_OCTOSPI +#define USE_OCTOSPI_DEVICE_1 +#define USE_SPI +#define USE_SPI_DEVICE_2 +#define SPI2_SCK_PIN PD3 +#define SPI2_MISO_PIN PB14 +#define SPI2_MOSI_PIN PB15 +#define SPI2_NSS_PIN PB12 +#define USE_SPI_DEVICE_6 +#define SPI6_SCK_PIN PB3 +#define SPI6_MISO_PIN PB4 +#define SPI6_MOSI_PIN PB5 +#define SPI6_NSS_PIN PA15 +#define SX1280_BUSY_PIN PC7 +#define SX1280_DIO1_PIN PC6 +#define SX1280_DIO2_PIN PD4 +#define SX1280_DIO3_PIN NONE +#define USE_FLASH_MEMORY_MAPPED +#define FLASH_OCTOSPI_INSTANCE OCTOSPI1 +#define CONFIG_IN_MEMORY_MAPPED_FLASH +#define USE_FIRMWARE_PARTITION +#define SDCARD_DETECT_PIN PC13 +#define SDCARD_DETECT_INVERTED +#define SDIO_DEVICE SDIODEV_1 +#define SDIO_USE_4BIT 1 +#define SDIO_CK_PIN PC12 +#define SDIO_CMD_PIN PD2 +#define SDIO_D0_PIN PC8 +#define SDIO_D1_PIN PC9 +#define SDIO_D2_PIN PC10 +#define SDIO_D3_PIN PC11 +#define TARGET_IO_PORTA 0xffff +#define TARGET_IO_PORTB (0xffff & ~(BIT(2)|BIT(6))) +#define TARGET_IO_PORTC 0xffff +#define TARGET_IO_PORTD (0xffff & ~(BIT(11)|BIT(12)|BIT(13))) +#define TARGET_IO_PORTE (0xffff & ~(BIT(2)|BIT(7)|BIT(8)|BIT(9)|BIT(10))) +#define TARGET_IO_PORTF 0xffff +#define TARGET_IO_PORTG 0xffff +#define TARGET_IO_PORTH 0xffff +#define USE_I2C +#define USE_I2C_DEVICE_1 +#define I2C1_SCL PB8 +#define I2C1_SDA PB9 +#define USE_I2C_DEVICE_2 +#define I2C2_SCL PB10 +#define I2C2_SDA PB11 +#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE (I2CDEV_2) +#define USE_MPU_DATA_READY_SIGNAL +#define ENSURE_MPU_DATA_READY_IS_LOW +#define SX1280_BUSY_PIN PC7 +#define SX1280_DIO1_PIN PC6 +#define SX1280_DIO2_PIN PD4 +#define SX1280_DIO3_PIN NONE +#define SX1280_NRESET_PIN PD10 +#define USE_RX_SPI +#define USE_RX_EXPRESSLRS +#define USE_RX_SX1280 +#define RX_SPI_INSTANCE SPI2 +#define RX_NSS_PIN SPI2_NSS_PIN +#define RX_SPI_EXTI_PIN SX1280_DIO1_PIN +#define RX_EXPRESSLRS_SPI_RESET_PIN SX1280_NRESET_PIN +#define RX_EXPRESSLRS_SPI_BUSY_PIN SX1280_BUSY_PIN +#define RX_EXPRESSLRS_TIMER_INSTANCE TIM6 +#define DEFAULT_RX_FEATURE FEATURE_RX_SPI +#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS +#define ADC3_DMA_OPT 10 +#define ADC_INSTANCE ADC3 +#define ADC1_INSTANCE ADC1 +#define ADC3_INSTANCE ADC3 +#define CURRENT_METER_2_ADC_PIN PC0 +#define CURRENT_METER_2_ADC_INSTANCE ADC3 +#define CURRENT_METER_1_ADC_PIN PC1 +#define CURRENT_METER_1_ADC_INSTANCE ADC3 +#define EXTERNAL1_ADC_PIN PC2 +#define EXTERNAL1_ADC_INSTANCE ADC3 +#define VBAT_ADC_PIN PC3 +#define VBAT_ADC_INSTANCE ADC3 +#define VIDEO_IN_ADC_PIN PC5 +#define VIDEO_OUT_ADC_PIN PC4 +#define RSSI_ADC_PIN CURRENT_METER_2_ADC_PIN +#define RSSI_ADC_INSTANCE CURRENT_METER_2_ADC_INSTANCE +#define CURRENT_METER_ADC_PIN CURRENT_METER_1_ADC_PIN +#define CURRENT_METER_ADC_INSTANCE CURRENT_METER_1_ADC_INSTANCE +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define VTX_ENABLE_PIN PC15 +#define PINIO1_PIN VTX_ENABLE_PIN +#define USE_ACC_SPI_ICM42605 +#define USE_ACC_SPI_ICM42688P +#define USE_GYRO_SPI_ICM42605 +#define USE_GYRO_SPI_ICM42688P +#define USE_BARO_BMP388 +#define USE_MAG_HMC5883 +#define USE_MAG_QMC5883 +#define USE_FLASH_W25Q128FV +#define USE_SDCARD +#define USE_OSD +#define SPRACING_PIXEL_OSD_BLACK_PIN PE12 +#define SPRACING_PIXEL_OSD_WHITE_PIN PE13 +#define SPRACING_PIXEL_OSD_MASK_ENABLE_PIN PE14 +#define SPRACING_PIXEL_OSD_WHITE_SOURCE_SELECT_PIN PE15 +#define SPRACING_PIXEL_OSD_SYNC_IN_PIN PE11 +#define SPRACING_PIXEL_OSD_SYNC_OUT_PIN PA8 +#define SPRACING_PIXEL_OSD_WHITE_SOURCE_PIN PA4 +#define SPRACING_PIXEL_OSD_VIDEO_THRESHOLD_DEBUG_PIN PA5 +#define SPRACING_PIXEL_OSD_PIXEL_DEBUG_1_PIN PE5 +#define SPRACING_PIXEL_OSD_PIXEL_DEBUG_2_PIN PE6 +#define SPRACING_PIXEL_OSD_PIXEL_GATING_DEBUG_PIN PB0 +#define SPRACING_PIXEL_OSD_PIXEL_BLANKING_DEBUG_PIN PB1 diff --git a/src/main/build/version.h b/src/main/build/version.h index 65f93eae1..ae74dcfaa 100644 --- a/src/main/build/version.h +++ b/src/main/build/version.h @@ -26,7 +26,7 @@ #define FC_FIRMWARE_IDENTIFIER "BTFL" #define FC_VERSION_MAJOR 4 // increment when a major release is made (big new feature, etc) #define FC_VERSION_MINOR 4 // increment when a minor release is made (small new feature, change etc) -#define FC_VERSION_PATCH_LEVEL 0 // increment when a bug is fixed +#define FC_VERSION_PATCH_LEVEL 1 // increment when a bug is fixed #define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL) diff --git a/src/main/platform.h b/src/main/platform.h index 3b3e19dd4..fb408352f 100644 --- a/src/main/platform.h +++ b/src/main/platform.h @@ -118,8 +118,8 @@ #include "target/common_pre.h" -#ifdef __BOARD__ -#include "board.h" +#ifdef USE_CONFIG +#include "config.h" #endif #include "target.h" -- 2.11.4.GIT