some simplifications

mission/devices/GomspaceDeviceHandler.cpp

@@ -86,32 +86,24 @@ ReturnValue_t GomspaceDeviceHandler::buildCommandFromCommand(DeviceCommandId_t d
       break;
     }
     case (GOMSPACE::REQUEST_HK_TABLE): {
-      auto reqType = SpecialRequestTypes::DEFAULT_COM_IF;
+      DeviceType devType;
-      if (getObjectId() == objects::PDU1_HANDLER or getObjectId() == objects::PDU2_HANDLER) {
+      if(getDevType(devType) != returnvalue::OK) {
-        reqType = SpecialRequestTypes::GET_PDU_HK;
+        return returnvalue::FAILED;
-      } else if (getObjectId() == objects::ACU_HANDLER) {
-        reqType = SpecialRequestTypes::GET_ACU_HK;
-      } else if (getObjectId() == objects::P60DOCK_HANDLER) {
-        reqType = SpecialRequestTypes::GET_P60DOCK_HK;
       }
-      result = generateRequestFullTableCmd(reqType, GOMSPACE::TableIds::HK, tableCfg.hkTableSize,
+      result =
-                                           deviceCommand, cspCookie);
+          generateRequestFullHkTableCmd(devType, tableCfg.hkTableSize, deviceCommand, cspCookie);
       if (result != returnvalue::OK) {
         return result;
       }
       break;
     }
     case (GOMSPACE::REQUEST_CONFIG_TABLE): {
-      auto reqType = SpecialRequestTypes::DEFAULT_COM_IF;
+      DeviceType devType;
-      if (getObjectId() == objects::PDU1_HANDLER or getObjectId() == objects::PDU2_HANDLER) {
+      if(getDevType(devType) != returnvalue::OK) {
-        reqType = SpecialRequestTypes::GET_PDU_CONFIG;
+        return returnvalue::FAILED;
-      } else if (getObjectId() == objects::ACU_HANDLER) {
-        reqType = SpecialRequestTypes::GET_ACU_CONFIG;
-      } else if (getObjectId() == objects::P60DOCK_HANDLER) {
-        reqType = SpecialRequestTypes::GET_P60DOCK_CONFIG;
       }
-      result = generateRequestFullTableCmd(reqType, GOMSPACE::TableIds::CONFIG,
+      result = generateRequestFullCfgTableCmd(devType, tableCfg.cfgTableSize,
-                                           tableCfg.cfgTableSize, deviceCommand, cspCookie);
+                                              deviceCommand, cspCookie);
       if (result != returnvalue::OK) {
         return result;
       }
@@ -122,7 +114,8 @@ ReturnValue_t GomspaceDeviceHandler::buildCommandFromCommand(DeviceCommandId_t d
         return HasActionsIF::INVALID_PARAMETERS;
       }
       auto* info = reinterpret_cast<GOMSPACE::TableInfo*>(cspPacket);
-      if(commandData[0] != 0 and commandData[0] != 1 and commandData[0] != 2 and commandData[0] != 4) {
+      if (commandData[0] != 0 and commandData[0] != 1 and commandData[0] != 2 and
+          commandData[0] != 4) {
         return HasActionsIF::INVALID_PARAMETERS;
       }
       info->sourceTable = commandData[0];
@@ -486,6 +479,19 @@ bool GomspaceDeviceHandler::validTableId(uint8_t id) {
   return false;
 }
 
+ReturnValue_t GomspaceDeviceHandler::getDevType(GOMSPACE::DeviceType& type) const {
+  if (getObjectId() == objects::PDU1_HANDLER or getObjectId() == objects::PDU2_HANDLER) {
+    type = DeviceType::PDU;
+  } else if (getObjectId() == objects::ACU_HANDLER) {
+    type = DeviceType::ACU;
+  } else if (getObjectId() == objects::P60DOCK_HANDLER) {
+    type = DeviceType::P60DOCK;
+  } else {
+    return returnvalue::FAILED;
+  }
+  return returnvalue::OK;
+}
+
 ReturnValue_t GomspaceDeviceHandler::generateResetWatchdogCmd() {
   WatchdogResetCommand watchdogResetCommand;
   size_t cspPacketLen = 0;
@@ -505,19 +511,40 @@ ReturnValue_t GomspaceDeviceHandler::generateResetWatchdogCmd() {
   return returnvalue::OK;
 }
 
-ReturnValue_t GomspaceDeviceHandler::generateRequestFullTableCmd(SpecialRequestTypes reqType,
+ReturnValue_t GomspaceDeviceHandler::generateRequestFullHkTableCmd(DeviceType dev,
-                                                                 uint8_t tableId,
                                                                    uint16_t tableReplySize,
                                                                    DeviceCommandId_t id,
                                                                    CspCookie* cspCookie) {
-  uint16_t querySize = tableReplySize;
+  if (dev == DeviceType::ACU) {
-  if (reqType == SpecialRequestTypes::DEFAULT_COM_IF) {
+    cspCookie->setRequest(SpecialRequestTypes::GET_ACU_HK, tableReplySize);
-    sif::warning << "Default communication for table requests not implemented anymore" << std::endl;
+  } else if (dev == DeviceType::P60DOCK) {
-    return returnvalue::FAILED;
+    cspCookie->setRequest(SpecialRequestTypes::GET_P60DOCK_HK, tableReplySize);
+  } else if (dev == DeviceType::PDU) {
+    cspCookie->setRequest(SpecialRequestTypes::GET_PDU_HK, tableReplySize);
   }
-  cspCookie->setRequest(reqType, tableReplySize);
   cspCookie->setCspPort(CspPorts::P60_PORT_RPARAM_ENUM);
-  rememberRequestedSize = querySize;
+  rememberRequestedSize = tableReplySize;
+  rememberCommandId = id;
+  return returnvalue::OK;
+}
+
+ReturnValue_t GomspaceDeviceHandler::generateRequestFullCfgTableCmd(DeviceType dev,
+                                                                    uint16_t tableReplySize,
+                                                                    DeviceCommandId_t id,
+                                                                    CspCookie* cspCookie) {
+  if (dev == DeviceType::ACU) {
+    cspCookie->setRequest(SpecialRequestTypes::GET_ACU_CONFIG, tableReplySize);
+  } else if (dev == DeviceType::P60DOCK) {
+    cspCookie->setRequest(SpecialRequestTypes::GET_P60DOCK_CONFIG, tableReplySize);
+  } else if (dev == DeviceType::PDU) {
+    cspCookie->setRequest(SpecialRequestTypes::GET_PDU_CONFIG, tableReplySize);
+  }
+  cspCookie->setCspPort(CspPorts::P60_PORT_RPARAM_ENUM);
+  // Unfortunately, this does not work..
+  // cspPacket[0] = defaultTable;
+  // rawPacket = cspPacket;
+  // rawPacketLen = 1;
+  rememberRequestedSize = tableReplySize;
   rememberCommandId = id;
   return returnvalue::OK;
 }

mission/devices/GomspaceDeviceHandler.h

@@ -82,10 +82,21 @@ class GomspaceDeviceHandler : public DeviceHandlerBase {
    * @brief   The command to generate a request to receive the full housekeeping table is device
    *          specific. Thus the child has to build this command.
    */
-  virtual ReturnValue_t generateRequestFullTableCmd(GOMSPACE::SpecialRequestTypes reqType,
+  ReturnValue_t generateRequestFullHkTableCmd(GOMSPACE::DeviceType devType, uint16_t tableSize,
-                                                    uint8_t tableId, uint16_t tableSize,
                                               DeviceCommandId_t id, CspCookie *cspCookie);
-
+  /**
+   * Unfortunately, it was not possible to specify the table ID (e.g. request table from
+   * default store)
+   * @param devType
+   * @param tableSize
+   * @param id
+   * @param cspCookie
+   * @return
+   */
+  ReturnValue_t generateRequestFullCfgTableCmd(GOMSPACE::DeviceType devType,
+                                               uint16_t tableSize, DeviceCommandId_t id,
+                                               CspCookie *cspCookie);
+  ReturnValue_t getDevType(GOMSPACE::DeviceType& type) const;
   /**
    * This command handles printing the HK table to the console. This is useful for debugging
    * purposes

mission/devices/devicedefinitions/GomspaceDefinitions.h

@@ -23,6 +23,8 @@ struct TableInfo {
   uint8_t targetTable;
 };
 
+enum DeviceType { PDU, ACU, P60DOCK };
+
 enum SpecialRequestTypes {
   DEFAULT_COM_IF,
   GET_PDU_HK,

tmtc

@@ -1 +1 @@
-Subproject commit cc31a756856623ecc2eec80e155557ac208f10a2
+Subproject commit abecbe44016313f1b51a29d1358fccb9f541d542