From 8aa664b49fb76ab7930803833c3de4dcc2064034 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 23 May 2022 17:50:54 +0200 Subject: [PATCH 1/2] rtd bugfixes --- fsfw | 2 +- linux/devices/Max31865RtdLowlevelHandler.cpp | 2 +- mission/devices/Max31865EiveHandler.cpp | 3 +++ tmtc | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fsfw b/fsfw index f35b0ffb..4b128d24 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit f35b0ffbbd6e0e9cc1a760d0aeb69931907f1d62 +Subproject commit 4b128d243569e0c87ae8868c545bdd80a354a2e6 diff --git a/linux/devices/Max31865RtdLowlevelHandler.cpp b/linux/devices/Max31865RtdLowlevelHandler.cpp index 9b24f268..6a3af90e 100644 --- a/linux/devices/Max31865RtdLowlevelHandler.cpp +++ b/linux/devices/Max31865RtdLowlevelHandler.cpp @@ -112,9 +112,9 @@ bool Max31865RtdReader::periodicInitHandling() { } if (rtdIsActive(rtd->idx)) { #if OBSW_RTD_AUTO_MODE == 0 - someRtdUsable = true; result = writeBiasSel(Bias::ON, rtd->spiCookie, BASE_CFG); #endif + someRtdUsable = true; } } return someRtdUsable; diff --git a/mission/devices/Max31865EiveHandler.cpp b/mission/devices/Max31865EiveHandler.cpp index adcf9a0a..7075b685 100644 --- a/mission/devices/Max31865EiveHandler.cpp +++ b/mission/devices/Max31865EiveHandler.cpp @@ -123,6 +123,9 @@ void Max31865EiveHandler::fillCommandAndReplyMap() { ReturnValue_t Max31865EiveHandler::scanForReply(const uint8_t* start, size_t remainingSize, DeviceCommandId_t* foundId, size_t* foundLen) { + if(mode == _MODE_POWER_ON or mode == _MODE_WAIT_ON) { + return IGNORE_FULL_PACKET; + } if (remainingSize != structLen) { sif::error << "Invalid reply from RTD reader detected, reply size " << remainingSize << " not equal to exchange struct size " << structLen << std::endl; diff --git a/tmtc b/tmtc index 648e0b78..7e36b387 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 648e0b781483119e17799e34d669f554559692f0 +Subproject commit 7e36b387fe83505bcd0cedbeabd1ba01fd912af9 From 10e075efaf50d350dfecf298b165c8823aa78f94 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 23 May 2022 17:52:44 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2128a01d..95ec7400 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ list yields a list of all related PRs for each release. ## Added +- Commands for individual RTD devices + PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/84 - `RwAssembly` added to system components. Assembly works in principle, issues making 4 consecutives RWs communicate at once.. PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/224