diff --git a/cfg/InOut/Nodes_Simple.txt b/cfg/InOut/Nodes_Simple.txt new file mode 100644 index 00000000..038e50d4 --- /dev/null +++ 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 index 86f728ce..9338b4b7 100644 --- a/cfg/InOut/SC_NOS3.txt +++ b/cfg/InOut/SC_NOS3.txt @@ -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,7 +99,7 @@ NONE ! Drag/Jitter Input File Name 0.0 0.0 1.0 ! MTB Axis Components, [X, Y, Z] 0 ! Flex Node Index ************************* Thruster Parameters ************************** -6 ! Number of Thrusters +4 ! Number of Thrusters ============================== Thr 0 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) @@ -109,33 +109,21 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) ============================== Thr 1 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) -0.0 1.0 0.0 ! Thrust Axis +1.0 0.0 0.0 ! Thrust Axis 0 ! Body -0 ! Node +1 ! Node ============================== Thr 2 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) -0.0 0.0 1.0 ! Thrust Axis +1.0 0.0 0.0 ! Thrust Axis 0 ! Body -0 ! Node +2 ! Node ============================== Thr 3 ================================= PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 0.01 ! Thrust Force (N) --1.0 0.0 0.0 ! Thrust Axis -0 ! Body -0 ! Node -============================== Thr 4 ================================= -PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) -0.01 ! Thrust Force (N) -0.0 -1.0 0.0 ! Thrust Axis -0 ! Body -0 ! Node -============================== Thr 5 ================================= -PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) -0.01 ! Thrust Force (N) -0.0 0.0 -1.0 ! Thrust Axis +1.0 0.0 0.0 ! Thrust Axis 0 ! Body -0 ! Node +3 ! Node ******************************* Gyro ************************************ 3 ! Number of Gyro Axes ============================== Axis 0 =================================== diff --git a/components/generic_thruster b/components/generic_thruster index 7dcd3843..0c552ae9 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 7dcd384392b0ea02fcca1120660e91c2d2d58a1e +Subproject commit 0c552ae92fb1bea21a800016dbe59b510e0dce95