From 7a1dbf8456740ed47a130b61cfab53a59652f0ed Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 25 Aug 2022 23:22:17 +0200 Subject: [PATCH] add gom space client code --- CMakeLists.txt | 2 +- bsp_q7s/OBSWConfig.h.in | 1 - bsp_q7s/boardtest/Q7STestTask.cpp | 12 ++++++++++++ thirdparty/gomspace-sw | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d14f7b3..ddb9f4b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -459,7 +459,7 @@ if(TGT_BSP MATCHES "arm/egse") endif() if(ADD_CSP_LIB) - target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_CSP_NAME}) + target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_CSP_NAME} libp60client) endif() if(EIVE_ADD_ETL_LIB) diff --git a/bsp_q7s/OBSWConfig.h.in b/bsp_q7s/OBSWConfig.h.in index ed321f8c..b9c27840 100644 --- a/bsp_q7s/OBSWConfig.h.in +++ b/bsp_q7s/OBSWConfig.h.in @@ -115,7 +115,6 @@ #cmakedefine LIBGPS_VERSION_MAJOR @LIBGPS_VERSION_MAJOR@ #cmakedefine LIBGPS_VERSION_MINOR @LIBGPS_VERSION_MINOR@ - #ifdef __cplusplus #include "objects/systemObjectList.h" diff --git a/bsp_q7s/boardtest/Q7STestTask.cpp b/bsp_q7s/boardtest/Q7STestTask.cpp index 6cf4e734..0264aba0 100644 --- a/bsp_q7s/boardtest/Q7STestTask.cpp +++ b/bsp_q7s/boardtest/Q7STestTask.cpp @@ -20,6 +20,9 @@ #include "fsfw/timemanager/Stopwatch.h" #include "test/DummyParameter.h" +#include "p60pdu.h" +#include + Q7STestTask::Q7STestTask(object_id_t objectId) : TestTask(objectId) { doTestSdCard = false; doTestScratchApi = false; @@ -35,6 +38,15 @@ ReturnValue_t Q7STestTask::performOneShotAction() { if (doTestScratchApi) { testScratchApi(); } + uint8_t p60pdu_node = 3; + uint8_t hk_mem[P60PDU_HK_SIZE]; + param_index_t p60pdu_hk{}; + p60pdu_hk.physaddr = hk_mem; + if (!p60pdu_get_hk(&p60pdu_hk, p60pdu_node, 1000)) { + printf("Error getting p60pdu hk\n"); + } else { + //param_list(&p60pdu_hk, 1); + } // testJsonLibDirect(); // testDummyParams(); if (doTestProtHandler) { diff --git a/thirdparty/gomspace-sw b/thirdparty/gomspace-sw index 47059ea5..b99ea737 160000 --- a/thirdparty/gomspace-sw +++ b/thirdparty/gomspace-sw @@ -1 +1 @@ -Subproject commit 47059ea593dda32e78e59ebd24902ea60db00448 +Subproject commit b99ea7371f5af591846df267d0a6d72e53f2cd88