From 7fdfa389dace36c37237ca2dfab6e667784e6227 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Wed, 6 Apr 2022 17:10:57 +0100
Subject: [PATCH] Added ResponsePacket constructor with string param

---
 src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp | 3 +--
 src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp     | 4 ++--
 src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp     | 3 +--
 src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp   | 4 ++++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
index d1110a8c..f645f398 100644
--- a/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
+++ b/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
@@ -64,9 +64,8 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
                 this->bytes
             );
 
-            auto hexMemoryBuffer = Packet::toHex(memoryBuffer);
             debugSession.connection.writePacket(
-                ResponsePacket(std::vector<unsigned char>(hexMemoryBuffer.begin(), hexMemoryBuffer.end()))
+                ResponsePacket(Packet::toHex(memoryBuffer))
             );
 
         } catch (const Exception& exception) {
diff --git a/src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp b/src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp
index 54b1edc1..f76689ec 100644
--- a/src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp
@@ -42,13 +42,13 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         if (packetString.find("qAttached") == 0) {
             Logger::debug("Handling qAttached");
-            debugSession.connection.writePacket(ResponsePacket({1}));
+            debugSession.connection.writePacket(ResponsePacket(std::vector<unsigned char>({1})));
             return;
         }
 
         Logger::debug("Unknown GDB RSP packet: " + packetString + " - returning empty response");
 
         // Respond with an empty packet
-        debugSession.connection.writePacket(ResponsePacket({0}));
+        debugSession.connection.writePacket(ResponsePacket(std::vector<unsigned char>({0})));
     }
 }
diff --git a/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
index d20667fb..780a51cd 100644
--- a/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
@@ -84,9 +84,8 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
                 registers.insert(registers.end(), reg.value.begin(), reg.value.end());
             }
 
-            auto responseRegisters = Packet::toHex(registers);
             debugSession.connection.writePacket(
-                ResponsePacket(std::vector<unsigned char>(responseRegisters.begin(), responseRegisters.end()))
+                ResponsePacket(Packet::toHex(registers))
             );
 
         } catch (const Exception& exception) {
diff --git a/src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp b/src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp
index 78a4d08e..2efeb816 100644
--- a/src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp
+++ b/src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp
@@ -18,5 +18,9 @@ namespace Bloom::DebugServer::Gdb::ResponsePackets
         explicit ResponsePacket(const std::vector<unsigned char>& data) {
             this->data = data;
         }
+
+        explicit ResponsePacket(const std::string& data) {
+            this->data = std::vector<unsigned char>(data.begin(), data.end());
+        }
     };
 }