Merge pull request #35 from nasa/ic-20200226

Integration Candidate 20200226
nasa · Feb 28, 2020 · e98263c · e98263c
2 parents e0e50cd + 631dbd9
commit e98263c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,9 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
 fsw/platform_inc/sch_lab_sched_tab.h
 
 ## Version Notes
-
+- 2.3.4: DEVELOPMENT
+  - Fix for clean build with OMIT_DEPRECATED
+  - Minor updates (see https://github.com/nasa/sch_lab/pull/35)
 - 2.3.3: DEVELOPMENT
   - Minor updates (see https://github.com/nasa/sch_lab/pull/28)
 - 2.3.2: DEVELOPMENT
@@ -32,5 +34,4 @@ As a lab application, extensive testing is not performed prior to release and on
 
 For best results, submit issues:questions or issues:help wanted requests at https://github.com/nasa/cFS.
 
-Official cFS page: http://cfs.gsfc.nasa.gov
-
+Official cFS page: http://cfs.gsfc.nasa.gov  
diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -62,7 +62,7 @@ void SCH_Lab_AppMain(void)
     int              i;
     uint32           SCH_OneHzPktsRcvd = 0;
     uint32           Status = CFE_SUCCESS;
-    uint32           RunStatus = CFE_ES_APP_RUN;
+    uint32           RunStatus = CFE_ES_RunStatus_APP_RUN;
 
     CFE_ES_PerfLogEntry(SCH_MAIN_TASK_PERF_ID);
 
@@ -89,7 +89,7 @@ void SCH_Lab_AppMain(void)
     }  
 
     /* Loop Forever */
-    while (CFE_ES_RunLoop(&RunStatus) == TRUE)
+    while (CFE_ES_RunLoop(&RunStatus) == true)
     {
         CFE_ES_PerfLogExit(SCH_MAIN_TASK_PERF_ID);
 
@@ -202,7 +202,7 @@ int32 SCH_LAB_AppInit(void)
          {   
               CFE_SB_InitMsg(&SCH_CmdHeaderTable[i],
                               MySchTBL->MessageID[i],
-                              sizeof(CFE_SB_CmdHdr_t), TRUE);
+                              sizeof(CFE_SB_CmdHdr_t), true);
          } 
          else
          {

diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h
@@ -32,7 +32,7 @@
 
 #define SCH_LAB_MAJOR_VERSION    2
 #define SCH_LAB_MINOR_VERSION    3
-#define SCH_LAB_REVISION         3
+#define SCH_LAB_REVISION         4
 #define SCH_LAB_MISSION_REV      0