From 47b6485e29315860caeb1ca06da0da0223a42e30 Mon Sep 17 00:00:00 2001
From: "Jakob.Meier" <meierj@irs.uni-stuttgart.de>
Date: Fri, 4 Dec 2020 20:08:58 +0100
Subject: [PATCH] p60dock read config table compiling

---
 bsp_linux/comIF/P60DockComIF.cpp   | 10 +++++-----
 bsp_linux/comIF/P60DockComIF.h     |  4 +++-
 mission/devices/P60DockHandler.cpp |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bsp_linux/comIF/P60DockComIF.cpp b/bsp_linux/comIF/P60DockComIF.cpp
index bf97c2e3..5bc1d4f9 100644
--- a/bsp_linux/comIF/P60DockComIF.cpp
+++ b/bsp_linux/comIF/P60DockComIF.cpp
@@ -94,16 +94,16 @@ ReturnValue_t P60DockComIF::readReceivedMessage(CookieIF *cookie,
 		uint32_t timeout = 1000;
 		uint8_t p60dockAddress = p60DockCookie->getCspAddress();
 		gs_param_table_instance_t moduleConfig;
-		moduleConfig.rows = moduleConfigTable;
+		moduleConfig.rows = (gs_param_table_row_t*)p60dock_config;
 		moduleConfig.id = p60dockAddress;
-		moduleConfig.row_count = p60dock_hk_count;
-		moduleConfig.memory_size = P60DOCK_HK_SIZE;
+		moduleConfig.row_count = p60dock_config_count;
+		moduleConfig.memory_size = moduleCfgTableSize;
 		moduleConfig.memory = *buffer;
 		/* Read complete module configuration table from P60 Dock and store data
 		 * in buffer */
 		int result = gs_rparam_get_full_table(&moduleConfig, p60dockAddress,
-				node_hk.id, GS_RPARAM_MAGIC_CHECKSUM, timeout);
-		*size = P60DOCK_HK_SIZE;
+				moduleConfig.id, GS_RPARAM_MAGIC_CHECKSUM, timeout);
+		*size = moduleCfgTableSize;
 		if (result != GS_OK) {
 			sif::info
 					<< "Failed retrieving module configuration from P60 dock with error code "
diff --git a/bsp_linux/comIF/P60DockComIF.h b/bsp_linux/comIF/P60DockComIF.h
index 994eeb73..4595e9dd 100644
--- a/bsp_linux/comIF/P60DockComIF.h
+++ b/bsp_linux/comIF/P60DockComIF.h
@@ -16,6 +16,7 @@
 #include <gomspace/libcsp/include/csp/csp_error.h>
 #include <gomspace/libparam_client/include/gs/param/types.h>
 #include <gs/param/internal/types.h>
+#include <p60dock.h>
 
 /**
  * @brief	This is the communication interface to the cubesat space protocol
@@ -42,10 +43,11 @@ private:
 	/* Table definitions. According to gomspace software documentation there
 	 * exist four tables each identified by a number*/
 	uint8_t boardConfigTable = 0;
-	uint8_t modulConfigTable = 1;
+	uint8_t moduleConfigTable = 1;
 	uint8_t calibrationParamTable = 2;
 	uint8_t tmDataTable = 4;
 	unsigned int moduleConfigTableRows = 32;
+	uint16_t moduleCfgTableSize = 412;
 
 };
 
diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index 61358464..c7cd8402 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -77,7 +77,7 @@ ReturnValue_t P60DockHandler::interpretDeviceReply(DeviceCommandId_t id,
     return HasReturnvaluesIF::RETURN_OK;
 }
 
-void setNormalDatapoolEntriesInvalid(){
+void P60DockHandler::setNormalDatapoolEntriesInvalid(){
 
 }