commit f254c1a8c340b88e2a9af7fc978a259efa168ed8
author James Kuszmaul <jabukuszmaul@gmail.com> Sun Mar 10 16:31:26 2013 -0700
committer Brian Silverman <brians> Sat Mar 16 19:59:31 2013 -0700
tree 5b636d14a9b57f261a980923a699a4b144294b09
parent e503eae94087096cc81c038e709f4c42122af79f

Updated the drivetrain control loop for this year.

Still need a couple unit tests, but the current test passes.

frc971/input/JoystickReader.cc

diff --git a/frc971/input/JoystickReader.cc b/frc971/input/JoystickReader.cc
index e0cfbac..6951760 100644
--- a/frc971/input/JoystickReader.cc
+++ b/frc971/input/JoystickReader.cc
@@ -8,7 +8,7 @@
 #include "aos/atom_code/input/JoystickInput.h"
 
 #include "frc971/input/AutoMode.q.h"
-#include "frc971/control_loops/DriveTrain.q.h"
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "frc971/queues/GyroAngle.q.h"
 #include "frc971/queues/Piston.q.h"
 

frc971/input/SensorReader.cc

diff --git a/frc971/input/SensorReader.cc b/frc971/input/SensorReader.cc
index fd14df4..e66dea0 100644
--- a/frc971/input/SensorReader.cc
+++ b/frc971/input/SensorReader.cc
@@ -6,7 +6,7 @@
 #include "aos/common/inttypes.h"
 #include "aos/common/input/SensorInput.h"
 
-#include "frc971/control_loops/DriveTrain.q.h"
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "frc971/queues/sensor_values.h"
 
 #define M_PI 3.14159265358979323846

frc971/input/input.gyp

diff --git a/frc971/input/input.gyp b/frc971/input/input.gyp
index c62365b..a7086fb 100644
--- a/frc971/input/input.gyp
+++ b/frc971/input/input.gyp
@@ -24,7 +24,7 @@
         '<(AOS)/atom_code/input/input.gyp:joystick',
         '<(AOS)/common/network/network.gyp:socket',
         'actions',
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
+        '<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
         '<(DEPTH)/frc971/queues/queues.gyp:queues',
         '<(AOS)/atom_code/atom_code.gyp:init',
       ],
@@ -37,7 +37,7 @@
       ],
       'dependencies': [
         '<(AOS)/build/aos.gyp:libaos',
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
+        '<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
         '<(DEPTH)/frc971/queues/queues.gyp:queues',
         '<(AOS)/common/network/network.gyp:socket',
       ],
@@ -57,7 +57,6 @@
       ],
       'dependencies': [
         '<(AOS)/build/aos.gyp:libaos',
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
         '<(AOS)/crio/shared_libs/shared_libs.gyp:interrupt_notifier',
       ],
     },
@@ -81,7 +80,6 @@
       ],
       'dependencies': [
         '<(AOS)/build/aos.gyp:libaos',
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
         '<(DEPTH)/frc971/queues/queues.gyp:queues',
         'actions',
 # TODO(brians) this shouldn't need to be here