sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v0.3.0-dev

Browse Source
This commit is contained in:
Paul Hollinsky
2021-06-11 18:54:36 -04:00
parent 8c9d3a5e6a da4ab6ef62
commit e5bf87ba7d
4 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/packet/versionpacket.cpp
+4 -2
View File
@@ -8,7 +8,8 @@ std::shared_ptr<VersionMessage> HardwareVersionPacket::DecodeMainToMessage(const
auto msg = std::make_shared<VersionMessage>(VersionMessage::MainChip);
optional<DeviceAppVersion>& version = msg->Versions.emplace_back();
msg->Versions.emplace_back();
optional<DeviceAppVersion>& version = msg->Versions.back();
version.emplace();
version->major = bytestream[1];
version->minor = bytestream[2];
@@ -24,7 +25,8 @@ std::shared_ptr<VersionMessage> HardwareVersionPacket::DecodeSecondaryToMessage(
bytesLeft--; // Disregard command byte
while(bytesLeft >= 3) {
const bool versionValid = bytestream[bytestream.size() - bytesLeft + 0];
optional<DeviceAppVersion>& version = msg->Versions.emplace_back();
msg->Versions.emplace_back();
optional<DeviceAppVersion>& version = msg->Versions.back();
if(versionValid) {
version.emplace();
version->major = bytestream[bytestream.size() - bytesLeft + 1];