Upgraded //y2012 to use the common drive code.
This is a fixup from changing the call signature of DoCoerceGoal
Change-Id: I6a99f666bebd9a728f42083a9c0280e8f2dab295
diff --git a/y2012/control_loops/drivetrain/BUILD b/y2012/control_loops/drivetrain/BUILD
index d23c06f..e285742 100644
--- a/y2012/control_loops/drivetrain/BUILD
+++ b/y2012/control_loops/drivetrain/BUILD
@@ -2,29 +2,6 @@
load('/aos/build/queues', 'queue_library')
-cc_binary(
- name = 'replay_drivetrain',
- srcs = [
- 'replay_drivetrain.cc',
- ],
- deps = [
- ':drivetrain_queue',
- '//aos/common/controls:replay_control_loop',
- '//aos/linux_code:init',
- '//frc971/queues:gyro',
- ],
-)
-
-queue_library(
- name = 'drivetrain_queue',
- srcs = [
- 'drivetrain.q',
- ],
- deps = [
- '//aos/common/controls:control_loop_queues',
- ],
-)
-
genrule(
name = 'genrule_drivetrain',
visibility = ['//visibility:private'],
@@ -73,67 +50,18 @@
)
cc_library(
- name = 'ssdrivetrain',
+ name = 'drivetrain_base',
srcs = [
- 'ssdrivetrain.cc',
+ 'drivetrain_base.cc',
],
hdrs = [
- 'ssdrivetrain.h',
+ 'drivetrain_base.h',
],
deps = [
':polydrivetrain_plants',
- ':drivetrain_queue',
- '//aos/common/controls:polytope',
- '//aos/common:math',
- '//aos/common/messages:robot_state',
- '//frc971/control_loops:state_feedback_loop',
- '//frc971/control_loops:coerce_goal',
- '//aos/common/util:log_interval',
- '//aos/common/logging:queue_logging',
- '//aos/common/logging:matrix_logging',
- ],
-)
-
-cc_library(
- name = 'polydrivetrain',
- srcs = [
- 'polydrivetrain.cc',
- ],
- hdrs = [
- 'polydrivetrain.h',
- ],
- deps = [
- ':polydrivetrain_plants',
- ':drivetrain_queue',
- '//aos/common/controls:polytope',
- '//aos/common:math',
- '//aos/common/messages:robot_state',
- '//frc971/control_loops:state_feedback_loop',
- '//frc971/control_loops:coerce_goal',
- '//aos/common/util:log_interval',
- '//aos/common/logging:queue_logging',
- '//aos/common/logging:matrix_logging',
- ],
-)
-
-cc_library(
- name = 'drivetrain_lib',
- srcs = [
- 'drivetrain.cc',
- ],
- hdrs = [
- 'drivetrain.h',
- ],
- deps = [
- ':drivetrain_queue',
- ':polydrivetrain',
- ':polydrivetrain_plants',
- ':ssdrivetrain',
- '//aos/common/controls:control_loop',
- '//frc971/queues:gyro',
- '//aos/common/util:log_interval',
- '//aos/common/logging:queue_logging',
- '//aos/common/logging:matrix_logging',
+ '//frc971/control_loops/drivetrain:drivetrain_config',
+ '//frc971:shifter_hall_effect',
+ '//y2016:constants',
],
)
@@ -143,8 +71,8 @@
'drivetrain_main.cc',
],
deps = [
+ ':drivetrain_base',
'//aos/linux_code:init',
- ':drivetrain_lib',
- ':drivetrain_queue',
+ '//frc971/control_loops/drivetrain:drivetrain_lib',
],
)