commit 6eaa2d832b6ab257c8406f0c07a2cd24a2bb0b42
author Brian Silverman <brians> Sat Feb 04 20:48:30 2017 -0800
committer Brian Silverman <brians> Sat Feb 04 20:49:11 2017 -0800
tree 2b3bf0da8102cebdac55663b9adb4c4b5a910499
parent 268e13ca6b118bbb48138bf38ca8a6c68931414b

Chop out the MotorDanger junk

It had race conditions, and the inheritance hierarchy is a mess.

Change-Id: I4566ee5d7a53ec162c885a70bef3e2774555eef7

y2015_bot3/wpilib/wpilib_interface.cc

diff --git a/y2015_bot3/wpilib/wpilib_interface.cc b/y2015_bot3/wpilib/wpilib_interface.cc
index b92d02b..84e8664 100644
--- a/y2015_bot3/wpilib/wpilib_interface.cc
+++ b/y2015_bot3/wpilib/wpilib_interface.cc
@@ -344,14 +344,14 @@
   virtual void Write() override {
     auto &queue = 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);
+    left_drivetrain_talon_->SetSpeed(queue->left_voltage / 12.0);
+    right_drivetrain_talon_->SetSpeed(-queue->right_voltage / 12.0);
   }
 
   virtual void Stop() override {
     LOG(WARNING, "drivetrain output too old\n");
-    left_drivetrain_talon_->Disable();
-    right_drivetrain_talon_->Disable();
+    left_drivetrain_talon_->SetDisabled();
+    right_drivetrain_talon_->SetDisabled();
   }
 
   ::std::unique_ptr<Talon> left_drivetrain_talon_;
@@ -376,14 +376,14 @@
   virtual void Write() override {
     auto &queue = ::y2015_bot3::control_loops::elevator_queue.output;
     LOG_STRUCT(DEBUG, "will output", *queue);
-    elevator_talon1_->Set(queue->elevator / 12.0);
-    elevator_talon2_->Set(-queue->elevator / 12.0);
+    elevator_talon1_->SetSpeed(queue->elevator / 12.0);
+    elevator_talon2_->SetSpeed(-queue->elevator / 12.0);
   }
 
   virtual void Stop() override {
     LOG(WARNING, "Elevator output too old.\n");
-    elevator_talon1_->Disable();
-    elevator_talon2_->Disable();
+    elevator_talon1_->SetDisabled();
+    elevator_talon2_->SetDisabled();
   }
 
   ::std::unique_ptr<Talon> elevator_talon1_;
@@ -408,14 +408,14 @@
   virtual void Write() override {
     auto &queue = ::y2015_bot3::control_loops::intake_queue.output;
     LOG_STRUCT(DEBUG, "will output", *queue);
-    intake_talon1_->Set(queue->intake / 12.0);
-    intake_talon2_->Set(-queue->intake / 12.0);
+    intake_talon1_->SetSpeed(queue->intake / 12.0);
+    intake_talon2_->SetSpeed(-queue->intake / 12.0);
   }
 
   virtual void Stop() override {
     LOG(WARNING, "Intake output too old.\n");
-    intake_talon1_->Disable();
-    intake_talon2_->Disable();
+    intake_talon1_->SetDisabled();
+    intake_talon2_->SetDisabled();
   }
 
   ::std::unique_ptr<Talon> intake_talon1_;
@@ -443,14 +443,14 @@
   virtual void Write() override {
     auto &queue = ::y2015_bot3::autonomous::can_grabber_control;
     LOG_STRUCT(DEBUG, "will output", *queue);
-    can_grabber_talon1_->Set(queue->can_grabber_voltage / 12.0);
-    can_grabber_talon2_->Set(-queue->can_grabber_voltage / 12.0);
+    can_grabber_talon1_->SetSpeed(queue->can_grabber_voltage / 12.0);
+    can_grabber_talon2_->SetSpeed(-queue->can_grabber_voltage / 12.0);
   }
 
   virtual void Stop() override {
     LOG(WARNING, "Can grabber output too old\n");
-    can_grabber_talon1_->Disable();
-    can_grabber_talon2_->Disable();
+    can_grabber_talon1_->SetDisabled();
+    can_grabber_talon2_->SetDisabled();
   }
 
   ::std::unique_ptr<Talon> can_grabber_talon1_, can_grabber_talon2_;