From 4f4f36238598c2ddc2cd5e8859ba8039fb7500dc Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Wed, 30 Jul 2025 16:53:27 -0400 Subject: [PATCH 01/20] Saving WIP, modified config files --- Makefile | 2 +- cfg/nos3-mission.xml | 2 +- cfg/nos3_defs/global_build_options.cmake | 3 ++- cfg/spacecraft/sc-minimal-config.xml | 2 +- components/cryptolib | 2 +- gsw/cosmos | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f6b8ec8c..da0be167 100755 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ all: ## Build everything: config, fsw, sim, gsw build-cryptolib: ## Build CryptoLib Component, ## -DSTANDALONE_TCP=0 if using udp for cryptolib in the loop mkdir -p $(GSWBUILDDIR) - cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DSA_FILE=OFF -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib + cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DDEBUG=1 -DCRYPTO_EPROC=1 -DSA_FILE=OFF -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib $(MAKE) --no-print-directory -C $(GSWBUILDDIR) build-fsw: ## Build the flight software (cFS or F') diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 5fb96819..52cfdf86 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -20,7 +20,7 @@ - spacecraft/sc-mission-config.xml + spacecraft/sc-minimal-config.xml diff --git a/cfg/nos3_defs/global_build_options.cmake b/cfg/nos3_defs/global_build_options.cmake index 3a02fd31..0401a0a3 100644 --- a/cfg/nos3_defs/global_build_options.cmake +++ b/cfg/nos3_defs/global_build_options.cmake @@ -30,8 +30,9 @@ SET(ENV{CFS_APP_PATH} "baseline_apps:apps/sbn/modules/protocol:../components:") # Set the CryptoLib FSW build flags for cFS use set(CRYPTO_LIBGCRYPT ON CACHE BOOL "Cryptography Module - Libgcrypt" FORCE) -#set(DEBUG ON CACHE BOOL "CryptoLib Debug" FORCE) +set(DEBUG ON CACHE BOOL "CryptoLib Debug" FORCE) set(KEY_INTERNAL ON CACHE BOOL "Key Module - Internal" FORCE) set(MC_INTERNAL ON CACHE BOOL "Monitoring and Control - Internal" FORCE) set(SA_FILE OFF CACHE BOOL "Save Security Association to File" FORCE) set(SA_INTERNAL ON CACHE BOOL "Security Association - Internal" FORCE) +set(CRYPTO_EPROC ON CACHE BOOL "Extended Procedures" FORCE) diff --git a/cfg/spacecraft/sc-minimal-config.xml b/cfg/spacecraft/sc-minimal-config.xml index be0f735b..71b38a11 100644 --- a/cfg/spacecraft/sc-minimal-config.xml +++ b/cfg/spacecraft/sc-minimal-config.xml @@ -52,7 +52,7 @@ false - false + true false diff --git a/components/cryptolib b/components/cryptolib index 5029af5a..9aed078a 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 5029af5abc84a3280365d5581ba8b25e07c7567d +Subproject commit 9aed078a9a63eafc83e31550a924369219194205 diff --git a/gsw/cosmos b/gsw/cosmos index 8cff4dbe..19bf9d91 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 8cff4dbe94c2009442bf362ff93c2740d1dc09f5 +Subproject commit 19bf9d917d1cc457fa9af5843f7ee68ef7454831 From 7632c64f843b723e66863f1c89c875c1defeeccc Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Mon, 4 Aug 2025 14:07:55 -0400 Subject: [PATCH 02/20] [nasa/nos3#769] Restore NOS3 defaults and update submods --- Makefile | 2 +- cfg/nos3-mission.xml | 2 +- cfg/nos3_defs/cpu1_cfe_es_startup.scr | 2 +- cfg/nos3_defs/global_build_options.cmake | 4 ++-- cfg/spacecraft/sc-minimal-config.xml | 2 +- components/cryptolib | 2 +- fsw/apps/ci | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index da0be167..e6786f41 100755 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ all: ## Build everything: config, fsw, sim, gsw build-cryptolib: ## Build CryptoLib Component, ## -DSTANDALONE_TCP=0 if using udp for cryptolib in the loop mkdir -p $(GSWBUILDDIR) - cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DDEBUG=1 -DCRYPTO_EPROC=1 -DSA_FILE=OFF -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib + cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib $(MAKE) --no-print-directory -C $(GSWBUILDDIR) build-fsw: ## Build the flight software (cFS or F') diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 52cfdf86..5fb96819 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -20,7 +20,7 @@ - spacecraft/sc-minimal-config.xml + spacecraft/sc-mission-config.xml diff --git a/cfg/nos3_defs/cpu1_cfe_es_startup.scr b/cfg/nos3_defs/cpu1_cfe_es_startup.scr index c320c33d..b9dc2343 100644 --- a/cfg/nos3_defs/cpu1_cfe_es_startup.scr +++ b/cfg/nos3_defs/cpu1_cfe_es_startup.scr @@ -3,7 +3,7 @@ CFE_LIB, hwlib, hwlib_Init, HW_LIB, CFE_LIB, io_lib, IO_LibInit, IO_LIB, 0, 0, 0x0, 0; CFE_APP, sch, SCH_AppMain, SCH, 40, 16384, 0x0, 0; -CFE_APP, ci, CI_AppMain, CI, 41, 16384, 0x0, 0; +CFE_APP, ci, CI_AppMain, CI, 41, 32768, 0x0, 0; CFE_APP, to, TO_AppMain, TO, 42, 32768, 0x0, 0; CFE_APP, ci_lab, CI_Lab_AppMain, CI_LAB_APP, 80, 16384, 0x0, 0; diff --git a/cfg/nos3_defs/global_build_options.cmake b/cfg/nos3_defs/global_build_options.cmake index 0401a0a3..d47b77e1 100644 --- a/cfg/nos3_defs/global_build_options.cmake +++ b/cfg/nos3_defs/global_build_options.cmake @@ -30,9 +30,9 @@ SET(ENV{CFS_APP_PATH} "baseline_apps:apps/sbn/modules/protocol:../components:") # Set the CryptoLib FSW build flags for cFS use set(CRYPTO_LIBGCRYPT ON CACHE BOOL "Cryptography Module - Libgcrypt" FORCE) -set(DEBUG ON CACHE BOOL "CryptoLib Debug" FORCE) +#set(DEBUG ON CACHE BOOL "CryptoLib Debug" FORCE) set(KEY_INTERNAL ON CACHE BOOL "Key Module - Internal" FORCE) set(MC_INTERNAL ON CACHE BOOL "Monitoring and Control - Internal" FORCE) -set(SA_FILE OFF CACHE BOOL "Save Security Association to File" FORCE) +#set(SA_FILE OFF CACHE BOOL "Save Security Association to File" FORCE) set(SA_INTERNAL ON CACHE BOOL "Security Association - Internal" FORCE) set(CRYPTO_EPROC ON CACHE BOOL "Extended Procedures" FORCE) diff --git a/cfg/spacecraft/sc-minimal-config.xml b/cfg/spacecraft/sc-minimal-config.xml index 71b38a11..be0f735b 100644 --- a/cfg/spacecraft/sc-minimal-config.xml +++ b/cfg/spacecraft/sc-minimal-config.xml @@ -52,7 +52,7 @@ false - true + false false diff --git a/components/cryptolib b/components/cryptolib index 9aed078a..f974b59d 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 9aed078a9a63eafc83e31550a924369219194205 +Subproject commit f974b59d1a72ad8031971a9ab46603cf08a1afa1 diff --git a/fsw/apps/ci b/fsw/apps/ci index 01a9e514..2a8b00fc 160000 --- a/fsw/apps/ci +++ b/fsw/apps/ci @@ -1 +1 @@ -Subproject commit 01a9e51472454fd3f2262bf97ad5b3be861f0d22 +Subproject commit 2a8b00fc645c7af196a3cd899b931b6b648b6831 From 53a0bedb534702fd20386e8fe940b22921b04028 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Mon, 4 Aug 2025 15:03:13 -0400 Subject: [PATCH 03/20] [nasa/nos3#769] Bring in Active VCID PR changes for testing --- fsw/apps/ci | 2 +- fsw/apps/to | 2 +- gsw/cosmos | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsw/apps/ci b/fsw/apps/ci index 2a8b00fc..1bede10e 160000 --- a/fsw/apps/ci +++ b/fsw/apps/ci @@ -1 +1 @@ -Subproject commit 2a8b00fc645c7af196a3cd899b931b6b648b6831 +Subproject commit 1bede10e07174ac3870ac644fa1991ac5a7de641 diff --git a/fsw/apps/to b/fsw/apps/to index 3f5225f1..e52769ec 160000 --- a/fsw/apps/to +++ b/fsw/apps/to @@ -1 +1 @@ -Subproject commit 3f5225f1f38d0a595cdcdcb25031a7939d3f0527 +Subproject commit e52769ece8dc08e50646ce7b662f11bef0cca1f0 diff --git a/gsw/cosmos b/gsw/cosmos index 19bf9d91..0d675fde 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 19bf9d917d1cc457fa9af5843f7ee68ef7454831 +Subproject commit 0d675fde05e8549e52d65a2bb6faf41f6fdf74dd From 0e8cfa116b59c11f31fd02326e990ec956c359b7 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Tue, 5 Aug 2025 11:53:31 -0400 Subject: [PATCH 04/20] [nasa/nos3#769] All ExProc Commands working --- components/cryptolib | 2 +- gsw/cosmos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index f974b59d..0b40e08c 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit f974b59d1a72ad8031971a9ab46603cf08a1afa1 +Subproject commit 0b40e08cc5818d89ae965e80dc80ab1e0209d189 diff --git a/gsw/cosmos b/gsw/cosmos index 0d675fde..4506a46c 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 0d675fde05e8549e52d65a2bb6faf41f6fdf74dd +Subproject commit 4506a46cdfbe9ede6eb78168c8adbea87f202073 From 5b4a53b379e0b53d344a922ba570cb6ee026ed92 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Tue, 5 Aug 2025 13:33:40 -0400 Subject: [PATCH 05/20] [nasa/nos3#769] Fixed Crypto debug print, ExProc states in commands --- components/cryptolib | 2 +- gsw/cosmos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 0b40e08c..38a8f92c 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 0b40e08cc5818d89ae965e80dc80ab1e0209d189 +Subproject commit 38a8f92c056f756f5f5195cb0ddd41b5043ab0ce diff --git a/gsw/cosmos b/gsw/cosmos index 4506a46c..df69c649 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 4506a46cdfbe9ede6eb78168c8adbea87f202073 +Subproject commit df69c6499b42059902070e42cbed6a47679b312c From 76682e8926b5d454ca5107a9d2b54468e53496b8 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Wed, 6 Aug 2025 11:44:09 -0400 Subject: [PATCH 06/20] [nasa/nos3#769] Update submod pointers --- components/cryptolib | 2 +- gsw/cosmos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 38a8f92c..635cfcef 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 38a8f92c056f756f5f5195cb0ddd41b5043ab0ce +Subproject commit 635cfcef7ed26bf0b0ce1fdb8c81f6eee5588268 diff --git a/gsw/cosmos b/gsw/cosmos index df69c649..ef873d4e 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit df69c6499b42059902070e42cbed6a47679b312c +Subproject commit ef873d4e4b020118d14071607ab6cc94203f8e15 From de50b2209b3fd0175885fc090810ba6c4e733251 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Thu, 7 Aug 2025 18:42:36 +0000 Subject: [PATCH 07/20] [nasa/nos3#754] Add YAMCS cmd def for TO_SET_TM_VC --- gsw/yamcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsw/yamcs b/gsw/yamcs index 428879a1..54e051cd 160000 --- a/gsw/yamcs +++ b/gsw/yamcs @@ -1 +1 @@ -Subproject commit 428879a132609998218759139eedbb2a23d42bf4 +Subproject commit 54e051cdd8270a93353247c6cff37810c5857c18 From 7210a8fa84c3a54cc94fcd98b7de6791e1d64c85 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Thu, 7 Aug 2025 18:53:57 +0000 Subject: [PATCH 08/20] Revert "[nasa/nos3#754] Add YAMCS cmd def for TO_SET_TM_VC" This reverts commit de50b2209b3fd0175885fc090810ba6c4e733251. --- gsw/yamcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsw/yamcs b/gsw/yamcs index 54e051cd..428879a1 160000 --- a/gsw/yamcs +++ b/gsw/yamcs @@ -1 +1 @@ -Subproject commit 54e051cdd8270a93353247c6cff37810c5857c18 +Subproject commit 428879a132609998218759139eedbb2a23d42bf4 From 893970d150bb99d9875e229b6fb3624fa6afca36 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Thu, 7 Aug 2025 19:01:16 +0000 Subject: [PATCH 09/20] [nasa/nos3#769] Ensure yamcs is on dev after accidental commit --- gsw/yamcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsw/yamcs b/gsw/yamcs index 428879a1..d080d1b7 160000 --- a/gsw/yamcs +++ b/gsw/yamcs @@ -1 +1 @@ -Subproject commit 428879a132609998218759139eedbb2a23d42bf4 +Subproject commit d080d1b7225af9ee0d6d3b1a160b85ee20cee7b3 From 683f7511391e2bc8bf4aafe80990bac3612743c2 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Mon, 11 Aug 2025 12:08:41 -0400 Subject: [PATCH 10/20] [nasa/nos3#769] update cryptolib and cosmos submods --- components/cryptolib | 2 +- gsw/cosmos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 635cfcef..6be4bf93 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 635cfcef7ed26bf0b0ce1fdb8c81f6eee5588268 +Subproject commit 6be4bf93684a53210c116c1ca810e953df81df57 diff --git a/gsw/cosmos b/gsw/cosmos index ef873d4e..ddeda31e 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit ef873d4e4b020118d14071607ab6cc94203f8e15 +Subproject commit ddeda31e260348d5d65e32094d3f19ea2b4abe63 From 85ab520f161ee3f2d1bdaad56df17da0ac191234 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Mon, 11 Aug 2025 12:39:17 -0400 Subject: [PATCH 11/20] [nasa/nos3#769] update cosmos submod --- gsw/cosmos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsw/cosmos b/gsw/cosmos index ddeda31e..846d122a 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit ddeda31e260348d5d65e32094d3f19ea2b4abe63 +Subproject commit 846d122ab7474cf9e73fee24da98691e88f7f82c From 3635465c3b3c2e41bbeee4eac379100eb273fc90 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Wed, 13 Aug 2025 16:30:41 -0400 Subject: [PATCH 12/20] [nasa/nos3#769] Update submods --- components/cryptolib | 2 +- fsw/apps/ci | 2 +- gsw/cosmos | 2 +- scripts/fsw/fsw_cfs_launch.sh | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 6be4bf93..55502a5f 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 6be4bf93684a53210c116c1ca810e953df81df57 +Subproject commit 55502a5ff0744ea8c67920484b5d83e1f3e047df diff --git a/fsw/apps/ci b/fsw/apps/ci index 1bede10e..113b7a4c 160000 --- a/fsw/apps/ci +++ b/fsw/apps/ci @@ -1 +1 @@ -Subproject commit 1bede10e07174ac3870ac644fa1991ac5a7de641 +Subproject commit 113b7a4cd1da4cd8cdad665712371a510fa39410 diff --git a/gsw/cosmos b/gsw/cosmos index 846d122a..35e5b0ad 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 846d122ab7474cf9e73fee24da98691e88f7f82c +Subproject commit 35e5b0ad29b40b6e979941d473f980a219385376 diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index 81e2ebf2..b8deea2e 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -138,7 +138,8 @@ do echo "" echo $SC_NUM " - CryptoLib..." - gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS --ipc=host -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + gnome-terminal --tab --title=$SC_NUM" - CryptoLib CMD" -- $DFLAGS --ipc=host -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_cmd" --network=$SC_NETNAME --network-alias=cryptolib-cmd -w $BASE_DIR/gsw/build $DBOX ./support/standalone_cmd echo "" done From 8a4f686e24ac1fa0be6b80cf7b2209b76540b828 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Tue, 19 Aug 2025 16:25:12 -0400 Subject: [PATCH 13/20] [nasa/nos3#769] pushing WIP submods --- fsw/apps/ci | 2 +- gsw/cosmos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsw/apps/ci b/fsw/apps/ci index 113b7a4c..354a2b7e 160000 --- a/fsw/apps/ci +++ b/fsw/apps/ci @@ -1 +1 @@ -Subproject commit 113b7a4cd1da4cd8cdad665712371a510fa39410 +Subproject commit 354a2b7e36b72cb84ec54459097321b0080c62d9 diff --git a/gsw/cosmos b/gsw/cosmos index 35e5b0ad..dceeb345 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 35e5b0ad29b40b6e979941d473f980a219385376 +Subproject commit dceeb345c6580a552a64608ec6e147aed4744a15 From 9de3badb7072198ca445872af94d7f8ace289957 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Wed, 27 Aug 2025 09:09:58 -0400 Subject: [PATCH 14/20] [nasa/nos3#769] EP commands and tlm working --- cfg/nos3_defs/tables/to_config.c | 30 ++++++++++++++++++++---------- components/cryptolib | 2 +- fsw/apps/ci | 2 +- gsw/cosmos | 2 +- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/cfg/nos3_defs/tables/to_config.c b/cfg/nos3_defs/tables/to_config.c index b366811b..126c3e11 100644 --- a/cfg/nos3_defs/tables/to_config.c +++ b/cfg/nos3_defs/tables/to_config.c @@ -82,6 +82,16 @@ extern "C" { */ #define CF_CONFIG_TLM_MID 0x08B2 #define CF_PDU_TLM_MID 0x0FFD +#define CRYPTO_EP_TLM_MID 0x0980 +#define CRYPTO_KEY_INV_TLM_MID 0x0981 +#define CRYPTO_KEY_VRFY_TLM_MID 0x0982 +#define CRYPTO_MC_PING_TLM_MID 0x0983 +#define CRYPTO_MC_STATUS_TLM_MID 0x0984 +#define CRYPTO_MC_DUMP_TLM_MID 0x0985 +#define CRYPTO_MC_ERASE_TLM_MID 0x0986 +#define CRYPTO_MC_SELFTEST_TLM_MID 0x0987 +#define CRYPTO_SA_READARSN_TLM_MID 0x0988 +#define CRYPTO_SA_STATUS_TLM_MID 0x0989 static CFE_TBL_FileDef_t CFE_TBL_FileDef = { @@ -163,16 +173,16 @@ TO_ConfigTable_t to_ConfigTable = //{CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_DO_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, /* 50 - 59 */ - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, - {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_EP_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_KEY_INV_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_KEY_VRFY_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_PING_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_STATUS_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_DUMP_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_ERASE_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_SELFTEST_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_SA_READARSN_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, + {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_SA_STATUS_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1}, /* 60 - 69 */ {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0}, diff --git a/components/cryptolib b/components/cryptolib index 55502a5f..86687384 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 55502a5ff0744ea8c67920484b5d83e1f3e047df +Subproject commit 866873846324e4e7581960cf4add439386621396 diff --git a/fsw/apps/ci b/fsw/apps/ci index 354a2b7e..388a1d73 160000 --- a/fsw/apps/ci +++ b/fsw/apps/ci @@ -1 +1 @@ -Subproject commit 354a2b7e36b72cb84ec54459097321b0080c62d9 +Subproject commit 388a1d7338f9d233d50c7affae54c3cce687ea05 diff --git a/gsw/cosmos b/gsw/cosmos index dceeb345..2bdf6673 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit dceeb345c6580a552a64608ec6e147aed4744a15 +Subproject commit 2bdf6673bd8d209d840dd9ba164ed86ccb7331f9 From d22a08c8f78bfce6a6a49f0b4db857b811a4b188 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Thu, 4 Sep 2025 11:19:38 -0400 Subject: [PATCH 15/20] [nasa/nos3#769] EP command and tlm updates --- gsw/cosmos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsw/cosmos b/gsw/cosmos index 2bdf6673..266d448a 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 2bdf6673bd8d209d840dd9ba164ed86ccb7331f9 +Subproject commit 266d448aa27197934e4d58d3c8a94a521fe472c3 From de557eeda3b40ce833a00942cdc3e987416916cc Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Tue, 9 Sep 2025 16:24:26 -0400 Subject: [PATCH 16/20] [nasa/nos3#769] remove cryptolib-cmd container from launch --- scripts/fsw/fsw_cfs_launch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index b8deea2e..da425191 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -138,8 +138,8 @@ do echo "" echo $SC_NUM " - CryptoLib..." - gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS --ipc=host -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone - gnome-terminal --tab --title=$SC_NUM" - CryptoLib CMD" -- $DFLAGS --ipc=host -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_cmd" --network=$SC_NETNAME --network-alias=cryptolib-cmd -w $BASE_DIR/gsw/build $DBOX ./support/standalone_cmd + gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + # gnome-terminal --tab --title=$SC_NUM" - CryptoLib CMD" -- $DFLAGS --ipc=host -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_cmd" --network=$SC_NETNAME --network-alias=cryptolib-cmd -w $BASE_DIR/gsw/build $DBOX ./support/standalone_cmd echo "" done From 09df53dcaefb17fcd0a0b994bcefbde7bdeae8fa Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Tue, 9 Sep 2025 16:24:47 -0400 Subject: [PATCH 17/20] [nasa/nos3#769] update submods --- components/cryptolib | 2 +- gsw/cosmos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 86687384..afc9b843 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 866873846324e4e7581960cf4add439386621396 +Subproject commit afc9b8438007c0d4d24b8b15ef832c256d321711 diff --git a/gsw/cosmos b/gsw/cosmos index 266d448a..f7dcfcef 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 266d448aa27197934e4d58d3c8a94a521fe472c3 +Subproject commit f7dcfcef11e5bdd40ac996046fa86e09c5c7c85a From 4a2f9eba1dbd89b2e600f04c4a4b76a1ecbd4384 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Wed, 10 Sep 2025 14:50:47 -0400 Subject: [PATCH 18/20] [nasa/nos3#769] remove comment from launch script, update cryptolib submod --- components/cryptolib | 2 +- scripts/fsw/fsw_cfs_launch.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index afc9b843..405724cf 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit afc9b8438007c0d4d24b8b15ef832c256d321711 +Subproject commit 405724cf31c7024b474114a1d780007419698832 diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index da425191..f8cee48b 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -138,8 +138,7 @@ do echo "" echo $SC_NUM " - CryptoLib..." - gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone - # gnome-terminal --tab --title=$SC_NUM" - CryptoLib CMD" -- $DFLAGS --ipc=host -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_cmd" --network=$SC_NETNAME --network-alias=cryptolib-cmd -w $BASE_DIR/gsw/build $DBOX ./support/standalone_cmd + gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-cryptolib-gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone echo "" done From b63f44c7986b3218931c35db45cab29adc06f6e1 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Thu, 11 Sep 2025 14:09:58 -0400 Subject: [PATCH 19/20] [nasa/nos3#769] update crypto submod --- components/cryptolib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cryptolib b/components/cryptolib index 405724cf..e02eab3a 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 405724cf31c7024b474114a1d780007419698832 +Subproject commit e02eab3adae32b9634d9229fb02ff857112022df From 6fc732df3ec5620c786ead11b2cd889213112b26 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Thu, 11 Sep 2025 14:10:33 -0400 Subject: [PATCH 20/20] [nasa/nos3#769] update ci_launch script for headless mode --- scripts/ci_launch.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index de95634a..caf958a4 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -161,18 +161,12 @@ for (( i=1; i<=$SATNUM; i++ )); do -v /tmp/.X11-unix:/tmp/.X11-unix:ro -w "$USER_NOS3_DIR/42" $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "$SC_NUM - Flight Software..." - $DCALL run -dit --name ${SC_NUM}_nos_fsw -h nos-fsw --network=$SC_NET \ + $DCALL run -dit --name ${SC_NUM}-nos-fsw -h nos-fsw --network=$SC_NET \ -v "$BASE_DIR:$BASE_DIR" -v "$FSW_DIR:$FSW_DIR" -v "$SCRIPT_DIR:$SCRIPT_DIR" \ -e USER=$(whoami) -e LD_LIBRARY_PATH=$FSW_DIR:/usr/lib:/usr/local/lib \ -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice \ $DBOX bash -c "exec ./core-cpu1 -R PO" - echo "$SC_NUM - CryptoLib..." - $DCALL run -d --name ${SC_NUM}-cryptolib --network=$SC_NET \ - --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ - --network-alias=cryptolib \ - -v "$BASE_DIR:$BASE_DIR" -w "$BASE_DIR/gsw/build" $DBOX ./support/standalone - echo "$SC_NUM - Simulators..." echo "$SC_NUM - NOS Engine Server..." $DCALL run -dit --name ${SC_NUM}-nos-engine-server -h nos-engine-server --network=$SC_NET \ @@ -185,6 +179,12 @@ for (( i=1; i<=$SATNUM; i++ )); do -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator $CFG_FILE truth42sim + echo "$SC_NUM - CryptoLib..." + $DCALL run -d --name ${SC_NUM}-cryptolib-gsw -h cryptolib --network=$SC_NET \ + --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ + --network-alias=cryptolib \ + -v "$BASE_DIR:$BASE_DIR" -w "$BASE_DIR/gsw/build" $DBOX ./support/standalone + for sim in \ camsim generic-css-sim generic-eps-sim generic-fss-sim \ gps generic-imu-sim generic-mag-sim \ @@ -192,13 +192,13 @@ for (( i=1; i<=$SATNUM; i++ )); do generic-reactionwheel-sim2 generic-radio-sim sample-sim \ generic-star-tracker-sim generic-thruster-sim generic-torquer-sim; do - if [[ "$sim" == "generic_radio_sim" ]]; then + if [[ "$sim" == "generic-radio-sim" ]]; then $DCALL run -d --name ${SC_NUM}-${sim} --network=$SC_NET \ -h radio-sim --network-alias=radio-sim \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator $CFG_FILE $sim else - $DCALL run -d --name ${SC_NUM}_${sim} --network=$SC_NET \ + $DCALL run -d --name ${SC_NUM}-${sim} --network=$SC_NET \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator $CFG_FILE $sim fi