Merge pull request 'Route CFDP to live' (#675) from route-cfdp-to-live-main into main

Reviewed-on: #675
2023-06-09 18:41:59 +02:00 · 2023-06-09 18:41:59 +02:00 · 962c792679
commit 962c792679
parent 020daf9a77 c44d8e6437
3 changed files with 3 additions and 0 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -46,6 +46,7 @@ will consitute of a breaking change warranting a new major release:
  16505 type.
 - Host build is working again. Added reduced live TM helper which schedules the PUS and CFDP
  funnel.
+- CFDP funnel did not route packets to live channel VC0

 # [v2.0.5] 2023-05-11

--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/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 */
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/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 */