From 0fba3f6d3cf3891d5fde33e6b2c72d532c3bd7bc Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 1 Mar 2022 19:58:04 +0000 Subject: [PATCH] Tidying --- .../ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp | 4 ++-- .../AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp | 2 +- .../EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp | 2 +- .../EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp | 2 +- .../EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp | 6 +++--- .../AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp | 2 +- .../HouseKeeping/HouseKeepingResponseFrame.hpp | 2 +- .../CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp index ca99c1ef..63c26f5a 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp @@ -8,8 +8,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrame { public: Avr8GenericResponseFrame() = default; - explicit Avr8GenericResponseFrame(const std::vector& AVRResponses) - : AvrResponseFrame(AVRResponses) {} + explicit Avr8GenericResponseFrame(const std::vector& avrResponses) + : AvrResponseFrame(avrResponses) {} [[nodiscard]] unsigned char getResponseId(); diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp index 960397a0..0b0a72c1 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp @@ -11,7 +11,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrame { public: GetProgramCounter() = default; - explicit GetProgramCounter(const std::vector& AVRResponses): Avr8GenericResponseFrame(AVRResponses) {} + explicit GetProgramCounter(const std::vector& avrResponses): Avr8GenericResponseFrame(avrResponses) {} std::uint32_t extractProgramCounter() { /* diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp index 0a2f1241..aed2e320 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp @@ -9,7 +9,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrame { public: ReadMemory() = default; - explicit ReadMemory(const std::vector& AVRResponses): Avr8GenericResponseFrame(AVRResponses) {} + explicit ReadMemory(const std::vector& avrResponses): Avr8GenericResponseFrame(avrResponses) {} Targets::TargetMemoryBuffer getMemoryBuffer() { /* diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp index e087930d..55c35b74 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp @@ -7,7 +7,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr using namespace Bloom::Exceptions; void AvrResponseFrame::initFromAvrResponses(const std::vector& avrResponses) { - // Build a raw frame buffer from the AVRResponse objects and just call initFromRawFrame() + // Build a raw frame buffer from the AvrResponse objects and just call initFromRawFrame() std::vector rawFrame; for (const auto& avrResponse : avrResponses) { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp index 73b8ae63..94b25da8 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp @@ -16,8 +16,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr public: explicit AvrResponseFrame() = default; - explicit AvrResponseFrame(const std::vector& AVRResponses) { - this->initFromAvrResponses(AVRResponses); + explicit AvrResponseFrame(const std::vector& avrResponses) { + this->initFromAvrResponses(avrResponses); } virtual ~AvrResponseFrame() = default; @@ -31,7 +31,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr /** * An AvrResponse contains a single fragment of an AvrResponseFrame. * - * This method will construct an AvrResponseFrame from a vector of AVRResponses. + * This method will construct an AvrResponseFrame from a vector of AvrResponse. * * @param avrResponses */ diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp index bad9f3c6..527ed607 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp @@ -8,7 +8,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrame { public: DiscoveryResponseFrame() = default; - explicit DiscoveryResponseFrame(const std::vector& AVRResponses): AvrResponseFrame(AVRResponses) {} + explicit DiscoveryResponseFrame(const std::vector& avrResponses): AvrResponseFrame(avrResponses) {} unsigned char getResponseId(); diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp index 34f6c658..468638cc 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp @@ -8,7 +8,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrame { public: HouseKeepingResponseFrame() = default; - explicit HouseKeepingResponseFrame(const std::vector& AVRResponses): AvrResponseFrame(AVRResponses) {} + explicit HouseKeepingResponseFrame(const std::vector& avrResponses): AvrResponseFrame(avrResponses) {} unsigned char getResponseId(); }; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp index bdee7b2e..9a9ba5a6 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp @@ -52,13 +52,13 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg if (avrResponse.getFragmentCount() != fragmentCount) { throw DeviceCommunicationFailure( - "Failed to fetch AVRResponse objects - invalid fragment count returned." + "Failed to fetch AvrResponse objects - invalid fragment count returned." ); } if (avrResponse.getFragmentCount() == 0 && avrResponse.getFragmentNumber() == 0) { throw DeviceCommunicationFailure( - "Failed to fetch AVRResponse objects - unexpected empty response" + "Failed to fetch AvrResponse objects - unexpected empty response" ); }