From c6b25fb3332afcdf0c460febed409a66483a1e3a Mon Sep 17 00:00:00 2001 From: Jake Hageman Date: Fri, 26 Jul 2019 15:27:13 -0400 Subject: [PATCH 1/7] Fix #7, Replace deprecated cfe refs --- fsw/platform_inc/to_lab_sub_table.h | 24 ++++++------- fsw/src/to_lab_app.c | 56 ++++++++++++++++++----------- 2 files changed, 48 insertions(+), 32 deletions(-) diff --git a/fsw/platform_inc/to_lab_sub_table.h b/fsw/platform_inc/to_lab_sub_table.h index 4d9bf89..27329a4 100644 --- a/fsw/platform_inc/to_lab_sub_table.h +++ b/fsw/platform_inc/to_lab_sub_table.h @@ -70,18 +70,18 @@ static TO_subsciption_t TO_SubTable[] = {LC_HK_TLM_MID, {0,0}, 4}, #endif /* cFE Core subsciptions */ - {CFE_ES_HK_TLM_MID, {0,0}, 4}, - {CFE_EVS_HK_TLM_MID, {0,0}, 4}, - {CFE_SB_HK_TLM_MID, {0,0}, 4}, - {CFE_TBL_HK_TLM_MID, {0,0}, 4}, - {CFE_TIME_HK_TLM_MID, {0,0}, 4}, - {CFE_TIME_DIAG_TLM_MID, {0,0}, 4}, - {CFE_SB_STATS_TLM_MID, {0,0}, 4}, - {CFE_TBL_REG_TLM_MID, {0,0}, 4}, - {CFE_EVS_EVENT_MSG_MID, {0,0}, 32}, - {CFE_ES_SHELL_TLM_MID, {0,0}, 32}, - {CFE_ES_APP_TLM_MID, {0,0}, 4}, - {CFE_ES_MEMSTATS_TLM_MID,{0,0}, 4}, + {CFE_ES_HK_TLM_MID, {0,0}, 4}, + {CFE_EVS_HK_TLM_MID, {0,0}, 4}, + {CFE_SB_HK_TLM_MID, {0,0}, 4}, + {CFE_TBL_HK_TLM_MID, {0,0}, 4}, + {CFE_TIME_HK_TLM_MID, {0,0}, 4}, + {CFE_TIME_DIAG_TLM_MID, {0,0}, 4}, + {CFE_SB_STATS_TLM_MID, {0,0}, 4}, + {CFE_TBL_REG_TLM_MID, {0,0}, 4}, + {CFE_EVS_LONG_EVENT_MSG_MID, {0,0}, 32}, + {CFE_ES_SHELL_TLM_MID, {0,0}, 32}, + {CFE_ES_APP_TLM_MID, {0,0}, 4}, + {CFE_ES_MEMSTATS_TLM_MID, {0,0}, 4}, {TO_UNUSED, {0,0}, 0}, {TO_UNUSED, {0,0}, 0}, diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index 496eb80..c0dd433 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -117,7 +117,7 @@ static void TO_StartSending( TO_OUTPUT_ENABLE_PKT_t * pCmd ); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void TO_Lab_AppMain(void) { - uint32 RunStatus = CFE_ES_APP_RUN; + uint32 RunStatus = CFE_ES_RunStatus_APP_RUN; CFE_ES_PerfLogEntry(TO_MAIN_TASK_PERF_ID); @@ -184,7 +184,7 @@ void TO_init(void) */ CFE_EVS_Register(CFE_TO_EVS_Filters, sizeof(CFE_TO_EVS_Filters)/sizeof(CFE_EVS_BinFilter_t), - CFE_EVS_BINARY_FILTER); + CFE_EVS_EventFilter_BINARY); /* ** Initialize housekeeping packet (clear user data area)... */ @@ -200,13 +200,15 @@ void TO_init(void) CFE_SB_Subscribe(TO_LAB_SEND_HK_MID, TO_Cmd_pipe); } else - CFE_EVS_SendEvent(TO_CRCMDPIPE_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't create cmd pipe status %i",__LINE__,(int)status); + CFE_EVS_SendEvent(TO_CRCMDPIPE_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't create cmd pipe status %i",__LINE__,(int)status); /* Create TO TLM pipe */ status = CFE_SB_CreatePipe(&TO_Tlm_pipe, ToTlmPipeDepth, ToTlmPipeName); if (status != CFE_SUCCESS) { - CFE_EVS_SendEvent(TO_TLMPIPE_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't create Tlm pipe status %i",__LINE__,(int)status); + CFE_EVS_SendEvent(TO_TLMPIPE_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't create Tlm pipe status %i",__LINE__,(int)status); } /* Subscriptions for TLM pipe*/ @@ -219,7 +221,8 @@ void TO_init(void) TO_SubTable[i].BufLimit); if (status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_SUBSCRIBE_ERR_EID,CFE_EVS_ERROR,"L%d TO Can't subscribe to stream 0x%x status %i", __LINE__, + CFE_EVS_SendEvent(TO_SUBSCRIBE_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't subscribe to stream 0x%x status %i", __LINE__, TO_SubTable[i].Stream,(int)status); } @@ -228,7 +231,7 @@ void TO_init(void) */ OS_TaskInstallDeleteHandler(&TO_delete_callback); - CFE_EVS_SendEvent (TO_INIT_INF_EID, CFE_EVS_INFORMATION, + CFE_EVS_SendEvent (TO_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "TO Lab Initialized. Version %d.%d.%d.%d Awaiting enable command.", TO_LAB_MAJOR_VERSION, TO_LAB_MINOR_VERSION, @@ -248,7 +251,8 @@ void TO_StartSending( TO_OUTPUT_ENABLE_PKT_t * pCmd ) sizeof (tlm_dest_IP), sizeof (pCmd->dest_IP)); suppress_sendto = FALSE; - CFE_EVS_SendEvent(TO_TLMOUTENA_INF_EID,CFE_EVS_INFORMATION,"TO telemetry output enabled for IP %s", tlm_dest_IP); + CFE_EVS_SendEvent(TO_TLMOUTENA_INF_EID,CFE_EVS_EventType_INFORMATION, + "TO telemetry output enabled for IP %s", tlm_dest_IP); if(downlink_on == FALSE) /* Then turn it on, otherwise we will just switch destination addresses*/ { @@ -286,7 +290,8 @@ void TO_process_commands(void) break; default: - CFE_EVS_SendEvent(TO_MSGID_ERR_EID,CFE_EVS_ERROR, "L%d TO: Invalid Msg ID Rcvd 0x%x",__LINE__,MsgId); + CFE_EVS_SendEvent(TO_MSGID_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO: Invalid Msg ID Rcvd 0x%x",__LINE__,MsgId); break; } break; @@ -311,7 +316,8 @@ void TO_exec_local_command(CFE_SB_MsgPtr_t cmd) switch (CommandCode) { case TO_NOP_CC: - CFE_EVS_SendEvent(TO_NOOP_INF_EID,CFE_EVS_INFORMATION, "No-op command"); + CFE_EVS_SendEvent(TO_NOOP_INF_EID,CFE_EVS_EventType_INFORMATION, + "No-op command"); break; case TO_RESET_STATUS_CC: @@ -341,7 +347,8 @@ void TO_exec_local_command(CFE_SB_MsgPtr_t cmd) break; default: - CFE_EVS_SendEvent(TO_FNCODE_ERR_EID,CFE_EVS_ERROR, "L%d TO: Invalid Function Code Rcvd In Ground Command 0x%x",__LINE__, + CFE_EVS_SendEvent(TO_FNCODE_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO: Invalid Function Code Rcvd In Ground Command 0x%x",__LINE__, CommandCode); valid = FALSE; } @@ -430,7 +437,8 @@ void TO_output_status(void) void TO_openTLM(void) { if ( (TLMsockid = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - CFE_EVS_SendEvent(TO_TLMOUTSOCKET_ERR_EID,CFE_EVS_ERROR, "L%d, TO TLM socket errno: %d",__LINE__, errno); + CFE_EVS_SendEvent(TO_TLMOUTSOCKET_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d, TO TLM socket errno: %d",__LINE__, errno); /*---------------- Add static arp entries ----------------*/ @@ -451,10 +459,12 @@ void TO_AddPkt( TO_ADD_PKT_t * pCmd) pCmd->BufLimit); if(status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_ADDPKT_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't subscribe 0x%x status %i",__LINE__, + CFE_EVS_SendEvent(TO_ADDPKT_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't subscribe 0x%x status %i",__LINE__, pCmd->Stream, (int)status); else - CFE_EVS_SendEvent(TO_ADDPKT_INF_EID,CFE_EVS_INFORMATION, "L%d TO AddPkt 0x%x, QoS %d.%d, limit %d",__LINE__, + CFE_EVS_SendEvent(TO_ADDPKT_INF_EID,CFE_EVS_EventType_INFORMATION, + "L%d TO AddPkt 0x%x, QoS %d.%d, limit %d",__LINE__, pCmd->Stream, pCmd->Flags.Priority, pCmd->Flags.Reliability, @@ -472,10 +482,12 @@ void TO_RemovePkt(TO_REMOVE_PKT_t * pCmd) status = CFE_SB_Unsubscribe(pCmd->Stream, TO_Tlm_pipe); if(status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_REMOVEPKT_ERR_EID,CFE_EVS_ERROR,"L%d TO Can't Unsubscribe to Stream 0x%x on pipe %d, status %i",__LINE__, + CFE_EVS_SendEvent(TO_REMOVEPKT_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't Unsubscribe to Stream 0x%x on pipe %d, status %i",__LINE__, pCmd->Stream, TO_Tlm_pipe, (int)status); else - CFE_EVS_SendEvent(TO_REMOVEPKT_INF_EID,CFE_EVS_INFORMATION,"L%d TO RemovePkt 0x%x",__LINE__, pCmd->Stream); + CFE_EVS_SendEvent(TO_REMOVEPKT_INF_EID,CFE_EVS_EventType_INFORMATION, + "L%d TO RemovePkt 0x%x",__LINE__, pCmd->Stream); } /* End of TO_RemovePkt() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -495,7 +507,8 @@ void TO_RemoveAllPkt(void) status = CFE_SB_Unsubscribe(TO_SubTable[i].Stream, TO_Tlm_pipe); if(status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_REMOVEALLPTKS_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't Unsubscribe to stream 0x%x status %i", __LINE__, + CFE_EVS_SendEvent(TO_REMOVEALLPTKS_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't Unsubscribe to stream 0x%x status %i", __LINE__, TO_SubTable[i].Stream, (int)status); } } @@ -503,15 +516,18 @@ void TO_RemoveAllPkt(void) /* remove commands as well */ status = CFE_SB_Unsubscribe(TO_LAB_CMD_MID, TO_Cmd_pipe); if(status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_REMOVECMDTO_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__, + CFE_EVS_SendEvent(TO_REMOVECMDTO_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__, TO_LAB_CMD_MID, (int)status); status = CFE_SB_Unsubscribe(TO_LAB_SEND_HK_MID, TO_Cmd_pipe); if (status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_REMOVEHKTO_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__, + CFE_EVS_SendEvent(TO_REMOVEHKTO_ERR_EID,CFE_EVS_EventType_ERROR, + "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__, TO_LAB_CMD_MID, (int)status); - CFE_EVS_SendEvent(TO_REMOVEALLPKTS_INF_EID,CFE_EVS_INFORMATION, "L%d TO Unsubscribed to all Commands and Telemetry", __LINE__); + CFE_EVS_SendEvent(TO_REMOVEALLPKTS_INF_EID,CFE_EVS_EventType_INFORMATION, + "L%d TO Unsubscribed to all Commands and Telemetry", __LINE__); } /* End of TO_RemoveAllPkt() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -553,7 +569,7 @@ void TO_forward_telemetry(void) } if (status < 0) { - CFE_EVS_SendEvent(TO_TLMOUTSTOP_ERR_EID,CFE_EVS_ERROR, + CFE_EVS_SendEvent(TO_TLMOUTSTOP_ERR_EID,CFE_EVS_EventType_ERROR, "L%d TO sendto errno %d. Tlm output supressed\n", __LINE__, errno); suppress_sendto = TRUE; } From 06a5ba51e1d259476493ef417956aada1e294716 Mon Sep 17 00:00:00 2001 From: skliper <47541139+skliper@users.noreply.github.com> Date: Wed, 4 Sep 2019 10:41:16 -0400 Subject: [PATCH 2/7] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 35 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 23 +++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..39aa04e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,35 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Code snips** +If applicable, add references to the software. + +**System observed on:** + - Hardware + - OS: [e.g. Linux 4.4] + - Versions [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps] + +**Additional context** +Add any other context about the problem here. + +**Reporter Info** +Full name and company/organization if applicable diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..6b729ed --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,23 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context about the feature request here. + +**Requester Info** +Full name and company/organization if applicable From 257e49ec0ed1b6a239925a71e94262f466084c71 Mon Sep 17 00:00:00 2001 From: Jake Hageman Date: Wed, 4 Sep 2019 15:35:11 -0400 Subject: [PATCH 3/7] Add pull request template --- .github/pull_request_template.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..632f1c7 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,27 @@ +**Describe the contribution** +A clear and concise description of what the contribution is [e.g. Fixes issue #X] + +**Testing performed** +Steps taken to test the contribution: +1. Build steps '...' +2. Execution steps '....' + +**Expected behavior changes** +A clear and concise description of how this contribution will change behavior and level of impact. + - API Change: xxx (if applicable) + - Behavior Change: xxx (if applicable) + - Or no impact to behavior + +**System(s) tested on:** + - Hardware + - OS: [e.g. Linux 4.4] + - Versions [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps] + +**Additional context** +Add any other context about the contribution here. + +**Contributor Info** +Full name and company/organization of all contributors (required for acceptance) + +**Community contributors** +You must attach a signed CLA (required for acceptance) or reference one already submitted From 91d01fa4f1f0dcfa9301b25471c232c13e527b38 Mon Sep 17 00:00:00 2001 From: avan989 Date: Wed, 28 Aug 2019 14:37:26 -0400 Subject: [PATCH 4/7] Fix #1, Update to valid Perfids --- fsw/mission_inc/to_lab_perfids.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fsw/mission_inc/to_lab_perfids.h b/fsw/mission_inc/to_lab_perfids.h index 435e828..5bc21f3 100644 --- a/fsw/mission_inc/to_lab_perfids.h +++ b/fsw/mission_inc/to_lab_perfids.h @@ -39,8 +39,8 @@ #ifndef _to_lab_perfids_h_ #define _to_lab_perfids_h_ -#define TO_MAIN_TASK_PERF_ID 22 -#define TO_SOCKET_SEND_PERF_ID 23 +#define TO_MAIN_TASK_PERF_ID 34 +#define TO_SOCKET_SEND_PERF_ID 35 #endif /* _to_lab_perfids_h_ */ From c52696d2e9d04ca6c3853d721e78dc4c6f2a0a1f Mon Sep 17 00:00:00 2001 From: Jake Hageman Date: Tue, 10 Sep 2019 13:43:21 -0400 Subject: [PATCH 5/7] Fix #3, TO_subscription typo --- fsw/platform_inc/to_lab_sub_table.h | 5 +++-- fsw/src/to_lab_app.c | 4 ++-- fsw/src/to_lab_msg.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fsw/platform_inc/to_lab_sub_table.h b/fsw/platform_inc/to_lab_sub_table.h index 27329a4..f827061 100644 --- a/fsw/platform_inc/to_lab_sub_table.h +++ b/fsw/platform_inc/to_lab_sub_table.h @@ -53,7 +53,7 @@ #include "lc_msgids.h" #endif -static TO_subsciption_t TO_SubTable[] = +static TO_subscription_t TO_SubTable[] = { /* CFS App Subscriptions */ {TO_LAB_HK_TLM_MID, {0,0}, 4}, @@ -69,7 +69,8 @@ static TO_subsciption_t TO_SubTable[] = {DS_HK_TLM_MID, {0,0}, 4}, {LC_HK_TLM_MID, {0,0}, 4}, #endif - /* cFE Core subsciptions */ + + /* cFE Core subscriptions */ {CFE_ES_HK_TLM_MID, {0,0}, 4}, {CFE_EVS_HK_TLM_MID, {0,0}, 4}, {CFE_SB_HK_TLM_MID, {0,0}, 4}, diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index c0dd433..25afc09 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -212,7 +212,7 @@ void TO_init(void) } /* Subscriptions for TLM pipe*/ - for (i=0; (i < (sizeof(TO_SubTable)/sizeof(TO_subsciption_t))); i++) + for (i=0; (i < (sizeof(TO_SubTable)/sizeof(TO_subscription_t))); i++) { if(TO_SubTable[i].Stream != TO_UNUSED ) status = CFE_SB_SubscribeEx(TO_SubTable[i].Stream, @@ -500,7 +500,7 @@ void TO_RemoveAllPkt(void) int32 status; int i; - for (i=0; (i < (sizeof(TO_SubTable)/sizeof(TO_subsciption_t))); i++) + for (i=0; (i < (sizeof(TO_SubTable)/sizeof(TO_subscription_t))); i++) { if (TO_SubTable[i].Stream != TO_UNUSED ) { diff --git a/fsw/src/to_lab_msg.h b/fsw/src/to_lab_msg.h index 6fc1c95..65a86f9 100644 --- a/fsw/src/to_lab_msg.h +++ b/fsw/src/to_lab_msg.h @@ -100,7 +100,7 @@ typedef struct { CFE_SB_MsgId_t Stream; CFE_SB_Qos_t Flags; uint16 BufLimit; - } TO_subsciption_t; + } TO_subscription_t; /******************************************************************************/ From 91598dadd257f5550a394d14ad41056feee0f0e9 Mon Sep 17 00:00:00 2001 From: avan989 Date: Mon, 26 Aug 2019 08:31:11 -0400 Subject: [PATCH 6/7] Fix #5, 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 2213a5e..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:16GMT-05:00 rmcgraw Exp $ -# -# $Log: Makefile $ -# Revision 1.5 2009/07/09 10:41:16GMT-05:00 rmcgraw -# DCR8291:1 Changed CFE_MISSION_INC to CFS_MISSION_INC and added log if needed -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = to_lab - -# -# Entry Point for task -# -ENTRY_PT = TO_Lab_AppMain - -# -# Object files required to build subsystem. -# -OBJS = to_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 8fddb03a36ce880e1871ebf7870fc2c7375ff7c4 Mon Sep 17 00:00:00 2001 From: avan989 Date: Fri, 23 Aug 2019 16:42:25 -0400 Subject: [PATCH 7/7] Fix #4, Remove MKS/CVS flags --- fsw/mission_inc/to_lab_perfids.h | 12 +----------- fsw/platform_inc/to_lab_msgids.h | 10 +--------- fsw/platform_inc/to_lab_sub_table.h | 6 ------ fsw/src/to_lab_app.c | 20 -------------------- fsw/src/to_lab_app.h | 13 +------------ fsw/src/to_lab_events.h | 7 +------ fsw/src/to_lab_msg.h | 7 +------ fsw/src/to_lab_version.h | 15 +-------------- 8 files changed, 6 insertions(+), 84 deletions(-) diff --git a/fsw/mission_inc/to_lab_perfids.h b/fsw/mission_inc/to_lab_perfids.h index 5bc21f3..6b188b4 100644 --- a/fsw/mission_inc/to_lab_perfids.h +++ b/fsw/mission_inc/to_lab_perfids.h @@ -18,23 +18,13 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: +** File: to_lab_perfids.h ** ** Purpose: ** Define TO Lab Performance IDs ** ** Notes: ** -** $Log: to_lab_perfids.h $ -** Revision 1.3 2010/09/20 12:28:05GMT-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 14:43:01EDT rjmcgraw -** Member moved from to_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj to to_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/mission_inc/project.pj. -** Revision 1.1 2008/04/30 13:43:01ACT rjmcgraw -** Initial revision -** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj -** *************************************************************************/ #ifndef _to_lab_perfids_h_ #define _to_lab_perfids_h_ diff --git a/fsw/platform_inc/to_lab_msgids.h b/fsw/platform_inc/to_lab_msgids.h index acc9368..b9d4061 100644 --- a/fsw/platform_inc/to_lab_msgids.h +++ b/fsw/platform_inc/to_lab_msgids.h @@ -18,21 +18,13 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: +** File: to_lab_msgids.h ** ** Purpose: ** Define TO Lab Message IDs ** ** Notes: ** -** $Log: to_lab_msgids.h $ -** Revision 1.2 2010/09/20 12:28:05GMT-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.1 2008/04/30 14:42:40EDT rjmcgraw -** Initial revision -** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj -** *************************************************************************/ #ifndef _to_lab_msgids_h_ #define _to_lab_msgids_h_ diff --git a/fsw/platform_inc/to_lab_sub_table.h b/fsw/platform_inc/to_lab_sub_table.h index f827061..4c907bf 100644 --- a/fsw/platform_inc/to_lab_sub_table.h +++ b/fsw/platform_inc/to_lab_sub_table.h @@ -25,12 +25,6 @@ ** ** Notes: ** -** $Log: to_lab_sub_table.h $ -** Revision 1.3 2014/07/16 14:44:45GMT-05:00 acudmore -** Member renamed from to_sub_table.h to to_lab_sub_table.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj. -** Revision 1.2 2014/07/16 14:44:45ACT acudmore -** Updated TO_LAB subscription table header file ( comments, clean up ) -** *************************************************************************/ /* diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index 25afc09..156c3ae 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -25,26 +25,6 @@ ** ** Notes: ** -** $Log: to_lab_app.c $ -** Revision 1.8 2014/07/17 12:51:03GMT-05:00 acudmore -** renamed to_sub_table.h to to_lab_sub_table.h -** Revision 1.7 2014/07/16 14:43:21GMT-05:00 acudmore -** Updated TO_LAB , relocating subscription table in header file -** Revision 1.6 2010/09/20 13:28:05EDT 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.5 2008/09/22 14:01:35EDT apcudmore -** Removed reference to FS Housekeeping packet, since FS thread does not exist. -** Revision 1.4 2008/09/22 13:57:46EDT apcudmore -** Added RunLoop call to TO_LAB app. -** Revision 1.3 2008/09/19 15:31:45EDT rjmcgraw -** DCR4337:1 Added #include version.h and display version after initialization is complete -** Revision 1.2 2008/04/30 15:31:40EDT rjmcgraw -** DCR1718:2 Fixed compiler errors -** Revision 1.1 2008/04/30 14:43:50EDT rjmcgraw -** Initial revision -** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/src/project.pj -** *************************************************************************/ #include "to_lab_app.h" diff --git a/fsw/src/to_lab_app.h b/fsw/src/to_lab_app.h index 841aca6..53ac767 100644 --- a/fsw/src/to_lab_app.h +++ b/fsw/src/to_lab_app.h @@ -18,24 +18,13 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: +** File: to_lab_app.h ** ** Purpose: ** Define TO Lab Application header file ** ** Notes: ** -** $Log: to_lab_app.h $ -** Revision 1.4 2010/11/17 08:12:27GMT-05:00 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 2008/09/22 13:57:46EDT apcudmore -** Added RunLoop call to TO_LAB app. -** Revision 1.2 2008/04/30 15:31:41EDT rjmcgraw -** DCR1718:2 Fixed compiler errors -** Revision 1.1 2008/04/30 14:44:51EDT rjmcgraw -** Initial revision -** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/src/project.pj -** *************************************************************************/ #ifndef _to_lab_app_h_ diff --git a/fsw/src/to_lab_events.h b/fsw/src/to_lab_events.h index fb9a186..7dcf2d2 100644 --- a/fsw/src/to_lab_events.h +++ b/fsw/src/to_lab_events.h @@ -18,18 +18,13 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: +** File: to_lab_events.h ** ** Purpose: ** Define TO Lab Event messages ** ** Notes: ** -** $Log: to_lab_events.h $ -** Revision 1.1 2008/04/30 13:45:11GMT-05:00 rjmcgraw -** Initial revision -** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/src/project.pj -** *************************************************************************/ #ifndef _to_lab_events_h_ #define _to_lab_events_h_ diff --git a/fsw/src/to_lab_msg.h b/fsw/src/to_lab_msg.h index 65a86f9..e8264bb 100644 --- a/fsw/src/to_lab_msg.h +++ b/fsw/src/to_lab_msg.h @@ -18,18 +18,13 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: +** File: to_lab_msg.h ** ** Purpose: ** Define TO Lab Messages and info ** ** Notes: ** -** $Log: to_lab_msg.h $ -** Revision 1.1 2008/04/30 13:45:27GMT-05:00 rjmcgraw -** Initial revision -** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/src/project.pj -** *************************************************************************/ #ifndef _to_lab_msg_h_ #define _to_lab_msg_h_ diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h index 04a245d..ac8f455 100644 --- a/fsw/src/to_lab_version.h +++ b/fsw/src/to_lab_version.h @@ -18,26 +18,13 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: -** $Id: to_lab_version.h 1.2 2010/11/16 14:21:35GMT-05:00 bmedina Exp $ +** File: to_lab_version.h ** ** Purpose: ** The TO Lab Application header file containing version number ** ** Notes: ** -** $Log: to_lab_version.h $ -** Revision 1.3 2016/06/17 sstrege -** changed version number to 2.2.0.0 for the following updates: -** 1. Resolve compiler warnings -** 2. Fix TO_StartSending strncpy buffer overflow -** 3. Remove backup file -** Revision 1.2 2010/11/16 14:21:35GMT-05:00 bmedina -** changed version to 2.1.0.0 -** Revision 1.1 2008/09/19 15:04:35EDT rjmcgraw -** Initial revision -** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/src/project.pj -** *************************************************************************/ #ifndef _to_lab_version_h_ #define _to_lab_version_h_