one variable per line is usually better

This commit is contained in:
rusefillc 2023-11-07 15:47:24 -05:00
parent e3b624c464
commit c8ba68aa75
24 changed files with 58 additions and 29 deletions

View File

@ -27,6 +27,8 @@ DDEFS += -DEFI_FLASH_WRITE_THREAD=TRUE
DDEFS += -DFIRMWARE_ID=\"at_start_f435\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=at_start_f435 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_AT_START_F435
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_AT_START_F435
DDEFS += -DSHORT_BOARD_NAME=at_start_f435
DDEFS += -DEFI_BACKUP_SRAM=FALSE

View File

@ -15,5 +15,6 @@ DDEFS += -DHW_ATLAS=1
LWIP = yes
ALLOW_SHADOW = yes
DDEFS += -DEFI_ETHERNET=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ATLAS
DDEFS += -DSHORT_BOARD_NAME=atlas -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ATLAS
DDEFS += -DSHORT_BOARD_NAME=atlas

View File

@ -16,9 +16,10 @@ DDEFS += -DSTM32_FSMC_USE_FSMC1=TRUE -DSTM32_SDRAM_USE_SDRAM2=TRUE
DDEFS += -DHAL_USE_SDRAM=TRUE
DDEFS += -DHAL_USE_FSMC=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HABA208
# see signature_haba208.h
DDEFS += -DSHORT_BOARD_NAME=haba208 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HABA208
DDEFS += -DSHORT_BOARD_NAME=haba208
# Shared variables
ALLINC += $(BOARDINC)

View File

@ -18,8 +18,9 @@ DDEFS += -DSTM32_USB_USE_OTG1=FALSE
DDEFS += -DSTM32_USB_USE_OTG2=TRUE
DDEFS += -DHAL_USE_SDRAM=TRUE
DDEFS += -DHAL_USE_FSMC=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F429_DISCOVERY
DDEFS += -DSHORT_BOARD_NAME=f429-discovery -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F429_DISCOVERY
DDEFS += -DSHORT_BOARD_NAME=f429-discovery
# Shared variables
ALLINC += $(BOARDINC)

View File

@ -18,5 +18,7 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
DDEFS += -DSHORT_BOARD_NAME=alphax-2chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_2CHAN
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_2CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-2chan

View File

@ -22,7 +22,8 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += -DTRIGGER_SCOPE
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DSHORT_BOARD_NAME=alphax-4chan_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN_F7
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN_F7
DDEFS += -DSHORT_BOARD_NAME=alphax-4chan_f7
# TODO: why do I struggle to fit into flash? compare with Proteus
#Linker options, flash size
USE_OPT += -Wl,--defsym=FLASH_SIZE=768k
@ -30,7 +31,8 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::D6 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::D5
DDEFS += -DTS_PRIMARY_UxART_PORT=SD2 -DEFI_TS_PRIMARY_IS_SERIAL=TRUE -DSTM32_SERIAL_USE_USART2=TRUE -DSTM32_UART_USE_USART2=FALSE
else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DSHORT_BOARD_NAME=alphax-4chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-4chan
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])

View File

@ -28,5 +28,7 @@ else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif
DDEFS += -DSHORT_BOARD_NAME=alphax-8chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-8chan
DDEFS += -DHW_HELLEN_8CHAN=1

View File

@ -29,6 +29,7 @@ else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-8chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-8chan
DDEFS += -DHW_HELLEN_8CHAN=1

View File

@ -11,6 +11,7 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_GM_E67
DDEFS += -DSHORT_BOARD_NAME=hellen-gm-e67 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_GM_E67
DDEFS += -DSHORT_BOARD_NAME=hellen-gm-e67

View File

@ -17,8 +17,9 @@ DDEFS += -DADC_MUX_PIN=Gpio::F2
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen-honda-k\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_HONDA_K
DDEFS += -DSHORT_BOARD_NAME=hellen-honda-k -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_HONDA_K
DDEFS += -DSHORT_BOARD_NAME=hellen-honda-k
DDEFS += -DHW_HELLEN_K=TRUE
include $(BOARDS_DIR)/hellen/hellen-common144.mk

View File

@ -17,7 +17,7 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
# Enable serial pins on expansion header
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
DDEFS += -DSHORT_BOARD_NAME=hellen-nb1 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1
DDEFS += -DSHORT_BOARD_NAME=hellen-nb1
DDEFS += -DHW_HELLEN_NB1=1

View File

@ -15,8 +15,9 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
# bad temporary solution of hardware issue https://github.com/rusefi/rusefi/issues/4821
DDEFS += -DMAX_TPS_PPS_DISCREPANCY=10.0f
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121NISSAN
DDEFS += -DSHORT_BOARD_NAME=hellen121nissan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121NISSAN
DDEFS += -DSHORT_BOARD_NAME=hellen121nissan
include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += -DHW_HELLEN_NISSAN=1

View File

@ -18,8 +18,9 @@ ifeq ($(EFI_LUA_LOOKUP),)
EFI_LUA_LOOKUP = FALSE
endif
DDEFS += -DEFI_LUA_LOOKUP=$(EFI_LUA_LOOKUP)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121VAG
DDEFS += -DSHORT_BOARD_NAME=hellen121vag -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121VAG
DDEFS += -DSHORT_BOARD_NAME=hellen121vag
include $(BOARDS_DIR)/hellen/hellen-common176.mk

View File

@ -14,8 +14,9 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_128
DDEFS += -DSHORT_BOARD_NAME=hellen128 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_128
DDEFS += -DSHORT_BOARD_NAME=hellen128
include $(BOARDS_DIR)/hellen/hellen-common176.mk

View File

@ -15,8 +15,9 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_154_HYUNDAI
DDEFS += -DSHORT_BOARD_NAME=hellen154hyundai -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_154_HYUNDAI
DDEFS += -DSHORT_BOARD_NAME=hellen154hyundai
include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += -DHW_HELLEN_HYUNDAI=1

View File

@ -15,7 +15,8 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
# https://github.com/rusefi/hellenNA6_issues/issues/35 hack :(
DDEFS += -DDISABLE_PIN_STATE_VALIDATION=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA6
DDEFS += -DSHORT_BOARD_NAME=hellenNA6 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA6
DDEFS += -DSHORT_BOARD_NAME=hellenNA6
include $(BOARDS_DIR)/hellen/hellen-common176.mk

View File

@ -14,8 +14,9 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_72
DDEFS += -DSHORT_BOARD_NAME=hellen72 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_72
DDEFS += -DSHORT_BOARD_NAME=hellen72
include $(BOARDS_DIR)/hellen/hellen-common176.mk
DDEFS += -DHW_HELLEN_NB2=1

View File

@ -22,8 +22,8 @@ DDEFS += -DSTM32_PWM_USE_TIM3=FALSE
# for analog VR we want to access un-averaged most raw data
# DDEFS += -DADC_BUF_DEPTH_FAST=1
# DDEFS += -DADC_BUF_NUM_AVG=1
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_81
DDEFS += -DSHORT_BOARD_NAME=hellen81 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_81
DDEFS += -DSHORT_BOARD_NAME=hellen81
include $(BOARDS_DIR)/hellen/hellen-common176.mk

View File

@ -12,7 +12,8 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_88_BMW
DDEFS += -DSHORT_BOARD_NAME=hellen88bmw -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_88_BMW
DDEFS += -DSHORT_BOARD_NAME=hellen88bmw
include $(BOARDS_DIR)/hellen/hellen-common144.mk

View File

@ -13,8 +13,8 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += -DSHORT_BOARD_NAME=hellenNA8_96 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA8_96
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA8_96
DDEFS += -DSHORT_BOARD_NAME=hellenNA8_96
# Enable serial pins on expansion header
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)

View File

@ -1,7 +1,9 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
DDEFS += -DFIRMWARE_ID=\"small-can-board\"
DDEFS += -DSHORT_BOARD_NAME=small-can-board -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SMALL_CAN_BOARD
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SMALL_CAN_BOARD
DDEFS += -DSHORT_BOARD_NAME=small-can-board
#DDEFS += -DEFI_SENT_SUPPORT=TRUE

View File

@ -13,8 +13,9 @@ BOARDCPPSRC += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS)
LDSCRIPT = $(STARTUPLD_KINETIS)/MKE1xF512.ld
CONFDIR = $(BOARD_DIR)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_KIN
DDEFS += -DSHORT_BOARD_NAME=kin -DSTATIC_BOARD_ID=STATIC_BOARD_ID_KIN
DDEFS += -DSHORT_BOARD_NAME=kin
DDEFS += -DCPU_MKE16F512VLH16
DDEFS += -DCPU_MKE16F512VLH16_cm4
DDEFS += -D__USE_CMSIS

View File

@ -11,4 +11,7 @@ USE_FATFS = no
DDEFS += -DFIRMWARE_ID=\"m74_9\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=m74_9 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_M74_9
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_M74_9
DDEFS += -DSHORT_BOARD_NAME=m74_9

View File

@ -46,9 +46,11 @@ DDEFS += -DHW_MICRO_RUSEFI=1
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
USE_OPT += -Wl,--defsym=FLASH_SIZE=768k
DDEFS += -DSHORT_BOARD_NAME=mre_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7
DDEFS += -DSHORT_BOARD_NAME=mre_f7
else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DSHORT_BOARD_NAME=mre_f4 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4
DDEFS += -DSHORT_BOARD_NAME=mre_f4
else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif