From dffb4ae4c241a77336cbe0e69aab48bf2550a6db Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 20 Jun 2023 23:35:17 -0500 Subject: [PATCH] F7 --- firmware/config/boards/hellen/alphax-4chan/board.mk | 6 +++--- firmware/config/boards/hellen/alphax-8chan/board.mk | 12 ++++++++++-- firmware/config/stm32f7ems/efifeatures.h | 3 +++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-4chan/board.mk b/firmware/config/boards/hellen/alphax-4chan/board.mk index e6a66dba03..7c9026c37e 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board.mk +++ b/firmware/config/boards/hellen/alphax-4chan/board.mk @@ -4,8 +4,8 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Turn off stuff proteus doesn't have/need -DDEFS += -DEFI_MAX_31855=FALSE -DBOARD_L9779_COUNT=0 -DBOARD_TLE8888_COUNT=0 +# Turn off stuff we don't have/need +DDEFS += -DBOARD_TLE8888_COUNT=0 # Add them all together DDEFS += -DFIRMWARE_ID=\"AlphaX-4chan\" @@ -20,7 +20,7 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk ifeq ($(PROJECT_CPU),ARCH_STM32F7) DDEFS += -DSHORT_BOARD_NAME=alphax-4chan-f7 - # TODO: why do I strugle to fit into flash? compare with Proteus + # TODO: why do I struggle to fit into flash? compare with Proteus DDEFS += -DCH_DBG_ENABLE_ASSERTS=FALSE else ifeq ($(PROJECT_CPU),ARCH_STM32F4) DDEFS += -DSHORT_BOARD_NAME=alphax-4chan diff --git a/firmware/config/boards/hellen/alphax-8chan/board.mk b/firmware/config/boards/hellen/alphax-8chan/board.mk index 4dbabf4bca..150000a3c1 100644 --- a/firmware/config/boards/hellen/alphax-8chan/board.mk +++ b/firmware/config/boards/hellen/alphax-8chan/board.mk @@ -15,9 +15,17 @@ DDEFS += -DADC_MUX_PIN=Gpio::B3 include $(BOARDS_DIR)/hellen/hellen-common144.mk -# serial ports only on F4 -ifeq ($(PROJECT_CPU),ARCH_STM32F4) +# Turn off stuff we don't have/need +DDEFS += -DBOARD_TLE8888_COUNT=0 + +ifeq ($(PROJECT_CPU),ARCH_STM32F7) + # TODO: why do I struggle to fit into flash? compare with Proteus + DDEFS += -DCH_DBG_ENABLE_ASSERTS=FALSE +else ifeq ($(PROJECT_CPU),ARCH_STM32F4) + # serial ports only on F4 DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) +else +$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)]) endif DDEFS += -DSHORT_BOARD_NAME=alphax-8chan diff --git a/firmware/config/stm32f7ems/efifeatures.h b/firmware/config/stm32f7ems/efifeatures.h index 73101d4504..c0d08c72f8 100644 --- a/firmware/config/stm32f7ems/efifeatures.h +++ b/firmware/config/stm32f7ems/efifeatures.h @@ -26,6 +26,9 @@ #undef EFI_MAX_31855 #define EFI_MAX_31855 FALSE +#undef BOARD_L9779_COUNT +#define BOARD_L9779_COUNT FALSE + #undef EFI_MCP_3208 #define EFI_MCP_3208 FALSE