From 74c0e449be387d499c6f4cca9faa9a6a3735520d Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 27 Sep 2022 14:44:44 +1000 Subject: [PATCH 1/3] Fix #115, Remove unnecessary parentheses around return values. --- fsw/src/ci_lab_app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index 70429f5..fb3d0ac 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -424,6 +424,6 @@ bool CI_LAB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) CI_LAB_Global.HkTlm.Payload.CommandErrorCounter++; } - return (result); + return result; } /* End of CI_LAB_VerifyCmdLength() */ From 25fe1178adb2bdec2d2db1d366eab4438b0e0cc4 Mon Sep 17 00:00:00 2001 From: Avi Date: Wed, 28 Sep 2022 14:32:57 +1000 Subject: [PATCH 2/3] Fix #117, Remove 'return;' from last line of void functions. --- fsw/src/ci_lab_app.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index 70429f5..d1e74d4 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -216,9 +216,6 @@ void CI_LAB_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr) (unsigned int)CFE_SB_MsgIdToValue(MsgId)); break; } - - return; - } /* End CI_LAB_ProcessCommandPacket */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ @@ -254,9 +251,6 @@ void CI_LAB_ProcessGroundCommand(CFE_SB_Buffer_t *SBBufPtr) default: break; } - - return; - } /* End of CI_LAB_ProcessGroundCommand() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -325,9 +319,6 @@ void CI_LAB_ResetCounters_Internal(void) /* Status of packets ingested by CI task */ CI_LAB_Global.HkTlm.Payload.IngestPackets = 0; CI_LAB_Global.HkTlm.Payload.IngestErrors = 0; - - return; - } /* End of CI_LAB_ResetCounters() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ @@ -389,9 +380,6 @@ void CI_LAB_ReadUpLink(void) break; /* no (more) messages */ } } - - return; - } /* End of CI_LAB_ReadUpLink() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ From 1836e2061f7e7ffd828a87077051e42dd15f6b5d Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 3 Oct 2022 17:02:36 -0400 Subject: [PATCH 3/3] Bump to v2.5.0-rc4+dev30 --- README.md | 4 ++++ fsw/src/ci_lab_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9900451..9385e8c 100644 --- a/README.md +++ b/README.md @@ -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 and ### Development Build: v2.5.0-rc4+dev24 - Update cmake mimimum required to something more recent diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index 9c1a453..163a6a4 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -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 */