From 0fef22667d261a6d0e361bb7aed8a7f598177a7d Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Thu, 16 Mar 2023 01:37:42 -0700
Subject: [PATCH] this is more robust

---
 firmware/console/binary/signature.cpp | 2 +-
 simulator/Makefile                    | 2 +-
 unit_tests/unit_test_rules.mk         | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/firmware/console/binary/signature.cpp b/firmware/console/binary/signature.cpp
index 10c6d0fe0d..b05686159e 100644
--- a/firmware/console/binary/signature.cpp
+++ b/firmware/console/binary/signature.cpp
@@ -17,7 +17,7 @@
 #undef TS_SIGNATURE
 
 #ifndef SHORT_BOARD_NAME
-#error SHORT_BOARD_NAME must be defined!
+#define SHORT_BOARD_NAME f407-discovery
 #endif /* SHORT_BOARD_NAME */
 
 #pragma message ("SHORT_BOARD_NAME: " QUOTE(SHORT_BOARD_NAME))
diff --git a/simulator/Makefile b/simulator/Makefile
index a2f17162af..db94020164 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -253,7 +253,7 @@ CPPWARN = -Wall -Wextra -Wundef
 
 # List all user C define here, like -D_DEBUG=1
 UDEFS = -DSIMULATOR
-DDEFS += -DFIRMWARE_ID=\"simulator\" -DSHORT_BOARD_NAME=f407-discovery
+DDEFS += -DFIRMWARE_ID=\"simulator\"
 
 
 # Define ASM defines here
diff --git a/unit_tests/unit_test_rules.mk b/unit_tests/unit_test_rules.mk
index c192fd346e..ce1fceb4f8 100644
--- a/unit_tests/unit_test_rules.mk
+++ b/unit_tests/unit_test_rules.mk
@@ -56,8 +56,6 @@ USE_OPT += -DEFI_UNIT_TEST=1 -DEFI_PROD_CODE=0 -DEFI_SIMULATOR=0
 # Pretend we are all different hardware so that all canned engine configs are included
 USE_OPT += -DHW_MICRO_RUSEFI=1 -DHW_PROTEUS=1 -DHW_FRANKENSO=1 -DHW_HELLEN=1
 
-DDEFS += -DSHORT_BOARD_NAME=f407-discovery
-
 ifeq ($(CCACHE_DIR),)
  $(info No CCACHE_DIR)
 else