diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca87ae0a..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
@@ -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,11 +76,9 @@ 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
+ 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
-
+ git push origin HEAD:${{ github.head_ref }}
- name: Archive Coverage Directory
uses: actions/upload-artifact@v4
with:
@@ -92,3 +88,4 @@ jobs:
uses: codecov/codecov-action@v5
with:
token: 040717d0-b624-470e-be41-d08720135088
+
diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml
index c0574b3a..a25b0c65 100644
--- a/cfg/sc-minimal-config.xml
+++ b/cfg/sc-minimal-config.xml
@@ -63,7 +63,7 @@
false
- true
+ false
false
diff --git a/components/generic_radio b/components/generic_radio
index 745c1817..55c5669b 160000
--- a/components/generic_radio
+++ b/components/generic_radio
@@ -1 +1 @@
-Subproject commit 745c18174083ab3b8d8031ba3e20dc10282d5625
+Subproject commit 55c5669b267fdafccc461b20238afa7129fca7c0
diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib
index 953915de..21e56817 160000
--- a/fsw/apps/hwlib
+++ b/fsw/apps/hwlib
@@ -1 +1 @@
-Subproject commit 953915deb2122081041fa63ada8a164f5cfb82a5
+Subproject commit 21e56817c93c982bc23c3ff459f40a99afa52a88
diff --git a/scripts/checkout.sh b/scripts/checkout.sh
index be119bb3..d8093c4f 100755
--- a/scripts/checkout.sh
+++ b/scripts/checkout.sh
@@ -12,6 +12,18 @@ 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 \
+ --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 ""
@@ -52,17 +64,25 @@ 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
-# echo ""
+
+# 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
+
##
## Reaction Wheels (RW)
@@ -77,11 +97,12 @@ echo "Checkout..."
#gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2
#gnome-terminal --title="RW Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_rw_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_reaction_wheel/fsw/standalone/build/generic_reaction_wheel_checkout
+
##
## 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 --title="Sample Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/fsw/standalone/build/sample_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
+# 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/fsw/standalone/build/sample_checkout
##
## Torquer