From f7bc052070e73f25ace3b69cacf70ac38f6b88a1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 13 Apr 2023 17:55:56 +0200 Subject: [PATCH] stupid submodules --- .gitmodules | 3 --- CMakeLists.txt | 2 +- linux/acs/StrComHandler.h | 6 ++++-- mission/acs/str/ArcsecDatalinkLayer.cpp | 13 +++++++------ mission/acs/str/ArcsecDatalinkLayer.h | 5 ++++- mission/acs/str/ArcsecJsonParamBase.cpp | 6 +++++- mission/acs/str/ArcsecJsonParamBase.h | 2 -- mission/acs/str/StarTrackerHandler.cpp | 9 +++++---- mission/acs/str/StarTrackerHandler.h | 2 +- thirdparty/CMakeLists.txt | 3 ++- thirdparty/arcsec_star_tracker | 1 - 11 files changed, 29 insertions(+), 23 deletions(-) delete mode 160000 thirdparty/arcsec_star_tracker diff --git a/.gitmodules b/.gitmodules index 76fb8527..2bcea610 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "thirdparty/lwgps"] path = thirdparty/lwgps url = https://github.com/rmspacefish/lwgps.git -[submodule "thirdparty/arcsec_star_tracker"] - path = thirdparty/arcsec_star_tracker - url = https://egit.irs.uni-stuttgart.de/eive/arcsec_star_tracker.git [submodule "thirdparty/json"] path = thirdparty/json url = https://github.com/nlohmann/json.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d73475d..76db1b78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,7 +220,7 @@ set(LIB_EIVE_MISSION_PATH mission) set(LIB_ETL_PATH ${THIRD_PARTY_FOLDER}/etl) set(LIB_CATCH2_PATH ${THIRD_PARTY_FOLDER}/Catch2) set(LIB_LWGPS_PATH ${THIRD_PARTY_FOLDER}/lwgps) -set(LIB_ARCSEC_PATH ${THIRD_PARTY_FOLDER}/arcsec_star_tracker) +set(LIB_ARCSEC_PATH ${THIRD_PARTY_FOLDER}/sagittactl) set(LIB_JSON_PATH ${THIRD_PARTY_FOLDER}/json) set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF) diff --git a/linux/acs/StrComHandler.h b/linux/acs/StrComHandler.h index 385e8b2e..d8542f26 100644 --- a/linux/acs/StrComHandler.h +++ b/linux/acs/StrComHandler.h @@ -11,8 +11,6 @@ #include "bsp_q7s/fs/SdCardManager.h" #endif -#include "arcsec/client/generated/actionreq.h" -#include "arcsec/common/generated/tmtcstructs.h" #include "fsfw/devicehandlers/CookieIF.h" #include "fsfw/objectmanager/SystemObject.h" #include "fsfw/osal/linux/BinarySemaphore.h" @@ -20,6 +18,10 @@ #include "fsfw/tasks/ExecutableObjectIF.h" #include "fsfw_hal/linux/serial/SerialComIF.h" +extern "C" { +#include +} + /** * @brief Helper class for the star tracker handler to accelerate large data transfers. * diff --git a/mission/acs/str/ArcsecDatalinkLayer.cpp b/mission/acs/str/ArcsecDatalinkLayer.cpp index 532c12b8..e192be2e 100644 --- a/mission/acs/str/ArcsecDatalinkLayer.cpp +++ b/mission/acs/str/ArcsecDatalinkLayer.cpp @@ -1,4 +1,8 @@ -#include +#include "ArcsecDatalinkLayer.h" + +extern "C" { +#include +} ArcsecDatalinkLayer::ArcsecDatalinkLayer() : decodeRingBuf(BUFFER_LENGTHS, true) { slipInit(); } @@ -18,13 +22,10 @@ ReturnValue_t ArcsecDatalinkLayer::checkRingBufForFrame(const uint8_t** decodedF case ARC_DEC_INPROGRESS: { break; } - case ARC_DEC_ERROR_FRAME_SHORT: { + case ARC_DEC_ERROR: { decodeRingBuf.deleteData(idx); - return REPLY_TOO_SHORT; + return returnvalue::FAILED; } - case ARC_DEC_ERROR_CHECKSUM: - decodeRingBuf.deleteData(idx); - return CRC_FAILURE; case ARC_DEC_ASYNC: case ARC_DEC_SYNC: { // Reset length of SLIP struct for next frame diff --git a/mission/acs/str/ArcsecDatalinkLayer.h b/mission/acs/str/ArcsecDatalinkLayer.h index 404d9e52..b1a7fd94 100644 --- a/mission/acs/str/ArcsecDatalinkLayer.h +++ b/mission/acs/str/ArcsecDatalinkLayer.h @@ -5,10 +5,13 @@ #include #include -#include "arcsec/common/misc.h" #include "eive/resultClassIds.h" #include "fsfw/returnvalues/returnvalue.h" +extern "C" { +#include +} + /** * @brief Helper class to handle the datalinklayer of replies from the star tracker of arcsec. */ diff --git a/mission/acs/str/ArcsecJsonParamBase.cpp b/mission/acs/str/ArcsecJsonParamBase.cpp index b5dd2150..6bdaa505 100644 --- a/mission/acs/str/ArcsecJsonParamBase.cpp +++ b/mission/acs/str/ArcsecJsonParamBase.cpp @@ -1,7 +1,11 @@ +#include "arcsecJsonKeys.h" + #include #include -#include "arcsecJsonKeys.h" +extern "C" { +#include +} ArcsecJsonParamBase::ArcsecJsonParamBase(std::string setName) : setName(setName) {} diff --git a/mission/acs/str/ArcsecJsonParamBase.h b/mission/acs/str/ArcsecJsonParamBase.h index 90c54f45..4c4a7a90 100644 --- a/mission/acs/str/ArcsecJsonParamBase.h +++ b/mission/acs/str/ArcsecJsonParamBase.h @@ -7,8 +7,6 @@ #include #include -#include "arcsec/common/generated/tmtcstructs.h" -#include "arcsec/common/genericstructs.h" #include "eive/resultClassIds.h" #include "fsfw/returnvalues/returnvalue.h" diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp index 3837d9e5..b449c036 100644 --- a/mission/acs/str/StarTrackerHandler.cpp +++ b/mission/acs/str/StarTrackerHandler.cpp @@ -1,18 +1,19 @@ -#include -#include -#include #include #include #include #include #include +#include +#include +#include + #include #include #include #include "OBSWConfig.h" -#include "arcsec/common/misc.h" +//#include "/common/misc.h" std::atomic_bool JCFG_DONE(false); diff --git a/mission/acs/str/StarTrackerHandler.h b/mission/acs/str/StarTrackerHandler.h index f143a660..4b8ba449 100644 --- a/mission/acs/str/StarTrackerHandler.h +++ b/mission/acs/str/StarTrackerHandler.h @@ -10,7 +10,7 @@ #include #include "OBSWConfig.h" -#include "arcsec/common/SLIP.h" +#include "common/SLIP.h" #include "devices/powerSwitcherList.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/src/fsfw/serialize/SerializeAdapter.h" diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index e300cd11..3a5110c9 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -4,7 +4,8 @@ endif() # Dependency on proprietary library if(TGT_BSP MATCHES "arm/q7s") - add_subdirectory(arcsec_star_tracker) + # Only add required folder for wire library. + add_subdirectory(sagittactl/wire) endif() add_subdirectory(rapidcsv) diff --git a/thirdparty/arcsec_star_tracker b/thirdparty/arcsec_star_tracker deleted file mode 160000 index 2823952e..00000000 --- a/thirdparty/arcsec_star_tracker +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2823952e0902726e6e35dd7c159761f76bf7e505