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

Merged
merged 12 commits into from
Jan 6, 2025
Merged

[nasa/nos3#381] generic_reaction_wheel checkout #429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 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
379da3c
[nasa/nos3#381] Updates after code review in prep for merge;
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
Prev Previous commit
Next Next commit
[#381] Attempted to do fixes, but issues launching sims
  • Loading branch information
@kevincbruce
kevincbruce committed Dec 18, 2024
commit a6aba33faa1404580ccf3f422f1fd9bfd192525b
2 changes: 1 addition & 1 deletion components/generic_reaction_wheel
Open in desktop
Submodule generic_reaction_wheel updated 46 files
+1 −1 fsw/shared/generic_reaction_wheel_device.c
+460 −0 fsw/standalone/build/CMakeCache.txt
+72 −0 fsw/standalone/build/CMakeFiles/3.22.1/CMakeCCompiler.cmake
+83 −0 fsw/standalone/build/CMakeFiles/3.22.1/CMakeCXXCompiler.cmake
+ − fsw/standalone/build/CMakeFiles/3.22.1/CMakeDetermineCompilerABI_C.bin
+ − fsw/standalone/build/CMakeFiles/3.22.1/CMakeDetermineCompilerABI_CXX.bin
+15 −0 fsw/standalone/build/CMakeFiles/3.22.1/CMakeSystem.cmake
+803 −0 fsw/standalone/build/CMakeFiles/3.22.1/CompilerIdC/CMakeCCompilerId.c
+ − fsw/standalone/build/CMakeFiles/3.22.1/CompilerIdC/a.out
+791 −0 fsw/standalone/build/CMakeFiles/3.22.1/CompilerIdCXX/CMakeCXXCompilerId.cpp
+ − fsw/standalone/build/CMakeFiles/3.22.1/CompilerIdCXX/a.out
+16 −0 fsw/standalone/build/CMakeFiles/CMakeDirectoryInformation.cmake
+463 −0 fsw/standalone/build/CMakeFiles/CMakeOutput.log
+56 −0 fsw/standalone/build/CMakeFiles/Makefile.cmake
+112 −0 fsw/standalone/build/CMakeFiles/Makefile2
+3 −0 fsw/standalone/build/CMakeFiles/TargetDirectories.txt
+1 −0 fsw/standalone/build/CMakeFiles/cmake.check_cache
+25 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/DependInfo.cmake
+213 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/build.make
+23 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/cmake_clean.cmake
+1,098 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/compiler_depend.internal
+1,453 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/compiler_depend.make
+2 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/compiler_depend.ts
+2 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/depend.make
+10 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/flags.make
+ − fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/generic_reaction_wheel_checkout.c.o
+134 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/generic_reaction_wheel_checkout.c.o.d
+ − ...me/jstar/Desktop/github-nos3/components/generic_reaction_wheel/fsw/shared/generic_reaction_wheel_device.c.o
+126 −0 .../jstar/Desktop/github-nos3/components/generic_reaction_wheel/fsw/shared/generic_reaction_wheel_device.c.o.d
+ − ...eFiles/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libcan.c.o
+126 −0 ...iles/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libcan.c.o.d
+ − ...eFiles/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libi2c.c.o
+126 −0 ...iles/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libi2c.c.o.d
+ − ...eFiles/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libspi.c.o
+136 −0 ...iles/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libspi.c.o.d
+ − ...Files/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libuart.c.o
+126 −0 ...les/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/libuart.c.o.d
+ − ...iles/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/nos_link.c.o
+125 −0 ...es/generic_reaction_wheel_checkout.dir/home/jstar/Desktop/github-nos3/fsw/apps/hwlib/sim/src/nos_link.c.o.d
+1 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/link.txt
+9 −0 fsw/standalone/build/CMakeFiles/generic_reaction_wheel_checkout.dir/progress.make
+1 −0 fsw/standalone/build/CMakeFiles/progress.marks
+343 −0 fsw/standalone/build/Makefile
+54 −0 fsw/standalone/build/cmake_install.cmake
+ − fsw/standalone/build/generic_reaction_wheel_checkout
+5 −9 fsw/standalone/generic_reaction_wheel_checkout.c
9 changes: 9 additions & 0 deletions scripts/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $U
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)
##
gnome-terminal --tab --title=$SC_NUM" - RW_0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_0_sim" --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_1_sim" --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_2_sim" --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