afmt and bump patch

CHANGELOG.md

@@ -16,7 +16,52 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
-# [v4.0.0] to be released
+# [v4.0.1] 2023-06-23
+
+## Fixed
+
+- `PusLiveDemux` packet demultiplexing bugfix where the demultiplexing did not work when there was
+  only one destination available.
+
+# [v4.0.0] 2023-06-22
+
+- `eive-tmtc` version v5.0.0
+- `q7s-package` version v3.1.1
+
+## Fixed
+
+- 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
+
+- Removed PTME busy/ready signals. Those were not used anyway because register reads are used now.
+- APB bus access busy checking is not done anymore as this is performed by the bus itself now.
+- Core controller will now announce version and image information event in addition to reboot
+  event in the `inititalize` function.
+- Core controller will now try to request and announce the firmware version in addition to the
+  OBSW version as well.
+- Added core controller action to read reboot mechansm information
+- GNSS reset pin will now only be asserted for 5 ms instead of 100 ms.
+
+## Added
+
+- Added PL I2C reset pin. It is not used/connected for now but could be used for FDIR procedures to
+  restore the PL I2C.
+- Core controller now announces firmware version as well when requesting a version info event
+
+# [v3.3.1] 2023-06-22
+
+## Fixed
+
+- `PusLiveDemux` packet demultiplexing bugfix where the demultiplexing did not work when there was
+  only one destination available.
+
+## Fixed
+
+- Fixed H parameter in SUS converter from 1 mm to 2.5 mm.
 
 # [v3.3.0] 2023-06-21
 

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 3)
 set(OBSW_VERSION_MINOR 3)
-set(OBSW_VERSION_REVISION 0)
+set(OBSW_VERSION_REVISION 1)
 
 # set(CMAKE_VERBOSE TRUE)
 

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;
 };

mission/tmtc/PersistentTmStore.cpp

@@ -268,7 +268,7 @@ ReturnValue_t PersistentTmStore::getNextDumpPacket(PusTmReader& reader, bool& fi
     // restore the file dump, but for now do not trust the file.
     std::error_code e;
     std::filesystem::remove(dumpParams.dirEntry.path().c_str(), e);
-    if(dumpParams.dirEntry.path() == activeFile) {
+    if (dumpParams.dirEntry.path() == activeFile) {
       activeFile == std::nullopt;
       assignAndOrCreateMostRecentFile();
     }

mission/tmtc/PusLiveDemux.cpp

@@ -11,6 +11,7 @@ ReturnValue_t PusLiveDemux::demultiplexPackets(StorageManagerIF& tmStore,
   ReturnValue_t result = returnvalue::OK;
   for (unsigned int idx = 0; idx < destinations.size(); idx++) {
     const auto& dest = destinations[idx];
+    bool setOrigStoreId = false;
     if (destinations.size() > 1) {
       if (idx < destinations.size() - 1) {
         // Create copy of data to ensure each TM recipient has its own copy. That way, we don't need
@@ -26,8 +27,13 @@ ReturnValue_t PusLiveDemux::demultiplexPackets(StorageManagerIF& tmStore,
 #endif
         }
       } else {
-        message.setStorageId(origStoreId);
+        setOrigStoreId = true;
       }
+    } else {
+      setOrigStoreId = true;
+    }
+    if (setOrigStoreId) {
+      message.setStorageId(origStoreId);
     }
     result = ownerQueue.sendMessage(dest.queueId, &message);
     if (result != returnvalue::OK) {