From cfbe5f4081531196e46d2c85de3bea6db1eb4d33 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 11 Oct 2022 11:38:37 +1000 Subject: [PATCH 1/2] Fix #125, Remove redundant comments --- fsw/src/sch_lab_app.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index a8475e0..84e6772 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -139,8 +139,7 @@ void SCH_Lab_AppMain(void) } /* end while */ CFE_ES_ExitApp(Status); - -} /* end SCH_Lab_AppMain */ +} void SCH_LAB_LocalTimerCallback(osal_id_t object_id, void *arg) { @@ -149,7 +148,7 @@ void SCH_LAB_LocalTimerCallback(osal_id_t object_id, void *arg) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ -/* SCH_LAB_AppInit() -- initialization */ +/* Initialization */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ int32 SCH_LAB_AppInit(void) @@ -295,5 +294,4 @@ int32 SCH_LAB_AppInit(void) OS_printf("SCH Lab Initialized.%s\n", SCH_LAB_VERSION_STRING); return CFE_SUCCESS; - -} /*End of AppInit*/ +} From 38fedee0b01f31d8e9a3fbac2cf124934681475d Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 17 Oct 2022 10:48:16 -0400 Subject: [PATCH 2/2] Bump to v2.5.0-rc4+dev45 --- CHANGELOG.md | 4 ++++ fsw/src/sch_lab_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 507c2f6..01e43dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: 2.5.0-rc4+dev45 +- Remove redundant comments +- See + ## Development Build: v2.5.0-rc4+dev41 - Create CHANGELOG.md - See diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 61a094c..ac5e47b 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_lab_version.h @@ -25,7 +25,7 @@ */ /* Development Build Macro Definitions */ -#define SCH_LAB_BUILD_NUMBER 41 /*!< Development Build: Number of commits since baseline */ +#define SCH_LAB_BUILD_NUMBER 45 /*!< Development Build: Number of commits since baseline */ #define SCH_LAB_BUILD_BASELINE \ "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */