From 45e515cdb3d668202b0605a06db49e9facdd4d0a Mon Sep 17 00:00:00 2001 From: "John M. Penn" Date: Tue, 23 Feb 2016 12:03:13 -0600 Subject: [PATCH] Consolidate the C Ball sims into one directory. refs #191 --- .../{ => Ball}/SIM_ball_L1/DP_Product/DP_ball_force.xml | 0 .../{ => Ball}/SIM_ball_L1/DP_Product/DP_ball_state_cmp.xml | 0 .../{ => Ball}/SIM_ball_L1/DP_Product/DP_ball_states.xml | 0 trick_sims/{ => Ball}/SIM_ball_L1/Modified_data/auto_test.dr | 0 .../{ => Ball}/SIM_ball_L1/Modified_data/data_record.dr | 0 trick_sims/{ => Ball}/SIM_ball_L1/RUN_test/Title | 0 trick_sims/{ => Ball}/SIM_ball_L1/RUN_test/input.py | 0 trick_sims/{ => Ball}/SIM_ball_L1/RUN_test/unit_test.py | 0 trick_sims/{ => Ball}/SIM_ball_L1/S_define | 0 trick_sims/Ball/SIM_ball_L1/S_overrides.mk | 4 ++++ trick_sims/{ => Ball}/SIM_ball_L1/Title | 0 .../{ => Ball}/SIM_ball_L2/DP_Product/DP_ball_force.xml | 0 .../{ => Ball}/SIM_ball_L2/DP_Product/DP_ball_states.xml | 0 .../{ => Ball}/SIM_ball_L2/DP_Product/DP_x_position.xml | 0 .../{ => Ball}/SIM_ball_L2/Modified_data/data_record.dr | 0 trick_sims/{ => Ball}/SIM_ball_L2/Modified_data/realtime.py | 0 trick_sims/{ => Ball}/SIM_ball_L2/RUN_control/Title | 0 trick_sims/{ => Ball}/SIM_ball_L2/RUN_control/input.py | 0 trick_sims/{ => Ball}/SIM_ball_L2/RUN_realtime/Title | 0 trick_sims/{ => Ball}/SIM_ball_L2/RUN_realtime/input.py | 0 trick_sims/{ => Ball}/SIM_ball_L2/RUN_test/Title | 0 trick_sims/{ => Ball}/SIM_ball_L2/RUN_test/input.py | 0 trick_sims/{ => Ball}/SIM_ball_L2/RUN_test/unit_test.py | 0 trick_sims/{ => Ball}/SIM_ball_L2/S_define | 0 trick_sims/Ball/SIM_ball_L2/S_overrides.mk | 4 ++++ trick_sims/{ => Ball}/SIM_ball_L2/Title | 0 .../{ => Ball}/SIM_ball_L3/DP_Product/DP_ball_force.xml | 0 .../{ => Ball}/SIM_ball_L3/DP_Product/DP_ball_states.xml | 0 trick_sims/{ => Ball}/SIM_ball_L3/Modified_data/auto_test.dr | 0 .../{ => Ball}/SIM_ball_L3/Modified_data/data_record.dr | 0 trick_sims/{ => Ball}/SIM_ball_L3/Modified_data/realtime.py | 0 trick_sims/{ => Ball}/SIM_ball_L3/RUN_control/Title | 0 trick_sims/{ => Ball}/SIM_ball_L3/RUN_control/input.py | 0 trick_sims/{ => Ball}/SIM_ball_L3/RUN_realtime/Title | 0 trick_sims/{ => Ball}/SIM_ball_L3/RUN_realtime/input.py | 0 trick_sims/{ => Ball}/SIM_ball_L3/RUN_test/Title | 0 trick_sims/{ => Ball}/SIM_ball_L3/RUN_test/input.py | 0 trick_sims/{ => Ball}/SIM_ball_L3/RUN_test/unit_test.py | 0 trick_sims/{ => Ball}/SIM_ball_L3/S_define | 0 trick_sims/Ball/SIM_ball_L3/S_overrides.mk | 4 ++++ trick_sims/{ => Ball}/SIM_ball_L3/Title | 0 .../Ball/models}/ball/L1/include/ball_force.h | 0 .../Ball/models}/ball/L1/include/ball_proto.h | 0 .../Ball/models}/ball/L1/include/ball_state.h | 0 .../Ball/models}/ball/L1/src/ball_force_default_data.c | 0 .../Ball/models}/ball/L1/src/ball_force_field.c | 0 .../Ball/models}/ball/L1/src/ball_malf.c | 0 .../Ball/models}/ball/L1/src/ball_malf_trigger.c | 0 .../Ball/models}/ball/L1/src/ball_print.c | 0 .../Ball/models}/ball/L1/src/ball_state_alt_integ.c | 0 .../Ball/models}/ball/L1/src/ball_state_default_data.c | 0 .../Ball/models}/ball/L1/src/ball_state_deriv.c | 0 .../Ball/models}/ball/L1/src/ball_state_init.c | 0 .../Ball/models}/ball/L1/src/ball_state_integ.c | 0 .../Ball/models}/ball/L2/include/ball_altimeter.h | 0 .../Ball/models}/ball/L2/include/ball_control.h | 0 .../Ball/models}/ball/L2/include/ball_jet.h | 0 .../Ball/models}/ball/L2/include/ball_state.h | 0 .../Ball/models}/ball/L2/src/ball_altimeter.c | 0 .../Ball/models}/ball/L2/src/ball_altimeter_default_data.c | 0 .../Ball/models}/ball/L2/src/ball_ceiling.c | 0 .../Ball/models}/ball/L2/src/ball_control.c | 0 .../Ball/models}/ball/L2/src/ball_control_default_data.c | 0 .../Ball/models}/ball/L2/src/ball_floor.c | 0 .../Ball/models}/ball/L2/src/ball_force_default_data.c | 0 .../Ball/models}/ball/L2/src/ball_jet.c | 0 .../Ball/models}/ball/L2/src/ball_jet_default_data.c | 0 .../Ball/models}/ball/L2/src/ball_left_wall.c | 0 .../Ball/models}/ball/L2/src/ball_right_wall.c | 0 .../Ball/models}/ball/L2/src/ball_state_default_data.c | 0 .../Ball/models}/ball/L2/src/ball_state_deriv.c | 0 .../Ball/models}/ball/L2/src/ball_state_init.c | 0 .../Ball/models}/ball/L2/src/ball_state_integ.c | 0 trick_sims/SIM_ball_L1/S_overrides.mk | 4 ---- trick_sims/SIM_ball_L2/S_overrides.mk | 4 ---- trick_sims/SIM_ball_L3/S_overrides.mk | 4 ---- 76 files changed, 12 insertions(+), 12 deletions(-) rename trick_sims/{ => Ball}/SIM_ball_L1/DP_Product/DP_ball_force.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/DP_Product/DP_ball_state_cmp.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/DP_Product/DP_ball_states.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/Modified_data/auto_test.dr (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/Modified_data/data_record.dr (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/RUN_test/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/RUN_test/input.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/RUN_test/unit_test.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L1/S_define (100%) create mode 100644 trick_sims/Ball/SIM_ball_L1/S_overrides.mk rename trick_sims/{ => Ball}/SIM_ball_L1/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/DP_Product/DP_ball_force.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/DP_Product/DP_ball_states.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/DP_Product/DP_x_position.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/Modified_data/data_record.dr (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/Modified_data/realtime.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/RUN_control/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/RUN_control/input.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/RUN_realtime/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/RUN_realtime/input.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/RUN_test/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/RUN_test/input.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/RUN_test/unit_test.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L2/S_define (100%) create mode 100644 trick_sims/Ball/SIM_ball_L2/S_overrides.mk rename trick_sims/{ => Ball}/SIM_ball_L2/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/DP_Product/DP_ball_force.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/DP_Product/DP_ball_states.xml (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/Modified_data/auto_test.dr (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/Modified_data/data_record.dr (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/Modified_data/realtime.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/RUN_control/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/RUN_control/input.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/RUN_realtime/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/RUN_realtime/input.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/RUN_test/Title (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/RUN_test/input.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/RUN_test/unit_test.py (100%) rename trick_sims/{ => Ball}/SIM_ball_L3/S_define (100%) create mode 100644 trick_sims/Ball/SIM_ball_L3/S_overrides.mk rename trick_sims/{ => Ball}/SIM_ball_L3/Title (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/include/ball_force.h (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/include/ball_proto.h (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/include/ball_state.h (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_force_default_data.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_force_field.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_malf.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_malf_trigger.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_print.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_state_alt_integ.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_state_default_data.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_state_deriv.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_state_init.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L1/src/ball_state_integ.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/include/ball_altimeter.h (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/include/ball_control.h (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/include/ball_jet.h (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/include/ball_state.h (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_altimeter.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_altimeter_default_data.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_ceiling.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_control.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_control_default_data.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_floor.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_force_default_data.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_jet.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_jet_default_data.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_left_wall.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_right_wall.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_state_default_data.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_state_deriv.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_state_init.c (100%) rename {trick_models => trick_sims/Ball/models}/ball/L2/src/ball_state_integ.c (100%) delete mode 100644 trick_sims/SIM_ball_L1/S_overrides.mk delete mode 100644 trick_sims/SIM_ball_L2/S_overrides.mk delete mode 100644 trick_sims/SIM_ball_L3/S_overrides.mk diff --git a/trick_sims/SIM_ball_L1/DP_Product/DP_ball_force.xml b/trick_sims/Ball/SIM_ball_L1/DP_Product/DP_ball_force.xml similarity index 100% rename from trick_sims/SIM_ball_L1/DP_Product/DP_ball_force.xml rename to trick_sims/Ball/SIM_ball_L1/DP_Product/DP_ball_force.xml diff --git a/trick_sims/SIM_ball_L1/DP_Product/DP_ball_state_cmp.xml b/trick_sims/Ball/SIM_ball_L1/DP_Product/DP_ball_state_cmp.xml similarity index 100% rename from trick_sims/SIM_ball_L1/DP_Product/DP_ball_state_cmp.xml rename to trick_sims/Ball/SIM_ball_L1/DP_Product/DP_ball_state_cmp.xml diff --git a/trick_sims/SIM_ball_L1/DP_Product/DP_ball_states.xml b/trick_sims/Ball/SIM_ball_L1/DP_Product/DP_ball_states.xml similarity index 100% rename from trick_sims/SIM_ball_L1/DP_Product/DP_ball_states.xml rename to trick_sims/Ball/SIM_ball_L1/DP_Product/DP_ball_states.xml diff --git a/trick_sims/SIM_ball_L1/Modified_data/auto_test.dr b/trick_sims/Ball/SIM_ball_L1/Modified_data/auto_test.dr similarity index 100% rename from trick_sims/SIM_ball_L1/Modified_data/auto_test.dr rename to trick_sims/Ball/SIM_ball_L1/Modified_data/auto_test.dr diff --git a/trick_sims/SIM_ball_L1/Modified_data/data_record.dr b/trick_sims/Ball/SIM_ball_L1/Modified_data/data_record.dr similarity index 100% rename from trick_sims/SIM_ball_L1/Modified_data/data_record.dr rename to trick_sims/Ball/SIM_ball_L1/Modified_data/data_record.dr diff --git a/trick_sims/SIM_ball_L1/RUN_test/Title b/trick_sims/Ball/SIM_ball_L1/RUN_test/Title similarity index 100% rename from trick_sims/SIM_ball_L1/RUN_test/Title rename to trick_sims/Ball/SIM_ball_L1/RUN_test/Title diff --git a/trick_sims/SIM_ball_L1/RUN_test/input.py b/trick_sims/Ball/SIM_ball_L1/RUN_test/input.py similarity index 100% rename from trick_sims/SIM_ball_L1/RUN_test/input.py rename to trick_sims/Ball/SIM_ball_L1/RUN_test/input.py diff --git a/trick_sims/SIM_ball_L1/RUN_test/unit_test.py b/trick_sims/Ball/SIM_ball_L1/RUN_test/unit_test.py similarity index 100% rename from trick_sims/SIM_ball_L1/RUN_test/unit_test.py rename to trick_sims/Ball/SIM_ball_L1/RUN_test/unit_test.py diff --git a/trick_sims/SIM_ball_L1/S_define b/trick_sims/Ball/SIM_ball_L1/S_define similarity index 100% rename from trick_sims/SIM_ball_L1/S_define rename to trick_sims/Ball/SIM_ball_L1/S_define diff --git a/trick_sims/Ball/SIM_ball_L1/S_overrides.mk b/trick_sims/Ball/SIM_ball_L1/S_overrides.mk new file mode 100644 index 00000000..a2eff6d4 --- /dev/null +++ b/trick_sims/Ball/SIM_ball_L1/S_overrides.mk @@ -0,0 +1,4 @@ + +TRICK_CFLAGS += -I../models +TRICK_CXXFLAGS += -I../models + diff --git a/trick_sims/SIM_ball_L1/Title b/trick_sims/Ball/SIM_ball_L1/Title similarity index 100% rename from trick_sims/SIM_ball_L1/Title rename to trick_sims/Ball/SIM_ball_L1/Title diff --git a/trick_sims/SIM_ball_L2/DP_Product/DP_ball_force.xml b/trick_sims/Ball/SIM_ball_L2/DP_Product/DP_ball_force.xml similarity index 100% rename from trick_sims/SIM_ball_L2/DP_Product/DP_ball_force.xml rename to trick_sims/Ball/SIM_ball_L2/DP_Product/DP_ball_force.xml diff --git a/trick_sims/SIM_ball_L2/DP_Product/DP_ball_states.xml b/trick_sims/Ball/SIM_ball_L2/DP_Product/DP_ball_states.xml similarity index 100% rename from trick_sims/SIM_ball_L2/DP_Product/DP_ball_states.xml rename to trick_sims/Ball/SIM_ball_L2/DP_Product/DP_ball_states.xml diff --git a/trick_sims/SIM_ball_L2/DP_Product/DP_x_position.xml b/trick_sims/Ball/SIM_ball_L2/DP_Product/DP_x_position.xml similarity index 100% rename from trick_sims/SIM_ball_L2/DP_Product/DP_x_position.xml rename to trick_sims/Ball/SIM_ball_L2/DP_Product/DP_x_position.xml diff --git a/trick_sims/SIM_ball_L2/Modified_data/data_record.dr b/trick_sims/Ball/SIM_ball_L2/Modified_data/data_record.dr similarity index 100% rename from trick_sims/SIM_ball_L2/Modified_data/data_record.dr rename to trick_sims/Ball/SIM_ball_L2/Modified_data/data_record.dr diff --git a/trick_sims/SIM_ball_L2/Modified_data/realtime.py b/trick_sims/Ball/SIM_ball_L2/Modified_data/realtime.py similarity index 100% rename from trick_sims/SIM_ball_L2/Modified_data/realtime.py rename to trick_sims/Ball/SIM_ball_L2/Modified_data/realtime.py diff --git a/trick_sims/SIM_ball_L2/RUN_control/Title b/trick_sims/Ball/SIM_ball_L2/RUN_control/Title similarity index 100% rename from trick_sims/SIM_ball_L2/RUN_control/Title rename to trick_sims/Ball/SIM_ball_L2/RUN_control/Title diff --git a/trick_sims/SIM_ball_L2/RUN_control/input.py b/trick_sims/Ball/SIM_ball_L2/RUN_control/input.py similarity index 100% rename from trick_sims/SIM_ball_L2/RUN_control/input.py rename to trick_sims/Ball/SIM_ball_L2/RUN_control/input.py diff --git a/trick_sims/SIM_ball_L2/RUN_realtime/Title b/trick_sims/Ball/SIM_ball_L2/RUN_realtime/Title similarity index 100% rename from trick_sims/SIM_ball_L2/RUN_realtime/Title rename to trick_sims/Ball/SIM_ball_L2/RUN_realtime/Title diff --git a/trick_sims/SIM_ball_L2/RUN_realtime/input.py b/trick_sims/Ball/SIM_ball_L2/RUN_realtime/input.py similarity index 100% rename from trick_sims/SIM_ball_L2/RUN_realtime/input.py rename to trick_sims/Ball/SIM_ball_L2/RUN_realtime/input.py diff --git a/trick_sims/SIM_ball_L2/RUN_test/Title b/trick_sims/Ball/SIM_ball_L2/RUN_test/Title similarity index 100% rename from trick_sims/SIM_ball_L2/RUN_test/Title rename to trick_sims/Ball/SIM_ball_L2/RUN_test/Title diff --git a/trick_sims/SIM_ball_L2/RUN_test/input.py b/trick_sims/Ball/SIM_ball_L2/RUN_test/input.py similarity index 100% rename from trick_sims/SIM_ball_L2/RUN_test/input.py rename to trick_sims/Ball/SIM_ball_L2/RUN_test/input.py diff --git a/trick_sims/SIM_ball_L2/RUN_test/unit_test.py b/trick_sims/Ball/SIM_ball_L2/RUN_test/unit_test.py similarity index 100% rename from trick_sims/SIM_ball_L2/RUN_test/unit_test.py rename to trick_sims/Ball/SIM_ball_L2/RUN_test/unit_test.py diff --git a/trick_sims/SIM_ball_L2/S_define b/trick_sims/Ball/SIM_ball_L2/S_define similarity index 100% rename from trick_sims/SIM_ball_L2/S_define rename to trick_sims/Ball/SIM_ball_L2/S_define diff --git a/trick_sims/Ball/SIM_ball_L2/S_overrides.mk b/trick_sims/Ball/SIM_ball_L2/S_overrides.mk new file mode 100644 index 00000000..a2eff6d4 --- /dev/null +++ b/trick_sims/Ball/SIM_ball_L2/S_overrides.mk @@ -0,0 +1,4 @@ + +TRICK_CFLAGS += -I../models +TRICK_CXXFLAGS += -I../models + diff --git a/trick_sims/SIM_ball_L2/Title b/trick_sims/Ball/SIM_ball_L2/Title similarity index 100% rename from trick_sims/SIM_ball_L2/Title rename to trick_sims/Ball/SIM_ball_L2/Title diff --git a/trick_sims/SIM_ball_L3/DP_Product/DP_ball_force.xml b/trick_sims/Ball/SIM_ball_L3/DP_Product/DP_ball_force.xml similarity index 100% rename from trick_sims/SIM_ball_L3/DP_Product/DP_ball_force.xml rename to trick_sims/Ball/SIM_ball_L3/DP_Product/DP_ball_force.xml diff --git a/trick_sims/SIM_ball_L3/DP_Product/DP_ball_states.xml b/trick_sims/Ball/SIM_ball_L3/DP_Product/DP_ball_states.xml similarity index 100% rename from trick_sims/SIM_ball_L3/DP_Product/DP_ball_states.xml rename to trick_sims/Ball/SIM_ball_L3/DP_Product/DP_ball_states.xml diff --git a/trick_sims/SIM_ball_L3/Modified_data/auto_test.dr b/trick_sims/Ball/SIM_ball_L3/Modified_data/auto_test.dr similarity index 100% rename from trick_sims/SIM_ball_L3/Modified_data/auto_test.dr rename to trick_sims/Ball/SIM_ball_L3/Modified_data/auto_test.dr diff --git a/trick_sims/SIM_ball_L3/Modified_data/data_record.dr b/trick_sims/Ball/SIM_ball_L3/Modified_data/data_record.dr similarity index 100% rename from trick_sims/SIM_ball_L3/Modified_data/data_record.dr rename to trick_sims/Ball/SIM_ball_L3/Modified_data/data_record.dr diff --git a/trick_sims/SIM_ball_L3/Modified_data/realtime.py b/trick_sims/Ball/SIM_ball_L3/Modified_data/realtime.py similarity index 100% rename from trick_sims/SIM_ball_L3/Modified_data/realtime.py rename to trick_sims/Ball/SIM_ball_L3/Modified_data/realtime.py diff --git a/trick_sims/SIM_ball_L3/RUN_control/Title b/trick_sims/Ball/SIM_ball_L3/RUN_control/Title similarity index 100% rename from trick_sims/SIM_ball_L3/RUN_control/Title rename to trick_sims/Ball/SIM_ball_L3/RUN_control/Title diff --git a/trick_sims/SIM_ball_L3/RUN_control/input.py b/trick_sims/Ball/SIM_ball_L3/RUN_control/input.py similarity index 100% rename from trick_sims/SIM_ball_L3/RUN_control/input.py rename to trick_sims/Ball/SIM_ball_L3/RUN_control/input.py diff --git a/trick_sims/SIM_ball_L3/RUN_realtime/Title b/trick_sims/Ball/SIM_ball_L3/RUN_realtime/Title similarity index 100% rename from trick_sims/SIM_ball_L3/RUN_realtime/Title rename to trick_sims/Ball/SIM_ball_L3/RUN_realtime/Title diff --git a/trick_sims/SIM_ball_L3/RUN_realtime/input.py b/trick_sims/Ball/SIM_ball_L3/RUN_realtime/input.py similarity index 100% rename from trick_sims/SIM_ball_L3/RUN_realtime/input.py rename to trick_sims/Ball/SIM_ball_L3/RUN_realtime/input.py diff --git a/trick_sims/SIM_ball_L3/RUN_test/Title b/trick_sims/Ball/SIM_ball_L3/RUN_test/Title similarity index 100% rename from trick_sims/SIM_ball_L3/RUN_test/Title rename to trick_sims/Ball/SIM_ball_L3/RUN_test/Title diff --git a/trick_sims/SIM_ball_L3/RUN_test/input.py b/trick_sims/Ball/SIM_ball_L3/RUN_test/input.py similarity index 100% rename from trick_sims/SIM_ball_L3/RUN_test/input.py rename to trick_sims/Ball/SIM_ball_L3/RUN_test/input.py diff --git a/trick_sims/SIM_ball_L3/RUN_test/unit_test.py b/trick_sims/Ball/SIM_ball_L3/RUN_test/unit_test.py similarity index 100% rename from trick_sims/SIM_ball_L3/RUN_test/unit_test.py rename to trick_sims/Ball/SIM_ball_L3/RUN_test/unit_test.py diff --git a/trick_sims/SIM_ball_L3/S_define b/trick_sims/Ball/SIM_ball_L3/S_define similarity index 100% rename from trick_sims/SIM_ball_L3/S_define rename to trick_sims/Ball/SIM_ball_L3/S_define diff --git a/trick_sims/Ball/SIM_ball_L3/S_overrides.mk b/trick_sims/Ball/SIM_ball_L3/S_overrides.mk new file mode 100644 index 00000000..a2eff6d4 --- /dev/null +++ b/trick_sims/Ball/SIM_ball_L3/S_overrides.mk @@ -0,0 +1,4 @@ + +TRICK_CFLAGS += -I../models +TRICK_CXXFLAGS += -I../models + diff --git a/trick_sims/SIM_ball_L3/Title b/trick_sims/Ball/SIM_ball_L3/Title similarity index 100% rename from trick_sims/SIM_ball_L3/Title rename to trick_sims/Ball/SIM_ball_L3/Title diff --git a/trick_models/ball/L1/include/ball_force.h b/trick_sims/Ball/models/ball/L1/include/ball_force.h similarity index 100% rename from trick_models/ball/L1/include/ball_force.h rename to trick_sims/Ball/models/ball/L1/include/ball_force.h diff --git a/trick_models/ball/L1/include/ball_proto.h b/trick_sims/Ball/models/ball/L1/include/ball_proto.h similarity index 100% rename from trick_models/ball/L1/include/ball_proto.h rename to trick_sims/Ball/models/ball/L1/include/ball_proto.h diff --git a/trick_models/ball/L1/include/ball_state.h b/trick_sims/Ball/models/ball/L1/include/ball_state.h similarity index 100% rename from trick_models/ball/L1/include/ball_state.h rename to trick_sims/Ball/models/ball/L1/include/ball_state.h diff --git a/trick_models/ball/L1/src/ball_force_default_data.c b/trick_sims/Ball/models/ball/L1/src/ball_force_default_data.c similarity index 100% rename from trick_models/ball/L1/src/ball_force_default_data.c rename to trick_sims/Ball/models/ball/L1/src/ball_force_default_data.c diff --git a/trick_models/ball/L1/src/ball_force_field.c b/trick_sims/Ball/models/ball/L1/src/ball_force_field.c similarity index 100% rename from trick_models/ball/L1/src/ball_force_field.c rename to trick_sims/Ball/models/ball/L1/src/ball_force_field.c diff --git a/trick_models/ball/L1/src/ball_malf.c b/trick_sims/Ball/models/ball/L1/src/ball_malf.c similarity index 100% rename from trick_models/ball/L1/src/ball_malf.c rename to trick_sims/Ball/models/ball/L1/src/ball_malf.c diff --git a/trick_models/ball/L1/src/ball_malf_trigger.c b/trick_sims/Ball/models/ball/L1/src/ball_malf_trigger.c similarity index 100% rename from trick_models/ball/L1/src/ball_malf_trigger.c rename to trick_sims/Ball/models/ball/L1/src/ball_malf_trigger.c diff --git a/trick_models/ball/L1/src/ball_print.c b/trick_sims/Ball/models/ball/L1/src/ball_print.c similarity index 100% rename from trick_models/ball/L1/src/ball_print.c rename to trick_sims/Ball/models/ball/L1/src/ball_print.c diff --git a/trick_models/ball/L1/src/ball_state_alt_integ.c b/trick_sims/Ball/models/ball/L1/src/ball_state_alt_integ.c similarity index 100% rename from trick_models/ball/L1/src/ball_state_alt_integ.c rename to trick_sims/Ball/models/ball/L1/src/ball_state_alt_integ.c diff --git a/trick_models/ball/L1/src/ball_state_default_data.c b/trick_sims/Ball/models/ball/L1/src/ball_state_default_data.c similarity index 100% rename from trick_models/ball/L1/src/ball_state_default_data.c rename to trick_sims/Ball/models/ball/L1/src/ball_state_default_data.c diff --git a/trick_models/ball/L1/src/ball_state_deriv.c b/trick_sims/Ball/models/ball/L1/src/ball_state_deriv.c similarity index 100% rename from trick_models/ball/L1/src/ball_state_deriv.c rename to trick_sims/Ball/models/ball/L1/src/ball_state_deriv.c diff --git a/trick_models/ball/L1/src/ball_state_init.c b/trick_sims/Ball/models/ball/L1/src/ball_state_init.c similarity index 100% rename from trick_models/ball/L1/src/ball_state_init.c rename to trick_sims/Ball/models/ball/L1/src/ball_state_init.c diff --git a/trick_models/ball/L1/src/ball_state_integ.c b/trick_sims/Ball/models/ball/L1/src/ball_state_integ.c similarity index 100% rename from trick_models/ball/L1/src/ball_state_integ.c rename to trick_sims/Ball/models/ball/L1/src/ball_state_integ.c diff --git a/trick_models/ball/L2/include/ball_altimeter.h b/trick_sims/Ball/models/ball/L2/include/ball_altimeter.h similarity index 100% rename from trick_models/ball/L2/include/ball_altimeter.h rename to trick_sims/Ball/models/ball/L2/include/ball_altimeter.h diff --git a/trick_models/ball/L2/include/ball_control.h b/trick_sims/Ball/models/ball/L2/include/ball_control.h similarity index 100% rename from trick_models/ball/L2/include/ball_control.h rename to trick_sims/Ball/models/ball/L2/include/ball_control.h diff --git a/trick_models/ball/L2/include/ball_jet.h b/trick_sims/Ball/models/ball/L2/include/ball_jet.h similarity index 100% rename from trick_models/ball/L2/include/ball_jet.h rename to trick_sims/Ball/models/ball/L2/include/ball_jet.h diff --git a/trick_models/ball/L2/include/ball_state.h b/trick_sims/Ball/models/ball/L2/include/ball_state.h similarity index 100% rename from trick_models/ball/L2/include/ball_state.h rename to trick_sims/Ball/models/ball/L2/include/ball_state.h diff --git a/trick_models/ball/L2/src/ball_altimeter.c b/trick_sims/Ball/models/ball/L2/src/ball_altimeter.c similarity index 100% rename from trick_models/ball/L2/src/ball_altimeter.c rename to trick_sims/Ball/models/ball/L2/src/ball_altimeter.c diff --git a/trick_models/ball/L2/src/ball_altimeter_default_data.c b/trick_sims/Ball/models/ball/L2/src/ball_altimeter_default_data.c similarity index 100% rename from trick_models/ball/L2/src/ball_altimeter_default_data.c rename to trick_sims/Ball/models/ball/L2/src/ball_altimeter_default_data.c diff --git a/trick_models/ball/L2/src/ball_ceiling.c b/trick_sims/Ball/models/ball/L2/src/ball_ceiling.c similarity index 100% rename from trick_models/ball/L2/src/ball_ceiling.c rename to trick_sims/Ball/models/ball/L2/src/ball_ceiling.c diff --git a/trick_models/ball/L2/src/ball_control.c b/trick_sims/Ball/models/ball/L2/src/ball_control.c similarity index 100% rename from trick_models/ball/L2/src/ball_control.c rename to trick_sims/Ball/models/ball/L2/src/ball_control.c diff --git a/trick_models/ball/L2/src/ball_control_default_data.c b/trick_sims/Ball/models/ball/L2/src/ball_control_default_data.c similarity index 100% rename from trick_models/ball/L2/src/ball_control_default_data.c rename to trick_sims/Ball/models/ball/L2/src/ball_control_default_data.c diff --git a/trick_models/ball/L2/src/ball_floor.c b/trick_sims/Ball/models/ball/L2/src/ball_floor.c similarity index 100% rename from trick_models/ball/L2/src/ball_floor.c rename to trick_sims/Ball/models/ball/L2/src/ball_floor.c diff --git a/trick_models/ball/L2/src/ball_force_default_data.c b/trick_sims/Ball/models/ball/L2/src/ball_force_default_data.c similarity index 100% rename from trick_models/ball/L2/src/ball_force_default_data.c rename to trick_sims/Ball/models/ball/L2/src/ball_force_default_data.c diff --git a/trick_models/ball/L2/src/ball_jet.c b/trick_sims/Ball/models/ball/L2/src/ball_jet.c similarity index 100% rename from trick_models/ball/L2/src/ball_jet.c rename to trick_sims/Ball/models/ball/L2/src/ball_jet.c diff --git a/trick_models/ball/L2/src/ball_jet_default_data.c b/trick_sims/Ball/models/ball/L2/src/ball_jet_default_data.c similarity index 100% rename from trick_models/ball/L2/src/ball_jet_default_data.c rename to trick_sims/Ball/models/ball/L2/src/ball_jet_default_data.c diff --git a/trick_models/ball/L2/src/ball_left_wall.c b/trick_sims/Ball/models/ball/L2/src/ball_left_wall.c similarity index 100% rename from trick_models/ball/L2/src/ball_left_wall.c rename to trick_sims/Ball/models/ball/L2/src/ball_left_wall.c diff --git a/trick_models/ball/L2/src/ball_right_wall.c b/trick_sims/Ball/models/ball/L2/src/ball_right_wall.c similarity index 100% rename from trick_models/ball/L2/src/ball_right_wall.c rename to trick_sims/Ball/models/ball/L2/src/ball_right_wall.c diff --git a/trick_models/ball/L2/src/ball_state_default_data.c b/trick_sims/Ball/models/ball/L2/src/ball_state_default_data.c similarity index 100% rename from trick_models/ball/L2/src/ball_state_default_data.c rename to trick_sims/Ball/models/ball/L2/src/ball_state_default_data.c diff --git a/trick_models/ball/L2/src/ball_state_deriv.c b/trick_sims/Ball/models/ball/L2/src/ball_state_deriv.c similarity index 100% rename from trick_models/ball/L2/src/ball_state_deriv.c rename to trick_sims/Ball/models/ball/L2/src/ball_state_deriv.c diff --git a/trick_models/ball/L2/src/ball_state_init.c b/trick_sims/Ball/models/ball/L2/src/ball_state_init.c similarity index 100% rename from trick_models/ball/L2/src/ball_state_init.c rename to trick_sims/Ball/models/ball/L2/src/ball_state_init.c diff --git a/trick_models/ball/L2/src/ball_state_integ.c b/trick_sims/Ball/models/ball/L2/src/ball_state_integ.c similarity index 100% rename from trick_models/ball/L2/src/ball_state_integ.c rename to trick_sims/Ball/models/ball/L2/src/ball_state_integ.c diff --git a/trick_sims/SIM_ball_L1/S_overrides.mk b/trick_sims/SIM_ball_L1/S_overrides.mk deleted file mode 100644 index 8fa02be5..00000000 --- a/trick_sims/SIM_ball_L1/S_overrides.mk +++ /dev/null @@ -1,4 +0,0 @@ - -TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models - diff --git a/trick_sims/SIM_ball_L2/S_overrides.mk b/trick_sims/SIM_ball_L2/S_overrides.mk deleted file mode 100644 index 8fa02be5..00000000 --- a/trick_sims/SIM_ball_L2/S_overrides.mk +++ /dev/null @@ -1,4 +0,0 @@ - -TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models - diff --git a/trick_sims/SIM_ball_L3/S_overrides.mk b/trick_sims/SIM_ball_L3/S_overrides.mk deleted file mode 100644 index 8fa02be5..00000000 --- a/trick_sims/SIM_ball_L3/S_overrides.mk +++ /dev/null @@ -1,4 +0,0 @@ - -TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models -