commit e7e40893492c2c360b9ccbb0cf10dd9afb858f74
author Austin Schuh <austin.linux@gmail.com> Mon Feb 15 18:21:04 2016 -0800
committer Austin Schuh <austin.linux@gmail.com> Mon Feb 15 18:25:53 2016 -0800
tree b41df5c62c6dbf4bf6e84ef7d05690759a042c76
parent 33204411b7e786ec172fae49293a690e88e9c237

Added acceleration limit test cases.

Change-Id: Ib21f01f99110a121ed0d1619cd447ccef221cdfe

y2016/control_loops/superstructure/superstructure.cc

diff --git a/y2016/control_loops/superstructure/superstructure.cc b/y2016/control_loops/superstructure/superstructure.cc
index bf4d3b5..c7127cc 100644
--- a/y2016/control_loops/superstructure/superstructure.cc
+++ b/y2016/control_loops/superstructure/superstructure.cc
@@ -327,7 +327,7 @@
                            unsafe_goal->max_angular_acceleration_shoulder,
                            unsafe_goal->max_angular_velocity_wrist,
                            unsafe_goal->max_angular_acceleration_wrist);
-        intake_.AdjustProfile(unsafe_goal->max_angular_velocity_wrist,
+        intake_.AdjustProfile(unsafe_goal->max_angular_velocity_intake,
                               unsafe_goal->max_angular_acceleration_intake);
 
         arm_.set_unprofiled_goal(unsafe_goal->angle_shoulder,