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

v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
Conversation 1 Commits 592 Files Changed 218 +13 -9
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 22154f2851 - Show all commits

19
mission/devices/Max31865PT1000Handler.cpp
View File

@ -319,14 +319,17 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
switch (id) {
case (Max31865Definitions::REQUEST_CONFIG): {
if (packet[1] != DEFAULT_CONFIG) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
// it propably would be better if we at least try one restart..
sif::error << "Max31865PT1000Handler: 0x" << std::hex << this->getObjectId()
<< ": Invalid configuration reply" << std::endl;
#else
sif::printError("Max31865PT1000Handler: %04x: Invalid configuration reply!\n",
this->getObjectId());
#endif
if(warningSwitch) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
// it propably would be better if we at least try one restart..
sif::warning << "Max31865PT1000Handler: 0x" << std::hex << this->getObjectId()
<< ": Invalid configuration reply" << std::endl;
#else
sif::printWarning("Max31865PT1000Handler: %04x: Invalid configuration reply!\n",
this->getObjectId());
#endif
warningSwitch = false;
}
return HasReturnvaluesIF::RETURN_OK;
}
// set to true for invalid configs too for now.

1
mission/devices/Max31865PT1000Handler.h
View File

@ -85,6 +85,7 @@ class Max31865PT1000Handler : public DeviceHandlerBase {
private:
uint8_t switchId = 0;
bool instantNormal = true;
bool warningSwitch = true;
enum class InternalState {
NONE,

2
tmtc

@ -1 +1 @@
Subproject commit 46c327101e24d61452ddb1cd3dd09cab87674abb
Subproject commit cb479cc2f48ed15668a5b223529dc1cf1ee5b6ad