Skip to content

Commit

Permalink
Disable unneeded SimObjects from default_trick_sys.sm in Trick exampl… (
Browse files Browse the repository at this point in the history
#1719)

* Disable unneeded SimObjects from default_trick_sys.sm in Trick example sims.

* Take out unit test disable. Add some S_defines I forgot.
  • Loading branch information
jmpenn authored May 23, 2024
1 parent fdb2bb2 commit ee2f824
Show file tree
Hide file tree
Showing 16 changed files with 95 additions and 9 deletions.
6 changes: 6 additions & 0 deletions trick_sims/SIM_aircraft/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_balloon/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_billiards/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_contact/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_lander/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 8 additions & 2 deletions trick_sims/SIM_msd/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -32,4 +37,5 @@ class MSDSimObject : public Trick::SimObject {
} ;

MSDSimObject dyn ;
IntegLoop dyn_integloop (0.01) dyn ;
IntegLoop dyn_integloop (0.01) dyn ;

6 changes: 5 additions & 1 deletion trick_sims/SIM_parachute/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion trick_sims/SIM_robot/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_rocket/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_sat2d/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion trick_sims/SIM_satellite/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_splashdown/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions trick_sims/SIM_submarine/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 5 additions & 2 deletions trick_sims/SIM_sun/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
7 changes: 6 additions & 1 deletion trick_sims/SIM_waterclock/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion trick_sims/SIM_wheelbot/S_define
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ee2f824

Please sign in to comment.