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

Health handling for ACS brd assy #415

Merged
muellerr merged 9 commits from bugfix_acs_brd_ass into develop 2023-03-06 14:36:19 +01:00
Conversation 0 Commits 9 Files Changed 11 +9 -10
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7a1c9f402 - Show all commits

5
mission/devices/GyrAdis1650XHandler.cpp
View File

@ -48,7 +48,7 @@ void GyrAdis1650XHandler::doShutDown() {
updatePeriodicReply(false, adis1650x::REPLY);
internalState = InternalState::NONE;
commandExecuted = false;
setMode(_MODE_POWER_DOWN);
setMode(MODE_OFF);
}
}
@ -90,7 +90,8 @@ void GyrAdis1650XHandler::fillCommandAndReplyMap() {
ReturnValue_t GyrAdis1650XHandler::scanForReply(const uint8_t *start, size_t remainingSize,
DeviceCommandId_t *foundId, size_t *foundLen) {
if (breakCountdown.isBusy() or getMode() == _MODE_WAIT_OFF or getMode() == _MODE_WAIT_ON) {
if (breakCountdown.isBusy() or getMode() == _MODE_WAIT_OFF or getMode() == _MODE_WAIT_ON or
getMode() == _MODE_POWER_DOWN) {
return IGNORE_FULL_PACKET;
}
if (remainingSize != sizeof(acs::Adis1650XReply)) {

4
mission/devices/GyrL3gCustomHandler.cpp
View File

@ -44,7 +44,7 @@ void GyrL3gCustomHandler::doShutDown() {
internalState = InternalState::NONE;
updatePeriodicReply(false, l3gd20h::REPLY);
commandExecuted = false;
setMode(_MODE_POWER_DOWN);
setMode(MODE_OFF);
}
}
@ -100,7 +100,7 @@ ReturnValue_t GyrL3gCustomHandler::buildCommandFromCommand(DeviceCommandId_t dev
ReturnValue_t GyrL3gCustomHandler::scanForReply(const uint8_t *start, size_t len,
DeviceCommandId_t *foundId, size_t *foundLen) {
if (getMode() == _MODE_WAIT_OFF or getMode() == _MODE_WAIT_ON) {
if (getMode() == _MODE_WAIT_OFF or getMode() == _MODE_WAIT_ON or getMode() == _MODE_POWER_DOWN) {
return IGNORE_FULL_PACKET;
}
if (len != sizeof(acs::GyroL3gReply)) {

2
mission/devices/MgmLis3CustomHandler.cpp
View File

@ -37,7 +37,7 @@ void MgmLis3CustomHandler::doShutDown() {
updatePeriodicReply(false, REPLY);
commandExecuted = false;
internalState = InternalState::NONE;
setMode(_MODE_POWER_DOWN);
setMode(MODE_OFF);
}
}

2
mission/devices/MgmRm3100CustomHandler.cpp
View File

@ -38,7 +38,7 @@ void MgmRm3100CustomHandler::doShutDown() {
}
if (internalState == InternalState::SHUTDOWN and commandExecuted) {
updatePeriodicReply(false, REPLY);
setMode(_MODE_POWER_DOWN);
setMode(MODE_OFF);
commandExecuted = false;
}
}

4
mission/system/objects/ImtqAssembly.cpp
View File

@ -51,6 +51,4 @@ ReturnValue_t ImtqAssembly::checkAndHandleHealthState(Mode_t deviceMode, Submode
return OK;
}
void ImtqAssembly::handleChildrenLostMode(ReturnValue_t result) {
startTransition(mode, submode);
}
void ImtqAssembly::handleChildrenLostMode(ReturnValue_t result) { startTransition(mode, submode); }

2
tmtc

@ -1 +1 @@
Subproject commit 208d328683a9911ecaa1d60abd3b8a9e3a841c37
Subproject commit 9462a6e2459e11ac03c2bb9694772959ac228cd0