Skip to content

Commit

Permalink
Merge branch 'fix-122-comment-cleanup' of https://github.com/thnkslpr…
Browse files Browse the repository at this point in the history
…pt/ci_lab into fix-122-comment-cleanup
  • Loading branch information
thnkslprpt committed Oct 5, 2022
2 parents 12e29fb + 18dfee7 commit 5e5b0ab
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac

## Changelog

### Development Build: v2.5.0-rc4+dev30
- Remove unnecessary parentheses around return values.
- Remove 'return;' from last line of void functions.
- See <https://github.com/nasa/ci_lab/pull/116> and <https://github.com/nasa/ci_lab/pull/118>

### Development Build: v2.5.0-rc4+dev24
- Update cmake mimimum required to something more recent
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/ci_lab_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,5 +413,5 @@ bool CI_LAB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength)
CI_LAB_Global.HkTlm.Payload.CommandErrorCounter++;
}

return (result);
return result;
}
2 changes: 1 addition & 1 deletion fsw/src/ci_lab_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/* Development Build Macro Definitions */

#define CI_LAB_BUILD_NUMBER 24 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_NUMBER 30 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_BASELINE \
"v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */

Expand Down

0 comments on commit 5e5b0ab

Please sign in to comment.