Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good

This commit is contained in:
Robin Müller 2022-05-23 22:24:28 +02:00
commit a1d2ec3db4
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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;

View File

@ -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;

2
tmtc

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