From 00e04e8b77a2c39b489ef9a9f4b5c29bfd695e64 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 9 Mar 2023 20:38:50 +0100 Subject: [PATCH] fix host build, fix in filter helper --- bsp_hosted/ObjectFactory.cpp | 6 +++++- mission/tmtc/CcsdsIpCoreHandler.cpp | 3 +-- mission/tmtc/PusTmRouteByFilterHelper.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp index 5ef9e2c2..eb633339 100644 --- a/bsp_hosted/ObjectFactory.cpp +++ b/bsp_hosted/ObjectFactory.cpp @@ -58,8 +58,12 @@ void ObjectFactory::produce(void* args) { Factory::setStaticFrameworkObjectIds(); PusTmFunnel* pusFunnel; CfdpTmFunnel* cfdpFunnel; + StorageManagerIF* tmStore; + StorageManagerIF* ipcStore; + PersistentTmStores persistentStores; auto sdcMan = new DummySdCardManager("/tmp"); - ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel, *sdcMan); + ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel, *sdcMan, &ipcStore, + &tmStore, persistentStores); auto* dummyGpioIF = new DummyGpioIF(); auto* dummySwitcher = new DummyPowerSwitcher(objects::PCDU_HANDLER, 18, 0); diff --git a/mission/tmtc/CcsdsIpCoreHandler.cpp b/mission/tmtc/CcsdsIpCoreHandler.cpp index ec6602cc..838af4c0 100644 --- a/mission/tmtc/CcsdsIpCoreHandler.cpp +++ b/mission/tmtc/CcsdsIpCoreHandler.cpp @@ -73,9 +73,8 @@ ReturnValue_t CcsdsIpCoreHandler::initialize() { #if OBSW_SYRLINKS_SIMULATED == 1 // Update data on rising edge - ptmeConfig->invertTxClock(false); + ptmeConfig.invertTxClock(false); linkState = LINK_UP; - forwardLinkstate(); #endif /* OBSW_SYRLINKS_SIMULATED == 1*/ return result; diff --git a/mission/tmtc/PusTmRouteByFilterHelper.cpp b/mission/tmtc/PusTmRouteByFilterHelper.cpp index 63b95733..15adde05 100644 --- a/mission/tmtc/PusTmRouteByFilterHelper.cpp +++ b/mission/tmtc/PusTmRouteByFilterHelper.cpp @@ -5,7 +5,7 @@ PusTmRouteByFilterHelper::PusTmRouteByFilterHelper() = default; bool PusTmRouteByFilterHelper::packetMatches(PusTmReader& reader, MessageQueueId_t& destination) { - for (const auto filterAndDest : routerMap) { + for (const auto& filterAndDest : routerMap) { if (filterAndDest.first.packetMatches(reader)) { destination = filterAndDest.second; return true;