diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index 309612e..cc5b594 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-cli +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). +* Document cabal update step in README (#100). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-cli/README.md b/ogma-cli/README.md index e006647..1c89919 100644 --- a/ogma-cli/README.md +++ b/ogma-cli/README.md @@ -86,6 +86,7 @@ Once GHC and cabal are installed, the simplest way to install Ogma is with: $ git clone https://github.com/nasa/ogma.git $ cd ogma $ export PATH="$HOME/.cabal/bin/:$PATH" +$ cabal v1-update $ cabal v1-install alex happy $ cabal v1-install BNFC copilot $ cabal v1-install ogma-*/ diff --git a/ogma-cli/ogma-cli.cabal b/ogma-cli/ogma-cli.cabal index 0ba54f2..140ac61 100644 --- a/ogma-cli/ogma-cli.cabal +++ b/ogma-cli/ogma-cli.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-cli -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf @@ -141,7 +141,7 @@ executable ogma build-depends: base >= 4.11.0.0 && < 5 , optparse-applicative - , ogma-core >= 1.0.11 && < 1.1 + , ogma-core >= 1.1.0 && < 1.2 hs-source-dirs: src diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index 5bf07fc..f7ec75f 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -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). diff --git a/ogma-core/ogma-core.cabal b/ogma-core/ogma-core.cabal index d62ef98..87c37bc 100644 --- a/ogma-core/ogma-core.cabal +++ b/ogma-core/ogma-core.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 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 @@ library , 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 diff --git a/ogma-core/src/Command/CFSApp.hs b/ogma-core/src/Command/CFSApp.hs index fc46302..26bdc8f 100644 --- a/ogma-core/src/Command/CFSApp.hs +++ b/ogma-core/src/Command/CFSApp.hs @@ -209,7 +209,7 @@ fileContents variables msgIds msgNames msgDatas = cfsFileContents , "** 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." , "**" , "*********************************************************************/" , "" diff --git a/ogma-core/templates/copilot-cfs/CMakeLists.txt b/ogma-core/templates/copilot-cfs/CMakeLists.txt index 4b49d30..abc798d 100644 --- a/ogma-core/templates/copilot-cfs/CMakeLists.txt +++ b/ogma-core/templates/copilot-cfs/CMakeLists.txt @@ -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) diff --git a/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile b/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile index ba7699f..0121168 100644 --- a/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile +++ b/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile @@ -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 @@ SOURCES = $(OBJS:.o=.c) ## ## Specify extra C Flags needed to build this subsystem ## -LOCAL_COPTS = +LOCAL_COPTS = ## @@ -49,22 +49,22 @@ EXEDIR=../exe ## 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 @@ INCLUDE_PATH = \ -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 diff --git a/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h b/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h index 598be36..c270f49 100644 --- a/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h +++ b/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h @@ -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_ */ diff --git a/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h b/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h index 8eaff84..0095b69 100644 --- a/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h +++ b/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h @@ -2,8 +2,8 @@ ** File: ** $Id: copilot_cfs_msgids.h $ ** -** Purpose: -** Define Sample App Message IDs +** Purpose: +** Define Copilot App Message IDs ** ** Notes: ** diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c index 4e7d747..74917cf 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c @@ -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 @@ void COPILOT_AppMain( void ) /* 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 @@ void COPILOT_AppInit(void) /* ** Register the events - */ + */ CFE_EVS_Register(COPILOT_EventFilters, sizeof(COPILOT_EventFilters)/sizeof(CFE_EVS_BinFilter_t), CFE_EVS_BINARY_FILTER); @@ -103,10 +103,10 @@ void COPILOT_AppInit(void) 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 @@ void COPILOT_ProcessIcarousPosition(void) position_t* msg; msg = (position_t*) COPILOTMsgPtr; my_position = *msg; - + // Run all copilot monitors. step(); } diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h index 096931d..7a37219 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h @@ -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_ */ diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h index 03f854d..6f687c6 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h @@ -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 @@ typedef struct /* ** Type definition (COPILOT App housekeeping) */ -typedef struct +typedef struct { uint8 TlmHeader[CFE_SB_TLM_HDR_SIZE]; uint8 copilot_command_error_count; diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h index 5d94b07..f1ce263 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h @@ -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_ */ /************************/ diff --git a/ogma-extra/CHANGELOG.md b/ogma-extra/CHANGELOG.md index 18f2530..c1f44fa 100644 --- a/ogma-extra/CHANGELOG.md +++ b/ogma-extra/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-extra +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-extra/ogma-extra.cabal b/ogma-extra/ogma-extra.cabal index 2dc173a..43e3880 100644 --- a/ogma-extra/ogma-extra.cabal +++ b/ogma-extra/ogma-extra.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-extra -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf diff --git a/ogma-language-c/CHANGELOG.md b/ogma-language-c/CHANGELOG.md index b5626d9..d08b0f8 100644 --- a/ogma-language-c/CHANGELOG.md +++ b/ogma-language-c/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-c +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-language-c/ogma-language-c.cabal b/ogma-language-c/ogma-language-c.cabal index 723aac4..2185536 100644 --- a/ogma-language-c/ogma-language-c.cabal +++ b/ogma-language-c/ogma-language-c.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-c -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf diff --git a/ogma-language-cocospec/CHANGELOG.md b/ogma-language-cocospec/CHANGELOG.md index 76ad2f0..f94d8f9 100644 --- a/ogma-language-cocospec/CHANGELOG.md +++ b/ogma-language-cocospec/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-cocospec +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-language-cocospec/ogma-language-cocospec.cabal b/ogma-language-cocospec/ogma-language-cocospec.cabal index e3c57cd..fa3b8ac 100644 --- a/ogma-language-cocospec/ogma-language-cocospec.cabal +++ b/ogma-language-cocospec/ogma-language-cocospec.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-cocospec -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf diff --git a/ogma-language-copilot/CHANGELOG.md b/ogma-language-copilot/CHANGELOG.md index 46f0553..bfb6a6a 100644 --- a/ogma-language-copilot/CHANGELOG.md +++ b/ogma-language-copilot/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-copilot +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-language-copilot/ogma-language-copilot.cabal b/ogma-language-copilot/ogma-language-copilot.cabal index 9011a54..ea1eba5 100644 --- a/ogma-language-copilot/ogma-language-copilot.cabal +++ b/ogma-language-copilot/ogma-language-copilot.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-copilot -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf diff --git a/ogma-language-fret-cs/CHANGELOG.md b/ogma-language-fret-cs/CHANGELOG.md index b19d00e..38a32f2 100644 --- a/ogma-language-fret-cs/CHANGELOG.md +++ b/ogma-language-fret-cs/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-fret-cs +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-language-fret-cs/ogma-language-fret-cs.cabal b/ogma-language-fret-cs/ogma-language-fret-cs.cabal index 779ca5f..ba2fd46 100644 --- a/ogma-language-fret-cs/ogma-language-fret-cs.cabal +++ b/ogma-language-fret-cs/ogma-language-fret-cs.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-fret-cs -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf @@ -68,8 +68,8 @@ library base >= 4.11.0.0 && < 5 , aeson >= 2.0.0.0 && < 2.2 - , ogma-language-cocospec >= 1.0.10 && < 1.1 - , ogma-language-smv >= 1.0.10 && < 1.1 + , ogma-language-cocospec >= 1.1.0 && < 1.2 + , ogma-language-smv >= 1.1.0 && < 1.2 hs-source-dirs: src @@ -95,7 +95,7 @@ test-suite unit-tests , test-framework , test-framework-quickcheck2 - , ogma-extra >= 1.0.10 && < 1.1 + , ogma-extra >= 1.1.0 && < 1.2 , ogma-language-fret-cs hs-source-dirs: diff --git a/ogma-language-fret-reqs/CHANGELOG.md b/ogma-language-fret-reqs/CHANGELOG.md index 11b0dd8..31ca4fd 100644 --- a/ogma-language-fret-reqs/CHANGELOG.md +++ b/ogma-language-fret-reqs/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-fret-reqs +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal b/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal index 77dd9e1..4e5f1e5 100644 --- a/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal +++ b/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-fret-reqs -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf @@ -69,8 +69,8 @@ library , aeson >= 2.0.0.0 && < 2.2 , text - , ogma-language-cocospec >= 1.0.10 && < 1.1 - , ogma-language-smv >= 1.0.10 && < 1.1 + , ogma-language-cocospec >= 1.1.0 && < 1.2 + , ogma-language-smv >= 1.1.0 && < 1.2 hs-source-dirs: src @@ -96,7 +96,7 @@ test-suite unit-tests , test-framework , test-framework-quickcheck2 - , ogma-extra >= 1.0.10 && < 1.1 + , ogma-extra >= 1.1.0 && < 1.2 , ogma-language-fret-reqs hs-source-dirs: diff --git a/ogma-language-smv/CHANGELOG.md b/ogma-language-smv/CHANGELOG.md index b0c6d45..dc888eb 100644 --- a/ogma-language-smv/CHANGELOG.md +++ b/ogma-language-smv/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-smv +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). diff --git a/ogma-language-smv/ogma-language-smv.cabal b/ogma-language-smv/ogma-language-smv.cabal index 4608fea..68ef21d 100644 --- a/ogma-language-smv/ogma-language-smv.cabal +++ b/ogma-language-smv/ogma-language-smv.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-smv -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf