From f5ee21334cd8a428da35aaf795532afb65ea8509 Mon Sep 17 00:00:00 2001 From: Irini Kosmidou Date: Sun, 29 May 2022 17:54:17 +0200 Subject: [PATCH] formatted --- linux/devices/ScexDleParser.cpp | 8 +++++--- linux/devices/ScexDleParser.h | 14 +++++++------- mission/devices/ScexDeviceHandler.cpp | 4 ++-- .../devices/devicedefinitions/ScexDefinitions.cpp | 5 ++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/linux/devices/ScexDleParser.cpp b/linux/devices/ScexDleParser.cpp index 43405fc5..ac1828dc 100644 --- a/linux/devices/ScexDleParser.cpp +++ b/linux/devices/ScexDleParser.cpp @@ -1,5 +1,7 @@ #include "ScexDleParser.h" -ScexDleParser::ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder, BufPair encodedBuf, BufPair decodedBuf, UserHandler handler, - void *args) : DleParser(decodeRingBuf, decoder, encodedBuf, decodedBuf, handler, args) {}; -ScexDleParser::~ScexDleParser() {}; +ScexDleParser::ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder, + BufPair encodedBuf, BufPair decodedBuf, UserHandler handler, + void *args) + : DleParser(decodeRingBuf, decoder, encodedBuf, decodedBuf, handler, args){}; +ScexDleParser::~ScexDleParser(){}; diff --git a/linux/devices/ScexDleParser.h b/linux/devices/ScexDleParser.h index 7fbd73db..ef87abb7 100644 --- a/linux/devices/ScexDleParser.h +++ b/linux/devices/ScexDleParser.h @@ -3,17 +3,17 @@ #include - class ScexDleParser : public DleParser { public: - ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder, - BufPair encodedBuf, BufPair decodedBuf, UserHandler handler, - void *args); -// ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder, -// BufPair encodedBuf, BufPair decodedBuf, UserHandler handler, -// void *args) : DleParser(decodeRingBuf, decoder, encodedBuf, decodedBuf, handler, args){} + ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder, BufPair encodedBuf, + BufPair decodedBuf, UserHandler handler, void *args); + // ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder, + // BufPair encodedBuf, BufPair decodedBuf, UserHandler handler, + // void *args) : DleParser(decodeRingBuf, decoder, encodedBuf, decodedBuf, handler, + // args){} virtual ~ScexDleParser(); + private: }; diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp index de4b63d0..f732447f 100644 --- a/mission/devices/ScexDeviceHandler.cpp +++ b/mission/devices/ScexDeviceHandler.cpp @@ -5,10 +5,10 @@ #include #include +#include #include "fsfw/globalfunctions/CRC.h" #include "mission/devices/devicedefinitions/ScexDefinitions.h" -#include using std::ofstream; @@ -48,7 +48,7 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic switch (deviceCommand) { case (PING): { - //rawPacket = cmdBuf.data(); + // rawPacket = cmdBuf.data(); prepareScexCmd(cmdTyped, commandData[0], {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {nullptr, 0}); return RETURN_OK; diff --git a/mission/devices/devicedefinitions/ScexDefinitions.cpp b/mission/devices/devicedefinitions/ScexDefinitions.cpp index 7b8f49dd..68bf0d76 100644 --- a/mission/devices/devicedefinitions/ScexDefinitions.cpp +++ b/mission/devices/devicedefinitions/ScexDefinitions.cpp @@ -8,9 +8,8 @@ uint8_t scex::createCmdByte(Cmds cmd, bool tempCheck) { return (IDLE_BIT_0_DEF_STATE << 7) | (IDLE_BIT_1_DEF_STATE << 6) | (cmd << 1) | tempCheck; } -ReturnValue_t scex::prepareScexCmd(Cmds cmd, bool tempCheck, - std::pair cmdBufPair, size_t& cmdLen, - std::pair usrDataPair) { +ReturnValue_t scex::prepareScexCmd(Cmds cmd, bool tempCheck, std::pair cmdBufPair, + size_t& cmdLen, std::pair usrDataPair) { using namespace scex; uint8_t* cmdBuf = cmdBufPair.first; const uint8_t* userData = usrDataPair.first;