commit a062edb89092f509ccc45d8dc77da123daf960d0
author Austin Schuh <austin.linux@gmail.com> Thu Jan 03 13:17:13 2019 -0800
committer Austin Schuh <austin.linux@gmail.com> Fri Jan 04 16:24:58 2019 -0800
tree fae3ec15d6f089dd7f67d73d4acd461d65c521f7
parent bb735b71c8a83e6072f0eaf0ccaaf213eb236cdc

Added make_hybrid_drivetrain_velocity_loop to drivetrain_config

Change-Id: I66dde6ddf0fc63c794d6b11ff2a2131005902953

y2017/control_loops/drivetrain/drivetrain_base.cc

diff --git a/y2017/control_loops/drivetrain/drivetrain_base.cc b/y2017/control_loops/drivetrain/drivetrain_base.cc
index ecea96c..6cc7822 100644
--- a/y2017/control_loops/drivetrain/drivetrain_base.cc
+++ b/y2017/control_loops/drivetrain/drivetrain_base.cc
@@ -6,6 +6,7 @@
 #include "frc971/control_loops/state_feedback_loop.h"
 #include "y2017/constants.h"
 #include "y2017/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
+#include "y2017/control_loops/drivetrain/hybrid_velocity_drivetrain.h"
 #include "y2017/control_loops/drivetrain/kalman_drivetrain_motor_plant.h"
 #include "y2017/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
 
@@ -28,9 +29,10 @@
       ::frc971::control_loops::drivetrain::GyroType::IMU_Z_GYRO,
       ::frc971::control_loops::drivetrain::IMUType::IMU_X,
 
-      ::y2017::control_loops::drivetrain::MakeDrivetrainLoop,
-      ::y2017::control_loops::drivetrain::MakeVelocityDrivetrainLoop,
-      ::y2017::control_loops::drivetrain::MakeKFDrivetrainLoop,
+      drivetrain::MakeDrivetrainLoop,
+      drivetrain::MakeVelocityDrivetrainLoop,
+      drivetrain::MakeKFDrivetrainLoop,
+      drivetrain::MakeHybridVelocityDrivetrainLoop,
 
       chrono::duration_cast<chrono::nanoseconds>(
           chrono::duration<double>(drivetrain::kDt)),