eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

p60dock read config table compiling

Browse Source
This commit is contained in:
Jakob Meier 2020-12-04 20:08:58 +01:00
parent 87e121f016
commit ad97a5538c
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bsp_linux/comIF/P60DockComIF.cpp
View File

@ -94,16 +94,16 @@ ReturnValue_t P60DockComIF::readReceivedMessage(CookieIF *cookie,
uint32_t timeout = 1000; uint32_t timeout = 1000;
uint8_t p60dockAddress = p60DockCookie->getCspAddress(); uint8_t p60dockAddress = p60DockCookie->getCspAddress();
gs_param_table_instance_t moduleConfig; gs_param_table_instance_t moduleConfig;
moduleConfig.rows = moduleConfigTable; moduleConfig.rows = (gs_param_table_row_t*)p60dock_config;
moduleConfig.id = p60dockAddress; moduleConfig.id = p60dockAddress;
moduleConfig.row_count = p60dock_hk_count; moduleConfig.row_count = p60dock_config_count;
moduleConfig.memory_size = P60DOCK_HK_SIZE; moduleConfig.memory_size = moduleCfgTableSize;
moduleConfig.memory = *buffer; moduleConfig.memory = *buffer;
/* Read complete module configuration table from P60 Dock and store data /* Read complete module configuration table from P60 Dock and store data
* in buffer */ * in buffer */
int result = gs_rparam_get_full_table(&moduleConfig, p60dockAddress, int result = gs_rparam_get_full_table(&moduleConfig, p60dockAddress,
node_hk.id, GS_RPARAM_MAGIC_CHECKSUM, timeout); moduleConfig.id, GS_RPARAM_MAGIC_CHECKSUM, timeout);
*size = P60DOCK_HK_SIZE; *size = moduleCfgTableSize;
if (result != GS_OK) { if (result != GS_OK) {
sif::info sif::info
<< "Failed retrieving module configuration from P60 dock with error code " << "Failed retrieving module configuration from P60 dock with error code "

4
bsp_linux/comIF/P60DockComIF.h
View File

@ -16,6 +16,7 @@
#include <gomspace/libcsp/include/csp/csp_error.h> #include <gomspace/libcsp/include/csp/csp_error.h>
#include <gomspace/libparam_client/include/gs/param/types.h> #include <gomspace/libparam_client/include/gs/param/types.h>
#include <gs/param/internal/types.h> #include <gs/param/internal/types.h>
#include <p60dock.h>
/** /**
* @brief This is the communication interface to the cubesat space protocol * @brief This is the communication interface to the cubesat space protocol
@ -42,10 +43,11 @@ private:
/* Table definitions. According to gomspace software documentation there /* Table definitions. According to gomspace software documentation there
* exist four tables each identified by a number*/ * exist four tables each identified by a number*/
uint8_t boardConfigTable = 0; uint8_t boardConfigTable = 0;
uint8_t modulConfigTable = 1; uint8_t moduleConfigTable = 1;
uint8_t calibrationParamTable = 2; uint8_t calibrationParamTable = 2;
uint8_t tmDataTable = 4; uint8_t tmDataTable = 4;
unsigned int moduleConfigTableRows = 32; unsigned int moduleConfigTableRows = 32;
uint16_t moduleCfgTableSize = 412;
}; };

2
mission/devices/P60DockHandler.cpp
View File

@ -77,7 +77,7 @@ ReturnValue_t P60DockHandler::interpretDeviceReply(DeviceCommandId_t id,
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
void setNormalDatapoolEntriesInvalid(){ void P60DockHandler::setNormalDatapoolEntriesInvalid(){
} }