commit | 71466fee065243bcad915ccc5f7fcb214030fc45 | [log] [tgz] |
---|---|---|
author | Comran Morshed <comranmorsh@gmail.com> | Thu Apr 21 20:21:14 2016 -0700 |
committer | Austin Schuh <austin.linux@gmail.com> | Sun Apr 24 19:15:36 2016 -0700 |
tree | 1d2b1cad0012afcc7354eb54be5234ce0b38224b | |
parent | e8b1dfe5ca043d4367c1d28a6d5bd48d5c98c61b [diff] [blame] |
Add climber framework. Change-Id: I807de18bb204f4da921332b2074e4d343d3fd8dd
diff --git a/y2016/control_loops/superstructure/superstructure.h b/y2016/control_loops/superstructure/superstructure.h index 9cd570c..4e76a2b 100644 --- a/y2016/control_loops/superstructure/superstructure.h +++ b/y2016/control_loops/superstructure/superstructure.h
@@ -232,6 +232,9 @@ float last_wrist_angle_ = 0.0; float last_intake_angle_ = 0.0; + double kill_shoulder_accumulator_ = 0.0; + bool kill_shoulder_ = false; + // Returns true if the profile has finished, and the joint is within the // specified tolerance. bool IsArmNear(double tolerance);