Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #145, Refactor mutually exclusive logic in if, else if block #146

Merged

Conversation

thnkslprpt
Copy link
Contributor

@thnkslprpt thnkslprpt commented Jan 27, 2023

Describe the contribution

Testing performed
GitHub CI actions (incl. Build + Run, Unit Tests etc.) all passing successfully.

Expected behavior changes
No change to logic.

Contributor Info
Avi Weiss @thnkslprpt

@jphickey jphickey force-pushed the fix-145-refactor-mutually-excl-if-elseif branch from 23a0dd1 to fce77cf Compare November 1, 2023 16:41
@jphickey
Copy link
Contributor

jphickey commented Nov 1, 2023

Rebased to resolve conflict and simplified a bit....

Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to get these into the next round

@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Nov 1, 2023
@dzbaker dzbaker added CCB:Approved Indicates approval by CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Nov 2, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Nov 13, 2023
*Combines:*

sch_lab v2.5.0-rc4+dev71
sample_app v1.3.0-rc4+dev65
to_lab v2.5.0-rc4+dev66
ci_lab v2.5.0-rc4+dev69
cFE v7.0.0-rc4+dev411
PSP v1.6.0-rc4+dev96

**Includes:**

*sch_lab*
- nasa/sch_lab#129
- nasa/sch_lab#149
- nasa/sch_lab#142
- nasa/sch_lab#134

*sample_app*
- nasa/sample_app#212
- nasa/sample_app#187
- nasa/sample_app#190

*to_lab*
- nasa/to_lab#168
- nasa/to_lab#134
- nasa/to_lab#146
- nasa/to_lab#148
- nasa/to_lab#152
- nasa/to_lab#158
- nasa/to_lab#163

*ci_lab*
- nasa/ci_lab#152
- nasa/ci_lab#153

*cFE*
- nasa/cFE#2462
- nasa/cFE#2408

*PSP*
- nasa/PSP#417

Co-authored by: Avi Weiss <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Isaac Rowe <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
@dzbaker dzbaker mentioned this pull request Nov 13, 2023
2 tasks
@dzbaker dzbaker merged commit d64ae8d into nasa:main Nov 14, 2023
11 checks passed
@thnkslprpt thnkslprpt deleted the fix-145-refactor-mutually-excl-if-elseif branch November 14, 2023 17:26
dzbaker added a commit to nasa/cFS that referenced this pull request Nov 14, 2023
*Combines:*

sch_lab v2.5.0-rc4+dev71
sample_app v1.3.0-rc4+dev65
to_lab v2.5.0-rc4+dev66
ci_lab v2.5.0-rc4+dev69
cFE v7.0.0-rc4+dev411
PSP v1.6.0-rc4+dev96

**Includes:**

*sch_lab*
- nasa/sch_lab#129
- nasa/sch_lab#149
- nasa/sch_lab#142
- nasa/sch_lab#134

*sample_app*
- nasa/sample_app#212
- nasa/sample_app#187
- nasa/sample_app#190

*to_lab*
- nasa/to_lab#168
- nasa/to_lab#134
- nasa/to_lab#146
- nasa/to_lab#148
- nasa/to_lab#152
- nasa/to_lab#158
- nasa/to_lab#163

*ci_lab*
- nasa/ci_lab#152
- nasa/ci_lab#153

*cFE*
- nasa/cFE#2462
- nasa/cFE#2408

*PSP*
- nasa/PSP#417

Co-authored by: Avi Weiss <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Isaac Rowe <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor mutually exclusive if in TO_LAB_init()
3 participants