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

This bugfix might be super important #621

Merged
muellerr merged 6 commits from possible_bugfix_dual_lane_assy into main 2023-04-28 15:35:55 +02:00
Conversation 4 Commits 6 Files Changed 2 +106 -340
12 changed files with 106 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 383849c5cb - Show all commits

3
mission/system/acs/DualLaneAssemblyBase.cpp
View File

@@ -205,7 +205,8 @@ bool DualLaneAssemblyBase::checkAndHandleRecovery() {
opCode = pwrStateMachine.fsm(); opCode = pwrStateMachine.fsm();
if (opCode == OpCodes::TO_OFF_DONE or opCode == OpCodes::TIMEOUT_OCCURED) { if (opCode == OpCodes::TO_OFF_DONE or opCode == OpCodes::TIMEOUT_OCCURED) {
customRecoveryStates = RecoveryCustomStates::POWER_SWITCHING_ON; customRecoveryStates = RecoveryCustomStates::POWER_SWITCHING_ON;
pwrStateMachine.start(targetMode, targetSubmode); // Command power back on in any case.
pwrStateMachine.start(HasModesIF::MODE_ON, targetSubmode);
gaisser marked this conversation as resolved
gaisser commented 2023-04-28 14:56:16 +02:00
Review
Copy Link

Is this working in combination with the call to opCode = pwrStateMachine.fsm(); directly afterwards (line 213)? (I haven't checked the fsm() call, so this might be perfectly fine.)

In line 215 (

mission/system/acs/DualLaneAssemblyBase.cpp Line 215 in b10275ca43
customRecoveryStates = RecoveryCustomStates::DONE;
) customRecoveryState will be set to RecoveryCustomStates::DONE; if we entered the "if" in line 206 with OpCodes::TIMEOUT_OCCURED, is this expected?

Is this working in combination with the call to ``opCode = pwrStateMachine.fsm();`` directly afterwards (line 213)? (I haven't checked the fsm() call, so this might be perfectly fine.) In line 215 (https://egit.irs.uni-stuttgart.de/eive/eive-obsw/src/commit/b10275ca43f13ee68be013c7ece3b63acf762130/mission/system/acs/DualLaneAssemblyBase.cpp#L215) ``customRecoveryState`` will be set to `` RecoveryCustomStates::DONE;`` if we entered the "if" in line 206 with ``OpCodes::TIMEOUT_OCCURED``, is this expected?
muellerr commented 2023-04-28 15:07:25 +02:00
Review
Copy Link

Why shouldn't it work? This mechanism has always worked properly when targetMode is correct. The immediate fsm call will send the swtich commands, the replies take some time.

Why shouldn't it work? This mechanism has always worked properly when `targetMode` is correct. The immediate fsm call will send the swtich commands, the replies take some time.
👍 1
gaisser commented 2023-04-28 15:22:40 +02:00
Review
Copy Link

Ok

Ok
} }
} }
if (customRecoveryStates == POWER_SWITCHING_ON) { if (customRecoveryStates == POWER_SWITCHING_ON) {