From 8d9eb9ac58a3f7cf845c2b6a15822fd22a577634 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 27 Jan 2023 17:34:22 +0100 Subject: [PATCH] last tweaks, all works now --- mission/system/tree/comModeTree.cpp | 4 ++-- mission/tmtc/CcsdsIpCoreHandler.cpp | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mission/system/tree/comModeTree.cpp b/mission/system/tree/comModeTree.cpp index 551e6c3d..92ab66f2 100644 --- a/mission/system/tree/comModeTree.cpp +++ b/mission/system/tree/comModeTree.cpp @@ -97,7 +97,7 @@ void buildRxOnlySequence(Subsystem& ss, ModeListEntry& eh) { // Build TX OFF sequence ihs(COM_SEQUENCE_RX_ONLY.second, COM_TABLE_RX_ONLY_TGT.first, 0, true); ihs(COM_SEQUENCE_RX_ONLY.second, COM_TABLE_RX_ONLY_TRANS_0.first, 0, true); - ihs(COM_SEQUENCE_RX_ONLY.second, COM_TABLE_RX_ONLY_TRANS_1.first, 0, true); + ihs(COM_SEQUENCE_RX_ONLY.second, COM_TABLE_RX_ONLY_TRANS_1.first, 0, false); check(ss.addSequence(SequenceEntry(COM_SEQUENCE_RX_ONLY.first, &COM_SEQUENCE_RX_ONLY.second, COM_SEQUENCE_RX_ONLY.first)), ctxc); @@ -148,7 +148,7 @@ void buildTxAndRxLowRateSequence(Subsystem& ss, ModeListEntry& eh) { // Build TX and RX low datarate sequence ihs(COM_SEQUENCE_RX_AND_TX_LOW_RATE.second, COM_TABLE_RX_AND_TX_LOW_RATE_TGT.first, 0, true); ihs(COM_SEQUENCE_RX_AND_TX_LOW_RATE.second, COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_0.first, 0, true); - ihs(COM_SEQUENCE_RX_AND_TX_LOW_RATE.second, COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_1.first, 0, true); + ihs(COM_SEQUENCE_RX_AND_TX_LOW_RATE.second, COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_1.first, 0, false); check(ss.addSequence(SequenceEntry(COM_SEQUENCE_RX_AND_TX_LOW_RATE.first, &COM_SEQUENCE_RX_AND_TX_LOW_RATE.second, COM_SEQUENCE_RX_ONLY.first)), diff --git a/mission/tmtc/CcsdsIpCoreHandler.cpp b/mission/tmtc/CcsdsIpCoreHandler.cpp index db9a56b3..f215c8cf 100644 --- a/mission/tmtc/CcsdsIpCoreHandler.cpp +++ b/mission/tmtc/CcsdsIpCoreHandler.cpp @@ -396,9 +396,12 @@ void CcsdsIpCoreHandler::startTransition(Mode_t mode, Submode_t submode) { mode = HasModesIF::MODE_OFF; } modeHelper.modeChanged(mode, submode); + announceMode(false); } -void CcsdsIpCoreHandler::announceMode(bool recursive) { triggerEvent(MODE_INFO, mode, submode); } +void CcsdsIpCoreHandler::announceMode(bool recursive) { + triggerEvent(MODE_INFO, mode, submode); +} void CcsdsIpCoreHandler::disableTransmit() { #ifndef TE0720_1CFA