From 104ec95a65634072381fa995aafb126b91288fa1 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Thu, 3 Jun 2021 00:25:54 +0100
Subject: [PATCH] Construct an AVR8 TDF via a TargetSignature object, as
 opposed to the signature hex value.

---
 src/Targets/Microchip/AVR/AVR8/Avr8.cpp                      | 2 +-
 .../AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp     | 5 +++--
 .../AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp     | 2 +-
 src/Targets/Microchip/AVR/TargetSignature.hpp                | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
index e132fbcb..22a3cf48 100644
--- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
+++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
@@ -69,7 +69,7 @@ void Avr8::postPromotionConfigure() {
 void Avr8::loadPartDescription() {
     auto targetSignature = this->getId();
     auto partDescription = TargetDescription::TargetDescriptionFile(
-        targetSignature.toHex(),
+        targetSignature,
         (!this->name.empty()) ? std::optional(this->name) : std::nullopt
     );
 
diff --git a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
index 53a94a25..22eecc4c 100644
--- a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
+++ b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
@@ -13,10 +13,11 @@ using namespace Bloom::Targets::Microchip::Avr;
 using namespace Bloom::Exceptions;
 
 TargetDescriptionFile::TargetDescriptionFile(
-    const std::string& targetSignatureHex,
+    const TargetSignature& targetSignature,
     std::optional<std::string> targetName
 ) {
-    auto mapping = this->getTargetDescriptionMapping();
+    auto targetSignatureHex = targetSignature.toHex();
+    auto mapping = TargetDescriptionFile::getTargetDescriptionMapping();
     auto qTargetSignatureHex = QString::fromStdString(targetSignatureHex);
 
     if (mapping.contains(qTargetSignatureHex)) {
diff --git a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp
index 3b2fdcfb..94a645bb 100644
--- a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp
+++ b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp
@@ -46,7 +46,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
          * @param targetSignatureHex
          * @param targetName
          */
-        TargetDescriptionFile(const std::string& targetSignatureHex, std::optional<std::string> targetName);
+        TargetDescriptionFile(const TargetSignature& targetSignature, std::optional<std::string> targetName);
 
         /**
          * Loads the AVR8 target description JSON mapping file.
diff --git a/src/Targets/Microchip/AVR/TargetSignature.hpp b/src/Targets/Microchip/AVR/TargetSignature.hpp
index 85a571f8..699d3cd8 100644
--- a/src/Targets/Microchip/AVR/TargetSignature.hpp
+++ b/src/Targets/Microchip/AVR/TargetSignature.hpp
@@ -37,7 +37,7 @@ namespace Bloom::Targets::Microchip::Avr
             this->byteTwo = static_cast<unsigned char>(signature);
         }
 
-        std::string toHex() {
+        std::string toHex() const {
             std::stringstream stream;
             stream << std::hex << std::setfill('0');
             stream << std::setw(2) << static_cast<unsigned int>(this->byteZero);