From 9fd0d4cdda564d07c2774fd8b12ead3fa3542e63 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Mon, 23 Dec 2024 14:04:36 -0500 Subject: [PATCH 01/17] [nasa/nos3#427] Initial file generation for radio checkout --- components/generic_radio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_radio b/components/generic_radio index 745c1817..5d87f84e 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 745c18174083ab3b8d8031ba3e20dc10282d5625 +Subproject commit 5d87f84e36ff7e5901423299ac19c83a1c7c32c1 From 93edc7b776151f63f7b170b8153904d4529b3e7e Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Sun, 29 Dec 2024 16:25:23 -0500 Subject: [PATCH 02/17] [nasa/nos3#427] Updated Radio Checkout to match with device commands. Still need to test/debug --- components/generic_radio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_radio b/components/generic_radio index 5d87f84e..877a7f61 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 5d87f84e36ff7e5901423299ac19c83a1c7c32c1 +Subproject commit 877a7f61865762bd9d2a18ded1fce4fd798742ee From 0872d87e3698226eb1479b56454c40a2c6a2b9d8 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Sun, 5 Jan 2025 19:17:31 -0500 Subject: [PATCH 03/17] [nasa/nos3#427] Minor updates to radio checkout --- components/generic_radio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_radio b/components/generic_radio index 877a7f61..7552fb20 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 877a7f61865762bd9d2a18ded1fce4fd798742ee +Subproject commit 7552fb20323c4fb3bd3a904b980e57bc339ccba7 From 20f2b9fa12200dd9a5b7e2014c401a56ce0eadaf Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Mon, 6 Jan 2025 17:21:06 -0500 Subject: [PATCH 04/17] [nasa/nos3#427] Updates to radio and hwlib; attempted config for radio checkout testing. Having issues running GSW in make checkout for radio linking. Config changes should be reverted before merge --- cfg/nos3-mission.xml | 2 +- cfg/sc-minimal-config.xml | 2 +- components/generic_radio | 2 +- fsw/apps/hwlib | 2 +- scripts/checkout.sh | 19 ++++++++++++++++--- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 4397ef1b..7820b12d 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -4,7 +4,7 @@ - yamcs + cosmos diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 3a14d38d..9735f301 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -48,7 +48,7 @@ true - false + true false diff --git a/components/generic_radio b/components/generic_radio index 7552fb20..41f79729 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 7552fb20323c4fb3bd3a904b980e57bc339ccba7 +Subproject commit 41f797291a35156d1255ba341eaab5979aff97e4 diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index 9c4dc2a1..1ab51c50 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit 9c4dc2a169f220c515629e5e8cc1a60929605035 +Subproject commit 1ab51c5033b13c37080c7e5fd32211c79ca7ccff diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 821672db..d87d7a04 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -52,16 +52,29 @@ echo "Checkout..." #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 +# ## +# ## Fine Sun Sensor (FSS) +# ## +# rm -rf $USER_NOS3_DIR/42/NOS3InOut +# cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut +# xhost +local:* +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# echo "" +# gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim +# gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout + ## -## Fine Sun Sensor (FSS) +## Generic Radio ## rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut xhost +local:* gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "" -gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim -gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout +/bin/bash $SCRIPT_DIR/gsw/launch_gsw.sh +gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_radio_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim +gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout + ## ## Sample From 14da34032ee31088ed10a9c0a3d1f1629bb90bad Mon Sep 17 00:00:00 2001 From: zlynch2 Date: Mon, 13 Jan 2025 16:21:21 +0000 Subject: [PATCH 05/17] [nasa/nos3#427] cosmos launch script --- scripts/cosmos_launch.sh | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 scripts/cosmos_launch.sh diff --git a/scripts/cosmos_launch.sh b/scripts/cosmos_launch.sh new file mode 100755 index 00000000..ad7a737f --- /dev/null +++ b/scripts/cosmos_launch.sh @@ -0,0 +1,64 @@ +#!/bin/bash -i +# +# Convenience script for NOS3 development +# + + + +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 + +echo "Make data folders..." +# FSW Side +mkdir $FSW_DIR/data 2> /dev/null +mkdir $FSW_DIR/data/cam 2> /dev/null +mkdir $FSW_DIR/data/evs 2> /dev/null +mkdir $FSW_DIR/data/hk 2> /dev/null +mkdir $FSW_DIR/data/inst 2> /dev/null +# GSW Side +mkdir /tmp/nos3 2> /dev/null +mkdir /tmp/nos3/data 2> /dev/null +mkdir /tmp/nos3/data/cam 2> /dev/null +mkdir /tmp/nos3/data/evs 2> /dev/null +mkdir /tmp/nos3/data/hk 2> /dev/null +mkdir /tmp/nos3/data/inst 2> /dev/null +mkdir /tmp/nos3/uplink 2> /dev/null +cp $BASE_DIR/fsw/build/exe/cpu1/cf/cfe_es_startup.scr /tmp/nos3/uplink/tmp0.so 2> /dev/null +cp $BASE_DIR/fsw/build/exe/cpu1/cf/sample.so /tmp/nos3/uplink/tmp1.so 2> /dev/null + +echo "Create ground networks..." +$DNETWORK create \ + --driver=bridge \ + --subnet=192.168.41.0/24 \ + --gateway=192.168.41.1 \ + nos3_core +echo "" + +#echo "Create ground networks..." +#$DNETWORK create \ +# --driver=bridge \ +# --subnet=192.168.254.0/24 \ +# --gateway=192.168.254.1 \ +# nos3_core +#echo "" + + +#echo "Launch GSW..." +$BASE_DIR/cfg/build/gsw_launch.sh +echo "" From c5c70bb984ffca741645fce14d8288ed1f9759aa Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Mon, 13 Jan 2025 13:15:13 -0500 Subject: [PATCH 06/17] [nasa/nos3#427] attempted to combine hwlib branches properly --- fsw/apps/hwlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index 7a98feb3..56926159 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit 7a98feb35bf2fa6ae8852f196c968b2a075751f8 +Subproject commit 569261596de4a37cd1772ecde2498971dbe4255d From 1c7176bf9df09ac2ed9fc6b047c3338f975bc14f Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Mon, 13 Jan 2025 14:50:18 -0500 Subject: [PATCH 07/17] [nasa/nos3#427] Updated checkout to fix reversed logic, and worked with checkout.sh and cosmos_launch.sh to get radio sim connected successfully --- components/generic_radio | 2 +- scripts/checkout.sh | 7 +++++-- scripts/cosmos_launch.sh | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/components/generic_radio b/components/generic_radio index 41f79729..ba8a51fe 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 41f797291a35156d1255ba341eaab5979aff97e4 +Subproject commit ba8a51fe2ca3ee095ac3d8fda35d6ff8dc5139d4 diff --git a/scripts/checkout.sh b/scripts/checkout.sh index dbeae930..1cd06c0f 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -71,8 +71,11 @@ cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut xhost +local:* gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "" -/bin/bash $SCRIPT_DIR/gsw/launch_gsw.sh -gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_radio_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim +/bin/bash $SCRIPT_DIR/cosmos_launch.sh +sleep 10 + +# gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_radio_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim +gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout #rm -rf $USER_NOS3_DIR/42/NOS3InOut diff --git a/scripts/cosmos_launch.sh b/scripts/cosmos_launch.sh index ad7a737f..8c6e28d7 100755 --- a/scripts/cosmos_launch.sh +++ b/scripts/cosmos_launch.sh @@ -61,4 +61,9 @@ echo "" #echo "Launch GSW..." $BASE_DIR/cfg/build/gsw_launch.sh + +#launch basic cFS +# $BASE_DIR/fsw/build/exe/cpu1/ +# gnome-terminal --title=$SC_NUM" - NOS3 Flight Software" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_nos_fsw" -h nos_fsw --network=$SC_NETNAME -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $DBOX $SCRIPT_DIR/fsw/fsw_respawn.sh & + echo "" From 8f831b53d98d34be52e805ab19849fc4cee31f38 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Mon, 13 Jan 2025 17:38:09 -0500 Subject: [PATCH 08/17] [nasa/nos3#427] Finished fixes for fully working NOS3 radio checkout --- components/generic_radio | 2 +- scripts/checkout.sh | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/components/generic_radio b/components/generic_radio index ba8a51fe..423fe003 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit ba8a51fe2ca3ee095ac3d8fda35d6ff8dc5139d4 +Subproject commit 423fe00309769ba7df5da92a554eca01a7c24b57 diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 1cd06c0f..0bd0de9f 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -12,6 +12,14 @@ export SC_NUM="sc_1" export SC_NETNAME="nos3_"$SC_NUM export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc_"$i"_nos3_simulator.xml" +echo "Create ground networks..." +$DNETWORK create \ + --driver=bridge \ + --subnet=192.168.41.0/24 \ + --gateway=192.168.41.1 \ + nos3_core +echo "" + echo "Create spacecraft network..." $DNETWORK create $SC_NETNAME 2> /dev/null echo "" @@ -66,17 +74,14 @@ echo "Checkout..." ## ## Generic Radio ## -rm -rf $USER_NOS3_DIR/42/NOS3InOut -cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut -xhost +local:* -gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut -echo "" -/bin/bash $SCRIPT_DIR/cosmos_launch.sh -sleep 10 -# gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_radio_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim + +# /bin/bash $SCRIPT_DIR/cosmos_launch.sh + +gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" -h nos_fsw --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout +sleep 1 + gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim -gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout #rm -rf $USER_NOS3_DIR/42/NOS3InOut #cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut From c33a0940d86d33227beb4a16e8c1f366969a8f7e Mon Sep 17 00:00:00 2001 From: Donovan Ice <77851621+Donnie-Ice@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:27:32 -0500 Subject: [PATCH 09/17] Update coverage CI --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca87ae0a..73f7cc49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,10 +78,10 @@ jobs: run: | git config user.name "github-actions" git config user.email "actions@github.com" - git add docs/coverage/line-coverage-badge.svg - git add docs/coverage/branch-coverage-badge.svg + if ! git diff --quiet -- docs/coverage/line-coverage-badge.svg; then git add docs/coverage/line-coverage-badge.svg; fi + if ! git diff --quiet -- docs/coverage/branch-coverage-badge.svg; then git add docs/coverage/branch-coverage-badge.svg; fi git commit -m "Update coverage badges" || echo "No changes to commit" - git push origin HEAD + git push origin HEAD:refs/heads/${{ github.ref_name }} - name: Archive Coverage Directory uses: actions/upload-artifact@v4 From 8adb0d09753bdd4ac15c9833eb867922b432c3b1 Mon Sep 17 00:00:00 2001 From: Donovan Ice <77851621+Donnie-Ice@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:41:14 -0500 Subject: [PATCH 10/17] Update coverage CI to detect base branch during PRs --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73f7cc49..d2b5fa24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: if ! git diff --quiet -- docs/coverage/line-coverage-badge.svg; then git add docs/coverage/line-coverage-badge.svg; fi if ! git diff --quiet -- docs/coverage/branch-coverage-badge.svg; then git add docs/coverage/branch-coverage-badge.svg; fi git commit -m "Update coverage badges" || echo "No changes to commit" - git push origin HEAD:refs/heads/${{ github.ref_name }} + git push origin HEAD:refs/heads/${{ github.base_ref }} - name: Archive Coverage Directory uses: actions/upload-artifact@v4 From 811369fb44924bec95f790194be26d299fb94fdf Mon Sep 17 00:00:00 2001 From: Donovan Ice <77851621+Donnie-Ice@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:54:13 -0500 Subject: [PATCH 11/17] Update CI to use github.head_ref --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2b5fa24..25669ded 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: if ! git diff --quiet -- docs/coverage/line-coverage-badge.svg; then git add docs/coverage/line-coverage-badge.svg; fi if ! git diff --quiet -- docs/coverage/branch-coverage-badge.svg; then git add docs/coverage/branch-coverage-badge.svg; fi git commit -m "Update coverage badges" || echo "No changes to commit" - git push origin HEAD:refs/heads/${{ github.base_ref }} + git push origin HEAD:refs/heads/${{ github.head_ref }} --force-with-lease - name: Archive Coverage Directory uses: actions/upload-artifact@v4 From 1e36bdd11b51f86a091d68680d8abf60cca15e51 Mon Sep 17 00:00:00 2001 From: Donovan Ice <77851621+Donnie-Ice@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:41:23 -0500 Subject: [PATCH 12/17] Attempt to sync HEAD branch before pushing --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25669ded..7dd27f4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,8 @@ jobs: git config user.email "actions@github.com" if ! git diff --quiet -- docs/coverage/line-coverage-badge.svg; then git add docs/coverage/line-coverage-badge.svg; fi if ! git diff --quiet -- docs/coverage/branch-coverage-badge.svg; then git add docs/coverage/branch-coverage-badge.svg; fi + git fetch origin ${{ github.head_ref }} + git pull origin ${{ github.head_ref }} git commit -m "Update coverage badges" || echo "No changes to commit" git push origin HEAD:refs/heads/${{ github.head_ref }} --force-with-lease From 89fa77424f058464a3e2914ca8ed4ae03c98a966 Mon Sep 17 00:00:00 2001 From: Donovan Ice <77851621+Donnie-Ice@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:54:11 -0500 Subject: [PATCH 13/17] Add debug step --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7dd27f4f..e3b39b61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,8 +80,7 @@ jobs: git config user.email "actions@github.com" if ! git diff --quiet -- docs/coverage/line-coverage-badge.svg; then git add docs/coverage/line-coverage-badge.svg; fi if ! git diff --quiet -- docs/coverage/branch-coverage-badge.svg; then git add docs/coverage/branch-coverage-badge.svg; fi - git fetch origin ${{ github.head_ref }} - git pull origin ${{ github.head_ref }} + git log origin/${{ github.head_ref }}..HEAD git commit -m "Update coverage badges" || echo "No changes to commit" git push origin HEAD:refs/heads/${{ github.head_ref }} --force-with-lease From ab9a7d121e3ffe643c2e6e51cf7e31cf3b930d7d Mon Sep 17 00:00:00 2001 From: Robert Brown <91291114+rjbrown2@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:40:57 -0500 Subject: [PATCH 14/17] #427 Update CI Commit --- .github/workflows/build.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3b39b61..759cfc0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: 1 + fetch-depth: 1 submodules: recursive - name: Configure Safe Directory run: git config --global --add safe.directory $GITHUB_WORKSPACE @@ -56,11 +56,9 @@ jobs: run: make config - name: build-test run: | - export CFLAGS="-fprofile-arcs -ftest-coverage -g" + export CFLAGS="-fprofile-arcs -ftest-coverage -g" make build-test make test-fsw - # - name: Generate Coverage Report - # run: make gcov - name: Generate Coverage Report and Badges run: | mkdir -p docs/coverage @@ -78,12 +76,9 @@ jobs: run: | git config user.name "github-actions" git config user.email "actions@github.com" - if ! git diff --quiet -- docs/coverage/line-coverage-badge.svg; then git add docs/coverage/line-coverage-badge.svg; fi - if ! git diff --quiet -- docs/coverage/branch-coverage-badge.svg; then git add docs/coverage/branch-coverage-badge.svg; fi - git log origin/${{ github.head_ref }}..HEAD + git add docs/coverage/line-coverage-badge.svg docs/coverage/branch-coverage-badge.svg || echo "No files to add" git commit -m "Update coverage badges" || echo "No changes to commit" - git push origin HEAD:refs/heads/${{ github.head_ref }} --force-with-lease - + git push origin HEAD:${{ github.head_ref }} - name: Archive Coverage Directory uses: actions/upload-artifact@v4 with: @@ -93,3 +88,4 @@ jobs: uses: codecov/codecov-action@v5 with: token: 040717d0-b624-470e-be41-d08720135088 + From fde6d1ad334f31b8af38198f58db13dda539ef87 Mon Sep 17 00:00:00 2001 From: Robert Brown <91291114+rjbrown2@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:49:41 -0500 Subject: [PATCH 15/17] #427 CI Modifications --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 759cfc0c..a9b8c7a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: 1 + fetch-depth: 0 submodules: recursive - name: Configure Safe Directory run: git config --global --add safe.directory $GITHUB_WORKSPACE From aecaa13befb6056d59c5c9db57bf794eb46abe2c Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Tue, 14 Jan 2025 13:17:20 -0500 Subject: [PATCH 16/17] [nasa/nos3#427] Reverted minimal and no3-mission to default configurations; commented out radio specific parts of the checkout script; removed redundant cosmos_launch script --- cfg/nos3-mission.xml | 2 +- cfg/sc-minimal-config.xml | 4 +-- scripts/checkout.sh | 22 ++++--------- scripts/cosmos_launch.sh | 69 --------------------------------------- 4 files changed, 10 insertions(+), 87 deletions(-) delete mode 100755 scripts/cosmos_launch.sh diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 413cae03..547b6317 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -4,7 +4,7 @@ - cosmos + yamcs diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 66574c1b..a25b0c65 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -48,7 +48,7 @@ false - true + false false @@ -63,7 +63,7 @@ false - true + false false diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 0bd0de9f..d8093c4f 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -12,6 +12,10 @@ export SC_NUM="sc_1" export SC_NETNAME="nos3_"$SC_NUM export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc_"$i"_nos3_simulator.xml" + +## +## Create Networks +## echo "Create ground networks..." $DNETWORK create \ --driver=bridge \ @@ -75,22 +79,10 @@ echo "Checkout..." ## Generic Radio ## +# gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" -h nos_fsw --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout +# sleep 1 +# gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim -# /bin/bash $SCRIPT_DIR/cosmos_launch.sh - -gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" -h nos_fsw --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout -sleep 1 - -gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim - -#rm -rf $USER_NOS3_DIR/42/NOS3InOut -#cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut -#xhost +local:* -#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut -#echo "" -#gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim -#gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout -# echo "" ## ## Reaction Wheels (RW) diff --git a/scripts/cosmos_launch.sh b/scripts/cosmos_launch.sh deleted file mode 100755 index 8c6e28d7..00000000 --- a/scripts/cosmos_launch.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -i -# -# Convenience script for NOS3 development -# - - - -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 - -echo "Make data folders..." -# FSW Side -mkdir $FSW_DIR/data 2> /dev/null -mkdir $FSW_DIR/data/cam 2> /dev/null -mkdir $FSW_DIR/data/evs 2> /dev/null -mkdir $FSW_DIR/data/hk 2> /dev/null -mkdir $FSW_DIR/data/inst 2> /dev/null -# GSW Side -mkdir /tmp/nos3 2> /dev/null -mkdir /tmp/nos3/data 2> /dev/null -mkdir /tmp/nos3/data/cam 2> /dev/null -mkdir /tmp/nos3/data/evs 2> /dev/null -mkdir /tmp/nos3/data/hk 2> /dev/null -mkdir /tmp/nos3/data/inst 2> /dev/null -mkdir /tmp/nos3/uplink 2> /dev/null -cp $BASE_DIR/fsw/build/exe/cpu1/cf/cfe_es_startup.scr /tmp/nos3/uplink/tmp0.so 2> /dev/null -cp $BASE_DIR/fsw/build/exe/cpu1/cf/sample.so /tmp/nos3/uplink/tmp1.so 2> /dev/null - -echo "Create ground networks..." -$DNETWORK create \ - --driver=bridge \ - --subnet=192.168.41.0/24 \ - --gateway=192.168.41.1 \ - nos3_core -echo "" - -#echo "Create ground networks..." -#$DNETWORK create \ -# --driver=bridge \ -# --subnet=192.168.254.0/24 \ -# --gateway=192.168.254.1 \ -# nos3_core -#echo "" - - -#echo "Launch GSW..." -$BASE_DIR/cfg/build/gsw_launch.sh - -#launch basic cFS -# $BASE_DIR/fsw/build/exe/cpu1/ -# gnome-terminal --title=$SC_NUM" - NOS3 Flight Software" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_nos_fsw" -h nos_fsw --network=$SC_NETNAME -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $DBOX $SCRIPT_DIR/fsw/fsw_respawn.sh & - -echo "" From f2929fd3242cec8de65acd8973b6a030d056d2dd Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Tue, 14 Jan 2025 18:43:25 -0500 Subject: [PATCH 17/17] [nasa/nos3#427] updated pointers after submodule commits before merge --- components/generic_radio | 2 +- fsw/apps/hwlib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/generic_radio b/components/generic_radio index 423fe003..55c5669b 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 423fe00309769ba7df5da92a554eca01a7c24b57 +Subproject commit 55c5669b267fdafccc461b20238afa7129fca7c0 diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index 56926159..21e56817 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit 569261596de4a37cd1772ecde2498971dbe4255d +Subproject commit 21e56817c93c982bc23c3ff459f40a99afa52a88