Merge pull request #116 from nasa/integration-candidate

sch_lab Integration candidate: Caelum-rc4+dev10
nasa · May 31, 2022 · c044cf8 · c044cf8
2 parents 3adad8c + 139fc2a
commit c044cf8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,11 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
 
 ## Version History
 
+### Development Build: v2.5.0-rc4+dev29
+
+- Resolve uninit var static analysis warnings
+- See <https://github.com/nasa/sch_lab/pull/116> and <https://github.com/nasa/cFS/pull/492>
+
 ### Development Build: v2.5.0-rc4+dev23
 
 - Update Copyright Headers

diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -158,7 +158,7 @@ int32 SCH_LAB_AppInit(void)
     int32                         Status;
     int32                         OsStatus;
     uint32                        TimerPeriod;
-    osal_id_t                     TimeBaseId;
+    osal_id_t                     TimeBaseId = OS_OBJECT_ID_UNDEFINED;
     SCH_LAB_ScheduleTable_t *     ConfigTable;
     SCH_LAB_ScheduleTableEntry_t *ConfigEntry;
     SCH_LAB_StateEntry_t *        LocalStateEntry;

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 23 /*!< Development Build: Number of commits since baseline */
+#define SCH_LAB_BUILD_NUMBER 29 /*!< 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 */