From cd716bc4654d382bcdef5c3b3b4d94c75428ec05 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Fri, 15 Mar 2024 09:24:40 -0400 Subject: [PATCH 1/8] [nasa/nos3#202] Updates to include CryptoLib in FSW and CryptoLib Standalone for GSW - errors getting data back from FSW; --- Makefile | 8 +++ cfg/nos3_defs/cpu1_cfe_es_startup.scr | 2 +- cfg/nos3_defs/targets.cmake | 2 +- cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake | 4 +- cfg/sims/nos3-simulator.xml | 59 ++++++++++--------- components/cryptolib | 2 +- gsw/cosmos | 2 +- scripts/docker_build_cryptolib.sh | 31 ++++++++++ scripts/docker_launch.sh | 3 +- scripts/env.sh | 2 +- 10 files changed, 77 insertions(+), 38 deletions(-) create mode 100644 scripts/docker_build_cryptolib.sh diff --git a/Makefile b/Makefile index 0852ced2..341c1790 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ BUILDTYPE ?= debug INSTALLPREFIX ?= exe FSWBUILDDIR ?= $(CURDIR)/fsw/build +GSWBUILDDIR ?= $(CURDIR)/gsw/build SIMBUILDDIR ?= $(CURDIR)/sims/build export CFS_APP_PATH = ../components @@ -45,6 +46,11 @@ all: $(MAKE) sim $(MAKE) gsw +build-cryptolib: + mkdir -p $(GSWBUILDDIR) + cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSUPPORT=1 ../../components/cryptolib + $(MAKE) --no-print-directory -C $(GSWBUILDDIR) + build-fsw: mkdir -p $(FSWBUILDDIR) cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) ../cfe @@ -72,6 +78,7 @@ clean-sim: rm -rf sims/build clean-gsw: + rm -rf gsw/build rm -rf gsw/cosmos/build config: @@ -84,6 +91,7 @@ fsw: ./scripts/docker_build_fsw.sh gsw: + ./scripts/docker_build_cryptolib.sh ./cfg/build/gsw_build.sh launch: diff --git a/cfg/nos3_defs/cpu1_cfe_es_startup.scr b/cfg/nos3_defs/cpu1_cfe_es_startup.scr index 324d5265..2b1520f7 100644 --- a/cfg/nos3_defs/cpu1_cfe_es_startup.scr +++ b/cfg/nos3_defs/cpu1_cfe_es_startup.scr @@ -1,5 +1,6 @@ CFE_LIB, hwlib, hwlib_Init, HW_LIB, 0, 0, 0x0, 0; CFE_LIB, io_lib, IO_LibInit, IO_LIB, 0, 0, 0x0, 0; +CFE_LIB, crypto, Crypto_TC_Init, CRYPTO, 0, 0, 0x0, 0; CFE_APP, sch, SCH_AppMain, SCH, 40, 16384, 0x0, 0; CFE_APP, ci, CI_AppMain, CI, 41, 16384, 0x0, 0; @@ -33,7 +34,6 @@ CFE_APP, generic_st, ST_AppMain, ST, CFE_APP, syn, SYN_AppMain, SYN, 72, 32768, 0x0, 0; CFE_LIB, cfs_lib, CFS_LibInit, CFS_LIB, 0, 0, 0x0, 0; -CFE_LIB, crypto, Crypto_TC_Init, CRYPTO, 0, 0, 0x0, 0; CFE_APP, cs, CS_AppMain, CS, 55, 16384, 0x0, 0; CFE_APP, hk, HK_AppMain, HK, 63, 16384, 0x0, 0; CFE_APP, hs, HS_AppMain, HS, 56, 16384, 0x0, 0; diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake index ddc442dd..4f4b8e76 100644 --- a/cfg/nos3_defs/targets.cmake +++ b/cfg/nos3_defs/targets.cmake @@ -84,7 +84,7 @@ list(APPEND MISSION_GLOBAL_APPLIST # # Libraries # - #cryptolib + cryptolib hwlib io_lib # diff --git a/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake b/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake index a062e7fc..b0656fc0 100644 --- a/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake +++ b/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake @@ -30,5 +30,5 @@ add_definitions(-DBYTE_ORDER_LE) add_definitions(-D_LINUX_OS_) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CI_TRANSPORT udp) -set(TO_TRANSPORT udp) +set(CI_TRANSPORT udp_tf) +set(TO_TRANSPORT udp_tf) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index 4c0b08dd..2cd2e2f1 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -134,8 +134,8 @@ SAMPLE_42_PROVIDER fortytwo 4242 - 20 - 5 + 30 + 1 0 @@ -158,8 +158,8 @@ GPS42SOCKET fortytwo 4245 - 20 - 5 + 30 + 1 0 0 37 @@ -218,8 +218,8 @@ GENERIC_EPS_42_PROVIDER fortytwo 4283 - 20 - 5 + 30 + 1 0 @@ -299,8 +299,8 @@ fortytwo 4277 4278 - 20 - 5 + 30 + 1 0 0 @@ -325,8 +325,8 @@ fortytwo 4377 4378 - 20 - 5 + 30 + 1 0 1 @@ -351,8 +351,8 @@ fortytwo 4477 4478 - 20 - 5 + 30 + 1 0 2 @@ -376,8 +376,8 @@ GENERIC_CSS_42_PROVIDER fortytwo 4227 - 20 - 5 + 30 + 1 0 <42-css-scale-factor>1.0 @@ -405,8 +405,8 @@ GENERIC_TORQUER_42_PROVIDER fortytwo 4279 - 20 - 5 + 30 + 1 3 @@ -437,8 +437,8 @@ TRUTH42PROVIDER fortytwo 9999 - 20 - 5 + 30 + 1 0 0 @@ -462,8 +462,8 @@ GENERIC_FSS_42_PROVIDER fortytwo 4281 - 20 - 5 + 30 + 1 0 @@ -495,15 +495,16 @@ gsw - cosmos + - prox @@ -540,8 +541,8 @@ GENERIC_IMU_42_PROVIDER fortytwo 4280 - 20 - 5 + 30 + 1 0 @@ -567,8 +568,8 @@ GENERIC_MAG_42_PROVIDER fortytwo 4234 - 20 - 5 + 30 + 1 0 @@ -594,8 +595,8 @@ GENERIC_STAR_TRACKER_42_PROVIDER fortytwo 4282 - 20 - 5 + 30 + 1 0 0 diff --git a/components/cryptolib b/components/cryptolib index 9fe8788c..174e896c 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 9fe8788cb487e5d883f4c8db68b607197cdc089f +Subproject commit 174e896c0f1587f4b4a0b0ed21d567a6ba2496d6 diff --git a/gsw/cosmos b/gsw/cosmos index 3b229c95..979bbf4d 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 3b229c951b122320c7b0ac6618cc9e7c25ba3c07 +Subproject commit 979bbf4d73e60e4a69ef310b6567524bae78d2a7 diff --git a/scripts/docker_build_cryptolib.sh b/scripts/docker_build_cryptolib.sh new file mode 100644 index 00000000..63126da2 --- /dev/null +++ b/scripts/docker_build_cryptolib.sh @@ -0,0 +1,31 @@ +#!/bin/bash -i +# +# Convenience script for NOS3 development +# Use with the Dockerfile in the deployment repository +# https://github.com/nasa-itc/deployment +# + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source $SCRIPT_DIR/env.sh + +# Check that local NOS3 directory exists +if [ ! -d $USER_NOS3_DIR ]; then + echo "" + echo " Need to run make prep first!" + echo "" + exit 1 +fi + +# Check that configure build directory exists +if [ ! -d $BASE_DIR/cfg/build ]; then + echo "" + echo " Need to run make config first!" + echo "" + exit 1 +fi + +# Make ground software build directory +mkdir -p $BASE_DIR/gsw/build + +# Build +$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_cryptolib" -w $BASE_DIR $DBOX make -j$NUM_CPUS build-cryptolib diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh index 5243c866..1eb1eb05 100755 --- a/scripts/docker_launch.sh +++ b/scripts/docker_launch.sh @@ -127,8 +127,7 @@ do gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim - # Note: Can keep open if desired after a new gnome-profile is manually created - #gnome-terminal --window-with-profile=KeepOpen --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim + gnome-terminal --window-with-profile=KeepOpen --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone echo "" done diff --git a/scripts/env.sh b/scripts/env.sh index 0fb42b28..6bf3791a 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -40,7 +40,7 @@ OPENC3_PATH=$OPENC3_DIR/openc3.sh DNETWORK="docker network" #fi -DBOX="ivvitc/nos3-64:20240306" +DBOX="ivvitc/nos3-64:dev" # Debugging #echo "Script directory = " $SCRIPT_DIR From b4d2f4dd01f5676b0a87bfdc26abc201b55a450c Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Wed, 27 Mar 2024 08:49:01 -0400 Subject: [PATCH 2/8] [nasa/nos3#202] TC clear and encrypted working again after submodule updates, disabled debug CI prints; --- components/cryptolib | 2 +- fsw/apps/ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 174e896c..56e99b94 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 174e896c0f1587f4b4a0b0ed21d567a6ba2496d6 +Subproject commit 56e99b94ed9eba44b812a0b1279b584641fe1c5a diff --git a/fsw/apps/ci b/fsw/apps/ci index 10c30a77..153db705 160000 --- a/fsw/apps/ci +++ b/fsw/apps/ci @@ -1 +1 @@ -Subproject commit 10c30a772c718bc38f3f522fcab137135603e61c +Subproject commit 153db705202edec3391c7b0dab11be0cd9cb128d From e90175c8ee3bbafc8a6635c752f078f4a1c23a4e Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Thu, 28 Mar 2024 10:54:40 -0400 Subject: [PATCH 3/8] [nasa/nos3#202] Updates in attempt to get both TC and TM initialized - failing still; --- cfg/nos3_defs/cpu1_cfe_es_startup.scr | 2 +- components/cryptolib | 2 +- fsw/apps/io_lib | 2 +- fsw/apps/to | 2 +- gsw/cosmos | 2 +- scripts/docker_launch.sh | 7 ++++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cfg/nos3_defs/cpu1_cfe_es_startup.scr b/cfg/nos3_defs/cpu1_cfe_es_startup.scr index 2b1520f7..7a21cddb 100644 --- a/cfg/nos3_defs/cpu1_cfe_es_startup.scr +++ b/cfg/nos3_defs/cpu1_cfe_es_startup.scr @@ -1,6 +1,6 @@ +CFE_LIB, crypto, Crypto_SC_Init, CRYPTO, 0, 0, 0x0, 0; CFE_LIB, hwlib, hwlib_Init, HW_LIB, 0, 0, 0x0, 0; CFE_LIB, io_lib, IO_LibInit, IO_LIB, 0, 0, 0x0, 0; -CFE_LIB, crypto, Crypto_TC_Init, CRYPTO, 0, 0, 0x0, 0; CFE_APP, sch, SCH_AppMain, SCH, 40, 16384, 0x0, 0; CFE_APP, ci, CI_AppMain, CI, 41, 16384, 0x0, 0; diff --git a/components/cryptolib b/components/cryptolib index 56e99b94..a344ffdd 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 56e99b94ed9eba44b812a0b1279b584641fe1c5a +Subproject commit a344ffdd75c3275c756688da38fa73e303d1e518 diff --git a/fsw/apps/io_lib b/fsw/apps/io_lib index 31a03167..92cf7e1e 160000 --- a/fsw/apps/io_lib +++ b/fsw/apps/io_lib @@ -1 +1 @@ -Subproject commit 31a0316787506cc664c4771f4f61cf6030351afb +Subproject commit 92cf7e1eed42205365992c3a988438f0a8051b77 diff --git a/fsw/apps/to b/fsw/apps/to index 42bf2418..28aaae22 160000 --- a/fsw/apps/to +++ b/fsw/apps/to @@ -1 +1 @@ -Subproject commit 42bf24186615e524a188efb7c067f34e44e75171 +Subproject commit 28aaae22688c442cdb15de99dd9670ff4eae1108 diff --git a/gsw/cosmos b/gsw/cosmos index 979bbf4d..5daf14f4 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 979bbf4d73e60e4a69ef310b6567524bae78d2a7 +Subproject commit 5daf14f454f5da88b9d7b4b6599378526b78b931 diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh index 1eb1eb05..a5a8cc19 100755 --- a/scripts/docker_launch.sh +++ b/scripts/docker_launch.sh @@ -85,6 +85,10 @@ do $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos echo "" + echo $SC_NUM " - CryptoLib..." + gnome-terminal --window-with-profile=KeepOpen --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + echo "" + echo $SC_NUM " - 42..." rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut @@ -126,9 +130,6 @@ do gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim - - gnome-terminal --window-with-profile=KeepOpen --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone - echo "" done echo "NOS Time Driver..." From 35c8c9fdf7d32050e264bd0309b5486e45353650 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Tue, 2 Apr 2024 15:52:51 -0400 Subject: [PATCH 4/8] [nos3#202] Debugging TM clear mode now; --- components/cryptolib | 2 +- fsw/apps/io_lib | 2 +- fsw/apps/to | 2 +- gsw/cosmos | 2 +- scripts/docker_launch.sh | 9 +++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index a344ffdd..30e457d6 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit a344ffdd75c3275c756688da38fa73e303d1e518 +Subproject commit 30e457d62bdbc561f622a8d620121e4fd556af30 diff --git a/fsw/apps/io_lib b/fsw/apps/io_lib index 92cf7e1e..f9c841b4 160000 --- a/fsw/apps/io_lib +++ b/fsw/apps/io_lib @@ -1 +1 @@ -Subproject commit 92cf7e1eed42205365992c3a988438f0a8051b77 +Subproject commit f9c841b42dec4b485cb02dbf5a682e974461606c diff --git a/fsw/apps/to b/fsw/apps/to index 28aaae22..5741c305 160000 --- a/fsw/apps/to +++ b/fsw/apps/to @@ -1 +1 @@ -Subproject commit 28aaae22688c442cdb15de99dd9670ff4eae1108 +Subproject commit 5741c3051b3ee0ccea0526bba7482d7cefe10a5f diff --git a/gsw/cosmos b/gsw/cosmos index 5daf14f4..fd47c51d 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 5daf14f454f5da88b9d7b4b6599378526b78b931 +Subproject commit fd47c51da784167318bee3a2bc8533ab11628a03 diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh index a5a8cc19..38149b8a 100755 --- a/scripts/docker_launch.sh +++ b/scripts/docker_launch.sh @@ -85,10 +85,6 @@ do $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos echo "" - echo $SC_NUM " - CryptoLib..." - gnome-terminal --window-with-profile=KeepOpen --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone - echo "" - echo $SC_NUM " - 42..." rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut @@ -105,6 +101,10 @@ do # Debugging # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually + echo $SC_NUM " - CryptoLib..." + gnome-terminal --window-with-profile=KeepOpen --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + echo "" + echo $SC_NUM " - Simulators..." cd $SIM_BIN gnome-terminal --tab --title=$SC_NUM" - NOS Engine Server" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json @@ -130,6 +130,7 @@ do gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim + echo "" done echo "NOS Time Driver..." From d06c08ee2f33456b58fc4097f005d18e18a0be7b Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Tue, 23 Apr 2024 07:38:41 -0400 Subject: [PATCH 5/8] [nasa/nos3#202] TM clear mode appears functional, but breaks FECF on TC side (cryptolib error -12) once started; --- components/cryptolib | 2 +- fsw/apps/to | 2 +- scripts/docker_launch.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 30e457d6..f62cf1b4 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 30e457d62bdbc561f622a8d620121e4fd556af30 +Subproject commit f62cf1b428016cbf33c66fe8875bbb2cff369dd4 diff --git a/fsw/apps/to b/fsw/apps/to index 5741c305..a3b534de 160000 --- a/fsw/apps/to +++ b/fsw/apps/to @@ -1 +1 @@ -Subproject commit 5741c3051b3ee0ccea0526bba7482d7cefe10a5f +Subproject commit a3b534dedd2e212d0eb2a500b2eac67cd30c497a diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh index 38149b8a..5d1caec7 100755 --- a/scripts/docker_launch.sh +++ b/scripts/docker_launch.sh @@ -102,7 +102,7 @@ do # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually echo $SC_NUM " - CryptoLib..." - gnome-terminal --window-with-profile=KeepOpen --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + gnome-terminal --tab --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone echo "" echo $SC_NUM " - Simulators..." From 9280ebf2fb9c367d59d891f7cc6f0fffb9a860ce Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Thu, 25 Apr 2024 09:16:38 -0400 Subject: [PATCH 6/8] [nasa/nos3#202] Removed badFECF option in CryptoLib - likely was getting set due to an issue elsewhere; --- components/cryptolib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cryptolib b/components/cryptolib index f62cf1b4..393b6214 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit f62cf1b428016cbf33c66fe8875bbb2cff369dd4 +Subproject commit 393b621486a5dcd9474065bfb39e88c77099f21f From ca033447c6799483829826eb324e5a1e17eeee9c Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Fri, 26 Apr 2024 15:55:25 -0400 Subject: [PATCH 7/8] [nasa/nos3#202] Swapped to a hybrid setup with CI udp_tf (TC) and TO udp (SPP); --- cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake | 2 +- cfg/sims/nos3-simulator.xml | 8 +++++++- fsw/apps/to | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake b/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake index b0656fc0..80f34130 100644 --- a/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake +++ b/cfg/nos3_defs/toolchain-amd64-linux-gnu.cmake @@ -31,4 +31,4 @@ add_definitions(-D_LINUX_OS_) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CI_TRANSPORT udp_tf) -set(TO_TRANSPORT udp_tf) +set(TO_TRANSPORT udp) # Note udp_tf used for Transfer Frames required for CryptoLib diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index 2cd2e2f1..d15d315b 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -501,10 +501,16 @@ 6010 6011 --> - + + cosmos + 8010 + 6011 + + prox diff --git a/fsw/apps/to b/fsw/apps/to index a3b534de..d30dca15 160000 --- a/fsw/apps/to +++ b/fsw/apps/to @@ -1 +1 @@ -Subproject commit a3b534dedd2e212d0eb2a500b2eac67cd30c497a +Subproject commit d30dca1539175f3555ffad6289a5ef5008a49b20 From 0333916fbb855c0e8b4c3d035365c4c868fd8f58 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Tue, 30 Apr 2024 19:50:43 -0400 Subject: [PATCH 8/8] [nasa/nos3#202] Updates after submodule pull requests; --- components/cryptolib | 2 +- fsw/apps/ci | 2 +- fsw/apps/io_lib | 2 +- fsw/apps/to | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/cryptolib b/components/cryptolib index 393b6214..fb72ee2e 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit 393b621486a5dcd9474065bfb39e88c77099f21f +Subproject commit fb72ee2e836f39737e0df20d838bae56076d277b diff --git a/fsw/apps/ci b/fsw/apps/ci index 153db705..57189901 160000 --- a/fsw/apps/ci +++ b/fsw/apps/ci @@ -1 +1 @@ -Subproject commit 153db705202edec3391c7b0dab11be0cd9cb128d +Subproject commit 57189901d7eae241a90e4fc346748bf56a686856 diff --git a/fsw/apps/io_lib b/fsw/apps/io_lib index f9c841b4..523edf70 160000 --- a/fsw/apps/io_lib +++ b/fsw/apps/io_lib @@ -1 +1 @@ -Subproject commit f9c841b42dec4b485cb02dbf5a682e974461606c +Subproject commit 523edf70f8a620f4a7988eef3beb23713289d1a4 diff --git a/fsw/apps/to b/fsw/apps/to index d30dca15..db65b438 160000 --- a/fsw/apps/to +++ b/fsw/apps/to @@ -1 +1 @@ -Subproject commit d30dca1539175f3555ffad6289a5ef5008a49b20 +Subproject commit db65b4381160adbbd35b8b140b2e5a19cfab1c5a