From dfedfc0d82edcf46a86e56a44925242ae09b0697 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 8 Nov 2023 09:35:40 -0500 Subject: [PATCH] one variable per line is usually better --- firmware/config/boards/core8/board.mk | 4 ++-- firmware/config/boards/cypress/config.mk | 5 +++-- firmware/config/boards/hellen/harley81/board.mk | 3 ++- firmware/config/boards/nucleo_f429/board.mk | 3 ++- firmware/config/boards/nucleo_f767/board.mk | 3 ++- firmware/config/boards/nucleo_h743/board.mk | 3 ++- firmware/config/boards/proteus/board.mk | 9 ++++++--- firmware/config/boards/s105/board.mk | 3 ++- firmware/config/boards/subaru_eg33/board.mk | 3 ++- firmware/config/boards/tdg-pdm8/board.mk | 4 +++- firmware/config/boards/test-build-guards/board.mk | 3 ++- 11 files changed, 28 insertions(+), 15 deletions(-) diff --git a/firmware/config/boards/core8/board.mk b/firmware/config/boards/core8/board.mk index 33e1f3f11b..55030037b4 100644 --- a/firmware/config/boards/core8/board.mk +++ b/firmware/config/boards/core8/board.mk @@ -1,7 +1,7 @@ # List of all the board related files. BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -# Override DEFAULT_ENGINE_TYPE -DDEFS += -DSHORT_BOARD_NAME=core8 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CORE8 +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CORE8 +DDEFS += -DSHORT_BOARD_NAME=core8 DDEFS += -DFIRMWARE_ID=\"core8\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS diff --git a/firmware/config/boards/cypress/config.mk b/firmware/config/boards/cypress/config.mk index bd4c8acf88..d8e37e387c 100644 --- a/firmware/config/boards/cypress/config.mk +++ b/firmware/config/boards/cypress/config.mk @@ -9,8 +9,9 @@ CYPRESS_CONTRIB = $(BOARD_DIR)/OS GENERATED_ENUMS_DIR = $(BOARD_DIR)/config/controllers/algo -EXTRA_PARAMS += -DFIRMWARE_ID=\"cypress\" -DSHORT_BOARD_NAME=cypress -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CYPRESS -# -nodefaultlibs -lc -lgcc -ltinyc +EXTRA_PARAMS += -DFIRMWARE_ID=\"cypress\" +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CYPRESS +DDEFS += -DSHORT_BOARD_NAME=cypress # used by USE_SMART_BUILD CONFDIR = $(BOARD_DIR) diff --git a/firmware/config/boards/hellen/harley81/board.mk b/firmware/config/boards/hellen/harley81/board.mk index 00ac1ca6f3..33b9bece39 100644 --- a/firmware/config/boards/hellen/harley81/board.mk +++ b/firmware/config/boards/hellen/harley81/board.mk @@ -14,6 +14,7 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk # Enable serial pins on expansion header DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HARLEY81 -DDEFS += -DSHORT_BOARD_NAME=harley81 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HARLEY81 +DDEFS += -DSHORT_BOARD_NAME=harley81 diff --git a/firmware/config/boards/nucleo_f429/board.mk b/firmware/config/boards/nucleo_f429/board.mk index 6b1590aadb..799367d521 100644 --- a/firmware/config/boards/nucleo_f429/board.mk +++ b/firmware/config/boards/nucleo_f429/board.mk @@ -12,4 +12,5 @@ IS_STM32F429 = yes DDEFS += -DFIRMWARE_ID=\"nucleo_f429\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS -DDEFS += -DSHORT_BOARD_NAME=nucleo_f429 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F429 +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F429 +DDEFS += -DSHORT_BOARD_NAME=nucleo_f429 diff --git a/firmware/config/boards/nucleo_f767/board.mk b/firmware/config/boards/nucleo_f767/board.mk index fc889de6d2..53b6f7975f 100644 --- a/firmware/config/boards/nucleo_f767/board.mk +++ b/firmware/config/boards/nucleo_f767/board.mk @@ -16,4 +16,5 @@ DDEFS += -DEFI_ETHERNET=TRUE DDEFS += -DFIRMWARE_ID=\"nucleo_f767\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS -DDEFS += -DSHORT_BOARD_NAME=nucleo_f767 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F767 +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F767 +DDEFS += -DSHORT_BOARD_NAME=nucleo_f767 diff --git a/firmware/config/boards/nucleo_h743/board.mk b/firmware/config/boards/nucleo_h743/board.mk index c0d74450e9..3a5c07458d 100644 --- a/firmware/config/boards/nucleo_h743/board.mk +++ b/firmware/config/boards/nucleo_h743/board.mk @@ -11,4 +11,5 @@ DDEFS += -DEFI_ETHERNET=TRUE DDEFS += -DFIRMWARE_ID=\"nucleo_h743\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS -DDEFS += -DSHORT_BOARD_NAME=nucleo_h743 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_H743 +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_H743 +DDEFS += -DSHORT_BOARD_NAME=nucleo_h743 diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index fe7c6037dc..4867d76af1 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -37,14 +37,17 @@ endif DDEFS += -DHW_PROTEUS=1 ifeq ($(PROJECT_CPU),ARCH_STM32F7) - DDEFS += -DSHORT_BOARD_NAME=proteus_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F7 + DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F7 + DDEFS += -DSHORT_BOARD_NAME=proteus_f7 ifeq ($(DEBUG_LEVEL_OPT),) DEBUG_LEVEL_OPT = -Os -ggdb -g endif else ifeq ($(PROJECT_CPU),ARCH_STM32F4) - DDEFS += -DSHORT_BOARD_NAME=proteus_f4 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F4 + DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F4 + DDEFS += -DSHORT_BOARD_NAME=proteus_f4 else ifeq ($(PROJECT_CPU),ARCH_STM32H7) - DDEFS += -DSHORT_BOARD_NAME=proteus_h7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_H7 + DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_H7 + DDEFS += -DSHORT_BOARD_NAME=proteus_h7 else $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)]) endif diff --git a/firmware/config/boards/s105/board.mk b/firmware/config/boards/s105/board.mk index 295b716b5c..2d184eb605 100644 --- a/firmware/config/boards/s105/board.mk +++ b/firmware/config/boards/s105/board.mk @@ -4,7 +4,8 @@ HALCONFDIR = $(BOARD_DIR) BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp # This is S105 board -DDEFS += -DSHORT_BOARD_NAME=s105 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_S105 +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_S105 +DDEFS += -DSHORT_BOARD_NAME=s105 # This board has no LSE and HSE oscillators DDEFS += -DSTM32_HSE_ENABLED=FALSE diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk index 7724907bda..fcd4c15f3d 100644 --- a/firmware/config/boards/subaru_eg33/board.mk +++ b/firmware/config/boards/subaru_eg33/board.mk @@ -18,8 +18,9 @@ DDEFS += -DLED_PIN_MODE=OM_INVERTED # We are running on Subaru EG33 hardware! DDEFS += -DHW_SUBARU_EG33=1 DDEFS += -DFIRMWARE_ID=\"EG33\" +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SUBARU_EG33_F7 -DDEFS += -DSHORT_BOARD_NAME=subaru_eg33_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SUBARU_EG33_F7 +DDEFS += -DSHORT_BOARD_NAME=subaru_eg33_f7 # Override DEFAULT_ENGINE_TYPE DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::SUBARUEG33_DEFAULTS diff --git a/firmware/config/boards/tdg-pdm8/board.mk b/firmware/config/boards/tdg-pdm8/board.mk index 0ff8fe6d7e..164afe0a5d 100644 --- a/firmware/config/boards/tdg-pdm8/board.mk +++ b/firmware/config/boards/tdg-pdm8/board.mk @@ -9,5 +9,7 @@ DDEFS += -DEFI_USB_SERIAL=FALSE # We're running on TDG PDM hardware! DDEFS += -DHW_TDG_PDM8=1 -DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\" -DSHORT_BOARD_NAME=tdg-pdm8 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TDG_PDM8 +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TDG_PDM8 +DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\" +DDEFS += -DSHORT_BOARD_NAME=tdg-pdm8 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS diff --git a/firmware/config/boards/test-build-guards/board.mk b/firmware/config/boards/test-build-guards/board.mk index 993a6eba24..846a9c4629 100644 --- a/firmware/config/boards/test-build-guards/board.mk +++ b/firmware/config/boards/test-build-guards/board.mk @@ -1,7 +1,8 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp DDEFS += -DFIRMWARE_ID=\"t-b-g\" -DDEFS += -DSHORT_BOARD_NAME=t-b-g -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TBG +DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TBG +DDEFS += -DSHORT_BOARD_NAME=t-b-g DDEFS += -DHAL_USE_ADC=FALSE DDEFS += -DHAL_USE_GPT=FALSE \ No newline at end of file