From 56aa376d5e627cb57fd7e8125501eaf9b130ce63 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 26 Feb 2022 22:23:49 -0500
Subject: [PATCH] explicit FW ID not so easy

---
 firmware/config/boards/clean_env_variables.sh            | 1 +
 firmware/config/boards/f407-discovery/board.mk           | 9 ++++++++-
 .../config/boards/frankenso/compile_frankenso_na6.sh     | 3 ++-
 .../config/boards/frankenso/compile_frankenso_pal.sh     | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/firmware/config/boards/clean_env_variables.sh b/firmware/config/boards/clean_env_variables.sh
index 33edb9a55a..a90837b334 100644
--- a/firmware/config/boards/clean_env_variables.sh
+++ b/firmware/config/boards/clean_env_variables.sh
@@ -13,3 +13,4 @@ export DEBUG_LEVEL_OPT=""
 export USE_FATFS=""
 export USE_LIS302=""
 export SC_BUFFER_SIZE=""
+export FW_ID_ENV=""
diff --git a/firmware/config/boards/f407-discovery/board.mk b/firmware/config/boards/f407-discovery/board.mk
index a86ca6468b..bf2384ee7d 100644
--- a/firmware/config/boards/f407-discovery/board.mk
+++ b/firmware/config/boards/f407-discovery/board.mk
@@ -4,13 +4,20 @@ BOARDCPPSRC = $(PROJECT_DIR)/config/boards/f407-discovery/board_extra.cpp
 # MCU defines
 DDEFS += -DSTM32F407xx
 
+# 'DEFAULT_ENGINE_TYPE' env variable is used to define DEFAULT_ENGINE_TYPE macro, confusing name reuse!
 ifeq ($(DEFAULT_ENGINE_TYPE),)
   DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO
 endif
 
+# here we use different names for env variable and macro name in order to reduce confusion. overall this is about Frankenso builds defining FIRMWARE_ID
+ifeq ($(FW_ID_ENV),)
+  DDEFS += -DFIRMWARE_ID=\"stm32f407vg\"
+else
+  DDEFS += -D$(FW_ID_ENV)
+endif
+
 # We are running on Frankenso hardware!
 DDEFS += -DHW_FRANKENSO=1
-DDEFS += -DFIRMWARE_ID=\"stm32f407vg\"
 DDEFS += $(DEFAULT_ENGINE_TYPE)
 
 DDEFS += -DSTM32_I2C_USE_I2C3=TRUE
diff --git a/firmware/config/boards/frankenso/compile_frankenso_na6.sh b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
index 7ec23dadcd..58f091f53a 100644
--- a/firmware/config/boards/frankenso/compile_frankenso_na6.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=FRANKENSO_MIATA_NA6_VAF
+FW_ID_ENV=frankensoNA6
 
 export EXTRA_PARAMS="-DDUMMY \
  -DSHORT_BOARD_NAME=frankenso_na6 \
@@ -8,7 +9,7 @@ export EXTRA_PARAMS="-DDUMMY \
  \
  \
  \
- -DFIRMWARE_ID=\\\"frankensoNA6\\\""
+ "
 
 bash ../common_make.sh
 
diff --git a/firmware/config/boards/frankenso/compile_frankenso_pal.sh b/firmware/config/boards/frankenso/compile_frankenso_pal.sh
index 4dc03a869a..0e1a6c9475 100644
--- a/firmware/config/boards/frankenso/compile_frankenso_pal.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_pal.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=FRANKENSO_MIATA_NA6_VAF
+FW_ID_ENV=frankensoNA6
 
 export EXTRA_PARAMS="-DDUMMY \
  -DSHORT_BOARD_NAME=frankenso_na6 \
@@ -8,7 +9,7 @@ export EXTRA_PARAMS="-DDUMMY \
  -DEFI_ICU_INPUTS=FALSE \
  -DHAL_USE_ICU=FALSE \
  -DEFI_LOGIC_ANALYZER=FALSE \
- -DFIRMWARE_ID=\\\"frankensoNA6\\\""
+ "
 
 bash ../common_make.sh