commit 5323ecb31df1d0e679df69d3a5de9129f97e3d18
author Comran Morshed <comranmorsh@gmail.com> Sat Dec 26 20:50:55 2015 +0000
committer Comran Morshed <comranmorsh@gmail.com> Sat Jan 16 10:09:57 2016 +0000
tree 20f6ae67674b514304cc2b8c769e004d97234193
parent 0520cbfdb790f4a9061435e87e951cebdd9dc945

Make a mutual drivetrain between robots.

Change-Id: I23cc9634d9af5d0482dc5a5501dccc064b7b53d3

y2014/wpilib/wpilib_interface.cc

diff --git a/y2014/wpilib/wpilib_interface.cc b/y2014/wpilib/wpilib_interface.cc
index 13b2e7b..6442a2a 100644
--- a/y2014/wpilib/wpilib_interface.cc
+++ b/y2014/wpilib/wpilib_interface.cc
@@ -32,7 +32,7 @@
 
 #include "frc971/shifter_hall_effect.h"
 
-#include "y2014/control_loops/drivetrain/drivetrain.q.h"
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "y2014/control_loops/claw/claw.q.h"
 #include "y2014/control_loops/shooter/shooter.q.h"
 #include "y2014/constants.h"
@@ -54,7 +54,7 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-using ::y2014::control_loops::drivetrain_queue;
+using ::frc971::control_loops::drivetrain_queue;
 using ::y2014::control_loops::claw_queue;
 using ::y2014::control_loops::shooter_queue;
 
@@ -470,7 +470,7 @@
   SolenoidWriter(const ::std::unique_ptr<::frc971::wpilib::BufferedPcm> &pcm)
       : pcm_(pcm),
         shooter_(".y2014.control_loops.shooter_queue.output"),
-        drivetrain_(".y2014.control_loops.drivetrain_queue.output") {}
+        drivetrain_(".frc971.control_loops.drivetrain_queue.output") {}
 
   void set_pressure_switch(::std::unique_ptr<DigitalInput> pressure_switch) {
     pressure_switch_ = ::std::move(pressure_switch);
@@ -566,7 +566,7 @@
   ::std::unique_ptr<Relay> compressor_relay_;
 
   ::aos::Queue<::y2014::control_loops::ShooterQueue::Output> shooter_;
-  ::aos::Queue<::y2014::control_loops::DrivetrainQueue::Output> drivetrain_;
+  ::aos::Queue<::frc971::control_loops::DrivetrainQueue::Output> drivetrain_;
 
   ::std::atomic<bool> run_{true};
 };
@@ -583,11 +583,11 @@
 
  private:
   virtual void Read() override {
-    ::y2014::control_loops::drivetrain_queue.output.FetchAnother();
+    ::frc971::control_loops::drivetrain_queue.output.FetchAnother();
   }
 
   virtual void Write() override {
-    auto &queue = ::y2014::control_loops::drivetrain_queue.output;
+    auto &queue = ::frc971::control_loops::drivetrain_queue.output;
     LOG_STRUCT(DEBUG, "will output", *queue);
     left_drivetrain_talon_->Set(-queue->left_voltage / 12.0);
     right_drivetrain_talon_->Set(queue->right_voltage / 12.0);