eive/eive-obsw
eive
/
eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests 1 Releases 117 Wiki Activity

str assembly mode checks #571

Merged
muellerr merged 6 commits from syrlinks_assy_mode_checks into develop 2023-04-05 16:08:17 +02:00
Conversation 0 Commits 6 Files Changed 9 +41 -12
muellerr commented 2023-04-05 15:08:21 +02:00
Owner
Copy Link
No description provided.
muellerr added 1 commit 2023-04-05 15:08:23 +02:00
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
0ade2ae0ee
str assembly mode checks
muellerr added 1 commit 2023-04-05 15:11:34 +02:00
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
600921e3a0
some code fixes
muellerr added 2 commits 2023-04-05 15:29:43 +02:00
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
c65b402361
changelog
muellerr added this to the v1.44.0 milestone 2023-04-05 15:30:20 +02:00
muellerr requested review from meggert 2023-04-05 15:31:10 +02:00
muellerr added 1 commit 2023-04-05 15:31:14 +02:00
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
a875bf55b8 Merge branch 'develop' into syrlinks_assy_mode_checks
meggert requested changes 2023-04-05 15:43:33 +02:00
mission/system/acs/StrAssembly.cpp Outdated
@ -31,5 +33,12 @@ ReturnValue_t StrAssembly::checkChildrenStateOn(Mode_t wantedMode, Submode_t wan
}
ReturnValue_t StrAssembly::isModeCombinationValid(Mode_t mode, Submode_t submode) {
if (mode == DeviceHandlerIF::MODE_NORMAL and submode != SUBMODE_NONE) {
meggert commented 2023-04-05 15:42:36 +02:00
Owner
Copy Link

shouldn't this include MODE_OFF?

shouldn't this include MODE_OFF?
muellerr commented 2023-04-05 16:07:07 +02:00
Author
Owner
Copy Link

done

done
muellerr added 1 commit 2023-04-05 16:07:04 +02:00
EIVE/eive-obsw/pipeline/pr-develop Build queued... Details
56c5838d15
str assembly include mode off
meggert approved these changes 2023-04-05 16:07:36 +02:00
muellerr merged commit 67988dad64 into develop 2023-04-05 16:08:17 +02:00
muellerr deleted branch syrlinks_assy_mode_checks 2023-04-05 16:08:18 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
meggert
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
v1.44.0
Assignees
Clear assignees
No Assignees
2 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#571
No description provided.
Delete Branch "syrlinks_assy_mode_checks"

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?