Merge pull request #341 from nasa/nos3-227-propulsion

[#227] Propulsion
nasa · Aug 6, 2024 · fc47c0e · fc47c0e
2 parents 1c0de00 + 5048aad
commit fc47c0e
Show file tree

Hide file tree

Showing 20 changed files with 129 additions and 33 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -131,3 +131,6 @@
  path = components/syn
  url = https://github.com/nasa-itc/syn.git
  branch = main
+[submodule "components/generic_thruster"]
+ path = components/generic_thruster
+ url = https://github.com/nasa-itc/generic_thruster.git
diff --git a/cfg/InOut/Inp_IPC.txt b/cfg/InOut/Inp_IPC.txt
@@ -70,6 +70,16 @@ FALSE ! Allow Blocking (i.e. wait on RX)
 FALSE ! Echo to stdout
 1 ! Number of TX prefixes
 "SC" ! Prefix 0
+********************************** Thruster IPC ****************************
+RX ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE)
+1 ! AC.ID for ACS mode
+"Thruster.Rx" ! File name for WRITE or READ
+SERVER ! Socket Role (SERVER,CLIENT,GMSEC_CLIENT)
+fortytwo 4280 ! Server Host Name, Port 
+FALSE ! Allow Blocking (i.e. wait on RX)
+FALSE ! Echo to stdout
+1 ! Number of TX prefixes
+"SC" ! Prefix 0
 ********************************** GPS IPC *****************************
 TX ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE)
 0 ! AC.ID for ACS mode

diff --git a/cfg/InOut/Nodes_Simple.txt b/cfg/InOut/Nodes_Simple.txt
@@ -0,0 +1,8 @@
+<<<<<<<<<<<<<<<< Body Node Inputs for 42 >>>>>>>>>>>>>>>>>>>>>
+Simple Nodes ! Description
+4 ! Number of Nodes
+******************* Node Location, Comment *********************
+ 0.1 -0.4 0.25 "Thrusters"
+ 0.1 -0.1 0.25 "Thrusters"
+ 0.1 -0.4 0.15 "Thrusters"
+ 0.1 -0.1 0.15 "Thrusters"
diff --git a/cfg/InOut/SC_NOS3.txt b/cfg/InOut/SC_NOS3.txt
@@ -11,7 +11,7 @@ CM ! Pos of CM or ORIGIN, wrt F
 0.0 0.0 0.0 ! Vel wrt Formation (m/s), expressed in F
 *************************** Initial Attitude ***************************
 NAN ! Ang Vel wrt [NL], Att [QA] wrt [NLF]
-0.3 0.4 0.5 ! Ang Vel (deg/sec)
+0.0 0.0 0.0 ! Ang Vel (deg/sec)
 0.0 0.0 0.0 1.0 ! Quaternion
 60.0 40.0 20.0 213 ! Angles (deg) & Euler Sequence
 *************************** Dynamics Flags ***************************
@@ -34,7 +34,7 @@ NONE ! Shaker File Name
 0.0 0.0 0.0 ! Constant Embedded Momentum (Nms)
 0.0 0.0 0.0 ! Constant Embedded Magnetic Dipole (A-m^2)
 stf1_red.obj ! Geometry Input File Name
-NONE  ! Node File Name
+Nodes_Simple.txt ! Node File Name
 NONE ! Flex File Name
 ************************************************************************
 *************************** Joint Parameters ***************************
@@ -99,13 +99,31 @@ NONE ! Drag/Jitter Input File Name
 0.0 0.0 1.0 ! MTB Axis Components, [X, Y, Z]
 0 ! Flex Node Index
 ************************* Thruster Parameters **************************
-0 ! Number of Thrusters
+4 ! Number of Thrusters
 ============================== Thr 0 =================================
-PULSED  ! Mode (PULSED or PROPORTIONAL)
- 1.0 ! Thrust Force (N)
--1.0 0.0 0.0 ! Thrust Axis 
+PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
+0.01 ! Thrust Force (N)
+1.0 0.0 0.0  ! Thrust Axis 
 0 ! Body
 0 ! Node
+============================== Thr 1 =================================
+PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
+0.01 ! Thrust Force (N)
+1.0 0.0 0.0 ! Thrust Axis 
+0 ! Body
+1 ! Node
+============================== Thr 2 =================================
+PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
+0.01 ! Thrust Force (N)
+1.0 0.0 0.0 ! Thrust Axis 
+0 ! Body
+2 ! Node
+============================== Thr 3 =================================
+PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
+0.01 ! Thrust Force (N)
+1.0 0.0 0.0 ! Thrust Axis 
+0 ! Body
+3 ! Node
 ******************************* Gyro ************************************
 3 ! Number of Gyro Axes
 ============================== Axis 0 ===================================

diff --git a/cfg/gui/cfg_gui_main.py b/cfg/gui/cfg_gui_main.py
@@ -90,7 +90,7 @@ def saveText(self, layout:QLayout, config_value:int):
 
  # TODO: change to dynamically pull apps/components from xml file or directory, but how?
  applications = ['cf', 'ds', 'fm', 'lc', 'sc']
- components = ['adcs', 'cam', 'css', 'eps', 'fss', 'gps', 'imu', 'mag', 'radio', 'rw', 'sample', 'st', 'syn', 'torquer']
+ components = ['adcs', 'cam', 'css', 'eps', 'fss', 'gps', 'imu', 'mag', 'radio', 'rw', 'sample', 'st', 'syn', 'torquer', 'thruster']
 
  i = 0
  while layout.itemAt(i) != None:

diff --git a/cfg/nos3_defs/cpu1_cfe_es_startup.scr b/cfg/nos3_defs/cpu1_cfe_es_startup.scr
@@ -32,6 +32,7 @@ CFE_APP, novatel_oem615, NOVATEL_AppMain, NAV,
 CFE_APP, sample, SAMPLE_AppMain, SAMPLE, 71, 32768, 0x0, 0;
 CFE_APP, generic_st, ST_AppMain, ST, 71, 32768, 0x0, 0;
 CFE_APP, syn, SYN_AppMain, SYN, 72, 32768, 0x0, 0;
+CFE_APP, generic_thruster, GENERIC_THR_AppMain, THRUSTER, 73, 32768, 0x0, 0;
 
 CFE_LIB, cfs_lib, CFS_LibInit, CFS_LIB, 0, 0, 0x0, 0;
 CFE_APP, cs, CS_AppMain, CS, 55, 16384, 0x0, 0;

diff --git a/cfg/nos3_defs/tables/sch_def_msgtbl.c b/cfg/nos3_defs/tables/sch_def_msgtbl.c
@@ -47,19 +47,19 @@
 ** Component Include Files
 */
 #include "cam_msgids.h"
+#include "generic_adcs_msgids.h"
 #include "generic_css_msgids.h"
 #include "generic_eps_msgids.h"
 #include "generic_fss_msgids.h"
 #include "generic_imu_msgids.h"
 #include "generic_mag_msgids.h"
 #include "generic_radio_msgids.h"
 #include "generic_reaction_wheel_msgids.h"
+#include "generic_star_tracker_msgids.h"
+#include "generic_thruster_msgids.h"
 #include "generic_torquer_msgids.h"
 #include "novatel_oem615_msgids.h"
 #include "sample_msgids.h"
-#include "generic_adcs_msgids.h"
-#include "generic_star_tracker_msgids.h"
-
 #include "syn_msgids.h"
 
 /*
@@ -326,8 +326,8 @@ SCH_MessageEntry_t SCH_DefaultMessageTable[SCH_MAX_MESSAGES] =
  { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } },
  /* command ID #104 */
  { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } },
- /* command ID #105 */
- { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } },
+ /* command ID #105 - Thruster HK */
+ { { CFE_MAKE_BIG16(GENERIC_THRUSTER_REQ_HK_MID), CFE_MAKE_BIG16(0xC000), CFE_MAKE_BIG16(0x0001), CFE_MAKE_BIG16(0x0000) } },
  /* command ID #106 */
  { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } },
  /* command ID #107 */

diff --git a/cfg/nos3_defs/tables/sch_def_schtbl.c b/cfg/nos3_defs/tables/sch_def_schtbl.c
@@ -114,9 +114,9 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  /* slot #3 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 2, SCH_GROUP_CFE_HK }, /* EVS HK Request */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE},  
- { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
- { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
+ { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
+ { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE},
+ { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE},
 
  /* slot #4 */
 /*{ SCH_DISABLED, SCH_ACTIVITY_SEND_MSG, 4, 1, 6, SCH_GROUP_CFS_HK }, */ /* CS HK Request */
@@ -187,7 +187,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  /* slot #13 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 3, SCH_GROUP_CFE_HK }, /* SB HK Request */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
 
@@ -201,7 +201,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  /* slot #15 - Component HK */
 /*{ SCH_DISABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 24, SCH_GROUP_MD_WAKEUP }, */ /* MD Wakeup */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 45, SCH_GROUP_NONE }, /* RW HK Request */ 
- { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},   
+ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST HK Request */ 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
@@ -261,7 +261,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  /* slot #23 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 4, SCH_GROUP_CFE_HK }, /* TIME HK Request */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
 
@@ -287,7 +287,6 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
- { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
 
  /* slot #27 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 90, SCH_GROUP_NONE }, /* ADCS ADAC Request */ 
@@ -335,7 +334,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  /* slot #33 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 5, SCH_GROUP_CFE_HK }, /* TBL HK Request */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
 
@@ -361,7 +360,6 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
- { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
 
  /* slot #37 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 90, SCH_GROUP_NONE }, /* ADCS ADAC Request */ 
@@ -410,7 +408,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  /* slot #43 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 4, 3, 1, SCH_GROUP_CFE_HK }, /* ES HK Request */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
 
@@ -424,7 +422,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  /* slot #45 - Component HK */
 /*{ SCH_DISABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 24, SCH_GROUP_MD_WAKEUP }, */ /* MD Wakeup */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 5, 1, 60, SCH_GROUP_CFS_HK }, /* FSS HK Request */
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0, 61, SCH_GROUP_CFS_HK }, /* FSS Data Request */
+ { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,105, SCH_GROUP_NONE }, /* Thruster HK Request */
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
@@ -483,7 +481,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
 
  /* slot #53 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
@@ -555,7 +553,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
 
  /* slot #63 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
@@ -627,7 +625,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
 
  /* slot #73 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
@@ -699,7 +697,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
 
  /* slot #83 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
@@ -775,7 +773,7 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
 
  /* slot #93 */
  { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,101, SCH_GROUP_NONE }, /* ST Data Request */ 
- { SCH_ENABLED, SCH_ACTIVITY_SEND_MSG, 1, 0,100, SCH_GROUP_NONE }, /* ST Data Request */ 
+ { SCH_UNUSED,  0,  0, 0, 0, SCH_GROUP_NONE},
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
@@ -820,8 +818,8 @@ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] =
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
  { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
- //{ SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
- //{ SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE} 
+ { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE}, 
+ { SCH_UNUSED, 0, 0, 0, 0, SCH_GROUP_NONE} 
 };
 
 /*

diff --git a/cfg/nos3_defs/tables/to_config.c b/cfg/nos3_defs/tables/to_config.c
@@ -69,6 +69,7 @@ extern "C" {
 #include "generic_mag_msgids.h"
 #include "generic_radio_msgids.h"
 #include "generic_reaction_wheel_msgids.h"
+#include "generic_thruster_msgids.h"
 #include "generic_torquer_msgids.h"
 #include "novatel_oem615_msgids.h"
 #include "sample_msgids.h"
@@ -150,7 +151,7 @@ TO_ConfigTable_t to_ConfigTable =
  {CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_HK_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
  {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_HK_TLM_MID),{0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
  {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_DEVICE_TLM_MID),{0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
- {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),  {0,0}, 0,  0x0000, TO_GROUP_NONE, 0,0},
+ {CFE_SB_MSGID_WRAP_VALUE(GENERIC_THRUSTER_HK_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
  {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
 
  // Commented out to limited ADCS messages sent via radio

diff --git a/cfg/nos3_defs/tables/to_lab_sub.c b/cfg/nos3_defs/tables/to_lab_sub.c
@@ -58,6 +58,7 @@
 #include "generic_radio_msgids.h"
 #include "generic_reaction_wheel_msgids.h"
 #include "generic_torquer_msgids.h"
+#include "generic_thruster_msgids.h"
 #include "novatel_oem615_msgids.h"
 #include "sample_msgids.h"
 #include "generic_adcs_msgids.h"
@@ -127,6 +128,7 @@ TO_LAB_Subs_t TO_LAB_Subs =
  {CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_DO_MID), {0,0}, 32},
  {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_HK_TLM_MID),{0,0}, 32},
  {CFE_SB_MSGID_WRAP_VALUE(GENERIC_STAR_TRACKER_DEVICE_TLM_MID),{0,0}, 32},
+ {CFE_SB_MSGID_WRAP_VALUE(GENERIC_THRUSTER_HK_TLM_MID), {0,0}, 32},
 
  {CFE_SB_MSGID_WRAP_VALUE(SYN_HK_TLM_MID), {0,0}, 32},
 

diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake
@@ -113,6 +113,7 @@ list(APPEND MISSION_GLOBAL_APPLIST
  generic_reaction_wheel/fsw
  generic_radio/fsw
  generic_star_tracker/fsw
+ generic_thruster/fsw
  generic_torquer/fsw
  novatel_oem615/fsw
  sample/fsw

diff --git a/cfg/sc-full-config.xml b/cfg/sc-full-config.xml
@@ -59,6 +59,9 @@
  <torquer>
  <enable>true</enable>
  </torquer>
+ <thruster>
+ <enable>true</enable>
+ </thruster>
  </components>
  <gui>
  <enable>true</enable>

diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml
@@ -59,6 +59,9 @@
  <torquer>
  <enable>false</enable>
  </torquer>
+ <thruster>
+ <enable>false</enable>
+ </thruster>
  </components>
  <gui>
  <enable>false</enable>