commit 2f8b72afb3282c014774792ee380e048febf24e0
author Brian Silverman <brians> Mon Feb 17 00:55:27 2014 -0800
committer Brian Silverman <brians> Mon Feb 17 00:55:27 2014 -0800
tree 9549a35097866db6d5e756e1fd4528c3424746e4
parent c4a5f2eaa05a1d8faec24e3bf97aec01c36eef14

fixed a stupid mistake in the messy merging

frc971/constants.cc

diff --git a/frc971/constants.cc b/frc971/constants.cc
index 08d0355..7751969 100755
--- a/frc971/constants.cc
+++ b/frc971/constants.cc
@@ -62,7 +62,7 @@
           control_loops::MakeClutchDrivetrainLoop,
           // ShooterLimits
           // TODO(ben): make these real numbers
-          {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}}
+          {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}},
           shooter_voltage,
           // shooter_total_length
           1.0,
@@ -95,7 +95,7 @@
           control_loops::MakeDogDrivetrainLoop,
           // ShooterLimits
           // TODO(ben): make these real numbers
-          {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}}
+          {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}},
           shooter_voltage,
           // shooter_total_length
           1.0,