From 8597ec3d13ba19b749d7f1382474480aea7babff Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 24 Oct 2024 08:25:49 -0400 Subject: [PATCH 1/3] [nasa/nos3#378] Arducam reformatted to include fsw/shared folder and created functional checkout with simulated hardware NOOP; --- cfg/nos3_defs/targets.cmake | 2 ++ components/arducam | 2 +- scripts/docker_checkout.sh | 30 ++++++++++++++---------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake index 2bec8258..bc544304 100644 --- a/cfg/nos3_defs/targets.cmake +++ b/cfg/nos3_defs/targets.cmake @@ -138,6 +138,8 @@ FOREACH(X ${MISSION_GLOBAL_APPLIST}) LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/public_inc) LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/public_inc) + LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/../shared) + LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/src) LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/src) LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/src) diff --git a/components/arducam b/components/arducam index 752c511a..c95e8f3a 160000 --- a/components/arducam +++ b/components/arducam @@ -1 +1 @@ -Subproject commit 752c511a33c77d943b2ae62820f712fb75b8d118 +Subproject commit c95e8f3a662fae6ac9a24aca2e0a7f75d9502517 diff --git a/scripts/docker_checkout.sh b/scripts/docker_checkout.sh index 63b1a9f7..ed346d38 100755 --- a/scripts/docker_checkout.sh +++ b/scripts/docker_checkout.sh @@ -31,14 +31,8 @@ gnome-terminal --tab --title="NOS Engine Server" -- $DFLAGS -v $SIM_DIR:$SIM_DIR gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE time gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_terminal" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE stdio-terminal -echo "Checkout..." -# Rename for your simulator under test to allow checkout -gnome-terminal --tab --title="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 - -#testing star tracker -# gnome-terminal --tab --title="Generic Star Tracker" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_star_tracker_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim -#testing generic mag -# gnome-terminal --tab --title="Generic Mag" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_mag_sim +echo " Checkout..." +# Rename for your simulator under test to allow checkout, uncomment if already exists # Example manual build for sample checkout: # cd ./components/sample/support @@ -47,18 +41,22 @@ gnome-terminal --tab --title="Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --na # cmake .. -DTGTNAME=cpu1 # make -# Rename for your checkout under test to allow checkout -# gnome-terminal --tab --title="FPrime" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./scripts/fsw_fprime_launch.sh -gnome-terminal --title="Sample Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/support/build/sample_checkout +## +## Arducam +## +gnome-terminal --tab --title="Arducam Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim +gnome-terminal --title="Arducam Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_arducam_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/arducam/fsw/standalone/build/arducam_checkout -echo "" +## +## Sample +## +#gnome-terminal --tab --title="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="FPrime" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./scripts/fsw_fprime_launch.sh +#gnome-terminal --title="Sample Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/support/build/sample_checkout # sleep 1 - # urlIP=$(docker container inspect sc_1_sample_checkout | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") - # sleep 10 - # firefox ${urlIP}:5000 -# echo "" +echo "" From 74b2a7e83a94d9f86d7859b1b01ce13847bda2d6 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Mon, 28 Oct 2024 13:36:34 -0400 Subject: [PATCH 2/3] [nasa/nos3#378] Added `make debug` step to building the checkout application; --- scripts/docker_checkout.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/docker_checkout.sh b/scripts/docker_checkout.sh index ed346d38..572d1976 100755 --- a/scripts/docker_checkout.sh +++ b/scripts/docker_checkout.sh @@ -35,11 +35,13 @@ echo " Checkout..." # Rename for your simulator under test to allow checkout, uncomment if already exists # Example manual build for sample checkout: +# make debug # cd ./components/sample/support # mkdir build # cd build # cmake .. -DTGTNAME=cpu1 # make +# exit ## ## Arducam From d9c6b2529d79064a4da4f9ae7657f15eda148201 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 29 Oct 2024 16:48:57 -0400 Subject: [PATCH 3/3] [nasa/nos3#378] Updated arducam for merge; --- components/arducam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/arducam b/components/arducam index c95e8f3a..89a08de6 160000 --- a/components/arducam +++ b/components/arducam @@ -1 +1 @@ -Subproject commit c95e8f3a662fae6ac9a24aca2e0a7f75d9502517 +Subproject commit 89a08de64585b784e488f733a2c7c2520951069c