From f93292afaea9fa5dbeb18676b6160ae03b1b960c Mon Sep 17 00:00:00 2001 From: avan989 Date: Wed, 28 Aug 2019 14:48:15 -0400 Subject: [PATCH 1/4] Fix #1, Update to valid Perfid --- fsw/mission_inc/sch_lab_perfids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/mission_inc/sch_lab_perfids.h index 10af9b8..cd659e1 100644 --- a/fsw/mission_inc/sch_lab_perfids.h +++ b/fsw/mission_inc/sch_lab_perfids.h @@ -40,7 +40,7 @@ #define _sch_lab_perfids_h_ -#define SCH_MAIN_TASK_PERF_ID 20 +#define SCH_MAIN_TASK_PERF_ID 36 #endif /* _sch_lab_perfids_h_ */ From e1fa0f5f15e061c16af371fd9f0be69f06419d3e Mon Sep 17 00:00:00 2001 From: avan989 Date: Mon, 26 Aug 2019 08:22:41 -0400 Subject: [PATCH 2/4] Fix #4, Remove classic build support --- fsw/for_build/Makefile | 112 ----------------------------------------- 1 file changed, 112 deletions(-) delete mode 100644 fsw/for_build/Makefile diff --git a/fsw/for_build/Makefile b/fsw/for_build/Makefile deleted file mode 100644 index 56cb91a..0000000 --- a/fsw/for_build/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -############################################################################### -# File: CFS Application Makefile -# -# $Id: Makefile 1.5 2009/07/09 10:41:17GMT-05:00 rmcgraw Exp $ -# -# $Log: Makefile $ -# Revision 1.5 2009/07/09 10:41:17GMT-05:00 rmcgraw -# DCR8291:1 Changed CFE_MISSION_INC to CFS_MISSION_INC and added log if needed -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = sch_lab - -# -# Entry Point for task -# -ENTRY_PT = SCH_Lab_AppMain - -# -# Object files required to build subsystem. -# -OBJS = sch_lab_app.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=../exe - -## -## Certain OSs and Application Loaders require the following option for -## Shared libraries. Currently only needed for vxWorks 5.5 and RTEMS. -## For each shared library that this app depends on, you need to have an -## entry like the following: -## -R../tst_lib/tst_lib.elf -## -SHARED_LIB_LINK = - -######################################################################## -# Should not have to change below this line, except for customized -# Mission and cFE directory structures -######################################################################## - -# -# Set build type to CFE_APP. This allows us to -# define different compiler flags for the cFE Core and Apps. -# -BUILD_TYPE = CFE_APP - -## -## Include all necessary cFE make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## cfe-config.mak contains PSP and OS selection -## -include ../cfe/cfe-config.mak -## -## debug-opts.mak contains debug switches -## -include ../cfe/debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(CFE_PSP_SRC)/$(PSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(CFE_CORE_SRC)/inc \ --I$(CFE_PSP_SRC)/inc \ --I$(CFE_PSP_SRC)/$(PSP)/inc \ --I$(CFS_APP_SRC)/inc \ --I$(CFS_APP_SRC)/$(APPTARGET)/fsw/src \ --I$(CFS_MISSION_INC) \ --I../cfe/inc \ --I../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the cfs-apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(CFS_APP_SRC)/$(APPTARGET)/fsw/src - -## -## Include the common make rules for building a cFE Application -## -include $(CFE_CORE_SRC)/make/app-rules.mak From 1276f64b744050cfbfa532a0ff62a89d6d1531fa Mon Sep 17 00:00:00 2001 From: avan989 Date: Fri, 23 Aug 2019 16:33:03 -0400 Subject: [PATCH 3/4] Fix #3, Remove MKS/CVS flags --- fsw/mission_inc/sch_lab_perfids.h | 12 +----------- fsw/platform_inc/sch_lab_sched_tab.h | 5 ----- fsw/src/sch_lab_app.c | 14 -------------- fsw/src/sch_lab_version.h | 12 +----------- 4 files changed, 2 insertions(+), 41 deletions(-) diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/mission_inc/sch_lab_perfids.h index cd659e1..0e6d4f8 100644 --- a/fsw/mission_inc/sch_lab_perfids.h +++ b/fsw/mission_inc/sch_lab_perfids.h @@ -18,23 +18,13 @@ ** 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_ diff --git a/fsw/platform_inc/sch_lab_sched_tab.h b/fsw/platform_inc/sch_lab_sched_tab.h index cc7b9c2..66c169e 100644 --- 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 index dcc231e..089e8e1 100644 --- 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 -** *************************************************************************/ /* diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index b24af3d..397e765 100644 --- 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_ From 7eb54204c0d8c38b791706ca1bc77868d6ea305c Mon Sep 17 00:00:00 2001 From: Jake Hageman Date: Fri, 26 Jul 2019 15:35:52 -0400 Subject: [PATCH 4/4] Fix #6, Remove deprecated dependencies --- fsw/src/sch_lab_app.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index 089e8e1..0468bea 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -58,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); @@ -74,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 { @@ -102,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);