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.

Sign up for GitHub

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

Jump to bottom

Fix #141, Convert int32 return codes and variables to CFE_Status_t #142

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fix #141, Convert int32 return codes and variables to CFE_Status_t #142

merged 1 commit into from
Nov 14, 2023

Conversation

thnkslprpt
Copy link
Contributor

@thnkslprpt thnkslprpt commented Apr 24, 2023 •
edited
Loading

Checklist

Describe the contribution

edit: some formatting issues cropped up after a recent PR went through

Testing performed
GitHub CI actions all passing successfully.
Local testing with full cFS suite passing all tests and showing not change to coverage.

Expected behavior changes
No change to behavior.
CFE_Status_t is more expressive and improves consistency with cFE/cFS.

Contributor Info
Avi Weiss @thnkslprpt

github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 24, 2023
View reviewed changes
fsw/src/sch_lab_app.c Fixed Show fixed Hide fixed
fsw/src/sch_lab_app.c Fixed Show fixed Hide fixed
@thnkslprpt thnkslprpt force-pushed the fix-141-convert-int32-return-codes-to-CFE_Status_t branch from 052dea4 to cd7c2a9 Compare May 24, 2023 02:55
github-advanced-security[bot]
github-advanced-security bot found potential problems May 24, 2023
View reviewed changes
fsw/src/sch_lab_app.c
@@ -155,10 +155,10 @@
/* Initialization */
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int32 SCH_LAB_AppInit(void)
CFE_Status_t SCH_LAB_AppInit(void)

Check notice

Code scanning / CodeQL

Function too long

SCH_LAB_AppInit has too many lines (154, while 60 are allowed).
fsw/src/sch_lab_app.c
@@ -155,10 +155,10 @@
/* Initialization */
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int32 SCH_LAB_AppInit(void)
CFE_Status_t SCH_LAB_AppInit(void)

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
@thnkslprpt thnkslprpt force-pushed the fix-141-convert-int32-return-codes-to-CFE_Status_t branch from cd7c2a9 to 9b24dd9 Compare May 24, 2023 03:02
github-advanced-security[bot]
github-advanced-security bot found potential problems May 24, 2023
View reviewed changes
fsw/tables/sch_lab_table.c
{CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SEND_HK_MID), 96, 0},

/* Example of including additional open source apps */
#ifdef HAVE_CI_LAB

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
fsw/tables/sch_lab_table.c
#ifdef HAVE_CI_LAB
{CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 95, 0},
#endif
#ifdef HAVE_TO_LAB

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
fsw/tables/sch_lab_table.c
#ifdef HAVE_TO_LAB
{CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 94, 0},
#endif
#ifdef HAVE_SAMPLE_APP

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
fsw/tables/sch_lab_table.c
#ifdef HAVE_SAMPLE_APP
{CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 93, 0},
#endif
#ifdef HAVE_SC

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
fsw/tables/sch_lab_table.c
{CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 92, 0},
{CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 91, 0},
#endif
#ifdef HAVE_HS

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
fsw/tables/sch_lab_table.c
#ifdef HAVE_HS
{CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID), 90, 0}, /* Example of a message that wouldn't be sent */
#endif
#ifdef HAVE_FM

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
fsw/tables/sch_lab_table.c
#ifdef HAVE_FM
{CFE_SB_MSGID_WRAP_VALUE(FM_SEND_HK_MID), 101, 0},
#endif
#ifdef HAVE_DS

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
fsw/tables/sch_lab_table.c
#ifdef HAVE_DS
{CFE_SB_MSGID_WRAP_VALUE(DS_SEND_HK_MID), 102, 0},
#endif
#ifdef HAVE_LC

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 24, 2023
@dzbaker dzbaker added CCB:Approved and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Nov 13, 2023
@dzbaker dzbaker mentioned this pull request Nov 13, 2023
Merged
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Nov 13, 2023
@dzbaker
IC: Caelum-rc4+dev64
4af773f 
*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 <thnkslprpt@users.noreply.github.com>
Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
@dzbaker dzbaker mentioned this pull request Nov 13, 2023
Merged
2 tasks
@dzbaker dzbaker merged commit ef6e0ea into nasa:main Nov 14, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Nov 14, 2023
@dzbaker
IC: Caelum-rc4+dev64
ae31951 
*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 <thnkslprpt@users.noreply.github.com>
Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
@thnkslprpt thnkslprpt deleted the fix-141-convert-int32-return-codes-to-CFE_Status_t branch November 14, 2023 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jphickey jphickey jphickey approved these changes

Assignees
No one assigned
Labels
CCB:Approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

sch_lab int32 return codes and variables should be converted to CFE_Status_t
3 participants
@thnkslprpt @jphickey @dzbaker