Merge branch 'dev'

nasa · Aug 6, 2023 · d9a2d9f · d9a2d9f
2 parents d665021 + 12489f0
commit d9a2d9f
Show file tree

Hide file tree

Showing 79 changed files with 4,102 additions and 5,721 deletions.
diff --git a/.gitmodules b/.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
diff --git a/Makefile b/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
 

diff --git a/Vagrantfile b/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
diff --git a/components/ComponentSettings.cmake b/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)

diff --git a/components/arducam b/components/arducam
diff --git a/components/cryptolib b/components/cryptolib
diff --git a/components/generic_adcs b/components/generic_adcs
diff --git a/components/generic_css b/components/generic_css
diff --git a/components/generic_eps b/components/generic_eps
diff --git a/components/generic_fss b/components/generic_fss
diff --git a/components/generic_imu b/components/generic_imu
diff --git a/components/generic_mag b/components/generic_mag
diff --git a/components/generic_radio b/components/generic_radio
diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel
diff --git a/components/generic_torquer b/components/generic_torquer
diff --git a/components/novatel_oem615 b/components/novatel_oem615
diff --git a/components/sample b/components/sample
diff --git a/components/template b/components/template
diff --git a/fsw/apps/cf b/fsw/apps/cf
diff --git a/fsw/apps/cfs_lib b/fsw/apps/cfs_lib
diff --git a/fsw/apps/ci b/fsw/apps/ci
diff --git a/fsw/apps/ci_lab b/fsw/apps/ci_lab
diff --git a/fsw/apps/ds b/fsw/apps/ds
diff --git a/fsw/apps/fm b/fsw/apps/fm
diff --git a/fsw/apps/hk b/fsw/apps/hk
diff --git a/fsw/apps/hs b/fsw/apps/hs
diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib
diff --git a/fsw/apps/io_lib b/fsw/apps/io_lib
diff --git a/fsw/apps/lc b/fsw/apps/lc
diff --git a/fsw/apps/sc b/fsw/apps/sc
diff --git a/fsw/apps/sch b/fsw/apps/sch
diff --git a/fsw/apps/to b/fsw/apps/to
diff --git a/fsw/apps/to_lab b/fsw/apps/to_lab
diff --git a/fsw/cfe b/fsw/cfe
diff --git a/fsw/nos3_defs/arch_build_custom.cmake b/fsw/nos3_defs/arch_build_custom.cmake
@@ -26,18 +26,20 @@
 # and uses the same warning options that are applied at the mission level. 
 #
 add_compile_options(
-    #-std=c99                # Target the C99 standard (without gcc extensions) 
-    #-pedantic               # Issue all the warnings demanded by strict ISO C
-    #-Wall                   # Warn about most questionable operations
-    #-Wstrict-prototypes     # Warn about missing prototypes
-    #-Wwrite-strings         # Warn if not treating string literals as "const"
-    #-Wpointer-arith         # Warn about suspicious pointer operations
-    #-Wcast-align            # Warn about casts that increase alignment requirements
-    #-Werror                 # Treat warnings as errors (code should be clean) 
+    -std=c99                    # Target the C99 standard (without gcc extensions)
+    -pedantic                   # Issue all the warnings demanded by strict ISO C
+    -Wall                       # Warn about most questionable operations
+    -Wstrict-prototypes         # Warn about missing prototypes
+    -Wwrite-strings             # Warn if not treating string literals as "const"
+    -Wpointer-arith             # Warn about suspicious pointer operations
+    -Werror                     # Treat warnings as errors (code should be clean)
     -Wno-address-of-packed-member
+    # Build Specific
+    -DBYTE_ORDER_LE
+    -D_LINUX_OS_
+    -D_DEFAULT_SOURCE
 )
 
-
 if (CFE_SYSTEM_PSPNAME STREQUAL "nos-linux")
     # find itc cmake module path
     find_path(_ITC_CMAKE_MODULES_
@@ -58,6 +60,3 @@ if (CFE_SYSTEM_PSPNAME STREQUAL "nos-linux")
     SET(OSAL_LINK_LIBS ${NOSENGINE_LIBRARIES} noslink)
     message(STATUS "Set NOS Engine Libraries")
 endif()
-
-
-
diff --git a/fsw/nos3_defs/cpu1_cfe_es_startup.scr b/fsw/nos3_defs/cpu1_cfe_es_startup.scr
@@ -1,47 +1,48 @@
-CFE_LIB, /cf/cfs_lib.so,                CFS_LibInit,              CFS_LIB,          0,  0,     0x0, 0;
-CFE_LIB, /cf/hwlib.so,                  hwlib_Init,               HW_LIB,           0,  0,     0x0, 0;
-CFE_LIB, /cf/io_lib.so,                 IO_LibInit,               IO_LIB,           0,  0,     0x0, 0;
-CFE_LIB, /cf/Crypto.so,                 Crypto_Init_TC_Unit_Test, CRYPTO,           0,  0,     0x0, 0;
+CFE_LIB, hwlib,                     hwlib_Init,               HW_LIB,           0,  0,     0x0, 0;
+CFE_LIB, io_lib,                    IO_LibInit,               IO_LIB,           0,  0,     0x0, 0;
 
-CFE_APP, /cf/sch.so,                    SCH_AppMain,              SCH,              40, 8192,  0x0, 0;
-CFE_APP, /cf/ci_lab.so,                 CI_Lab_AppMain,           CI_LAB,           90, 8192, 0x0, 0;
-CFE_APP, /cf/to_lab.so,                 TO_Lab_AppMain,           TO_LAB,           90, 8192, 0x0, 0;
+CFE_APP, sch,                       SCH_AppMain,              SCH,              40, 16384, 0x0, 0;
+CFE_APP, ci,                        CI_AppMain,               CI,               41, 16384, 0x0, 0;
+CFE_APP, to,                        TO_AppMain,               TO,               42, 16384, 0x0, 0;
 
-CFE_APP, /cf/ci.so,                     CI_AppMain,               CI,               40, 16384, 0x0, 0;
-CFE_APP, /cf/to.so,                     TO_AppMain,               TO,               40, 16384, 0x0, 0;
+CFE_APP, ci_lab,                    CI_Lab_AppMain,           CI_LAB_APP,       80, 16384, 0x0, 0;
+CFE_APP, to_lab,                    TO_LAB_AppMain,           TO_LAB_APP,       81, 16384, 0x0, 0;
 
-CFE_APP, /cf/cf.so,                     CF_AppMain,               CF,               50, 16384, 0x0, 0;
-CFE_APP, /cf/ds.so,                     DS_AppMain,               DS,               50, 16384, 0x0, 0;
-CFE_APP, /cf/fm.so,                     FM_AppMain,               FM,               50, 16384, 0x0, 0;
-CFE_APP, /cf/lc.so,                     LC_AppMain,               LC,               50, 16384, 0x0, 0;
-CFE_APP, /cf/sc.so,                     SC_AppMain,               SC,               50, 16384, 0x0, 0;
+CFE_APP, cf,                        CF_AppMain,               CF,               50, 16384, 0x0, 0;
+CFE_APP, ds,                        DS_AppMain,               DS,               51, 16384, 0x0, 0;
+CFE_APP, fm,                        FM_AppMain,               FM,               52, 16384, 0x0, 0;
+CFE_APP, lc,                        LC_AppMain,               LC,               53, 16384, 0x0, 0;
+CFE_APP, sc,                        SC_AppMain,               SC,               54, 16384, 0x0, 0;
 
-CFE_APP, /cf/arducam.so,                arducam_AppMain,          CAM,              60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_css.so,            GENERIC_CSS_AppMain,      CSS,              60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_eps.so,            GENERIC_EPS_AppMain,      EPS,              60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_fss.so,            GENERIC_FSS_AppMain,      FSS,              60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_imu.so,            GENERIC_IMU_AppMain,      IMU,              60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_mag.so,            GENERIC_MAG_AppMain,      MAG,              60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_radio.so,          GENERIC_RADIO_AppMain,    RADIO,            60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_rw.so,             GENERIC_RW_AppMain,       RW,               60, 8192,  0x0, 0;
-CFE_APP, /cf/generic_torquer.so,        GENERIC_TORQUER_AppMain,  TORQUER,          60, 8192,  0x0, 0;
-CFE_APP, /cf/novatel_oem615.so,         novatel_oem615_AppMain,   NAV,              60, 8192,  0x0, 0;
-CFE_APP, /cf/sample.so,                 SAMPLE_AppMain,           SAMPLE,           60, 8192,  0x0, 0;
+CFE_APP, arducam,                   arducam_AppMain,          CAM,              60, 8192,  0x0, 0;
+CFE_APP, generic_adcs,              ADCS_AppMain,             ADCS,             61, 8192,  0x0, 0;
+CFE_APP, generic_css,               CSS_AppMain,              CSS,              62, 8192,  0x0, 0;
+CFE_APP, generic_eps,               EPS_AppMain,              EPS,              63, 8192,  0x0, 0;
+CFE_APP, generic_fss,               FSS_AppMain,              FSS,              64, 8192,  0x0, 0;
+CFE_APP, generic_imu,               IMU_AppMain,              IMU,              65, 8192,  0x0, 0;
+CFE_APP, generic_mag,               MAG_AppMain,              MAG,              66, 8192,  0x0, 0;
+CFE_APP, generic_radio,             RADIO_AppMain,            RADIO,            67, 8192,  0x0, 0;
+CFE_APP, generic_rw,                RW_AppMain,               RW,               68, 8192,  0x0, 0;
+CFE_APP, generic_torquer,           TORQUER_AppMain,          TORQUER,          69, 8192,  0x0, 0;
+CFE_APP, novatel_oem615,            NOVATEL_AppMain,          NAV,              70, 8192,  0x0, 0;
+CFE_APP, sample,                    SAMPLE_AppMain,           SAMPLE,           71, 8192,  0x0, 0;
+
+!
+CFE_LIB, crypto,                    Crypto_TC_Init,           CRYPTO,           0,  0,     0x0, 0;
 
 !
 !  ** The software will not try to parse anything after the first '!' character it sees. **
 !
-! CFE_APP, /cf/cs.so,               CS_AppMain,               CS,               55, 16384, 0x0, 0;
-! CFE_APP, /cf/hk.so,               HK_AppMain,               HK,               63, 16384, 0x0, 0;
-! CFE_APP, /cf/hs.so,               HS_AppMain,               HS,               56, 16384, 0x0, 0;
-! CFE_APP, /cf/sbn.so,              SBN_AppMain,              SBN,              63, 16384, 0x0, 0;
-! CFE_APP, /cf/md.so,               MD_AppMain,               MD,               60, 16384, 0x0, 0;
-! CFE_APP, /cf/mm.so,               MM_AppMain,               MM,               61, 16384, 0x0, 0;
+! CFE_LIB, cfs_lib,             CFS_LibInit,              CFS_LIB,          0,  0,     0x0, 0;
+! CFE_APP, cs,                  CS_AppMain,               CS,               55, 16384, 0x0, 0;
+! CFE_APP, hk,                  HK_AppMain,               HK,               63, 16384, 0x0, 0;
+! CFE_APP, hs,                  HS_AppMain,               HS,               56, 16384, 0x0, 0;
+! CFE_APP, sbn,                 SBN_AppMain,              SBN,              63, 16384, 0x0, 0;
+! CFE_APP, md,                  MD_AppMain,               MD,               60, 16384, 0x0, 0;
+! CFE_APP, mm,                  MM_AppMain,               MM,               61, 16384, 0x0, 0;
 !
-! CFE_APP, /cf/ci_lab.so,           CI_Lab_AppMain,           CI_LAB_APP,       50, 8192,  0x0, 0;
-! CFE_LIB, /cf/sample_lib.so,       SAMPLE_LibInit,           SAMPLE_LIB,       0,  0,     0x0, 0;
-! CFE_APP, /cf/sample_app.so,       SAMPLE_AppMain,           SAMPLE_APP,       51, 16384, 0x0, 0;
-! CFE_APP, /cf/to_lab.so,           TO_Lab_AppMain,           TO_LAB_APP,       50, 8192,  0x0, 0;
+! CFE_LIB, sample_lib,          SAMPLE_LibInit,           SAMPLE_LIB,       0,  0,     0x0, 0;
+! CFE_APP, sample_app,          SAMPLE_AppMain,           SAMPLE_APP,       51, 16384, 0x0, 0;
 !
 ! Startup script fields:
 ! 1. Object Type      -- CFE_APP for an Application, or CFE_LIB for a library.
+1 −2		fsw/platform_inc/cam_msgids.h
+63 −162		fsw/src/cam_app.c
+2 −3		fsw/src/cam_app.h
+28 −101		fsw/src/cam_child.c
+0 −1		fsw/src/cam_child.h
+30 −22		fsw/src/cam_lib.c
+4 −4		fsw/src/cam_lib.h
+3 −20		fsw/src/cam_msg.h
+42 −42		fsw/unit_test/cam_cmd_test.c
+7 −7		fsw/unit_test/cam_init_test.c
+1 −1		gsw/ARDUCAM/cmd_tlm/ARDUCAM_CMD.txt
+2 −0		gsw/ARDUCAM/cmd_tlm/ARDUCAM_TLM.txt
+1 −0		gsw/ARDUCAM/target.txt
+0 −3		sim/CMakeLists.txt
+0 −38		sim/src/camsim.cpp
+62 −92		fsw/src/generic_css_app.c
+4 −4		fsw/src/generic_css_app.h
+2 −2		fsw/src/generic_css_device.c
+2 −2		fsw/src/generic_css_device.h
+5 −5		fsw/src/generic_css_msg.h
+2 −0		gsw/GENERIC_CSS/cmd_tlm/GENERIC_CSS_TLM.txt
+1 −0		gsw/GENERIC_CSS/target.txt
+0 −5		sim/CMakeLists.txt
+1 −1		sim/inc/generic_css_42_data_provider.hpp
+11 −2		sim/inc/generic_css_data_point.hpp
+1 −1		sim/inc/generic_css_data_provider.hpp
+42 −54		sim/src/generic_css_data_point.cpp
+1 −1		sim/src/generic_css_hardware_model.cpp
+0 −22		sim/src/generic_css_sim.cpp
+55 −76		fsw/src/generic_eps_app.c
+4 −4		fsw/src/generic_eps_app.h
+7 −7		fsw/src/generic_eps_device.c
+5 −5		fsw/src/generic_eps_device.h
+4 −4		fsw/src/generic_eps_msg.h
+1 −0		gsw/GENERIC_EPS/cmd_tlm/GENERIC_EPS_TLM.txt
+21 −0		gsw/GENERIC_EPS/lib/slope_intercept_conversion.rb
+1 −0		gsw/GENERIC_EPS/target.txt
+0 −5		sim/CMakeLists.txt
+1 −1		sim/inc/generic_eps_42_data_provider.hpp
+1 −1		sim/inc/generic_eps_data_provider.hpp
+1 −1		sim/src/generic_eps_data_point.cpp
+0 −22		sim/src/generic_eps_sim.cpp
+62 −87		fsw/src/generic_fss_app.c
+3 −3		fsw/src/generic_fss_app.h
+1 −1		fsw/src/generic_fss_device.h
+5 −5		fsw/src/generic_fss_msg.h
+2 −0		gsw/GENERIC_FSS/cmd_tlm/GENERIC_FSS_TLM.txt
+1 −0		gsw/GENERIC_FSS/target.txt
+1 −1		sim/inc/generic_fss_42_data_provider.hpp
+14 −5		sim/inc/generic_fss_data_point.hpp
+29 −46		sim/src/generic_fss_data_point.cpp
+1 −1		sim/src/generic_fss_hardware_model.cpp
+1 −1		fsw/platform_inc/generic_imu_platform_cfg.h
+69 −72		fsw/src/generic_imu_app.c
+4 −4		fsw/src/generic_imu_app.h
+2 −5		fsw/src/generic_imu_device.c
+5 −5		fsw/src/generic_imu_device.h
+6 −10		fsw/src/generic_imu_msg.h
+2 −0		gsw/GENERIC_IMU/cmd_tlm/GENERIC_IMU_TLM.txt
+1 −0		gsw/GENERIC_IMU/target.txt
+0 −5		sim/CMakeLists.txt
+1 −1		sim/inc/generic_imu_42_data_provider.hpp
+11 −10		sim/inc/generic_imu_data_point.hpp
+1 −1		sim/inc/generic_imu_data_provider.hpp
+31 −116		sim/src/generic_imu_data_point.cpp
+6 −8		sim/src/generic_imu_hardware_model.cpp
+0 −22		sim/src/generic_imu_sim.cpp
+61 −98		fsw/src/generic_mag_app.c
+4 −4		fsw/src/generic_mag_app.h
+1 −2		fsw/src/generic_mag_device.c
+1 −1		fsw/src/generic_mag_device.h
+5 −5		fsw/src/generic_mag_msg.h
+2 −0		gsw/GENERIC_MAG/cmd_tlm/GENERIC_MAG_TLM.txt
+1 −0		gsw/GENERIC_MAG/target.txt
+0 −5		sim/CMakeLists.txt
+1 −1		sim/inc/generic_mag_42_data_provider.hpp
+12 −2		sim/inc/generic_mag_data_point.hpp
+24 −42		sim/src/generic_mag_data_point.cpp
+1 −1		sim/src/generic_mag_hardware_model.cpp
+0 −22		sim/src/generic_mag_sim.cpp
+72 −84		fsw/src/generic_radio_app.c
+5 −5		fsw/src/generic_radio_app.h
+2 −1		fsw/src/generic_radio_device.h
+5 −5		fsw/src/generic_radio_msg.h
+1 −0		gsw/GENERIC_RADIO/cmd_tlm/GENERIC_RADIO_TLM.txt
+1 −0		gsw/GENERIC_RADIO/target.txt
+0 −5		sim/CMakeLists.txt
+1 −1		sim/inc/generic_radio_42_data_provider.hpp
+1 −1		sim/inc/generic_radio_data_provider.hpp
+1 −1		sim/src/generic_radio_data_point.cpp
+5 −11		sim/src/generic_radio_hardware_model.cpp
+0 −22		sim/src/generic_radio_sim.cpp
+81 −99		fsw/src/generic_reaction_wheel_app.c
+6 −12		fsw/src/generic_reaction_wheel_app.h
+9 −7		fsw/src/generic_reaction_wheel_msg.h
+2 −1		gsw/GENERIC_REACTION_WHEEL/cmd_tlm/GENERIC_REACTION_WHEEL_CMD.txt
+8 −2		gsw/GENERIC_REACTION_WHEEL/cmd_tlm/GENERIC_REACTION_WHEEL_TLM.txt
+1 −0		gsw/GENERIC_REACTION_WHEEL/target.txt
+0 −5		sim/CMakeLists.txt
+1 −1		sim/inc/generic_rw_data_point.hpp
+1 −0		sim/inc/generic_rw_hardware_model.hpp
+0 −38		sim/src/generic_reaction_wheel_sim.cpp
+24 −36		sim/src/generic_rw_data_point.cpp
+3 −1		sim/src/generic_rw_hardware_model.cpp
+62 −101		fsw/src/generic_torquer_app.c
+6 −6		fsw/src/generic_torquer_app.h
+8 −8		fsw/src/generic_torquer_msg.h
+1 −0		gsw/GENERIC_TORQUER/cmd_tlm/GENERIC_TORQUER_TLM.txt
+1 −0		gsw/GENERIC_TORQUER/target.txt
+0 −5		sim/CMakeLists.txt
+1 −1		sim/inc/generic_torquer_42_data_provider.hpp
+0 −6		sim/src/generic_torquer_hardware_model.cpp
+0 −22		sim/src/generic_torquer_sim.cpp
+91 −1		README.md
+0 −21		fsw/mission_inc/nav_perfids.h
+21 −0		fsw/mission_inc/novatel_oem615_perfids.h
+0 −27		fsw/platform_inc/nav_msgids.h
+28 −0		fsw/platform_inc/novatel_oem615_msgids.h
+29 −0		fsw/platform_inc/novatel_oem615_platform_cfg.h
+0 −341		fsw/src/nav_app.c
+0 −42		fsw/src/nav_app.h
+0 −23		fsw/src/nav_events.h
+0 −64		fsw/src/nav_msg.h
+0 −24		fsw/src/nav_version.h
+857 −0		fsw/src/novatel_oem615_app.c
+119 −0		fsw/src/novatel_oem615_app.h
+55 −0		fsw/src/novatel_oem615_child.c
+19 −0		fsw/src/novatel_oem615_child.h
+603 −0		fsw/src/novatel_oem615_device.c
+98 −0		fsw/src/novatel_oem615_device.h
+77 −0		fsw/src/novatel_oem615_events.h
+100 −0		fsw/src/novatel_oem615_msg.h
+19 −0		fsw/src/novatel_oem615_version.h
+5 −5		fsw/unit_test/nav_utest.c
+74 −6		gsw/NOVATEL_OEM615/cmd_tlm/NOVATEL_OEM615_CMD.txt
+23 −7		gsw/NOVATEL_OEM615/cmd_tlm/NOVATEL_OEM615_TLM.txt
+1 −0		gsw/NOVATEL_OEM615/target.txt
+0 −5		sim/CMakeLists.txt
+3 −2		sim/inc/gps_sim_data_point.hpp
+16 −1		sim/inc/gps_sim_hardware_model_OEM615.hpp
+3 −2		sim/src/gps_sim_data_file_provider.cpp
+38 −78		sim/src/gps_sim_data_point.cpp
+151 −13		sim/src/gps_sim_hardware_model_OEM615.cpp
+0 −36		sim/src/gps_simulator.cpp