From 1a95a9d6c17c8a27f091da79eefbb98c039d8964 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Mon, 28 Feb 2022 17:07:44 +0000
Subject: [PATCH] Renamed ResponseFrameType alias to ExpectedResponseFrameType

---
 .../CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp   | 2 +-
 .../EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp      | 2 +-
 .../AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp     | 2 +-
 .../EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp       | 2 +-
 .../EDBG/AVR/CommandFrames/AvrCommandFrame.hpp              | 2 +-
 .../AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp   | 2 +-
 .../CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp         | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp
index 6e5b701e..59519b5e 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp
@@ -11,7 +11,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
     class Avr8GenericCommandFrame: public AvrCommandFrame<PayloadContainerType>
     {
     public:
-        using ResponseFrameType = ResponseFrames::Avr8Generic::Avr8GenericResponseFrame;
+        using ExpectedResponseFrameType = ResponseFrames::Avr8Generic::Avr8GenericResponseFrame;
 
         Avr8GenericCommandFrame(): AvrCommandFrame<PayloadContainerType>(ProtocolHandlerId::AVR8_GENERIC) {}
     };
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp
index b426ee3e..27d9fa43 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp
@@ -8,7 +8,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
     class GetDeviceId: public Avr8GenericCommandFrame<std::array<unsigned char, 2>>
     {
     public:
-        using ResponseFrameType = ResponseFrames::Avr8Generic::GetDeviceId;
+        using ExpectedResponseFrameType = ResponseFrames::Avr8Generic::GetDeviceId;
 
         GetDeviceId() {
             /*
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp
index b4f9574f..7457595a 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp
@@ -8,7 +8,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
     class GetProgramCounter: public Avr8GenericCommandFrame<std::array<unsigned char, 2>>
     {
     public:
-        using ResponseFrameType = ResponseFrames::Avr8Generic::GetProgramCounter;
+        using ExpectedResponseFrameType = ResponseFrames::Avr8Generic::GetProgramCounter;
 
         GetProgramCounter() {
             /*
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp
index 2217a8a9..ba7a38e0 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp
@@ -11,7 +11,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
     class ReadMemory: public Avr8GenericCommandFrame<std::vector<unsigned char>>
     {
     public:
-        using ResponseFrameType = ResponseFrames::Avr8Generic::ReadMemory;
+        using ExpectedResponseFrameType = ResponseFrames::Avr8Generic::ReadMemory;
 
         ReadMemory(
             const Avr8MemoryType& type,
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp
index 4618b334..4e5b4aed 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp
@@ -48,7 +48,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
         );
 
     public:
-        using ResponseFrameType = AvrResponseFrame;
+        using ExpectedResponseFrameType = AvrResponseFrame;
 
         explicit AvrCommandFrame(ProtocolHandlerId protocolHandlerId): protocolHandlerId(protocolHandlerId) {
             if (LAST_SEQUENCE_ID < std::numeric_limits<decltype(LAST_SEQUENCE_ID)>::max()) {
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp
index 472300df..2bbf27bd 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp
@@ -38,7 +38,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
     class DiscoveryCommandFrame: public AvrCommandFrame<PayloadContainerType>
     {
     public:
-        using ResponseFrameType = ResponseFrames::DiscoveryResponseFrame;
+        using ExpectedResponseFrameType = ResponseFrames::DiscoveryResponseFrame;
 
         DiscoveryCommandFrame(): AvrCommandFrame<PayloadContainerType>(ProtocolHandlerId::DISCOVERY) {}
     };
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp
index 82006b77..32e8df0d 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp
@@ -50,13 +50,13 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg
         );
 
         template<class CommandFrameType>
-        typename CommandFrameType::ResponseFrameType sendAvrCommandFrameAndWaitForResponseFrame(
+        typename CommandFrameType::ExpectedResponseFrameType sendAvrCommandFrameAndWaitForResponseFrame(
             const CommandFrameType& avrCommandFrame
         ) {
             static_assert(
                 std::is_base_of<
                     Protocols::CmsisDap::Edbg::Avr::AvrResponseFrame,
-                    typename CommandFrameType::ResponseFrameType
+                    typename CommandFrameType::ExpectedResponseFrameType
                 >::value,
                 "AVR Command must specify a valid response frame type, derived from AvrResponseFrame."
             );
@@ -71,7 +71,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg
             }
 
             auto responses = this->requestAvrResponses();
-            auto responseFrame = typename CommandFrameType::ResponseFrameType();
+            auto responseFrame = typename CommandFrameType::ExpectedResponseFrameType();
             responseFrame.initFromAvrResponses(responses);
             return responseFrame;
         }