commit 48319c59efb2ac3ac263867e4853892eeb2b1b4f
author Austin Schuh <austin.linux@gmail.com> Tue Mar 19 06:22:46 2013 +0000
committer Brian Silverman <brians> Sat Mar 30 16:35:11 2013 -0700
tree 25a9e8f7a1dc24c8ab7d9e70c9c67a33822fd88a
parent 261c40594c90179a364d3dc44759441101de7433

Code now builds.

frc971/atom_code/scripts/start_list.txt

diff --git a/frc971/atom_code/scripts/start_list.txt b/frc971/atom_code/scripts/start_list.txt
index 2c30c83..e759946 100644
--- a/frc971/atom_code/scripts/start_list.txt
+++ b/frc971/atom_code/scripts/start_list.txt
@@ -1,7 +1,7 @@
 MotorWriter
 JoystickReader
 sensor_receiver
-DriveTrain
+drivetrain
 AutoMode
 BinaryLogReader
 CRIOLogReader

frc971/control_loops/angle_adjust/angle_adjust.gyp

diff --git a/frc971/control_loops/angle_adjust/angle_adjust.gyp b/frc971/control_loops/angle_adjust/angle_adjust.gyp
index fefb832..c48ded3 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust.gyp
+++ b/frc971/control_loops/angle_adjust/angle_adjust.gyp
@@ -24,7 +24,6 @@
         'unaugmented_angle_adjust_motor_plant.cc',
       ],
       'dependencies': [
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
         '<(AOS)/common/common.gyp:controls',
         '<(DEPTH)/frc971/frc971.gyp:common',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
@@ -33,7 +32,6 @@
       'export_dependent_settings': [
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
         '<(AOS)/common/common.gyp:controls',
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
         'angle_adjust_loop',
       ],
     },
@@ -45,7 +43,6 @@
       ],
       'dependencies': [
         '<(EXTERNALS):gtest',
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
         'angle_adjust_lib',
         '<(AOS)/common/common.gyp:queue_testutils',
         'angle_adjust_loop',
@@ -74,7 +71,6 @@
       'dependencies': [
         'angle_adjust_lib',
         'angle_adjust_loop',
-        '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
         '<(AOS)/atom_code/atom_code.gyp:init',
       ],
     },

frc971/input/sensor_unpacker.cc

diff --git a/frc971/input/sensor_unpacker.cc b/frc971/input/sensor_unpacker.cc
index bb99e2a..873c33b 100644
--- a/frc971/input/sensor_unpacker.cc
+++ b/frc971/input/sensor_unpacker.cc
@@ -5,7 +5,7 @@
 
 #include "aos/common/inttypes.h"
 
-#include "frc971/control_loops/DriveTrain.q.h"
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "frc971/control_loops/wrist/wrist_motor.q.h"
 #include "frc971/control_loops/angle_adjust/angle_adjust_motor.q.h"
 #include "frc971/control_loops/index/index_motor.q.h"

frc971/output/output.gyp

diff --git a/frc971/output/output.gyp b/frc971/output/output.gyp
index edeab15..4459984 100644
--- a/frc971/output/output.gyp
+++ b/frc971/output/output.gyp
@@ -35,7 +35,7 @@
               '<(DEPTH)/frc971/control_loops/wrist/wrist.gyp:wrist_loop',
               '<(DEPTH)/frc971/control_loops/index/index.gyp:index_loop',
               '<(DEPTH)/frc971/control_loops/shooter/shooter.gyp:shooter_loop',
-              '<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
+              '<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
             ],
           }, {
             'sources': ['CRIOMotorWriter.cc'],