CCB 2019-09-04: Merge #1 #3 #4 #6

Reviewed and approved at 2019-09-04 CCB
nasa · Sep 10, 2019 · 6c051f9 · 6c051f9
2 parents 34bac8f + 7eb5420
commit 6c051f9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 157 deletions.
diff --git a/fsw/for_build/Makefile b/fsw/for_build/Makefile
diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/mission_inc/sch_lab_perfids.h
@@ -18,29 +18,19 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File:
+** File: sch_lab_perfids.h
 **
 ** Purpose: 
 **  Define SCH Lab Performance IDs
 **
 ** Notes:
 **
-** $Log: sch_lab_perfids.h  $
-** Revision 1.3 2010/09/20 12:28:52GMT-05:00 wmoleski 
-** Modified the CI_LAB, SCH_LAB and TO_LAB applications to use unique message IDs and Pipe Names. The "_LAB" was
-** added to all definitions so that a mission can use these "Lab" apps as well as their own mission apps together.
-** Revision 1.2 2008/04/30 16:04:46EDT rjmcgraw 
-** Member moved from sch_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/sch_lab/fsw/platform_cfg/project.pj to sch_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/sch_lab/fsw/mission_inc/project.pj.
-** Revision 1.1 2008/04/30 15:04:46ACT rjmcgraw 
-** Initial revision
-** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/sch_lab/fsw/platform_cfg/project.pj
-**
 *************************************************************************/
 #ifndef _sch_lab_perfids_h_
 #define _sch_lab_perfids_h_
 
 
-#define SCH_MAIN_TASK_PERF_ID           20
+#define SCH_MAIN_TASK_PERF_ID           36
 
 #endif /* _sch_lab_perfids_h_ */
 

diff --git a/fsw/platform_inc/sch_lab_sched_tab.h b/fsw/platform_inc/sch_lab_sched_tab.h
@@ -27,11 +27,6 @@
 **
 ** Notes:
 **
-** $Log: sch_lab_sched_tab.h  $
-** Revision 1.1 2014/07/17 12:36:57GMT-05:00 acudmore 
-** Initial revision
-** Member added to project c:/MKSDATA/MKS-REPOSITORY/MKS-CFE-PROJECT/tools/sch_lab/fsw/platform_inc/project.pj
-**
 *************************************************************************/
 
 

diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -25,20 +25,6 @@
 **
 ** Notes:
 **
-** $Log: sch_lab_app.c  $
-** Revision 1.5 2014/07/17 12:36:12GMT-05:00 acudmore 
-** Created schedule table in platform_inc header file.
-** Revision 1.4 2010/11/17 08:12:58EST wmoleski 
-** The TO_Lab_APP, CI_Lab_APP and SCH_Lab_APP did not compile with cFE6.1.0.An include statement of cfe_error.h needed to be added to each app.
-** Revision 1.3 2010/09/20 13:28:52EDT wmoleski 
-** Modified the CI_LAB, SCH_LAB and TO_LAB applications to use unique message IDs and Pipe Names. The "_LAB" was
-** added to all definitions so that a mission can use these "Lab" apps as well as their own mission apps together.
-** Revision 1.2 2008/09/19 15:31:17EDT rjmcgraw 
-** DCR4337:1 Added #include version.h and display version after initialization is complete
-** Revision 1.1 2008/04/30 16:07:53EDT rjmcgraw 
-** Initial revision
-** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/sch_lab/fsw/src/project.pj
-**
 *************************************************************************/
 
 /*
@@ -72,7 +58,7 @@ void SCH_Lab_AppMain(void)
     int              i;
     int32            rtnStat;
     uint32           SCH_OneHzPktsRcvd = 0;
-    uint32           RunStatus = CFE_ES_APP_RUN;
+    uint32           RunStatus = CFE_ES_RunStatus_APP_RUN;
     CFE_SB_PipeId_t  SCH_CmdPipe;
 
     CFE_ES_PerfLogEntry(SCH_MAIN_TASK_PERF_ID);
@@ -88,7 +74,7 @@ void SCH_Lab_AppMain(void)
          {   
               CFE_SB_InitMsg(&SCH_CmdHeaderTable[i],
                               SCH_LAB_ScheduleTable[i].MessageID,
-                                sizeof(CFE_SB_CmdHdr_t), TRUE);
+                                sizeof(CFE_SB_CmdHdr_t), true);
          } 
          else
          {
@@ -116,7 +102,7 @@ void SCH_Lab_AppMain(void)
                 SCH_LAB_MISSION_REV);    
 
     /* Loop Forever */
-    while (CFE_ES_RunLoop(&RunStatus) == TRUE)
+    while (CFE_ES_RunLoop(&RunStatus) == true)
     {
         CFE_ES_PerfLogExit(SCH_MAIN_TASK_PERF_ID);
 

diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h
@@ -18,23 +18,13 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File:
-**   $Id: sch_lab_version.h 1.2 2010/11/16 14:20:20GMT-05:00 bmedina Exp  $
+** File: sch_lab_version.h
 **
 ** Purpose:
 **  The SCH Lab Application header file containing version number
 **
 ** Notes:
 **
-** $Log: sch_lab_version.h  $
-** Revision 1.3 2016/06/17 sstrege
-** changed version number to 2.2.0.0 for updates made to resolve compiler warnings
-** Revision 1.2 2010/11/16 14:20:20GMT-05:00 bmedina
-** changed version to 2.1.0.0
-** Revision 1.1 2008/09/19 15:04:16EDT rjmcgraw
-** Initial revision
-** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/sch_lab/fsw/src/project.pj
-**
 *************************************************************************/
 #ifndef _sch_lab_version_h_
 #define _sch_lab_version_h_