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 diff --git a/fsw/mission_inc/to_lab_perfids.h b/fsw/mission_inc/to_lab_perfids.h index 435e828..6b188b4 100644 --- a/fsw/mission_inc/to_lab_perfids.h +++ b/fsw/mission_inc/to_lab_perfids.h @@ -18,29 +18,19 @@ ** 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_ -#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_ */ 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 4d9bf89..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 ) -** *************************************************************************/ /* @@ -53,7 +47,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,19 +63,20 @@ 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_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 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}, + {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..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" @@ -117,7 +97,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 +164,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,17 +180,19 @@ 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*/ - 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, @@ -219,7 +201,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 +211,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 +231,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 +270,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 +296,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 +327,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 +417,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 +439,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 +462,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() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -488,14 +480,15 @@ 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 ) { 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 +496,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 +549,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; } 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 6fc1c95..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_ @@ -100,7 +95,7 @@ typedef struct { CFE_SB_MsgId_t Stream; CFE_SB_Qos_t Flags; uint16 BufLimit; - } TO_subsciption_t; + } TO_subscription_t; /******************************************************************************/ 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_