From 9fb017c2ded3726ac1fe166e06e9bc4e729f2120 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 1 Oct 2022 21:02:10 +0100
Subject: [PATCH] Renamed CMSIS `commandId` field to `id`

---
 .../Protocols/CMSIS-DAP/CmsisDapInterface.hpp                 | 2 +-
 src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.cpp          | 4 ++--
 src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp
index 676811b9..93609f5d 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp
@@ -98,7 +98,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap
             this->sendCommand(cmsisDapCommand);
             auto response = this->getResponse<typename CommandType::ExpectedResponseType>();
 
-            if (response.id != cmsisDapCommand.commandId) {
+            if (response.id != cmsisDapCommand.id) {
                 throw Exceptions::DeviceCommunicationFailure("Unexpected response to CMSIS-DAP command.");
             }
 
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.cpp
index a20cbd22..e1c11087 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.cpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.cpp
@@ -3,11 +3,11 @@
 namespace Bloom::DebugToolDrivers::Protocols::CmsisDap
 {
     Command::Command(unsigned char commandId)
-        : commandId(commandId)
+        : id(commandId)
     {}
 
     Command::operator std::vector<unsigned char>() const {
-        auto rawCommand = std::vector<unsigned char>(1, this->commandId);
+        auto rawCommand = std::vector<unsigned char>(1, this->id);
         rawCommand.insert(rawCommand.end(), this->data.begin(), this->data.end());
 
         return rawCommand;
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp
index 25f2c108..dcb0583b 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp
@@ -50,7 +50,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap
          */
         using ExpectedResponseType = Response;
 
-        unsigned char commandId;
+        unsigned char id;
         std::vector<unsigned char> data;
 
         explicit Command(unsigned char commandId);