From 30aa802069019d325ad15361ed37dcaa7004edd2 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 23 Dec 2022 10:13:26 +0100
Subject: [PATCH] minor udpates for PLOC SUPV code

---
 .../devicedefinitions/PlocSupervisorDefinitions.h      | 10 +++-------
 linux/devices/ploc/PlocSupervisorHandler.cpp           |  7 +++----
 tmtc                                                   |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
index cb0639fa..ffc310f0 100644
--- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
+++ b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
@@ -730,17 +730,13 @@ class FactoryReset : public TcBase {
       : TcBase(params, Apid::DATA_LOGGER,
                static_cast<uint8_t>(tc::DataLoggerServiceId::FACTORY_RESET), 0) {}
 
-  ReturnValue_t buildPacket(std::optional<uint8_t> op) {
-    if (op) {
-      setLenFromPayloadLen(1);
-    }
+  ReturnValue_t buildPacket(uint8_t op) {
+    setLenFromPayloadLen(1);
     auto res = checkSizeAndSerializeHeader();
     if (res != returnvalue::OK) {
       return res;
     }
-    if (op) {
-      payloadStart[0] = op.value();
-    }
+    payloadStart[0] = op;
     return calcAndSetCrc();
   }
 
diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp
index 08c63b1a..74ea8780 100644
--- a/linux/devices/ploc/PlocSupervisorHandler.cpp
+++ b/linux/devices/ploc/PlocSupervisorHandler.cpp
@@ -1467,11 +1467,10 @@ ReturnValue_t PlocSupervisorHandler::prepareReadGpioCmd(const uint8_t* commandDa
 ReturnValue_t PlocSupervisorHandler::prepareFactoryResetCmd(const uint8_t* commandData,
                                                             size_t len) {
   FactoryReset resetCmd(spParams);
-  std::optional<uint8_t> op;
-  if (len > 0) {
-    op = commandData[0];
+  if (len < 1) {
+	return HasActionsIF::INVALID_PARAMETERS;
   }
-  ReturnValue_t result = resetCmd.buildPacket(op);
+  ReturnValue_t result = resetCmd.buildPacket(commandData[0]);
   if (result != returnvalue::OK) {
     return result;
   }
diff --git a/tmtc b/tmtc
index 00991b92..20c2f615 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 00991b92f15425aa80d2448ad304de46a08b5470
+Subproject commit 20c2f615555e5e7ddc03a2a22e225f75dff1c320