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#381] generic_reaction_wheel checkout #429

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
Open

[nasa/nos3#381] generic_reaction_wheel checkout #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
203518e
[nasa/nos3#381] Added Reaction Wheel Checkout, updated reaction wheel…
kevincbruce Dec 13, 2024
e51bf53
Update nos3-mission.xml
kevincbruce Dec 16, 2024
455ad27
[nasa/nos3#381] Merge branch 'dev' into nos3#381-rw-checkout-application
kevincbruce Dec 18, 2024
a6aba33
[nasa/nos3#381] Attempted to do fixes, but issues launching sims
kevincbruce Dec 18, 2024
9299af3
[nasa/nos3#381] Attempted to use RW sim launches from make launch cfs…
kevincbruce Dec 18, 2024
6cf5e9d
[nasa/nos3#381] Updates to enable RW sims in config and assure checko…
kevincbruce Dec 19, 2024
6ededdd
[nasa/nos3#381] Pushing RW Checkout/App/Device fixes to top level
kevincbruce Dec 19, 2024
fb3c878
[nasa/nos3#381] Removing build files from commit
kevincbruce Dec 20, 2024
01caa56
[nasa/nos3#381] pushed double fix to top level
kevincbruce Dec 20, 2024
15b9dbf
[nasa/nos3#381] - Fixed renamed uninstall target. Fixed mission xml …
msuder Dec 20, 2024
049334d
[nasa/nos3#381] - Fix YAMCS to be the default as intended.
msuder Dec 20, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# The "LOCALTGTS" defines the top-level targets that are implemented in this makefile
# Any other target may also be given, in that case it will simply be passed through.
LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw
LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep sim stop stop-gsw uninstall
OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS))

# As this makefile does not build any real files, treat everything as a PHONY target
Expand Down
2 changes: 1 addition & 1 deletion cfg/nos3-mission.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<!-- Spacecraft 1 Configuration -->
<!-- sc-full-config.xml or sc-minimal-config.xml -->
<sc-1-cfg>sc-minimal-config.xml</sc-1-cfg>
<sc-1-cfg>sc-full-config.xml</sc-1-cfg>

<!-- Spacecraft N Configuration -->
<!-- <sc-N-cfg>sc-minimal-config.xml</sc-N-cfg> -->
Expand Down
8 changes: 4 additions & 4 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 @@ -54,7 +54,7 @@
<enable>false</enable>
</rw>
<sample>
<enable>true</enable>
<enable>false</enable>
</sample>
<st>
<enable>false</enable>
Expand All @@ -70,7 +70,7 @@
</thruster>
</components>
<gui>
<enable>false</enable>
<enable>true</enable>
</gui>
<orbit>
<tipoff_x>5.0</tipoff_x>
Expand Down
2 changes: 1 addition & 1 deletion components/generic_adcs
Open in desktop
Submodule generic_adcs updated 0 files
2 changes: 1 addition & 1 deletion components/generic_reaction_wheel
Open in desktop
Submodule generic_reaction_wheel updated 12 files
+1 −0 .gitignore
+3 −1 fsw/cfs/CMakeLists.txt
+62 −0 fsw/cfs/platform_inc/generic_reaction_wheel_platform_cfg.h
+13 −62 fsw/cfs/src/generic_reaction_wheel_app.c
+1 −0 fsw/cfs/src/generic_reaction_wheel_app.h
+80 −0 fsw/shared/generic_reaction_wheel_device.c
+22 −0 fsw/shared/generic_reaction_wheel_device.h
+65 −0 fsw/standalone/CMakeLists.txt
+50 −0 fsw/standalone/device_cfg.h
+249 −0 fsw/standalone/generic_reaction_wheel_checkout.c
+65 −0 fsw/standalone/generic_reaction_wheel_checkout.h
+1 −1 sim/src/generic_rw_data_point.cpp
18 changes: 16 additions & 2 deletions scripts/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,27 @@ 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
# echo ""

##
## Reaction Wheels (RW)
##
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
gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0
gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1
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
Expand Down
Loading