doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More tidying of EDBG AVR commands frames

Browse Source
This commit is contained in:
Nav
2022-02-27 23:33:45 +00:00
parent 51678ed08e
commit 3163f5c1e3
4 changed files with 17 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp
View File

@@ -13,8 +13,6 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
public: public:
using ResponseFrameType = ResponseFrames::Avr8Generic::Avr8GenericResponseFrame; using ResponseFrameType = ResponseFrames::Avr8Generic::Avr8GenericResponseFrame;
Avr8GenericCommandFrame() { Avr8GenericCommandFrame(): AvrCommandFrame<PayloadContainerType>(ProtocolHandlerId::AVR8_GENERIC) {}
this->setProtocolHandlerId(ProtocolHandlerId::AVR8_GENERIC);
}
}; };
} }

56
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp
View File

@@ -47,11 +47,10 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
"Invalid payload container type - must be an std::array<unsigned char, X> or an std::vector<unsigned char>" "Invalid payload container type - must be an std::array<unsigned char, X> or an std::vector<unsigned char>"
); );
public: public:
using ResponseFrameType = AvrResponseFrame; using ResponseFrameType = AvrResponseFrame;
AvrCommandFrame() { explicit AvrCommandFrame(ProtocolHandlerId protocolHandlerId): protocolHandlerId(protocolHandlerId) {
if (LAST_SEQUENCE_ID < std::numeric_limits<decltype(LAST_SEQUENCE_ID)>::max()) { if (LAST_SEQUENCE_ID < std::numeric_limits<decltype(LAST_SEQUENCE_ID)>::max()) {
this->sequenceId = ++(LAST_SEQUENCE_ID); this->sequenceId = ++(LAST_SEQUENCE_ID);
@@ -69,49 +68,28 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
AvrCommandFrame& operator = (const AvrCommandFrame& other) = default; AvrCommandFrame& operator = (const AvrCommandFrame& other) = default;
AvrCommandFrame& operator = (AvrCommandFrame&& other) noexcept = default; AvrCommandFrame& operator = (AvrCommandFrame&& other) noexcept = default;
[[nodiscard]] unsigned char getProtocolVersion() const {
return this->protocolVersion;
}
void setProtocolVersion(unsigned char protocolVersion) {
this->protocolVersion = protocolVersion;
}
[[nodiscard]] std::uint16_t getSequenceId() const {
return this->sequenceId;
}
[[nodiscard]] ProtocolHandlerId getProtocolHandlerId() const {
return this->protocolHandlerID;
}
void setProtocolHandlerId(ProtocolHandlerId protocolHandlerId) {
this->protocolHandlerID = protocolHandlerId;
}
void setProtocolHandlerId(unsigned char protocolHandlerId) {
this->protocolHandlerID = static_cast<ProtocolHandlerId>(protocolHandlerId);
}
[[nodiscard]] virtual const PayloadContainerType& getPayload() const { [[nodiscard]] virtual const PayloadContainerType& getPayload() const {
return this->payload; return this->payload;
}; };
/** /**
* Converts the command frame into a container of unsigned char - a raw buffer to send to the EDBG device. * Converts the command frame into a container of unsigned char - a raw buffer to include in an AVR
* command packet, for sending to the EDBG device.
*
* See AvrCommandFrame::generateAvrCommands() and the AvrCommand class for more.
* *
* @return * @return
*/ */
[[nodiscard]] auto getRawCommandFrame() const { [[nodiscard]] auto getRawCommandFrame() const {
auto rawCommand = std::vector<unsigned char>(5); auto rawCommand = std::vector<unsigned char>(5);
rawCommand[0] = this->SOF; rawCommand[0] = 0x0E; // Start of frame
rawCommand[1] = this->getProtocolVersion(); rawCommand[1] = 0x00; // Protocol version
rawCommand[2] = static_cast<unsigned char>(this->getSequenceId()); rawCommand[2] = static_cast<unsigned char>(this->sequenceId);
rawCommand[3] = static_cast<unsigned char>(this->getSequenceId() >> 8); rawCommand[3] = static_cast<unsigned char>(this->sequenceId >> 8);
rawCommand[4] = static_cast<unsigned char>(this->getProtocolHandlerId()); rawCommand[4] = static_cast<unsigned char>(this->protocolHandlerId);
if (!this->payload.empty()) { if (!this->payload.empty()) {
rawCommand.insert( rawCommand.insert(
@@ -171,22 +149,16 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
} }
protected: protected:
PayloadContainerType payload;
private:
unsigned char SOF = 0x0E;
unsigned char protocolVersion = 0x00;
/** /**
* Incrementing from 0x00 * Incrementing from 0
*/ */
std::uint16_t sequenceId = 0; std::uint16_t sequenceId = 0;
/** /**
* Destination sub-protocol handler ID * Destination sub-protocol handler ID
*/ */
ProtocolHandlerId protocolHandlerID = ProtocolHandlerId::DISCOVERY; ProtocolHandlerId protocolHandlerId = ProtocolHandlerId::DISCOVERY;
};
PayloadContainerType payload;
};
} }

4
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp
View File

@@ -40,8 +40,6 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
public: public:
using ResponseFrameType = ResponseFrames::DiscoveryResponseFrame; using ResponseFrameType = ResponseFrames::DiscoveryResponseFrame;
DiscoveryCommandFrame() { DiscoveryCommandFrame(): AvrCommandFrame<PayloadContainerType>(ProtocolHandlerId::DISCOVERY) {}
this->setProtocolHandlerId(ProtocolHandlerId::DISCOVERY);
}
}; };
} }

4
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp
View File

@@ -25,8 +25,6 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
class HouseKeepingCommandFrame: public AvrCommandFrame<PayloadContainerType> class HouseKeepingCommandFrame: public AvrCommandFrame<PayloadContainerType>
{ {
public: public:
HouseKeepingCommandFrame() { HouseKeepingCommandFrame(): AvrCommandFrame<PayloadContainerType>(ProtocolHandlerId::HOUSE_KEEPING) {}
this->setProtocolHandlerId(ProtocolHandlerId::HOUSE_KEEPING);
}
}; };
} }