Merge branch 'dev'

Author: Lucas, John P

.gitmodules

@@ -28,18 +28,9 @@
 [submodule "fsw/apps/cf"]
 	path = fsw/apps/cf
 	url = https://github.com/nasa-itc/CF.git
-[submodule "fsw/apps/hk"]
-	path = fsw/apps/hk
-	url = https://github.com/nasa-itc/HK.git
-[submodule "fsw/apps/cfs_lib"]
-	path = fsw/apps/cfs_lib
-	url = https://github.com/nasa-itc/cfs_lib.git
 [submodule "fsw/apps/lc"]
 	path = fsw/apps/lc
 	url = https://github.com/nasa-itc/LC.git
-[submodule "fsw/apps/hs"]
-	path = fsw/apps/hs
-	url = https://github.com/nasa-itc/HS.git
 [submodule "sims/nos_time_driver"]
 	path = sims/nos_time_driver
 	url = https://github.com/nasa-itc/nos_time_driver.git
@@ -89,10 +80,6 @@
 	path = components/novatel_oem615
 	url = https://github.com/nasa-itc/novatel_oem615.git
 	branch = master
-[submodule "components/template"]
-	path = components/template
-	url = https://github.com/nasa-itc/component_template.git
-	branch = main
 [submodule "fsw/apps/ds"]
 	path = fsw/apps/ds
 	url = https://github.com/nasa-itc/DS.git
@@ -133,3 +120,6 @@
 	path = components/cryptolib
 	url = https://github.com/nasa/CryptoLib.git
 	branch = main
+[submodule "components/generic_adcs"]
+	path = components/generic_adcs
+	url = https://github.com/nasa-itc/generic_adcs.git

Makefile

@@ -27,7 +27,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 fsw fsw-prep pack sim sim-prep clean clean-fsw clean-sim checkout gsw launch log real-clean stop sc-launch
+LOCALTGTS := all fsw fsw-prep pack sim sim-prep clean clean-fsw clean-sim checkout gsw gsm-prep launch log real-clean stop sc-launch
 OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS))
 
 # As this makefile does not build any real files, treat everything as a PHONY target
@@ -40,6 +40,7 @@ OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS))
 all:
 	$(MAKE) fsw
 	$(MAKE) sim
+	$(MAKE) gsw
 
 #
 # FSW
@@ -63,31 +64,48 @@ sim-prep:
 	mkdir -p $(SIMBUILDDIR)
 	cd $(SIMBUILDDIR) && cmake -DCMAKE_INSTALL_PREFIX=$(SIMBUILDDIR) ..
 
+#
+# GSW
+#
+gsw:
+	$(MAKE) gsw-prep
+	./gsw/scripts/create_cosmos_gem.sh
+
+gsw-prep:
+	mkdir -p ./gsw/cosmos/build
+
 #
 # Clean
 #
 clean:
 	$(MAKE) clean-fsw
 	$(MAKE) clean-sim
+	$(MAKE) clean-gsw
 
 clean-fsw:
 	rm -rf fsw/build
 
 clean-sim:
 	rm -rf sims/build
 
+clean-gsw:
+	rm -rf gsw/cosmos/build
+
 #
 # Script Calls
 #
 checkout:
 	./gsw/scripts/checkout.sh
 
-gsw:
+gsw-launch:
 	./gsw/scripts/gsw.sh
 
 launch:
 	./gsw/scripts/launch.sh
 
+reboot:
+	./gsw/scripts/reboot.sh
+
 log:
 	./gsw/scripts/log.sh
 

Vagrantfile

@@ -1,11 +1,10 @@
 Vagrant.configure("2") do |config|
     ### Uncomment one of the following to select configuration
-    #config.vm.box = "nos3/oracle"
     #config.vm.box = "nos3/rocky"
     config.vm.box = "nos3/ubuntu"
 
     ### Specify version
-    config.vm.box_version = "1.6.1"
+    config.vm.box_version = "20230731"
 
     ### Share host NOS3 repository into VM
     config.vm.synced_folder ".", "/home/nos3/Desktop/github-nos3", 
@@ -14,10 +13,10 @@ Vagrant.configure("2") do |config|
 
     ### General configuration
     config.vm.provider "virtualbox" do |vbox|
-        vbox.name = "nos3_1.6.1"
+        vbox.name = "nos3_20230731"
         vbox.gui = true
         ### Enable additional configuration as needed
-        #vbox.cpus = 8
-        #vbox.memory = "16384"
+        vbox.cpus = 6
+        vbox.memory = "6144"
     end
 end

components/ComponentSettings.cmake

@@ -43,10 +43,10 @@ set(ITC_C_FLAGS "${ITC_C_FLAGS}"
                 #"-pedantic-errors"
                 )
 
-if(${TGTNAME} STREQUAL cpu1)
-    set(ITC_C_FLAGS "${ITC_C_FLAGS}"
-           "-Wformat=0")
-endif()
+#if(${TGTNAME} STREQUAL cpu1)
+#    set(ITC_C_FLAGS "${ITC_C_FLAGS}"
+#           "-Wformat=0")
+#endif()
 
 # Not Compatable with Clang
 if(CMAKE_COMPILER_IS_GNUCC)