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

Split ACU HK #256

Merged
meierj merged 16 commits from mueller/split-acu-hk into develop 2022-05-25 15:23:19 +02:00
Conversation 0 Commits 16 Files Changed 9 +7 -2
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1d2ec3db4 - Show all commits

2
CHANGELOG.md
View File

@ -14,6 +14,8 @@ list yields a list of all related PRs for each release.
## Added ## 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, - `RwAssembly` added to system components. Assembly works in principle,
issues making 4 consecutives RWs communicate at once.. issues making 4 consecutives RWs communicate at once..
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/224 PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/224

2
linux/devices/Max31865RtdLowlevelHandler.cpp
View File

@ -112,9 +112,9 @@ bool Max31865RtdReader::periodicInitHandling() {
} }
if (rtdIsActive(rtd->idx)) { if (rtdIsActive(rtd->idx)) {
#if OBSW_RTD_AUTO_MODE == 0 #if OBSW_RTD_AUTO_MODE == 0
someRtdUsable = true;
result = writeBiasSel(Bias::ON, rtd->spiCookie, BASE_CFG); result = writeBiasSel(Bias::ON, rtd->spiCookie, BASE_CFG);
#endif #endif
someRtdUsable = true;
} }
} }
return someRtdUsable; return someRtdUsable;

3
mission/devices/Max31865EiveHandler.cpp
View File

@ -123,6 +123,9 @@ void Max31865EiveHandler::fillCommandAndReplyMap() {
ReturnValue_t Max31865EiveHandler::scanForReply(const uint8_t* start, size_t remainingSize, ReturnValue_t Max31865EiveHandler::scanForReply(const uint8_t* start, size_t remainingSize,
DeviceCommandId_t* foundId, size_t* foundLen) { DeviceCommandId_t* foundId, size_t* foundLen) {
if(mode == _MODE_POWER_ON or mode == _MODE_WAIT_ON) {
return IGNORE_FULL_PACKET;
}
if (remainingSize != structLen) { if (remainingSize != structLen) {
sif::error << "Invalid reply from RTD reader detected, reply size " << remainingSize sif::error << "Invalid reply from RTD reader detected, reply size " << remainingSize
<< " not equal to exchange struct size " << structLen << std::endl; << " not equal to exchange struct size " << structLen << std::endl;

2
tmtc

@ -1 +1 @@
Subproject commit 7f03dcb3a613d26462ac2571140ed6ecb91dd9f0 Subproject commit 51bbeaa693a11bfc4d2cb342354041972dd93c1e