commit 39e5abcaa2432ab66e70f321bf29339ced53309a
author Austin Schuh <austin@peloton-tech.com> Sat Oct 31 18:51:20 2015 -0700
committer Austin Schuh <austin@peloton-tech.com> Sat Oct 31 18:51:20 2015 -0700
tree fad6d28ecf5a8fd33d4ba588f05081abdc4d86c5
parent 6804a8533abd41f3cb030d20f02ee03bb86b6144

Removed HallEffect class usage from //bot3/

Change-Id: I127da046766eaaf7443111920ab8bef8018caa19

bot3/wpilib/BUILD

diff --git a/bot3/wpilib/BUILD b/bot3/wpilib/BUILD
index 0ee1460..77b90b8 100644
--- a/bot3/wpilib/BUILD
+++ b/bot3/wpilib/BUILD
@@ -18,7 +18,6 @@
     '//aos/common/messages:robot_state',
     '//aos/common/util:phased_loop',
     '//aos/common/util:wrapping_counter',
-    '//frc971/wpilib:hall_effect',
     '//frc971/wpilib:joystick_sender',
     '//frc971/wpilib:loop_output_handler',
     '//frc971/wpilib:buffered_pcm',

bot3/wpilib/wpilib_interface.cc

diff --git a/bot3/wpilib/wpilib_interface.cc b/bot3/wpilib/wpilib_interface.cc
index 36e14ad..cc340cb 100644
--- a/bot3/wpilib/wpilib_interface.cc
+++ b/bot3/wpilib/wpilib_interface.cc
@@ -23,7 +23,6 @@
 #include "bot3/control_loops/intake/intake.q.h"
 #include "bot3/autonomous/auto.q.h"
 
-#include "frc971/wpilib/hall_effect.h"
 #include "frc971/wpilib/joystick_sender.h"
 #include "frc971/wpilib/loop_output_handler.h"
 #include "frc971/wpilib/buffered_solenoid.h"
@@ -57,7 +56,6 @@
 using ::frc971::wpilib::LoopOutputHandler;
 using ::frc971::wpilib::JoystickSender;
 using ::frc971::wpilib::GyroSender;
-using ::frc971::wpilib::HallEffect;
 
 namespace bot3 {
 namespace wpilib {
@@ -105,7 +103,7 @@
     elevator_encoder_ = ::std::move(encoder);
   }
 
-  void set_elevator_zeroing_hall_effect(::std::unique_ptr<HallEffect> hall) {
+  void set_elevator_zeroing_hall_effect(::std::unique_ptr<DigitalInput> hall) {
     zeroing_hall_effect_ = ::std::move(hall);
   }
 
@@ -168,7 +166,7 @@
       auto elevator_message = elevator_queue.position.MakeMessage();
       elevator_message->encoder =
           elevator_translate(elevator_encoder_->GetRaw());
-      elevator_message->bottom_hall_effect = zeroing_hall_effect_->Get();
+      elevator_message->bottom_hall_effect = !zeroing_hall_effect_->Get();
       elevator_message->has_tote = tote_sensor_->GetVoltage() > 2.5;
 
       elevator_message.Send();
@@ -191,7 +189,7 @@
   DriverStation *ds_;
 
   ::std::unique_ptr<Encoder> left_encoder_, right_encoder_, elevator_encoder_;
-  ::std::unique_ptr<HallEffect> zeroing_hall_effect_;
+  ::std::unique_ptr<DigitalInput> zeroing_hall_effect_;
   ::std::unique_ptr<AnalogInput> tote_sensor_;
 
   ::std::atomic<bool> run_{true};
@@ -207,7 +205,7 @@
         intake_(".bot3.control_loops.intake_queue.output"),
         can_grabber_control_(".bot3.autonomous.can_grabber_control") {}
 
-  void set_pressure_switch(::std::unique_ptr<DigitalSource> pressure_switch) {
+  void set_pressure_switch(::std::unique_ptr<DigitalInput> pressure_switch) {
     pressure_switch_ = ::std::move(pressure_switch);
   }
 
@@ -300,7 +298,7 @@
   ::std::unique_ptr<BufferedSolenoid> intake_claw_;
   ::std::unique_ptr<BufferedSolenoid> can_grabber_;
 
-  ::std::unique_ptr<DigitalSource> pressure_switch_;
+  ::std::unique_ptr<DigitalInput> pressure_switch_;
   ::std::unique_ptr<Relay> compressor_relay_;
 
   ::aos::Queue<::bot3::control_loops::ElevatorQueue::Output> elevator_;
@@ -465,7 +463,7 @@
     LOG(INFO, "Creating the reader\n");
 
     reader.set_elevator_encoder(encoder(6));
-    reader.set_elevator_zeroing_hall_effect(make_unique<HallEffect>(6));
+    reader.set_elevator_zeroing_hall_effect(make_unique<DigitalInput>(6));
 
     reader.set_left_encoder(encoder(0));
     reader.set_right_encoder(encoder(1));