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 #125, Standardize CI_LAB function names #126

Merged
merged 1 commit into from
Nov 8, 2023

Conversation

thnkslprpt
Copy link
Contributor

@thnkslprpt thnkslprpt commented Oct 16, 2022

Checklist

Describe the contribution

  • Fixes Apply standard naming convention (CI_LAB...) #125
    • Standardize naming of CI_LAB functions to match predominant cFS style.
    • Updates the list of command codes in ci_lab_msg.h in order for CHeaderParser.py to correctly generate the full list of commands in the CI_LAB_CMD binary file.

Also requires a change to the cfe startup script
A few files in the Ground System should also be updated to match the predominant convention.

Testing performed
Only GitHub CI workflow actions.

Expected behavior changes
No impact on behavior.

Contributor Info
@thnkslprpt

@@ -75,7 +75,7 @@
/* and acts accordingly to process them. */
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
void CI_Lab_AppMain(void)
void CI_LAB_AppMain(void)

Check notice

Code scanning / CodeQL-coding-standard

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
@thnkslprpt
Copy link
Contributor Author

thnkslprpt commented Oct 19, 2022

CHeaderParser.py uses ci_lab_msg.h to generate the CI_LAB_CMD binary which defines the commands that are listed in the Ground System display window for ci_lab.

I had to update the list of command codes in ci_lab_msg.h (2nd commit in this PR) in order for CHeaderParser.py to generate the full list of commands in the CI_LAB_CMD binary. Without updating ci_lab_msg.h only the 2 command codes that were already listed in ci_lab_msg.h will be populated in the display window for ci_lab in the Ground System.

After updating it, the CI_LAB_CMD binary seems to be generated correctly and the Ground System correctly displays all of the commands and runs them without error.

If this change would be better as a separate issue, just let me know.

@thnkslprpt thnkslprpt marked this pull request as ready for review October 19, 2022 04:07
@dzbaker
Copy link
Collaborator

dzbaker commented Oct 20, 2022

@thnkslprpt CCB 20 October 2022: Approved pending workflow failure resolution (squash commits?)

@dzbaker dzbaker added the CCB:Approved Indicates code approval by CCB label Oct 20, 2022
@dzbaker dzbaker added this to the Fornax milestone Nov 21, 2022
@dzbaker dzbaker modified the milestones: Fornax, Equuleus Dec 7, 2022
@thnkslprpt
Copy link
Contributor Author

@thnkslprpt CCB 20 October 2022: Approved pending workflow failure resolution (squash commits?)

Squashed now @dzbaker
Note: goes along with nasa/cFE#2170

@dmknutsen dmknutsen merged commit fbe0c68 into nasa:main Nov 8, 2023
11 checks passed
@thnkslprpt thnkslprpt deleted the fix-125-standardize-naming branch November 9, 2023 05:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Apply standard naming convention (CI_LAB...)
3 participants