moved targets to the right .gyp file
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 702a21f..132c61f 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -155,47 +155,6 @@
],
},
{
- 'target_name': 'control_loop_queues',
- 'type': 'static_library',
- 'sources': [ '<(AOS)/common/controls/control_loops.q' ],
- 'variables': {
- 'header_path': 'aos/common/controls',
- },
- 'dependencies': [
- '<(AOS)/common/common.gyp:queues',
- ],
- 'includes': ['../build/queues.gypi'],
- },
- {
- 'target_name': 'controls',
- 'type': 'static_library',
- 'sources': [
- 'controls/control_loop.cc',
- ],
- 'dependencies': [
- '<(AOS)/common/messages/messages.gyp:robot_state',
- '<(AOS)/build/aos.gyp:logging',
- '<(AOS)/common/util/util.gyp:phased_loop',
- 'time',
- 'control_loop_queues',
- '<(AOS)/common/logging/logging.gyp:queue_logging',
- '<(AOS)/common/util/util.gyp:log_interval',
- '<(AOS)/common/controls/controls.gyp:sensor_generation',
- '<(AOS)/common/controls/controls.gyp:output_check',
- ],
- 'export_dependent_settings': [
- '<(AOS)/common/messages/messages.gyp:robot_state',
- '<(AOS)/build/aos.gyp:logging',
- '<(AOS)/common/util/util.gyp:phased_loop',
- 'time',
- 'control_loop_queues',
- '<(AOS)/common/logging/logging.gyp:queue_logging',
- '<(AOS)/common/util/util.gyp:log_interval',
- '<(AOS)/common/controls/controls.gyp:sensor_generation',
- '<(AOS)/common/controls/controls.gyp:output_check',
- ],
- },
- {
'target_name': 'queue_test',
'type': 'executable',
'sources': [
diff --git a/aos/common/controls/controls.gyp b/aos/common/controls/controls.gyp
index 1f5e76f..36daf56 100644
--- a/aos/common/controls/controls.gyp
+++ b/aos/common/controls/controls.gyp
@@ -37,5 +37,46 @@
},
'includes': ['../../../aos/build/queues.gypi'],
},
+ {
+ 'target_name': 'control_loop_queues',
+ 'type': 'static_library',
+ 'sources': [ '<(AOS)/common/controls/control_loops.q' ],
+ 'variables': {
+ 'header_path': 'aos/common/controls',
+ },
+ 'dependencies': [
+ '<(AOS)/common/common.gyp:queues',
+ ],
+ 'includes': ['../../../aos/build/queues.gypi'],
+ },
+ {
+ 'target_name': 'control_loop',
+ 'type': 'static_library',
+ 'sources': [
+ 'control_loop.cc',
+ ],
+ 'dependencies': [
+ '<(AOS)/common/messages/messages.gyp:robot_state',
+ '<(AOS)/build/aos.gyp:logging',
+ '<(AOS)/common/util/util.gyp:phased_loop',
+ '<(AOS)/common/common.gyp:time',
+ 'control_loop_queues',
+ '<(AOS)/common/logging/logging.gyp:queue_logging',
+ '<(AOS)/common/util/util.gyp:log_interval',
+ 'sensor_generation',
+ 'output_check',
+ ],
+ 'export_dependent_settings': [
+ '<(AOS)/common/messages/messages.gyp:robot_state',
+ '<(AOS)/build/aos.gyp:logging',
+ '<(AOS)/common/util/util.gyp:phased_loop',
+ '<(AOS)/common/common.gyp:time',
+ 'control_loop_queues',
+ '<(AOS)/common/logging/logging.gyp:queue_logging',
+ '<(AOS)/common/util/util.gyp:log_interval',
+ 'sensor_generation',
+ 'output_check',
+ ],
+ },
],
}
diff --git a/frc971/autonomous/autonomous.gyp b/frc971/autonomous/autonomous.gyp
index 0d11f89..c2e9d96 100644
--- a/frc971/autonomous/autonomous.gyp
+++ b/frc971/autonomous/autonomous.gyp
@@ -23,7 +23,7 @@
],
'dependencies': [
'auto_queue',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
'<(DEPTH)/frc971/control_loops/shooter/shooter.gyp:shooter_loop',
'<(DEPTH)/frc971/control_loops/claw/claw.gyp:claw_loop',
@@ -37,7 +37,7 @@
'<(DEPTH)/frc971/actions/actions.gyp:drivetrain_action_lib',
],
'export_dependent_settings': [
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
],
},
{
diff --git a/frc971/control_loops/claw/claw.gyp b/frc971/control_loops/claw/claw.gyp
index 65472d6..b522a95 100644
--- a/frc971/control_loops/claw/claw.gyp
+++ b/frc971/control_loops/claw/claw.gyp
@@ -8,11 +8,11 @@
'header_path': 'frc971/control_loops/claw',
},
'dependencies': [
- '<(AOS)/common/common.gyp:control_loop_queues',
+ '<(AOS)/common/controls/controls.gyp:control_loop_queues',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
],
'export_dependent_settings': [
- '<(AOS)/common/common.gyp:control_loop_queues',
+ '<(AOS)/common/controls/controls.gyp:control_loop_queues',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
],
'includes': ['../../../aos/build/queues.gypi'],
@@ -26,7 +26,7 @@
],
'dependencies': [
'claw_loop',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/frc971.gyp:constants',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
'<(AOS)/common/controls/controls.gyp:polytope',
@@ -36,7 +36,7 @@
],
'export_dependent_settings': [
'claw_loop',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
'<(AOS)/common/controls/controls.gyp:polytope',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
@@ -65,7 +65,7 @@
'dependencies': [
'<(AOS)/linux_code/linux_code.gyp:init',
'claw_loop',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/frc971.gyp:constants',
],
},
diff --git a/frc971/control_loops/drivetrain/drivetrain.gyp b/frc971/control_loops/drivetrain/drivetrain.gyp
index 339e01e..9eb54d2 100644
--- a/frc971/control_loops/drivetrain/drivetrain.gyp
+++ b/frc971/control_loops/drivetrain/drivetrain.gyp
@@ -8,11 +8,11 @@
'header_path': 'frc971/control_loops/drivetrain',
},
'dependencies': [
- '<(AOS)/common/common.gyp:control_loop_queues',
+ '<(AOS)/common/controls/controls.gyp:control_loop_queues',
'<(AOS)/common/common.gyp:queues',
],
'export_dependent_settings': [
- '<(AOS)/common/common.gyp:control_loop_queues',
+ '<(AOS)/common/controls/controls.gyp:control_loop_queues',
'<(AOS)/common/common.gyp:queues',
],
'includes': ['../../../aos/build/queues.gypi'],
@@ -40,7 +40,7 @@
],
'dependencies': [
'drivetrain_loop',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/frc971.gyp:constants',
'<(AOS)/common/controls/controls.gyp:polytope',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
@@ -54,7 +54,7 @@
'<(AOS)/common/controls/controls.gyp:polytope',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'drivetrain_loop',
],
},
diff --git a/frc971/control_loops/shooter/shooter.gyp b/frc971/control_loops/shooter/shooter.gyp
index 10e0f4e..30226fd 100755
--- a/frc971/control_loops/shooter/shooter.gyp
+++ b/frc971/control_loops/shooter/shooter.gyp
@@ -8,11 +8,11 @@
'header_path': 'frc971/control_loops/shooter',
},
'dependencies': [
- '<(AOS)/common/common.gyp:control_loop_queues',
+ '<(AOS)/common/controls/controls.gyp:control_loop_queues',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
],
'export_dependent_settings': [
- '<(AOS)/common/common.gyp:control_loop_queues',
+ '<(AOS)/common/controls/controls.gyp:control_loop_queues',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
],
'includes': ['../../../aos/build/queues.gypi'],
@@ -27,14 +27,14 @@
],
'dependencies': [
'shooter_loop',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/frc971.gyp:constants',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
'<(AOS)/common/logging/logging.gyp:queue_logging',
],
'export_dependent_settings': [
'shooter_loop',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
],
},
diff --git a/frc971/output/output.gyp b/frc971/output/output.gyp
index d94e598..edae002 100644
--- a/frc971/output/output.gyp
+++ b/frc971/output/output.gyp
@@ -46,7 +46,7 @@
'<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/build/aos.gyp:logging',
'<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
- '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/controls/controls.gyp:control_loop',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
'<(AOS)/common/util/util.gyp:log_interval',
'<(AOS)/common/common.gyp:time',