From a526bfe972a726389d4af6d38a2221cf2351553d Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Tue, 31 Jan 2023 11:27:53 +0100 Subject: [PATCH 1/5] pdec far now also parsed in irq based operation --- linux/ipcore/PdecHandler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp index bc33a220..57d59841 100644 --- a/linux/ipcore/PdecHandler.cpp +++ b/linux/ipcore/PdecHandler.cpp @@ -188,6 +188,7 @@ ReturnValue_t PdecHandler::irqOperation() { if ((pisr & NEW_FAR_MASK) == NEW_FAR_MASK) { // Read FAR here CURRENT_FAR = readFar(); + checkFrameAna(CURRENT_FAR); } if (lockCheckCd.hasTimedOut()) { checkLocks(); -- 2.43.0 From a4cd2d1702738c022c3397791962f01c98622256 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Tue, 31 Jan 2023 14:05:40 +0100 Subject: [PATCH 2/5] changed spacecraft id to 0x3DC --- linux/ipcore/PdecConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/ipcore/PdecConfig.h b/linux/ipcore/PdecConfig.h index 284af6ef..3d909581 100644 --- a/linux/ipcore/PdecConfig.h +++ b/linux/ipcore/PdecConfig.h @@ -34,7 +34,7 @@ class PdecConfig { static const uint8_t VIRTUAL_CHANNEL = 0; static const uint8_t RESERVED_FIELD_A = 0; - static const uint16_t SPACECRAFT_ID = 0x274; + static const uint16_t SPACECRAFT_ID = 0x3DC; static const uint16_t DUMMY_BITS = 0; // Parameters to control the FARM for AD frames // Set here for future use -- 2.43.0 From bdf397a71eeae26553bef3735969f39c42764d39 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Wed, 1 Feb 2023 08:27:55 +0100 Subject: [PATCH 3/5] corrections for transmitter timer in ccsds handler --- mission/tmtc/CcsdsIpCoreHandler.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mission/tmtc/CcsdsIpCoreHandler.cpp b/mission/tmtc/CcsdsIpCoreHandler.cpp index f31aeaa4..85d1143b 100644 --- a/mission/tmtc/CcsdsIpCoreHandler.cpp +++ b/mission/tmtc/CcsdsIpCoreHandler.cpp @@ -135,10 +135,12 @@ ReturnValue_t CcsdsIpCoreHandler::initialize() { return ObjectManagerIF::CHILD_INIT_FAILED; } + transmitterCountdown.setTimeout(transmitterTimeout); + transmitterCountdown.timeOut(); + #if OBSW_SYRLINKS_SIMULATED == 1 // Update data on rising edge ptmeConfig->invertTxClock(false); - transmitterCountdown.setTimeout(transmitterTimeout); linkState = UP; forwardLinkstate(); #endif /* OBSW_SYRLINKS_SIMULATED == 1*/ @@ -348,6 +350,9 @@ void CcsdsIpCoreHandler::enableTransmit() { gpioIF->pullHigh(enTxClock); gpioIF->pullHigh(enTxData); #endif + linkState = UP; + forwardLinkstate(); + transmitterCountdown.resetTimer(); } void CcsdsIpCoreHandler::checkTxTimer() { @@ -356,6 +361,7 @@ void CcsdsIpCoreHandler::checkTxTimer() { } if (transmitterCountdown.hasTimedOut()) { disableTransmit(); + //TODO: set mode to off (move timer to subsystem) } } @@ -425,7 +431,7 @@ void CcsdsIpCoreHandler::disableTransmit() { #endif linkState = DOWN; forwardLinkstate(); - transmitterCountdown.setTimeout(0); + transmitterCountdown.timeOut(); } const char* CcsdsIpCoreHandler::getName() const { return "CCSDS Handler"; } -- 2.43.0 From 9768541c35220ccc560889d89004f35956747a55 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Wed, 1 Feb 2023 08:40:05 +0100 Subject: [PATCH 4/5] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ffedb56..7bdb205f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,11 @@ change warranting a new major release: TMTC version: v2.6.1 +## Fixed + - The CCSDS handler starts the transmitter timer each time it is commanded to MODE_ON and times out the timer when the handler is commanded to MODE_OFF + - If the timer is timed out the CCSDS handler will disable the TX clock which will cause the syrlinks to got to standby mode + - PDEC handler now parses the FAR register also in interrupt mode + ## Added - First COM subsystem implementation. It mirrors the Syrlinks mode/submodes but also takes -- 2.43.0 From f5c5377a81d52c76858ec20a6c5c21de6a75ad01 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 1 Feb 2023 13:43:29 +0100 Subject: [PATCH 5/5] move to unreleased section --- CHANGELOG.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bdb205f..7c013105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,12 @@ change warranting a new major release: # [unreleased] +## Fixed + + - The CCSDS handler starts the transmitter timer each time it is commanded to MODE_ON and times out the timer when the handler is commanded to MODE_OFF + - If the timer is timed out the CCSDS handler will disable the TX clock which will cause the syrlinks to got to standby mode + - PDEC handler now parses the FAR register also in interrupt mode + # [v1.22.1] 2023-01-30 ## Changed @@ -28,11 +34,6 @@ change warranting a new major release: TMTC version: v2.6.1 -## Fixed - - The CCSDS handler starts the transmitter timer each time it is commanded to MODE_ON and times out the timer when the handler is commanded to MODE_OFF - - If the timer is timed out the CCSDS handler will disable the TX clock which will cause the syrlinks to got to standby mode - - PDEC handler now parses the FAR register also in interrupt mode - ## Added - First COM subsystem implementation. It mirrors the Syrlinks mode/submodes but also takes -- 2.43.0