From aa726095d9ad2fa36d1a860a457bbcba793d5717 Mon Sep 17 00:00:00 2001
From: Peter Feerick <pfeerick@users.noreply.github.com>
Date: Mon, 14 Sep 2026 09:40:57 +1000
Subject: [PATCH] fix(cpn):board hardware definition not loaded for firmware
 objects with empty hwdefnId (#7744)

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
---
 companion/src/firmwares/eeprominterface.cpp | 2 +-
 companion/src/tests/gtests.cpp              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/companion/src/firmwares/eeprominterface.cpp b/companion/src/firmwares/eeprominterface.cpp
index 862d7967e..410dcec0e 100644
--- a/companion/src/firmwares/eeprominterface.cpp
+++ b/companion/src/firmwares/eeprominterface.cpp
@@ -58,7 +58,7 @@ Firmware::Firmware(Firmware * base, const QString & id, const QString & name, Bo
   simulatorId(simulatorId),
   hwdefnId(hwdefnId)
 {
-  gBoardFactories->registerBoard(board, hwdefnId);
+  gBoardFactories->registerBoard(board, this->hwdefnId.isEmpty() ? getFlavour() : this->hwdefnId);
 }
 
 // static
diff --git a/companion/src/tests/gtests.cpp b/companion/src/tests/gtests.cpp
index f0b83b514..8883c6f47 100644
--- a/companion/src/tests/gtests.cpp
+++ b/companion/src/tests/gtests.cpp
@@ -130,6 +130,8 @@ int main(int argc, char **argv)
 {
   QCoreApplication app(argc, argv);
 
+  Q_INIT_RESOURCE(hwdefs);
+
   CustomDebug::setFilterRules();
   gBoardFactories = new BoardFactories();
   registerStorageFactories();