Merge remote-tracking branch 'origin/v4.0.0-dev' into set-more-temps-to-invalid-value

CHANGELOG.md

@@ -23,10 +23,10 @@ will consitute of a breaking change warranting a new major release:
 
 ## Fixed
 
-- CFDP low level protocol bugfix. Requires fsfw update and tmtc update.
 - Important bugfixes for PTME. See `q7s-package` CHANGELOG.
 - TCS fixes: Set temperature values to invalid value for MAX31865 RTD handler, SUS handler
   and STR handler. Also set dataset to invakid for RTD handler.
+- Fixed H parameter in SUS converter from 1 mm to 2.5 mm.
 
 ## Changed
 

mission/acs/str/StarTrackerHandler.cpp

@@ -12,14 +12,13 @@ extern "C" {
 #include <wire/common/genericstructs.h>
 }
 
-#include "fsfw/thermal/tcsDefinitions.h"
-
 #include <atomic>
 #include <fstream>
 #include <thread>
 
 #include "OBSWConfig.h"
 #include "eive/definitions.h"
+#include "fsfw/thermal/tcsDefinitions.h"
 
 std::atomic_bool JCFG_DONE(false);
 

mission/controller/acs/SusConverter.h

@@ -25,7 +25,7 @@ class SusConverter {
 
   static constexpr float S = 0.03;  // S=[mm] gap between diodes
   static constexpr float D = 5;     // D=[mm] edge length of the quadratic aperture
-  static constexpr float H = 1;     // H=[mm] distance between diodes and aperture
+  static constexpr float H = 2.5;   // H=[mm] distance between diodes and aperture
 
   AcsParameters acsParameters;
 };