Merge pull request #130 from nasa/integration-candidate

sch_lab Integration candidate: Caelum-rc4+dev26
nasa · Oct 17, 2022 · 91d3b7d · 91d3b7d
2 parents 7bb3342 + 38fedee
commit 91d3b7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: 2.5.0-rc4+dev45
+- Remove redundant comments
+- See <https://github.com/nasa/sch_lab/pull/126>
+
 ## Development Build: v2.5.0-rc4+dev41
 - Create CHANGELOG.md
 - See <https://github.com/nasa/sch_lab/pull/123>

diff --git 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*/
+}
diff --git 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 */