stupid submodules

.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

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)

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 <sagitta/client/arc_client.h>
+}
+
 /**
  * @brief   Helper class for the star tracker handler to accelerate large data transfers.
  *

mission/acs/str/ArcsecDatalinkLayer.cpp

@@ -1,4 +1,8 @@
-#include <mission/acs/str/ArcsecDatalinkLayer.h>
+#include "ArcsecDatalinkLayer.h"
+
+extern "C" {
+#include <common/misc.h>
+}
 
 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

mission/acs/str/ArcsecDatalinkLayer.h

@@ -5,10 +5,13 @@
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <mission/acs/str/strHelpers.h>
 
-#include "arcsec/common/misc.h"
 #include "eive/resultClassIds.h"
 #include "fsfw/returnvalues/returnvalue.h"
 
+extern "C" {
+#include <common/SLIP.h>
+}
+
 /**
  * @brief   Helper class to handle the datalinklayer of replies from the star tracker of arcsec.
  */

mission/acs/str/ArcsecJsonParamBase.cpp

@@ -1,7 +1,11 @@
+#include "arcsecJsonKeys.h"
+
 #include <mission/acs/str/ArcsecJsonParamBase.h>
 #include <mission/acs/str/arcsecJsonKeys.h>
 
-#include "arcsecJsonKeys.h"
+extern "C" {
+#include <common/genericstructs.h>
+}
 
 ArcsecJsonParamBase::ArcsecJsonParamBase(std::string setName) : setName(setName) {}
 

mission/acs/str/ArcsecJsonParamBase.h

@@ -7,8 +7,6 @@
 #include <fstream>
 #include <nlohmann/json.hpp>
 
-#include "arcsec/common/generated/tmtcstructs.h"
-#include "arcsec/common/genericstructs.h"
 #include "eive/resultClassIds.h"
 #include "fsfw/returnvalues/returnvalue.h"
 

mission/acs/str/StarTrackerHandler.cpp

@@ -1,18 +1,19 @@
-#include <arcsec/client/generated/actionreq.h>
-#include <arcsec/client/generated/parameter.h>
-#include <arcsec/client/generated/telemetry.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/timemanager/Stopwatch.h>
 #include <mission/acs/str/StarTrackerHandler.h>
 #include <mission/acs/str/strHelpers.h>
 #include <mission/acs/str/strJsonCommands.h>
 
+#include <sagitta/client/actionreq.h>
+#include <sagitta/client/parameter.h>
+#include <sagitta/client/telemetry.h>
+
 #include <atomic>
 #include <fstream>
 #include <thread>
 
 #include "OBSWConfig.h"
-#include "arcsec/common/misc.h"
+//#include "/common/misc.h"
 
 std::atomic_bool JCFG_DONE(false);
 

mission/acs/str/StarTrackerHandler.h

@@ -10,7 +10,7 @@
 #include <thread>
 
 #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"

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)

thirdparty/arcsec_star_tracker

@@ -1 +0,0 @@
-Subproject commit 2823952e0902726e6e35dd7c159761f76bf7e505