ogma-core 1.0.11 → 1.1.0
raw patch · 11 files changed
+53/−47 lines, 11 filesdep ~ogma-extradep ~ogma-language-cdep ~ogma-language-cocospec
Dependency ranges changed: ogma-extra, ogma-language-c, ogma-language-cocospec, ogma-language-copilot, ogma-language-fret-cs, ogma-language-fret-reqs, ogma-language-smv
Files
- CHANGELOG.md +6/−0
- ogma-core.cabal +8/−8
- src/Command/CFSApp.hs +1/−1
- templates/copilot-cfs/CMakeLists.txt +1/−1
- templates/copilot-cfs/fsw/for_build/Makefile +14/−14
- templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h +3/−3
- templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h +2/−2
- templates/copilot-cfs/fsw/src/copilot_cfs.c +7/−7
- templates/copilot-cfs/fsw/src/copilot_cfs_events.h +5/−5
- templates/copilot-cfs/fsw/src/copilot_cfs_msg.h +3/−3
- templates/copilot-cfs/fsw/src/copilot_cfs_version.h +3/−3
CHANGELOG.md view
@@ -1,5 +1,11 @@ # Revision history for ogma-core +## [1.1.0] - 2023-11-21++* Version bump 1.1.0 (#112).+* Remove trailing spaces from cFS app template (#108).+* Replace all mentions of the Sample App (#105).+ ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103).
ogma-core.cabal view
@@ -32,7 +32,7 @@ build-type: Simple name: ogma-core-version: 1.0.11+version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf@@ -109,13 +109,13 @@ , IfElse , mtl - , ogma-extra >= 1.0.11 && < 1.1- , ogma-language-c >= 1.0.11 && < 1.1- , ogma-language-cocospec >= 1.0.11 && < 1.1- , ogma-language-copilot >= 1.0.11 && < 1.1- , ogma-language-fret-cs >= 1.0.11 && < 1.1- , ogma-language-fret-reqs >= 1.0.11 && < 1.1- , ogma-language-smv >= 1.0.11 && < 1.1+ , ogma-extra >= 1.1.0 && < 1.2+ , ogma-language-c >= 1.1.0 && < 1.2+ , ogma-language-cocospec >= 1.1.0 && < 1.2+ , ogma-language-copilot >= 1.1.0 && < 1.2+ , ogma-language-fret-cs >= 1.1.0 && < 1.2+ , ogma-language-fret-reqs >= 1.1.0 && < 1.2+ , ogma-language-smv >= 1.1.0 && < 1.2 hs-source-dirs: src
src/Command/CFSApp.hs view
@@ -209,7 +209,7 @@ , "** File: copilot_cfs.c" , "**" , "** Purpose:"- , "** This file contains the source code for the Sample App."+ , "** This file contains the source code for the Copilot App." , "**" , "*********************************************************************/" , ""
templates/copilot-cfs/CMakeLists.txt view
@@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6.4)-project(CFE_SAMPLE_APP C)+project(CFE_COPILOT_APP C) include_directories(../../Modules/Core/Interfaces) include_directories(../Icarouslib/fsw/platform_inc)
templates/copilot-cfs/fsw/for_build/Makefile view
@@ -1,10 +1,10 @@ ###############################################################################-# File: CFS Application Makefile +# 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 +# Revision 1.8 2009/07/09 12:25:54EDT rmcgraw # DCR8291:1 Changed CFE_MISSION_INC to CFS_MISSION_INC and added log # ###############################################################################@@ -13,9 +13,9 @@ # APPTARGET = copilot_cfs -# +# # Entry Point for task-# +# ENTRY_PT = COPILOT_CFSMain #@@ -33,7 +33,7 @@ ## ## Specify extra C Flags needed to build this subsystem ##-LOCAL_COPTS = +LOCAL_COPTS = ##@@ -49,22 +49,22 @@ ## entry like the following: ## -R../tst_lib/tst_lib.elf ##-SHARED_LIB_LINK = +SHARED_LIB_LINK = ########################################################################-# Should not have to change below this line, except for customized +# 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 +# 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 +## Any of these can be copied to a local file and ## changed if needed. ## ##@@ -98,13 +98,13 @@ -I../inc ##-## Define the VPATH make variable. +## 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 +## 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 +VPATH = $(CFS_APP_SRC)/$(APPTARGET)/fsw/src ## ## Include the common make rules for building a cFE Application
templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h view
@@ -2,8 +2,8 @@ ** File: ** $Id: copilot_cfs_perfids.h $ **-** Purpose: -** Define Sample App Performance IDs+** Purpose:+** Define Copilot App Performance IDs ** ** Notes: **@@ -12,7 +12,7 @@ #define _copilot_cfs_perfids_h_ -#define COPILOT_CFS_PERF_ID 91 +#define COPILOT_CFS_PERF_ID 91 #endif /* _copilot_cfs_perfids_h_ */
templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h view
@@ -2,8 +2,8 @@ ** File: ** $Id: copilot_cfs_msgids.h $ **-** Purpose: -** Define Sample App Message IDs+** Purpose:+** Define Copilot App Message IDs ** ** Notes: **
templates/copilot-cfs/fsw/src/copilot_cfs.c view
@@ -2,7 +2,7 @@ ** File: copilot_cfs.c ** ** Purpose:-** This file contains the source code for the Sample App.+** This file contains the source code for the Copilot App. ** *******************************************************************************/ @@ -60,7 +60,7 @@ /* Pend on receipt of command packet -- timeout set to 500 millisecs */ status = CFE_SB_RcvMsg(&COPILOTMsgPtr, COPILOT_CommandPipe, 500);- + CFE_ES_PerfLogEntry(COPILOT_CFS_PERF_ID); if (status == CFE_SUCCESS)@@ -88,7 +88,7 @@ /* ** Register the events- */ + */ CFE_EVS_Register(COPILOT_EventFilters, sizeof(COPILOT_EventFilters)/sizeof(CFE_EVS_BinFilter_t), CFE_EVS_BINARY_FILTER);@@ -103,10 +103,10 @@ CFE_EVS_SendEvent (COPILOT_STARTUP_INF_EID, CFE_EVS_INFORMATION, "COPILOT App Initialized. Version %d.%d.%d.%d", COPILOT_CFS_MAJOR_VERSION,- COPILOT_CFS_MINOR_VERSION, - COPILOT_CFS_REVISION, + COPILOT_CFS_MINOR_VERSION,+ COPILOT_CFS_REVISION, COPILOT_CFS_MISSION_REV);- + } /* End of COPILOT_AppInit() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/@@ -147,7 +147,7 @@ position_t* msg; msg = (position_t*) COPILOTMsgPtr; my_position = *msg;- + // Run all copilot monitors. step(); }
templates/copilot-cfs/fsw/src/copilot_cfs_events.h view
@@ -1,8 +1,8 @@ /************************************************************************ ** File:-** copilot_app_events.h +** copilot_app_events.h **-** Purpose: +** Purpose: ** Define COPILOT App Events IDs ** ** Notes:@@ -14,11 +14,11 @@ #define COPILOT_RESERVED_EID 0-#define COPILOT_STARTUP_INF_EID 1 +#define COPILOT_STARTUP_INF_EID 1 #define COPILOT_COMMAND_ERR_EID 2 #define COPILOT_COMMANDCPVIOL_INF_EID 3-#define COPILOT_INVALID_MSGID_ERR_EID 4 -#define COPILOT_LEN_ERR_EID 5 +#define COPILOT_INVALID_MSGID_ERR_EID 4+#define COPILOT_LEN_ERR_EID 5 #endif /* _copilot_app_events_h_ */
templates/copilot-cfs/fsw/src/copilot_cfs_msg.h view
@@ -1,8 +1,8 @@ /******************************************************************************* ** File:-** copilot_cfs_msg.h +** copilot_cfs_msg.h **-** Purpose: +** Purpose: ** Define COPILOT App Messages and info ** ** Notes:@@ -26,7 +26,7 @@ /* ** Type definition (COPILOT App housekeeping) */-typedef struct +typedef struct { uint8 TlmHeader[CFE_SB_TLM_HDR_SIZE]; uint8 copilot_command_error_count;
templates/copilot-cfs/fsw/src/copilot_cfs_version.h view
@@ -2,8 +2,8 @@ ** File: ** $Id: copilot_app_version.h $ **-** Purpose: -** The Sample Application header file containing version number+** Purpose:+** The Copilot Application header file containing version number ** ** Notes: **@@ -16,7 +16,7 @@ #define COPILOT_CFS_MINOR_VERSION 0 #define COPILOT_CFS_REVISION 0 #define COPILOT_CFS_MISSION_REV 0- + #endif /* _copilot_app_version_h_ */ /************************/