commit 2845c4cab6355808ee71c715debb4bea74ddb1fa
author Brian Silverman <brians> Sat Mar 16 19:54:08 2013 -0700
committer Brian Silverman <brians> Sat Mar 16 19:59:34 2013 -0700
tree 954b2bae8fdb686c32afa682be3e9a8f91b5373a
parent 8f0962f2c3fda774ea1afc514ba0bb336de20588

cleaned some more stuff up

frc971/control_loops/drivetrain/drivetrain.cc

diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index 297b6dd..b9b7908 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -296,12 +296,10 @@
   dt_closedloop.Update(!bad_pos, bad_pos || bad_output);
   dt_openloop.SetGoal(wheel, throttle, quickturn, highgear);
   dt_openloop.Update();
-  if (!bad_output) {
-    if (control_loop_driving) {
-      dt_closedloop.SendMotors(output);
-    } else {
-      dt_openloop.SendMotors(output);
-    }
+  if (control_loop_driving) {
+    dt_closedloop.SendMotors(output);
+  } else {
+    dt_openloop.SendMotors(output);
   }
 }
 

frc971/control_loops/drivetrain/drivetrain.gyp

diff --git a/frc971/control_loops/drivetrain/drivetrain.gyp b/frc971/control_loops/drivetrain/drivetrain.gyp
index e7e4e16..8e98e4b 100644
--- a/frc971/control_loops/drivetrain/drivetrain.gyp
+++ b/frc971/control_loops/drivetrain/drivetrain.gyp
@@ -8,12 +8,10 @@
         'header_path': 'frc971/control_loops/drivetrain',
       },
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
       'export_dependent_settings': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
@@ -27,7 +25,6 @@
         'drivetrain_motor_plant.cc',
       ],
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         'drivetrain_loop',
         '<(AOS)/common/common.gyp:controls',
         '<(DEPTH)/frc971/frc971.gyp:common',