commit 016a6b06b6395767f9c2d524f01648b6cf9723fe
author Austin Schuh <austin.linux@gmail.com> Thu Oct 08 06:41:14 2015 +0000
committer Austin Schuh <austin.linux@gmail.com> Thu Oct 08 06:41:14 2015 +0000
tree 82738c1da76186505b83a00fca2113db418ff2d4
parent a96bbae48222369ea15f43463b9ae746e5947f89

Switched to spike.

Change-Id: Idde2b997764cf67b4e68225b93452e25e86fff96

y2014/wpilib/wpilib_interface.cc

diff --git a/y2014/wpilib/wpilib_interface.cc b/y2014/wpilib/wpilib_interface.cc
index e7c2116..107a18c 100644
--- a/y2014/wpilib/wpilib_interface.cc
+++ b/y2014/wpilib/wpilib_interface.cc
@@ -505,7 +505,6 @@
 
       {
         PneumaticsToLog to_log;
-#if 0
         {
           const bool compressor_on = !pressure_switch_->Get();
           to_log.compressor_on = compressor_on;
@@ -515,9 +514,6 @@
             compressor_relay_->Set(Relay::kOff);
           }
         }
-#else
-        to_log.compressor_on = false;
-#endif
 
         pcm_->Flush();
         to_log.read_solenoids = pcm_->GetAll();
@@ -742,12 +738,8 @@
     solenoid_writer.set_shooter_latch(pcm->MakeSolenoid(5));
     solenoid_writer.set_shooter_brake(pcm->MakeSolenoid(4));
 
-    // TODO(Brian): Re-enable this once we move the compressor back to a spike
-    // etc.
-#if 0
-    solenoid_writer.set_pressure_switch(make_unique<DigitalInput>(9));
+    solenoid_writer.set_pressure_switch(make_unique<DigitalInput>(25));
     solenoid_writer.set_compressor_relay(make_unique<Relay>(0));
-#endif
     ::std::thread solenoid_thread(::std::ref(solenoid_writer));
 
     // Wait forever. Not much else to do...