Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nasa/nos3#427] radio checkout #451

Merged
merged 22 commits into from
Jan 14, 2025
Merged

[nasa/nos3#427] radio checkout #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9fd0d4c
[nasa/nos3#427] Initial file generation for radio checkout
kevincbruce Dec 23, 2024
93edc7b
[nasa/nos3#427] Updated Radio Checkout to match with device commands.…
kevincbruce Dec 29, 2024
0872d87
[nasa/nos3#427] Minor updates to radio checkout
kevincbruce Jan 6, 2025
20f2b9f
[nasa/nos3#427] Updates to radio and hwlib; attempted config for radi…
kevincbruce Jan 6, 2025
2ae7f60
[nasa/nos3#427] Merge branch 'dev' into nos3#427-radio-checkout
kevincbruce Jan 13, 2025
14da340
[nasa/nos3#427] cosmos launch script
zlynch2 Jan 13, 2025
c5c70bb
[nasa/nos3#427] attempted to combine hwlib branches properly
kevincbruce Jan 13, 2025
1c7176b
[nasa/nos3#427] Updated checkout to fix reversed logic, and worked wi…
kevincbruce Jan 13, 2025
8f831b5
[nasa/nos3#427] Finished fixes for fully working NOS3 radio checkout
kevincbruce Jan 13, 2025
c33a094
Update coverage CI
Donnie-Ice Jan 14, 2025
8adb0d0
Update coverage CI to detect base branch during PRs
Donnie-Ice Jan 14, 2025
811369f
Update CI to use github.head_ref
Donnie-Ice Jan 14, 2025
1e36bdd
Attempt to sync HEAD branch before pushing
Donnie-Ice Jan 14, 2025
89fa774
Add debug step
Donnie-Ice Jan 14, 2025
ab9a7d1
#427 Update CI Commit
rjbrown2 Jan 14, 2025
fde6d1a
#427 CI Modifications
rjbrown2 Jan 14, 2025
ca3922c
Merge fde6d1ad334f31b8af38198f58db13dda539ef87 into 3c612610e6b51f641…
kevincbruce Jan 14, 2025
aecaa13
[nasa/nos3#427] Reverted minimal and no3-mission to default configura…
kevincbruce Jan 14, 2025
c78316b
Merge branch 'nos3#427-radio-checkout' of github.com:nasa/nos3 into n…
kevincbruce Jan 14, 2025
f02587e
Merge c78316b8372490b56742c8939fbfdcb17f96c95e into 3c612610e6b51f641…
kevincbruce Jan 14, 2025
f2929fd
[nasa/nos3#427] updated pointers after submodule commits before merge
kevincbruce Jan 14, 2025
095ebe7
Merge f2929fd3242cec8de65acd8973b6a030d056d2dd into 3c612610e6b51f641…
kevincbruce Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -92,3 +88,4 @@ jobs:
uses: codecov/codecov-action@v5
with:
token: 040717d0-b624-470e-be41-d08720135088

2 changes: 1 addition & 1 deletion cfg/sc-minimal-config.xml
View file
Open in desktop
kevincbruce marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<enable>false</enable>
</syn>
<torquer>
<enable>true</enable>
<enable>false</enable>
</torquer>
<thruster>
<enable>false</enable>
Expand Down
2 changes: 1 addition & 1 deletion components/generic_radio
Open in desktop
Submodule generic_radio updated 10 files
+1 −1 .gitignore
+3 −1 fsw/cfs/CMakeLists.txt
+0 −195 fsw/fprime/src/generic_radio_device.c
+0 −64 fsw/fprime/src/generic_radio_device.h
+225 −195 fsw/shared/generic_radio_device.c
+55 −56 fsw/shared/generic_radio_device.h
+66 −0 fsw/standalone/CMakeLists.txt
+19 −0 fsw/standalone/device_cfg.h
+317 −0 fsw/standalone/generic_radio_checkout.c
+66 −0 fsw/standalone/generic_radio_checkout.h
2 changes: 1 addition & 1 deletion fsw/apps/hwlib
Open in desktop
Submodule hwlib updated 1 files
+5 −1 fsw/public_inc/hwlib.h
43 changes: 32 additions & 11 deletions scripts/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down