More universal Board-ID for bench test (#5518)

* add STATIC_BOARD_ID defines to get Board-ID more universal * add getBoardId() * broadcast BENCH_TEST_BOARD_STATUS via CAN * add guards for sendBoardStatus()
2023-08-19 01:41:17 +03:00 · 2023-08-19 01:41:17 +03:00 · 84c6d4cde6
parent f2fce491b9
commit 84c6d4cde6
49 changed files with 106 additions and 48 deletions
--- a/firmware/Makefile
+++ b/firmware/Makefile
@ -168,6 +168,7 @@ MAKEFLAGS += ${NUMJOBS}

 BOARDINC = $(BOARD_DIR)
 include $(BOARD_DIR)/board.mk
+BOARDCPPSRC += $(BOARDS_DIR)/board_id.cpp

 # Include various ChibiOS mk files
 # Licensing files.
--- a/firmware/config/boards/48way/board.mk
+++ b/firmware/config/boards/48way/board.mk
@ -2,6 +2,6 @@
 BOARDCPPSRC =  $(BOARD_DIR)/board_configuration.cpp

 # Override DEFAULT_ENGINE_TYPE
-DDEFS += -DSHORT_BOARD_NAME=48way
+DDEFS += -DSHORT_BOARD_NAME=48way -DSTATIC_BOARD_ID=STATIC_BOARD_ID_48WAY
 DDEFS += -DFIRMWARE_ID=\"48way\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
--- a/firmware/config/boards/BB_V2/board.mk
+++ b/firmware/config/boards/BB_V2/board.mk
@ -3,7 +3,7 @@ BOARDCPPSRC =  $(BOARD_DIR)/board_configuration.cpp

 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DSTM32F407xx
-DDEFS += -DSHORT_BOARD_NAME=BB_V2 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
+DDEFS += -DSHORT_BOARD_NAME=BB_V2 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_BB_V2 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
 DDEFS += -DFIRMWARE_ID=\"BB_V2\"
 DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::Unassigned
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
--- a/firmware/config/boards/BB_V3/board.mk
+++ b/firmware/config/boards/BB_V3/board.mk
@ -3,7 +3,7 @@ BOARDCPPSRC =  $(BOARD_DIR)/board_configuration.cpp

 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DSTM32F407xx
-DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
+DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_BB_V3 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
 DDEFS += -DFIRMWARE_ID=\"BB_V3\"
 DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::Unassigned
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
--- a/firmware/config/boards/at_start_f435/board.mk
+++ b/firmware/config/boards/at_start_f435/board.mk
@ -12,6 +12,6 @@ CONFDIR = $(PROJECT_DIR)/hw_layer/ports/at32/at32f4/cfg

 DDEFS += -DFIRMWARE_ID=\"at_start_f435\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
-DDEFS += -DSHORT_BOARD_NAME=at_start_f435
+DDEFS += -DSHORT_BOARD_NAME=at_start_f435 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_AT_START_F435

 DDEFS += -DEFI_BACKUP_SRAM=FALSE
--- a/firmware/config/boards/atlas/board.mk
+++ b/firmware/config/boards/atlas/board.mk
@ -15,4 +15,4 @@ DDEFS += -DHW_ATLAS=1
 LWIP = yes
 DDEFS += -DEFI_ETHERNET=TRUE

-DDEFS += -DSHORT_BOARD_NAME=atlas
+DDEFS += -DSHORT_BOARD_NAME=atlas -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ATLAS
--- a/firmware/config/boards/board_id.cpp
+++ b/firmware/config/boards/board_id.cpp
@ -0,0 +1,22 @@
+/*
+ * board_id.cpp
+ *
+ * @date Aug 18, 2023
+ * @author Andrey Belomutskiy, (c) 2012-2021
+ * @author andreika <prometheus.pcb@gmail.com>
+ */
+
+#include "pch.h"
+#include "board_id.h"
+#include "boards_dictionary.h"
+
+
+board_id_t getBoardId() {
+#if HW_HELLEN
+	return (board_id_t)engine->engineState.hellenBoardId;
+#elif STATIC_BOARD_ID
+	return (board_id_t)STATIC_BOARD_ID;
+#else
+	return 0;
+#endif
+}
--- a/firmware/config/boards/board_id.h
+++ b/firmware/config/boards/board_id.h
@ -0,0 +1,13 @@
+/*
+ * board_id.h
+ *
+ * @date Aug 18, 2023
+ * @author Andrey Belomutskiy, (c) 2012-2021
+ * @author andreika <prometheus.pcb@gmail.com>
+ */
+
+#pragma once
+
+typedef uint16_t board_id_t;
+
+board_id_t getBoardId();
--- a/firmware/config/boards/core8/board.mk
+++ b/firmware/config/boards/core8/board.mk
@ -2,6 +2,6 @@
 BOARDCPPSRC =  $(BOARD_DIR)/board_configuration.cpp

 # Override DEFAULT_ENGINE_TYPE
-DDEFS += -DSHORT_BOARD_NAME=core8
+DDEFS += -DSHORT_BOARD_NAME=core8 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CORE8
 DDEFS += -DFIRMWARE_ID=\"core8\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
--- a/firmware/config/boards/coreECU/board.mk
+++ b/firmware/config/boards/coreECU/board.mk
@ -3,7 +3,7 @@ BOARDCPPSRC =  $(BOARD_DIR)/board_configuration.cpp

 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DSTM32F407xx
-DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
+DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_BB_V3 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
 DDEFS += -DFIRMWARE_ID=\"BB_V3\"
 DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::Unassigned
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
--- a/firmware/config/boards/cypress/config.mk
+++ b/firmware/config/boards/cypress/config.mk
@ -9,7 +9,7 @@ CYPRESS_CONTRIB = $(BOARD_DIR)/OS

 GENERATED_ENUMS_DIR = $(BOARD_DIR)/config/controllers/algo

-EXTRA_PARAMS += -DFIRMWARE_ID=\"cypress\" -DSHORT_BOARD_NAME=cypress
+EXTRA_PARAMS += -DFIRMWARE_ID=\"cypress\" -DSHORT_BOARD_NAME=cypress -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CYPRESS
 # -nodefaultlibs -lc -lgcc -ltinyc

 # used by USE_SMART_BUILD
--- a/firmware/config/boards/f407-discovery/compile_f407-discovery.sh
+++ b/firmware/config/boards/f407-discovery/compile_f407-discovery.sh
@ -1,5 +1,5 @@
 #!/bin/bash

-export EXTRA_PARAMS="-DDUMMY -DSHORT_BOARD_NAME=f407-discovery"
+export EXTRA_PARAMS="-DDUMMY -DSHORT_BOARD_NAME=f407-discovery -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F407_DISCOVERY"

 bash ../common_make.sh f407-discovery ARCH_STM32F4
--- a/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh
+++ b/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh
@ -1,6 +1,6 @@
 #!/bin/bash

-export EXTRA_PARAMS="-DEFI_LUA=FALSE -DSHORT_BOARD_NAME=f407-discovery"
+export EXTRA_PARAMS="-DEFI_LUA=FALSE -DSHORT_BOARD_NAME=f407-discovery -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F407_DISCOVERY"
 export DEBUG_LEVEL_OPT="-O0 -ggdb -g"

 bash ../common_make.sh f407-discovery ARCH_STM32F4
--- a/firmware/config/boards/f429-208/board.mk
+++ b/firmware/config/boards/f429-208/board.mk
@ -18,7 +18,7 @@ DDEFS += -DHAL_USE_SDRAM=TRUE
 DDEFS += -DHAL_USE_FSMC=TRUE

 # see signature_haba208.h
-DDEFS += -DSHORT_BOARD_NAME=haba208
+DDEFS += -DSHORT_BOARD_NAME=haba208 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HABA208

 # Shared variables
 ALLINC += $(BOARDINC)
--- a/firmware/config/boards/f429-discovery/board.mk
+++ b/firmware/config/boards/f429-discovery/board.mk
@ -19,7 +19,7 @@ DDEFS += -DSTM32_USB_USE_OTG2=TRUE
 DDEFS += -DHAL_USE_SDRAM=TRUE
 DDEFS += -DHAL_USE_FSMC=TRUE

-DDEFS += -DSHORT_BOARD_NAME=f429-discovery
+DDEFS += -DSHORT_BOARD_NAME=f429-discovery -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F429_DISCOVERY

 # Shared variables
 ALLINC += $(BOARDINC)
--- a/firmware/config/boards/frankenso/compile_frankenso_na6.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
@ -8,6 +8,6 @@ FW_ID_ENV=frankensoNA6
 # sad technical debt: HW CI uses default bundle and it needs logic analyzer
 # while humans want to use second cam input asap https://rusefi.com/forum/viewtopic.php?f=4&t=2343
 #
-export EXTRA_PARAMS="-DSHORT_BOARD_NAME=frankenso_na6"
+export EXTRA_PARAMS="-DSHORT_BOARD_NAME=frankenso_na6 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_FRANKENSO_NA6"

 bash ../common_make.sh f407-discovery ARCH_STM32F4
--- a/firmware/config/boards/hellen/alphax-2chan/board.mk
+++ b/firmware/config/boards/hellen/alphax-2chan/board.mk
@ -18,5 +18,5 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk

 DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)

-DDEFS += -DSHORT_BOARD_NAME=alphax-2chan
+DDEFS += -DSHORT_BOARD_NAME=alphax-2chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_2CHAN

--- a/firmware/config/boards/hellen/alphax-4chan/board.mk
+++ b/firmware/config/boards/hellen/alphax-4chan/board.mk
@ -22,7 +22,7 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
 DDEFS += -DTRIGGER_SCOPE

 ifeq ($(PROJECT_CPU),ARCH_STM32F7)
-	DDEFS += -DSHORT_BOARD_NAME=alphax-4chan_f7
+	DDEFS += -DSHORT_BOARD_NAME=alphax-4chan_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_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
@ -31,7 +31,7 @@ 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
+	DDEFS += -DSHORT_BOARD_NAME=alphax-4chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN
 	DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
 else
 $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
--- a/firmware/config/boards/hellen/alphax-8chan/board.mk
+++ b/firmware/config/boards/hellen/alphax-8chan/board.mk
@ -28,4 +28,4 @@ else
 $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
 endif

-DDEFS += -DSHORT_BOARD_NAME=alphax-8chan
+DDEFS += -DSHORT_BOARD_NAME=alphax-8chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
--- a/firmware/config/boards/hellen/harley81/board.mk
+++ b/firmware/config/boards/hellen/harley81/board.mk
@ -15,5 +15,5 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
 # Enable serial pins on expansion header
 DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)

-DDEFS += -DSHORT_BOARD_NAME=harley81
+DDEFS += -DSHORT_BOARD_NAME=harley81 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HARLEY81

--- a/firmware/config/boards/hellen/hellen-gm-e67/board.mk
+++ b/firmware/config/boards/hellen/hellen-gm-e67/board.mk
@ -12,4 +12,5 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 include $(BOARDS_DIR)/hellen/hellen-common144.mk


-DDEFS += -DSHORT_BOARD_NAME=hellen-gm-e67
+DDEFS += -DSHORT_BOARD_NAME=hellen-gm-e67 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_GM_E67
+
--- a/firmware/config/boards/hellen/hellen-honda-k/board.mk
+++ b/firmware/config/boards/hellen/hellen-honda-k/board.mk
@ -18,7 +18,7 @@ DDEFS += -DADC_MUX_PIN=Gpio::F2
 DDEFS += -DFIRMWARE_ID=\"hellen-honda-k\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

-DDEFS += -DSHORT_BOARD_NAME=hellen-honda-k
+DDEFS += -DSHORT_BOARD_NAME=hellen-honda-k -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_HONDA_K
 DDEFS += -DHW_HELLEN_K=TRUE

 include $(BOARDS_DIR)/hellen/hellen-common144.mk
--- a/firmware/config/boards/hellen/hellen-nb1/board.mk
+++ b/firmware/config/boards/hellen/hellen-nb1/board.mk
@ -18,4 +18,4 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
 # Enable serial pins on expansion header
 DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)

-DDEFS += -DSHORT_BOARD_NAME=hellen-nb1
+DDEFS += -DSHORT_BOARD_NAME=hellen-nb1 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1
--- a/firmware/config/boards/hellen/hellen121nissan/board.mk
+++ b/firmware/config/boards/hellen/hellen121nissan/board.mk
@ -16,6 +16,6 @@ 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 += -DSHORT_BOARD_NAME=hellen121nissan
+DDEFS += -DSHORT_BOARD_NAME=hellen121nissan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121NISSAN

 include $(BOARDS_DIR)/hellen/hellen-common144.mk
--- a/firmware/config/boards/hellen/hellen121vag/board.mk
+++ b/firmware/config/boards/hellen/hellen121vag/board.mk
@ -19,7 +19,7 @@ ifeq ($(EFI_LUA_LOOKUP),)
 endif
 DDEFS += -DEFI_LUA_LOOKUP=$(EFI_LUA_LOOKUP)

-DDEFS += -DSHORT_BOARD_NAME=hellen121vag
+DDEFS += -DSHORT_BOARD_NAME=hellen121vag -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121VAG

 include $(BOARDS_DIR)/hellen/hellen-common176.mk

--- a/firmware/config/boards/hellen/hellen128/board.mk
+++ b/firmware/config/boards/hellen/hellen128/board.mk
@ -15,7 +15,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

-DDEFS += -DSHORT_BOARD_NAME=hellen128
+DDEFS += -DSHORT_BOARD_NAME=hellen128 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_128

 include $(BOARDS_DIR)/hellen/hellen-common176.mk

--- a/firmware/config/boards/hellen/hellen154hyundai/board.mk
+++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk
@ -16,6 +16,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

-DDEFS += -DSHORT_BOARD_NAME=hellen154hyundai
+DDEFS += -DSHORT_BOARD_NAME=hellen154hyundai -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_154_HYUNDAI

 include $(BOARDS_DIR)/hellen/hellen-common144.mk
--- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
+++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
@ -16,6 +16,6 @@ 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 += -DSHORT_BOARD_NAME=hellenNA6
+DDEFS += -DSHORT_BOARD_NAME=hellenNA6 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA6

 include $(BOARDS_DIR)/hellen/hellen-common176.mk
--- a/firmware/config/boards/hellen/hellen72/board.mk
+++ b/firmware/config/boards/hellen/hellen72/board.mk
@ -15,6 +15,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

-DDEFS += -DSHORT_BOARD_NAME=hellen72
+DDEFS += -DSHORT_BOARD_NAME=hellen72 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_72

 include $(BOARDS_DIR)/hellen/hellen-common176.mk
--- a/firmware/config/boards/hellen/hellen81/board.mk
+++ b/firmware/config/boards/hellen/hellen81/board.mk
@ -24,6 +24,6 @@ DDEFS += -DSTM32_PWM_USE_TIM3=FALSE
 # DDEFS += -DADC_BUF_NUM_AVG=1


-DDEFS += -DSHORT_BOARD_NAME=hellen81
+DDEFS += -DSHORT_BOARD_NAME=hellen81 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_81

 include $(BOARDS_DIR)/hellen/hellen-common176.mk
--- a/firmware/config/boards/hellen/hellen88bmw/board.mk
+++ b/firmware/config/boards/hellen/hellen88bmw/board.mk
@ -13,6 +13,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 # Add them all together
 DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE)

-DDEFS += -DSHORT_BOARD_NAME=hellen88bmw
+DDEFS += -DSHORT_BOARD_NAME=hellen88bmw -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_88_BMW

 include $(BOARDS_DIR)/hellen/hellen-common144.mk
--- a/firmware/config/boards/hellen/hellenNA8_96/board.mk
+++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk
@ -14,7 +14,7 @@ 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
+DDEFS += -DSHORT_BOARD_NAME=hellenNA8_96 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA8_96

 # Enable serial pins on expansion header
 DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
--- a/firmware/config/boards/hellen/small-can-board/board.mk
+++ b/firmware/config/boards/hellen/small-can-board/board.mk
@ -1,7 +1,7 @@
 BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp

 DDEFS += -DFIRMWARE_ID=\"small-can-board\"
-DDEFS += -DSHORT_BOARD_NAME=small-can-board
+DDEFS += -DSHORT_BOARD_NAME=small-can-board -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SMALL_CAN_BOARD

 #DDEFS += -DEFI_SENT_SUPPORT=TRUE

--- a/firmware/config/boards/kinetis/board.mk
+++ b/firmware/config/boards/kinetis/board.mk
@ -14,7 +14,7 @@ LDSCRIPT = $(STARTUPLD_KINETIS)/MKE1xF512.ld

 CONFDIR = $(BOARD_DIR)

-DDEFS += -DSHORT_BOARD_NAME=kin
+DDEFS += -DSHORT_BOARD_NAME=kin -DSTATIC_BOARD_ID=STATIC_BOARD_ID_KIN
 DDEFS += -DCPU_MKE16F512VLH16
 DDEFS += -DCPU_MKE16F512VLH16_cm4
 DDEFS += -D__USE_CMSIS
--- a/firmware/config/boards/m74_9/board.mk
+++ b/firmware/config/boards/m74_9/board.mk
@ -11,4 +11,4 @@ USE_FATFS = no

 DDEFS += -DFIRMWARE_ID=\"m74_9\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
-DDEFS += -DSHORT_BOARD_NAME=m74_9
+DDEFS += -DSHORT_BOARD_NAME=m74_9 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_M74_9
--- a/firmware/config/boards/microrusefi/board.mk
+++ b/firmware/config/boards/microrusefi/board.mk
@ -45,9 +45,9 @@ DDEFS += -DSTM32_SERIAL_USE_USART3=TRUE
 DDEFS += -DHW_MICRO_RUSEFI=1

 ifeq ($(PROJECT_CPU),ARCH_STM32F7)
-	DDEFS += -DSHORT_BOARD_NAME=mre_f7
+	DDEFS += -DSHORT_BOARD_NAME=mre_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7
 else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
-	DDEFS += -DSHORT_BOARD_NAME=mre_f4
+	DDEFS += -DSHORT_BOARD_NAME=mre_f4 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4
 else
 $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
 endif
--- a/firmware/config/boards/nucleo_f429/board.mk
+++ b/firmware/config/boards/nucleo_f429/board.mk
@ -11,4 +11,4 @@ IS_STM32F429 = yes

 DDEFS += -DFIRMWARE_ID=\"nucleo_f429\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
-DDEFS += -DSHORT_BOARD_NAME=nucleo_f429
+DDEFS += -DSHORT_BOARD_NAME=nucleo_f429 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F429
--- a/firmware/config/boards/nucleo_f767/board.mk
+++ b/firmware/config/boards/nucleo_f767/board.mk
@ -16,4 +16,4 @@ DEBUG_LEVEL_OPT = -Os -ggdb -g

 DDEFS += -DFIRMWARE_ID=\"nucleo_f767\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
-DDEFS += -DSHORT_BOARD_NAME=nucleo_f767
+DDEFS += -DSHORT_BOARD_NAME=nucleo_f767 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F767
--- a/firmware/config/boards/nucleo_h743/board.mk
+++ b/firmware/config/boards/nucleo_h743/board.mk
@ -10,4 +10,4 @@ DDEFS += -DEFI_ETHERNET=TRUE

 DDEFS += -DFIRMWARE_ID=\"nucleo_h743\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
-DDEFS += -DSHORT_BOARD_NAME=nucleo_h743
+DDEFS += -DSHORT_BOARD_NAME=nucleo_h743 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_H743
--- a/firmware/config/boards/prometheus/prometheus-common-board.mk
+++ b/firmware/config/boards/prometheus/prometheus-common-board.mk
@ -15,7 +15,7 @@ ifeq ($(DEBUG_LEVEL_OPT),)
 endif

 ifeq ($(PROMETHEUS_BOARD),405)
-	DDEFS += -DFIRMWARE_ID=\"prometeus405\" -DSHORT_BOARD_NAME=prometheus_405
+	DDEFS += -DFIRMWARE_ID=\"prometeus405\" -DSHORT_BOARD_NAME=prometheus_405 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROMETHEUS_405
 else
-	DDEFS += -DFIRMWARE_ID=\"prometeus469\" -DSHORT_BOARD_NAME=prometheus_469
+	DDEFS += -DFIRMWARE_ID=\"prometeus469\" -DSHORT_BOARD_NAME=prometheus_469 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROMETHEUS_469
 endif
--- a/firmware/config/boards/proteus/board.mk
+++ b/firmware/config/boards/proteus/board.mk
@ -36,14 +36,14 @@ endif
 DDEFS += -DHW_PROTEUS=1

 ifeq ($(PROJECT_CPU),ARCH_STM32F7)
-	DDEFS += -DSHORT_BOARD_NAME=proteus_f7
+	DDEFS += -DSHORT_BOARD_NAME=proteus_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_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
+	DDEFS += -DSHORT_BOARD_NAME=proteus_f4 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F4
 else ifeq ($(PROJECT_CPU),ARCH_STM32H7)
-	DDEFS += -DSHORT_BOARD_NAME=proteus_h7
+	DDEFS += -DSHORT_BOARD_NAME=proteus_h7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_H7
 else
 $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
 endif
--- a/firmware/config/boards/s105/board.mk
+++ b/firmware/config/boards/s105/board.mk
@ -4,7 +4,7 @@ HALCONFDIR = $(BOARD_DIR)
 BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp

 # This is S105 board
-DDEFS += -DSHORT_BOARD_NAME=s105
+DDEFS += -DSHORT_BOARD_NAME=s105 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_S105

 # This board has no LSE and HSE oscillators
 DDEFS += -DSTM32_HSE_ENABLED=FALSE
--- a/firmware/config/boards/subaru_eg33/board.mk
+++ b/firmware/config/boards/subaru_eg33/board.mk
@ -17,7 +17,7 @@ DDEFS +=  -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::G7
 DDEFS += -DHW_SUBARU_EG33=1
 DDEFS += -DFIRMWARE_ID=\"EG33\"

-DDEFS += -DSHORT_BOARD_NAME=subaru_eg33_f7
+DDEFS += -DSHORT_BOARD_NAME=subaru_eg33_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SUBARU_EG33_F7

 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::SUBARUEG33_DEFAULTS
--- a/firmware/config/boards/tdg-pdm8/board.mk
+++ b/firmware/config/boards/tdg-pdm8/board.mk
@ -9,5 +9,5 @@ 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
+DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\" -DSHORT_BOARD_NAME=tdg-pdm8 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TDG_PDM8
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
--- a/firmware/config/boards/test-build-guards/board.mk
+++ b/firmware/config/boards/test-build-guards/board.mk
@ -1,5 +1,5 @@
 DDEFS += -DFIRMWARE_ID=\"t-b-g\"
-DDEFS += -DSHORT_BOARD_NAME=t-b-g
+DDEFS += -DSHORT_BOARD_NAME=t-b-g -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TBG

 DDEFS += -DHAL_USE_ADC=FALSE
 DDEFS += -DHAL_USE_GPT=FALSE
--- a/firmware/controllers/can/can_bench_test.cpp
+++ b/firmware/controllers/can/can_bench_test.cpp
@ -1,5 +1,6 @@

 #include "pch.h"
+#include "board_id.h"
 #include "can_bench_test.h"
 #include "can_msg_tx.h"
 #include "can_common.h"
@ -73,6 +74,21 @@ void sendRawAnalogValues() {
 	// todo: send the second packet
 }

+void sendBoardStatus() {
+#if EFI_PROD_CODE
+	CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_BOARD_STATUS, 8);
+
+	int boardId = getBoardId();
+	msg[0] = TRUNCATE_TO_BYTE(boardId >> 8);
+	msg[1] = TRUNCATE_TO_BYTE(boardId);
+	
+	int numSecondsSinceReset = getTimeNowS();
+	msg[2] = TRUNCATE_TO_BYTE(numSecondsSinceReset >> 16);
+	msg[3] = TRUNCATE_TO_BYTE(numSecondsSinceReset >> 8);
+	msg[4] = TRUNCATE_TO_BYTE(numSecondsSinceReset);
+#endif // EFI_PROD_CODE
+}
+
 void processCanBenchTest(const CANRxFrame& frame) {
 	if (CAN_EID(frame) != CAN_ECU_HW_META) {
 		return;
--- a/firmware/controllers/can/can_bench_test.h
+++ b/firmware/controllers/can/can_bench_test.h
@ -8,3 +8,4 @@
 void processCanBenchTest(const CANRxFrame& frame);
 void sendEventCounters();
 void sendRawAnalogValues();
+void sendBoardStatus();
--- a/firmware/controllers/can/can_tx.cpp
+++ b/firmware/controllers/can/can_tx.cpp
@ -60,6 +60,10 @@ void CanWrite::PeriodicTask(efitick_t nowNt) {
 		sendRawAnalogValues();
 	}

+	if (cycle.isInterval(CI::_250ms)) {
+		sendBoardStatus();
+	}
+
 #if EFI_WIDEBAND_FIRMWARE_UPDATE
 	if (engineConfiguration->enableAemXSeries && cycle.isInterval(CI::_50ms)) {
 		sendWidebandInfo();
--- a/firmware/libfirmware
+++ b/firmware/libfirmware
@ -1 +1 @@
-Subproject commit 5dcb1fef0956b8fc35a8d184f4056aa1b81e737f
+Subproject commit 03defc1513c37149ef5af894dbc8393f6a3603e8