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#382] Updated generic_torquer to include a standalone check… #440

Merged
merged 3 commits into from
Jan 6, 2025
Merged

[nasa/nos3#382] Updated generic_torquer to include a standalone check… #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eee8dad
[nasa/nos3#382] Updated generic_torquer to include a standalone check…
jlucas9 Dec 20, 2024
53b31fa
[nasa/nos3#382] Updates to get generic torquer unit tests working for…
jlucas9 Dec 20, 2024
0fbbd8e
[nasa/nos3#382] Updates to after code reviewsfor generic torquer chec…
jlucas9 Jan 6, 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
6 changes: 3 additions & 3 deletions cfg/sc-minimal-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<enable>false</enable>
</eps>
<fss>
<enable>true</enable>
<enable>false</enable>
</fss>
<gps>
<enable>false</enable>
Expand All @@ -45,7 +45,7 @@
<enable>false</enable>
</mag>
<onair>
<enable>true</enable>
<enable>false</enable>
</onair>
<radio>
<enable>false</enable>
Expand All @@ -63,7 +63,7 @@
<enable>false</enable>
</syn>
<torquer>
<enable>false</enable>
<enable>true</enable>
</torquer>
<thruster>
<enable>false</enable>
Expand Down
2 changes: 1 addition & 1 deletion components/generic_torquer
Open in desktop
Submodule generic_torquer updated 20 files
+16 −0 .gitignore
+263 −0 LICENSE
+11 −1 fsw/cfs/CMakeLists.txt
+33 −68 fsw/cfs/src/generic_torquer_app.c
+1 −11 fsw/cfs/src/generic_torquer_app.h
+1 −12 fsw/cfs/src/generic_torquer_msg.h
+46 −0 fsw/cfs/unit-test/CMakeLists.txt
+467 −0 fsw/cfs/unit-test/coveragetest/coveragetest_generic_torquer_app.c
+67 −0 fsw/cfs/unit-test/coveragetest/generic_torquer_app_coveragetest_common.h
+51 −0 fsw/cfs/unit-test/inc/ut_generic_torquer_app.h
+29 −0 fsw/shared/generic_torquer_device.c
+41 −0 fsw/shared/generic_torquer_device.h
+66 −0 fsw/standalone/CMakeLists.txt
+10 −0 fsw/standalone/device_cfg.h
+239 −0 fsw/standalone/generic_torquer_checkout.c
+66 −0 fsw/standalone/generic_torquer_checkout.h
+46 −0 fsw/unit-test/CMakeLists.txt
+467 −0 fsw/unit-test/coveragetest/coveragetest_generic_torquer_app.c
+67 −0 fsw/unit-test/coveragetest/generic_torquer_app_coveragetest_common.h
+51 −0 fsw/unit-test/inc/ut_generic_torquer_app.h
2 changes: 1 addition & 1 deletion fsw/apps/hwlib
Open in desktop
Submodule hwlib updated 1 files
+1 −1 fsw/stubs/libtrq.c
20 changes: 13 additions & 7 deletions scripts/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,26 @@ echo "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
#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

##
## 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

##
## Torquer
##
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 --title="Torquer Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_torquer_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_torquer/fsw/standalone/build/generic_torquer_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
Expand Down
Loading