Merge branch 'develop' into mueller/core-controller-remount-sd-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
This commit is contained in:
commit
b66a91da2e
@ -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
|
||||
|
2
fsfw
2
fsfw
@ -1 +1 @@
|
||||
Subproject commit f35b0ffbbd6e0e9cc1a760d0aeb69931907f1d62
|
||||
Subproject commit 4b128d243569e0c87ae8868c545bdd80a354a2e6
|
@ -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;
|
||||
|
@ -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
2
tmtc
@ -1 +1 @@
|
||||
Subproject commit 15e0861c4def44d4a2facbfd8347b1933d671f21
|
||||
Subproject commit 9332fb8690de200070e712a70b1fa339d5b6b8d8
|
Loading…
Reference in New Issue
Block a user