eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

syrlinks HK tweaks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-04-04 15:59:45 +02:00
parent bc7bdfe1fe
commit 677457bbe7
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 9fca7581dd75d074df343802c922e48f95b677eb Subproject commit 6650c293da09d8851c2bd6c4d6e6c5a8390d003e

7
mission/com/SyrlinksHandler.cpp
View File

@ -652,7 +652,7 @@ ReturnValue_t SyrlinksHandler::initializeLocalDataPool(localpool::DataPool& loca
poolManager.subscribeForDiagPeriodicPacket( poolManager.subscribeForDiagPeriodicPacket(
subdp::DiagnosticsHkPeriodicParams(rxDataset.getSid(), enableHkSets, 60.0)); subdp::DiagnosticsHkPeriodicParams(rxDataset.getSid(), enableHkSets, 60.0));
poolManager.subscribeForRegularPeriodicPacket( poolManager.subscribeForRegularPeriodicPacket(
subdp::RegularHkPeriodicParams(temperatureSet.getSid(), enableHkSets, 20.0)); subdp::RegularHkPeriodicParams(temperatureSet.getSid(), enableHkSets, 60.0));
return returnvalue::OK; return returnvalue::OK;
} }
@ -737,6 +737,9 @@ void SyrlinksHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {
internalState = InternalState::IDLE; internalState = InternalState::IDLE;
}; };
auto txOnHandler = [&](InternalState selMod) { auto txOnHandler = [&](InternalState selMod) {
txDataset.setReportingEnabled(true);
poolManager.changeCollectionInterval(txDataset.getSid(), 10.0);
poolManager.changeCollectionInterval(temperatureSet.getSid(), 5.0);
if (internalState == InternalState::IDLE) { if (internalState == InternalState::IDLE) {
transitionCommandPending = false; transitionCommandPending = false;
commandExecuted = false; commandExecuted = false;
@ -760,6 +763,8 @@ void SyrlinksHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {
return false; return false;
}; };
auto txStandbyHandler = [&]() { auto txStandbyHandler = [&]() {
txDataset.setReportingEnabled(false);
poolManager.changeCollectionInterval(temperatureSet.getSid(), 60.0);
if (internalState == InternalState::IDLE) { if (internalState == InternalState::IDLE) {
transitionCommandPending = false; transitionCommandPending = false;
internalState = InternalState::SET_TX_STANDBY; internalState = InternalState::SET_TX_STANDBY;