eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 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 0 Commits 6 Files Changed 2 +16 -1
muellerr commented 2023-04-28 14:03:14 +02:00
Owner
Copy Link
  • Old FDIR tests should still be repeated: Commanding devices to NEEDS_RECOVERY and
    check the recovery handling works as well.
- Old FDIR tests should still be repeated: Commanding devices to `NEEDS_RECOVERY` and check the recovery handling works as well.
muellerr added 1 commit 2023-04-28 14:03:15 +02:00
this bugfix might be super important
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details
74d5d70973
muellerr changed title from this bugfix might be super important to WIP: This bugfix might be super important 2023-04-28 14:03:26 +02:00
muellerr added this to the v3.0.0 milestone 2023-04-28 14:17:48 +02:00
muellerr added the
bug
 label 2023-04-28 14:19:26 +02:00
muellerr changed title from WIP: This bugfix might be super important to This bugfix might be super important 2023-04-28 14:19:32 +02:00
muellerr added 1 commit 2023-04-28 14:22:28 +02:00
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details
02ea8a7298
muellerr requested review from mkranz 2023-04-28 14:22:35 +02:00
muellerr requested review from gaisser 2023-04-28 14:22:40 +02:00
muellerr added 1 commit 2023-04-28 14:23:24 +02:00
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details
c66cef9129
muellerr added 1 commit 2023-04-28 14:25:20 +02:00
that is more robust
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details
383849c5cb
muellerr requested review from meggert 2023-04-28 14:25:37 +02:00
muellerr added 1 commit 2023-04-28 14:28:10 +02:00
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details
b10275ca43
muellerr modified the milestone from v3.0.0 to v2.0.5 2023-04-28 14:41:26 +02:00
meggert approved these changes 2023-04-28 14:43:44 +02:00
gaisser reviewed 2023-04-28 14:50:28 +02:00
mission/system/acs/DualLaneAssemblyBase.cpp
@ -185,3 +185,3 @@
triggerEvent(CANT_KEEP_MODE, mode, submode);
startTransition(mode, nextSubmode);
startTransition(targetMode, nextSubmode);
tryingOtherSide = true;
gaisser commented 2023-04-28 14:50:28 +02:00
Member
Copy Link

Small notice: the name "tryingOtherSide" is unclear to me. It seems to be more "tried other side" than "tryingOtherSide". Or "triedOtherSideBefore". At least in the check in line 184.

Small notice: the name "tryingOtherSide" is unclear to me. It seems to be more "tried other side" than "tryingOtherSide". Or "triedOtherSideBefore". At least in the check in line 184.
gaisser reviewed 2023-04-28 14:56:16 +02:00
mission/system/acs/DualLaneAssemblyBase.cpp
@ -207,2 +207,3 @@
customRecoveryStates = RecoveryCustomStates::POWER_SWITCHING_ON;
pwrStateMachine.start(targetMode, targetSubmode);
// Command power back on in any case.
pwrStateMachine.start(HasModesIF::MODE_ON, targetSubmode);
gaisser commented 2023-04-28 14:56:16 +02:00
Member
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
Author
Owner
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
Member
Copy Link

Ok

Ok
gaisser marked this conversation as resolved
gaisser approved these changes 2023-04-28 15:23:45 +02:00
muellerr added 1 commit 2023-04-28 15:34:51 +02:00
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
Details
a17f57cbb5
muellerr added 1 commit 2023-04-28 15:35:14 +02:00
Merge branch 'main' into possible_bugfix_dual_lane_assy
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
Details
51f9d5e1fe
muellerr merged commit 4179e8e124 into main 2023-04-28 15:35:55 +02:00
muellerr deleted branch possible_bugfix_dual_lane_assy 2023-04-28 15:35:56 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
mkranz
meggert
gaisser
Labels
Clear labels   
OPS TODO

Issues identified by OPS

  
api change

API change

  
breaking api change

API change which can break existing code

  
bug

Something is not working

  
documentation

Documentation

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
OPS TODO
api change
breaking api change
bug
documentation
duplicate
feature
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
v2.0.5
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#621
No description provided.
Delete Branch "possible_bugfix_dual_lane_assy"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?