diff --git a/Makefile b/Makefile index 31640064..2560e7e6 100755 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 4397ef1b..413cae03 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -4,7 +4,7 @@ - yamcs + cosmos @@ -15,7 +15,7 @@ - sc-minimal-config.xml + sc-full-config.xml diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index d2080abf..a25b0c65 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -51,10 +51,10 @@ false - true + false - true + false false @@ -70,7 +70,7 @@ - false + true 5.0 diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index 3b7be181..c24ed5f5 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit 3b7be181697527a035508b2c48e312d62b1ca966 +Subproject commit c24ed5f5cdcb22902e7290aa4d3e8978d2534261