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

v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
Conversation 0 Commits 493 Files Changed 264 +6 -3
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8aa664b49f - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit f35b0ffbbd6e0e9cc1a760d0aeb69931907f1d62 Subproject commit 4b128d243569e0c87ae8868c545bdd80a354a2e6

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 648e0b781483119e17799e34d669f554559692f0 Subproject commit 7e36b387fe83505bcd0cedbeabd1ba01fd912af9