From 677457bbe7b5dda3bc71363d7f1ff3bb1c8020db Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 4 Apr 2023 15:59:45 +0200 Subject: [PATCH] syrlinks HK tweaks --- fsfw | 2 +- mission/com/SyrlinksHandler.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fsfw b/fsfw index 9fca7581..6650c293 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 9fca7581dd75d074df343802c922e48f95b677eb +Subproject commit 6650c293da09d8851c2bd6c4d6e6c5a8390d003e diff --git a/mission/com/SyrlinksHandler.cpp b/mission/com/SyrlinksHandler.cpp index 297ffd88..92546194 100644 --- a/mission/com/SyrlinksHandler.cpp +++ b/mission/com/SyrlinksHandler.cpp @@ -652,7 +652,7 @@ ReturnValue_t SyrlinksHandler::initializeLocalDataPool(localpool::DataPool& loca poolManager.subscribeForDiagPeriodicPacket( subdp::DiagnosticsHkPeriodicParams(rxDataset.getSid(), enableHkSets, 60.0)); poolManager.subscribeForRegularPeriodicPacket( - subdp::RegularHkPeriodicParams(temperatureSet.getSid(), enableHkSets, 20.0)); + subdp::RegularHkPeriodicParams(temperatureSet.getSid(), enableHkSets, 60.0)); return returnvalue::OK; } @@ -737,6 +737,9 @@ void SyrlinksHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) { internalState = InternalState::IDLE; }; auto txOnHandler = [&](InternalState selMod) { + txDataset.setReportingEnabled(true); + poolManager.changeCollectionInterval(txDataset.getSid(), 10.0); + poolManager.changeCollectionInterval(temperatureSet.getSid(), 5.0); if (internalState == InternalState::IDLE) { transitionCommandPending = false; commandExecuted = false; @@ -760,6 +763,8 @@ void SyrlinksHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) { return false; }; auto txStandbyHandler = [&]() { + txDataset.setReportingEnabled(false); + poolManager.changeCollectionInterval(temperatureSet.getSid(), 60.0); if (internalState == InternalState::IDLE) { transitionCommandPending = false; internalState = InternalState::SET_TX_STANDBY;