From 6ae0249fdc2367577e00afecb4e660f2e0474987 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 1 Sep 2022 17:31:43 +0200
Subject: [PATCH] load table command

---
 linux/csp/CspComIF.cpp                            | 10 ++++++++++
 mission/csp/CspCookie.cpp                         |  3 ++-
 mission/devices/GomspaceDeviceHandler.cpp         | 15 +++++++++++++++
 .../devicedefinitions/GomspaceDefinitions.h       |  6 ++++--
 tmtc                                              |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/linux/csp/CspComIF.cpp b/linux/csp/CspComIF.cpp
index b52bcfa2..5d8c3fd6 100644
--- a/linux/csp/CspComIF.cpp
+++ b/linux/csp/CspComIF.cpp
@@ -176,6 +176,16 @@ ReturnValue_t CspComIF::sendMessage(CookieIF* cookie, const uint8_t* sendData, s
           if (result != 0) {
             return returnvalue::FAILED;
           }
+        } else if(req == GOMSPACE::SpecialRequestTypes::LOAD_TABLE) {
+          if(sendLen < 2) {
+            return returnvalue::FAILED;
+          }
+          const TableInfo* tableInfo = reinterpret_cast<const TableInfo*>(sendData);
+          int result = gs_rparam_load(cspAddress, cspCookie->getTimeout(), tableInfo->sourceTable,
+              tableInfo->targetTable);
+          if (result != 0) {
+            return returnvalue::FAILED;
+          }
         }
       } else {
         /* No CSP fixed port was selected. Send data to the specified port and
diff --git a/mission/csp/CspCookie.cpp b/mission/csp/CspCookie.cpp
index f6ab1eed..228a8058 100644
--- a/mission/csp/CspCookie.cpp
+++ b/mission/csp/CspCookie.cpp
@@ -1,10 +1,11 @@
 #include "CspCookie.h"
 
+using namespace GOMSPACE;
 CspCookie::CspCookie(uint16_t maxReplyLength_, uint8_t cspAddress_, uint32_t timeoutMs)
     : maxReplyLength(maxReplyLength_),
       cspAddress(cspAddress_),
       timeoutMs(timeoutMs),
-      reqType(GOMSPACE::DEFAULT_COM_IF) {}
+      reqType(SpecialRequestTypes::DEFAULT_COM_IF) {}
 
 CspCookie::~CspCookie() {}
 
diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp
index 197195e6..ebfcf2a9 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/devices/GomspaceDeviceHandler.cpp
@@ -109,6 +109,20 @@ ReturnValue_t GomspaceDeviceHandler::buildCommandFromCommand(DeviceCommandId_t d
       }
       break;
     }
+    case (GOMSPACE::LOAD_TABLE): {
+      if (commandDataLen != 2) {
+        return HasActionsIF::INVALID_PARAMETERS;
+      }
+      auto* info = reinterpret_cast<GOMSPACE::TableInfo*>(cspPacket);
+      info->sourceTable = commandData[0];
+      info->targetTable = commandData[1];
+      rawPacket = cspPacket;
+      rawPacketLen = sizeof(GOMSPACE::TableInfo);
+      cspCookie->setCspPort(CspPorts::P60_PORT_RPARAM_ENUM);
+      cspCookie->setRequest(SpecialRequestTypes::LOAD_TABLE, 0);
+      rememberCommandId = deviceCommand;
+      break;
+    }
     case (GOMSPACE::SAVE_TABLE_FILE): {
       if (commandDataLen > 2) {
         return HasActionsIF::INVALID_PARAMETERS;
@@ -171,6 +185,7 @@ void GomspaceDeviceHandler::fillCommandAndReplyMap() {
   this->insertInCommandMap(GOMSPACE::PRINT_LATCHUPS);
   insertInCommandMap(GOMSPACE::SAVE_TABLE_FILE);
   insertInCommandMap(GOMSPACE::SAVE_TABLE_DEFAULT);
+  insertInCommandMap(GOMSPACE::LOAD_TABLE);
 }
 
 ReturnValue_t GomspaceDeviceHandler::scanForReply(const uint8_t* start, size_t remainingSize,
diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h
index 4a356aa9..cab71362 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h
@@ -25,7 +25,7 @@ struct TableInfo {
 
 enum DeviceType { PDU, ACU, P60DOCK };
 
-enum SpecialRequestTypes {
+enum class SpecialRequestTypes {
   DEFAULT_COM_IF,
   GET_PDU_HK,
   GET_PDU_CONFIG,
@@ -33,7 +33,8 @@ enum SpecialRequestTypes {
   GET_ACU_CONFIG,
   GET_P60DOCK_HK,
   GET_P60DOCK_CONFIG,
-  SAVE_TABLE
+  SAVE_TABLE,
+  LOAD_TABLE
 };
 
 enum CspPorts : uint8_t {
@@ -70,6 +71,7 @@ static const DeviceCommandId_t REQUEST_HK_TABLE = 16;      //!< [EXPORT] : [COMM
 static const DeviceCommandId_t REQUEST_CONFIG_TABLE = 17;  //!< [EXPORT] : [COMMAND]
 static const DeviceCommandId_t SAVE_TABLE_FILE = 18;
 static const DeviceCommandId_t SAVE_TABLE_DEFAULT = 19;
+static const DeviceCommandId_t LOAD_TABLE = 20;
 static const DeviceCommandId_t PARAM_SET = 255;  //!< [EXPORT] : [COMMAND]
 
 // Not implemented yet
diff --git a/tmtc b/tmtc
index e162e5c5..6085c654 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit e162e5c51b0bf08b2018e4169a07eed1e4f7eacb
+Subproject commit 6085c6543c0beb24cc427fae16d1fa2897a2fe5a