diff --git a/fsw/for_build/Makefile b/fsw/for_build/Makefile deleted file mode 100644 index 16ce361..0000000 --- a/fsw/for_build/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -############################################################################### -# File: CFS Application Makefile -# -# $Id: Makefile 1.8 2009/07/09 12:25:54EDT rmcgraw Exp $ -# -# $Log: Makefile $ -# Revision 1.8 2009/07/09 12:25:54EDT rmcgraw -# DCR8291:1 Changed CFE_MISSION_INC to CFS_MISSION_INC and added log -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = sample_app - -# -# Entry Point for task -# -ENTRY_PT = SAMPLE_AppMain - -# -# Object files required to build subsystem. -# -OBJS = sample_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/sample_app_perfids.h b/fsw/mission_inc/sample_app_perfids.h index d60c94d..d79c6b3 100644 --- a/fsw/mission_inc/sample_app_perfids.h +++ b/fsw/mission_inc/sample_app_perfids.h @@ -18,8 +18,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: -** $Id: sample_app_perfids.h $ +** File: sample_app_perfids.h ** ** Purpose: ** Define Sample App Performance IDs diff --git a/fsw/platform_inc/sample_app_msgids.h b/fsw/platform_inc/sample_app_msgids.h index 5153bfd..74fe66a 100644 --- a/fsw/platform_inc/sample_app_msgids.h +++ b/fsw/platform_inc/sample_app_msgids.h @@ -18,8 +18,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: -** $Id: sample_app_msgids.h $ +** File: sample_app_msgids.h ** ** Purpose: ** Define Sample App Message IDs diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index bfc2b92..17ba37c 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -59,7 +59,7 @@ static CFE_EVS_BinFilter_t SAMPLE_EventFilters[] = void SAMPLE_AppMain( void ) { int32 status; - uint32 RunStatus = CFE_ES_APP_RUN; + uint32 RunStatus = CFE_ES_RunStatus_APP_RUN; CFE_ES_PerfLogEntry(SAMPLE_APP_PERF_ID); @@ -68,7 +68,7 @@ void SAMPLE_AppMain( void ) /* ** SAMPLE Runloop */ - while (CFE_ES_RunLoop(&RunStatus) == TRUE) + while (CFE_ES_RunLoop(&RunStatus) == true) { CFE_ES_PerfLogExit(SAMPLE_APP_PERF_ID); @@ -105,7 +105,7 @@ void SAMPLE_AppInit(void) */ CFE_EVS_Register(SAMPLE_EventFilters, sizeof(SAMPLE_EventFilters)/sizeof(CFE_EVS_BinFilter_t), - CFE_EVS_BINARY_FILTER); + CFE_EVS_EventFilter_BINARY); /* ** Create the Software Bus command pipe and subscribe to housekeeping @@ -119,9 +119,9 @@ void SAMPLE_AppInit(void) CFE_SB_InitMsg(&SAMPLE_HkTelemetryPkt, SAMPLE_APP_HK_TLM_MID, - SAMPLE_APP_HK_TLM_LNGTH, TRUE); + SAMPLE_APP_HK_TLM_LNGTH, true); - CFE_EVS_SendEvent (SAMPLE_STARTUP_INF_EID, CFE_EVS_INFORMATION, + CFE_EVS_SendEvent (SAMPLE_STARTUP_INF_EID, CFE_EVS_EventType_INFORMATION, "SAMPLE App Initialized. Version %d.%d.%d.%d", SAMPLE_APP_MAJOR_VERSION, SAMPLE_APP_MINOR_VERSION, @@ -156,7 +156,7 @@ void SAMPLE_ProcessCommandPacket(void) default: SAMPLE_HkTelemetryPkt.sample_command_error_count++; - CFE_EVS_SendEvent(SAMPLE_COMMAND_ERR_EID,CFE_EVS_ERROR, + CFE_EVS_SendEvent(SAMPLE_COMMAND_ERR_EID,CFE_EVS_EventType_ERROR, "SAMPLE: invalid command packet,MID = 0x%x", MsgId); break; } @@ -182,7 +182,8 @@ void SAMPLE_ProcessGroundCommand(void) { case SAMPLE_APP_NOOP_CC: SAMPLE_HkTelemetryPkt.sample_command_count++; - CFE_EVS_SendEvent(SAMPLE_COMMANDNOP_INF_EID,CFE_EVS_INFORMATION, + CFE_EVS_SendEvent(SAMPLE_COMMANDNOP_INF_EID, + CFE_EVS_EventType_INFORMATION, "SAMPLE: NOOP command"); break; @@ -229,7 +230,7 @@ void SAMPLE_ResetCounters(void) SAMPLE_HkTelemetryPkt.sample_command_count = 0; SAMPLE_HkTelemetryPkt.sample_command_error_count = 0; - CFE_EVS_SendEvent(SAMPLE_COMMANDRST_INF_EID, CFE_EVS_INFORMATION, + CFE_EVS_SendEvent(SAMPLE_COMMANDRST_INF_EID, CFE_EVS_EventType_INFORMATION, "SAMPLE: RESET command"); return; @@ -240,9 +241,9 @@ void SAMPLE_ResetCounters(void) /* SAMPLE_VerifyCmdLength() -- Verify command packet length */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ -boolean SAMPLE_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength) +bool SAMPLE_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength) { - boolean result = TRUE; + bool result = true; uint16 ActualLength = CFE_SB_GetTotalMsgLength(msg); @@ -254,10 +255,10 @@ boolean SAMPLE_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength) CFE_SB_MsgId_t MessageID = CFE_SB_GetMsgId(msg); uint16 CommandCode = CFE_SB_GetCmdCode(msg); - CFE_EVS_SendEvent(SAMPLE_LEN_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SAMPLE_LEN_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid msg length: ID = 0x%X, CC = %d, Len = %d, Expected = %d", MessageID, CommandCode, ActualLength, ExpectedLength); - result = FALSE; + result = false; SAMPLE_HkTelemetryPkt.sample_command_error_count++; } diff --git a/fsw/src/sample_app.h b/fsw/src/sample_app.h index 8856faa..5f51d3c 100644 --- a/fsw/src/sample_app.h +++ b/fsw/src/sample_app.h @@ -64,6 +64,6 @@ void SAMPLE_ProcessGroundCommand(void); void SAMPLE_ReportHousekeeping(void); void SAMPLE_ResetCounters(void); -boolean SAMPLE_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength); +bool SAMPLE_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength); #endif /* _sample_app_h_ */ diff --git a/fsw/src/sample_app_events.h b/fsw/src/sample_app_events.h index 49227ee..6a0cea7 100644 --- a/fsw/src/sample_app_events.h +++ b/fsw/src/sample_app_events.h @@ -18,8 +18,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: -** sample_app_events.h +** File: sample_app_events.h ** ** Purpose: ** Define SAMPLE App Events IDs diff --git a/fsw/src/sample_app_msg.h b/fsw/src/sample_app_msg.h index 03fecff..c6c7b40 100644 --- a/fsw/src/sample_app_msg.h +++ b/fsw/src/sample_app_msg.h @@ -18,8 +18,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: -** sample_app_msg.h +** File: sample_app_msg.h ** ** Purpose: ** Define SAMPLE App Messages and info diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index 1370fa0..16e47a3 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -18,8 +18,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** -** File: -** $Id: sample_app_version.h $ +** File: sample_app_version.h ** ** Purpose: ** The Sample Application header file containing version number