From fedb4aaee3284d40b7099a36fc2dfb6bb9690181 Mon Sep 17 00:00:00 2001 From: jmpenn Date: Thu, 23 May 2024 10:12:27 -0500 Subject: [PATCH] =?UTF-8?q?Disable=20unneeded=20SimObjects=20from=20defaul?= =?UTF-8?q?t=5Ftrick=5Fsys.sm=20in=20Trick=20exampl=E2=80=A6=20(#1719)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Disable unneeded SimObjects from default_trick_sys.sm in Trick example sims. * Take out unit test disable. Add some S_defines I forgot. --- trick_sims/SIM_aircraft/S_define | 6 ++++++ trick_sims/SIM_balloon/S_define | 6 ++++++ trick_sims/SIM_billiards/S_define | 6 ++++++ trick_sims/SIM_contact/S_define | 6 ++++++ trick_sims/SIM_lander/S_define | 6 ++++++ trick_sims/SIM_msd/S_define | 10 ++++++++-- trick_sims/SIM_parachute/S_define | 6 +++++- trick_sims/SIM_robot/S_define | 7 ++++++- trick_sims/SIM_rocket/S_define | 6 ++++++ trick_sims/SIM_sat2d/S_define | 6 ++++++ trick_sims/SIM_satellite/S_define | 7 ++++++- trick_sims/SIM_splashdown/S_define | 6 ++++++ trick_sims/SIM_submarine/S_define | 6 ++++++ trick_sims/SIM_sun/S_define | 7 +++++-- trick_sims/SIM_waterclock/S_define | 7 ++++++- trick_sims/SIM_wheelbot/S_define | 6 +++++- 16 files changed, 95 insertions(+), 9 deletions(-) diff --git a/trick_sims/SIM_aircraft/S_define b/trick_sims/SIM_aircraft/S_define index 727ba4ffd..20be236ce 100644 --- a/trick_sims/SIM_aircraft/S_define +++ b/trick_sims/SIM_aircraft/S_define @@ -7,7 +7,13 @@ LIBRARY DEPENDENCIES: (Aircraft/src/Waypoint.cpp) ) **************************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "Aircraft/include/Aircraft.hh" ##include "Aircraft/include/Waypoint.hh" diff --git a/trick_sims/SIM_balloon/S_define b/trick_sims/SIM_balloon/S_define index f83826b0d..7d2f862c1 100644 --- a/trick_sims/SIM_balloon/S_define +++ b/trick_sims/SIM_balloon/S_define @@ -5,7 +5,13 @@ LIBRARY DEPENDENCIES: ((balloon/src/Balloon.cpp) (atmosphere/src/atmosphere.c)) *************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "balloon/include/Balloon.hh" class BalloonSimObject : public Trick::SimObject { diff --git a/trick_sims/SIM_billiards/S_define b/trick_sims/SIM_billiards/S_define index 15dcd6cab..9533f5087 100644 --- a/trick_sims/SIM_billiards/S_define +++ b/trick_sims/SIM_billiards/S_define @@ -4,7 +4,13 @@ PURPOSE: LIBRARY DEPENDENCIES: ((pool_table/src/pool_table.cpp)) *************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "pool_table/include/pool_table.hh" class PoolTableSimObject : public Trick::SimObject { diff --git a/trick_sims/SIM_contact/S_define b/trick_sims/SIM_contact/S_define index 2c4130a3a..8c5b085b5 100644 --- a/trick_sims/SIM_contact/S_define +++ b/trick_sims/SIM_contact/S_define @@ -4,7 +4,13 @@ PURPOSE: LIBRARY DEPENDENCIES: ((contact/src/Contact.cpp)) *************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "contact/include/Contact.hh" class ContactSimObject : public Trick::SimObject { public: diff --git a/trick_sims/SIM_lander/S_define b/trick_sims/SIM_lander/S_define index e99f2057f..605d21a66 100644 --- a/trick_sims/SIM_lander/S_define +++ b/trick_sims/SIM_lander/S_define @@ -5,7 +5,13 @@ LIBRARY DEPENDENCIES: ((lander/src/Lander.cpp) (PIDController/src/PIDController.cpp)) *************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "lander/include/Lander.hh" class LanderSimObject : public Trick::SimObject { public: diff --git a/trick_sims/SIM_msd/S_define b/trick_sims/SIM_msd/S_define index dd3874736..c885e14af 100644 --- a/trick_sims/SIM_msd/S_define +++ b/trick_sims/SIM_msd/S_define @@ -11,8 +11,13 @@ LIBRARY DEPENDENCIES: (msd/src/msd_shutdown.cpp) ) *************************************************************/ - +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + // #include "sim_objects/WebServer.sm" ##include "msd/include/msd.hh" @@ -32,4 +37,5 @@ class MSDSimObject : public Trick::SimObject { } ; MSDSimObject dyn ; -IntegLoop dyn_integloop (0.01) dyn ; \ No newline at end of file +IntegLoop dyn_integloop (0.01) dyn ; + diff --git a/trick_sims/SIM_parachute/S_define b/trick_sims/SIM_parachute/S_define index 406be6699..933b01c91 100644 --- a/trick_sims/SIM_parachute/S_define +++ b/trick_sims/SIM_parachute/S_define @@ -4,7 +4,11 @@ PURPOSE: LIBRARY DEPENDENCIES: ((parachute/src/Parachutist.cpp)) *************************************************************/ - +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" ##include "parachute/include/Parachutist.hh" diff --git a/trick_sims/SIM_robot/S_define b/trick_sims/SIM_robot/S_define index 3f5187952..2ddb216f5 100644 --- a/trick_sims/SIM_robot/S_define +++ b/trick_sims/SIM_robot/S_define @@ -6,8 +6,13 @@ LIBRARY DEPENDENCIES: (manipulator/manipulator.cc) ) *************************************************************/ - +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "include/trick/exec_proto.h" ##include "manipulator/manipulator.hh" diff --git a/trick_sims/SIM_rocket/S_define b/trick_sims/SIM_rocket/S_define index 89e5943ce..a18222f71 100644 --- a/trick_sims/SIM_rocket/S_define +++ b/trick_sims/SIM_rocket/S_define @@ -4,7 +4,13 @@ PURPOSE: LIBRARY DEPENDENCIES: ((rocket/src/Rocket.cpp)) *************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "rocket/include/Rocket.hh" class ModelRocketSimObject : public Trick::SimObject { public: diff --git a/trick_sims/SIM_sat2d/S_define b/trick_sims/SIM_sat2d/S_define index ca58495b7..64489999b 100644 --- a/trick_sims/SIM_sat2d/S_define +++ b/trick_sims/SIM_sat2d/S_define @@ -4,7 +4,13 @@ PURPOSE: LIBRARY DEPENDENCIES: ((satellite/src/Satellite.cpp)) *************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "satellite/include/Satellite.hh" class SatelliteSimObject : public Trick::SimObject { public: diff --git a/trick_sims/SIM_satellite/S_define b/trick_sims/SIM_satellite/S_define index 029539d9c..5be3ef625 100644 --- a/trick_sims/SIM_satellite/S_define +++ b/trick_sims/SIM_satellite/S_define @@ -5,8 +5,13 @@ LIBRARY DEPENDENCIES: ( ) *************************************************************/ - +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "Satellite/include/Satellite.hh" ##include "Satellite/include/SatGraphicsComm.hh" diff --git a/trick_sims/SIM_splashdown/S_define b/trick_sims/SIM_splashdown/S_define index 55d9ae386..d75655707 100644 --- a/trick_sims/SIM_splashdown/S_define +++ b/trick_sims/SIM_splashdown/S_define @@ -5,7 +5,13 @@ LIBRARY DEPENDENCIES: ((CrewModule/src/CrewModuleDynamics.o) (CrewModule/src/CrewModuleShape.o)) **************************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "CrewModule/include/CrewModuleDynamics.hh" class CrewModuleSimObject : public Trick::SimObject { diff --git a/trick_sims/SIM_submarine/S_define b/trick_sims/SIM_submarine/S_define index 18e62b734..b83747bda 100644 --- a/trick_sims/SIM_submarine/S_define +++ b/trick_sims/SIM_submarine/S_define @@ -4,7 +4,13 @@ PURPOSE: LIBRARY DEPENDENCIES: ((submarine/src/Submarine.cpp)) *************************************************************/ +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "submarine/include/Submarine.hh" class SubmarineSimObject : public Trick::SimObject { diff --git a/trick_sims/SIM_sun/S_define b/trick_sims/SIM_sun/S_define index 206597785..e525055f7 100644 --- a/trick_sims/SIM_sun/S_define +++ b/trick_sims/SIM_sun/S_define @@ -15,10 +15,13 @@ LIBRARY DEPENDENCIES: (Sun/src/sun_pred_slow_display.c) ) *************************************************************/ - +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" - ##include "Sun/include/sun_pred.h" ##include "sim_services/MemoryManager/include/wcs_ext.h" diff --git a/trick_sims/SIM_waterclock/S_define b/trick_sims/SIM_waterclock/S_define index c6f593fd0..b2f5ff334 100644 --- a/trick_sims/SIM_waterclock/S_define +++ b/trick_sims/SIM_waterclock/S_define @@ -8,8 +8,13 @@ LIBRARY DEPENDENCIES: (waterclock/src/waterclock_shutdown.c) ) *************************************************************/ - +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" + ##include "waterclock/include/waterclock_numeric.h" class WaterClockSimObject : public Trick::SimObject { diff --git a/trick_sims/SIM_wheelbot/S_define b/trick_sims/SIM_wheelbot/S_define index fc625c5e0..847254df9 100644 --- a/trick_sims/SIM_wheelbot/S_define +++ b/trick_sims/SIM_wheelbot/S_define @@ -5,7 +5,11 @@ LIBRARY DEPENDENCIES: ((Vehicle/src/vehicleOne.cpp) (Control/src/PIDController.cpp)) *************************************************************/ - +#define TRICK_NO_MONTE_CARLO +#define TRICK_NO_MASTERSLAVE +#define TRICK_NO_INSTRUMENTATION +#define TRICK_NO_REALTIMEINJECTOR +#define TRICK_NO_ZEROCONF #include "sim_objects/default_trick_sys.sm" ##include "Vehicle/include/vehicleOne.hh"