Merge remote-tracking branch 'origin/main' into v4.0.0-dev

CHANGELOG.md

@@ -31,7 +31,7 @@ TODO: New firmware package version.
 - 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.
 
-# [v3.0.0] to be released
+# [v3.0.0] 2023-06-11
 
 - `eive-tmtc` version v4.0.0
 
@@ -125,6 +125,7 @@ TODO: New firmware package version.
 - Various fixes for the pointing modes of the `ACS Controller`. All modes should work now as
   intended.
 - The variance for the ADIS GYRs now represents the used `-3` version and not the `-1` version
+- CFDP funnel did not route packets to live channel VC0
 
 # [v2.0.5] 2023-05-11
 

bsp_q7s/em/emObjectFactory.cpp

@@ -140,6 +140,7 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_TM_TO_PTME == 1
   if (ccsdsArgs.liveDestination != nullptr) {
     pusFunnel->addLiveDestination("VC0 LIVE TM", *ccsdsArgs.liveDestination, 0);
+    cfdpFunnel->addLiveDestination("VC0 LIVE TM", *ccsdsArgs.liveDestination, 0);
   }
 #endif
 #endif /* OBSW_ADD_CCSDS_IP_CORES == 1 */

bsp_q7s/fmObjectFactory.cpp

@@ -97,6 +97,7 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_TM_TO_PTME == 1
   if (ccsdsArgs.liveDestination != nullptr) {
     pusFunnel->addLiveDestination("VC0 LIVE TM", *ccsdsArgs.liveDestination, 0);
+    cfdpFunnel->addLiveDestination("VC0 LIVE TM", *ccsdsArgs.liveDestination, 0);
   }
 #endif
 #endif /* OBSW_ADD_CCSDS_IP_CORES == 1 */

dummies/helperFactory.h

@@ -19,7 +19,7 @@ struct DummyCfg {
   bool addTempSensorDummies = true;
   bool addRtdComIFDummy = true;
   bool addPlocDummies = true;
-  bool addCamSwitcherDummy = true;
+  bool addCamSwitcherDummy = false;
 };
 
 void createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch, GpioIF* gpioIF, bool enableHkSets);

linux/acs/AcsBoardPolling.cpp

@@ -572,8 +572,6 @@ void AcsBoardPolling::gyroAdisHandler(GyroAdis& gyro) {
       return;
     }
     uint16_t decRateReadBack = (rawReply[10] << 8) | rawReply[11];
-    sif::debug << "AcsPollingTask: DEC rate configuration. Read " << decRateReadBack
-               << ", expected " << decRate << std::endl;
     if (decRateReadBack != decRate) {
       sif::warning << "AcsPollingTask: DEC rate configuration failed. Read " << decRateReadBack
                    << ", expected " << decRate << std::endl;

mission/cfdp/CfdpHandler.cpp

@@ -93,6 +93,7 @@ ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) {
       return INVALID_PDU_FORMAT;
     }
     if (not FileDirectiveReader::checkFileDirective(pduDataField[0])) {
+      sif::error << "CfdpHandler: Invalid PDU directive field " << pduDataField[0] << std::endl;
       return INVALID_DIRECTIVE_FIELD;
     }
     auto directive = static_cast<FileDirective>(pduDataField[0]);

tmtc

@@ -1 +1 @@
-Subproject commit 8804a4e8e9fce1d45fcf62314affb791114d1517
+Subproject commit 522f273c99845f9c50aaf135b1c6f52676b975dd