commit d3b7a887f0f06a9565b5f71dc2b961568f114983
author Parker Schuh <jabukuszmaul+notme@gmail.com> Mon Feb 19 16:42:27 2018 -0800
committer James Kuszmaul <jabukuszmaul@gmail.com> Tue Jan 01 18:45:11 2019 -0800
tree eb9d42548751f380b034d90e86dc59633a7d5edb
parent 0258a31512f1c6c257479e94620e9ae5c781dc8e

Added ahal

This is a formatted copy of WPILib's default user-visible C++ API, with
a bit of completely unnecessary functionality stripped out. Most of the
stripping so far is only related to weird threading decisions.

Change-Id: Icbfd949b48cd115561862cb909bcc572aba0e753

frc971/wpilib/interrupt_edge_counting.h

diff --git a/frc971/wpilib/interrupt_edge_counting.h b/frc971/wpilib/interrupt_edge_counting.h
index e4eec35..50dc94d 100644
--- a/frc971/wpilib/interrupt_edge_counting.h
+++ b/frc971/wpilib/interrupt_edge_counting.h
@@ -1,18 +1,16 @@
 #ifndef FRC971_WPILIB_INTERRUPT_EDGE_COUNTING_H_
 #define FRC971_WPILIB_INTERRUPT_EDGE_COUNTING_H_
 
-#include <memory>
 #include <atomic>
+#include <memory>
 #include <thread>
 #include <vector>
 
 #include "aos/stl_mutex/stl_mutex.h"
 #include "aos/macros.h"
 
-#include "DigitalInput.h"
-#include "Encoder.h"
-#include "AnalogInput.h"
-#include "Utility.h"
+#include "frc971/wpilib/ahal/DigitalInput.h"
+#include "frc971/wpilib/ahal/Encoder.h"
 
 namespace frc971 {
 namespace wpilib {
@@ -109,7 +107,7 @@
 // input.
 class EdgeCounter : public InterruptHandler {
  public:
-  EdgeCounter(Encoder *encoder, DigitalInput *input)
+  EdgeCounter(frc::Encoder *encoder, frc::DigitalInput *input)
       : encoder_(encoder), input_(input) {}
 
   // Returns the current interrupt edge counts and encoder values.
@@ -139,8 +137,8 @@
   void CommitValue() override { output_ = shadow_values_; }
   void operator()() override;
 
-  Encoder *encoder_;
-  DigitalInput *input_;
+  frc::Encoder *encoder_;
+  frc::DigitalInput *input_;
 
   // The following variables represent the current "shadow" state.
   bool current_value_ = false;
@@ -156,7 +154,7 @@
 // Synchronizes reading an encoder with interrupt handling.
 class InterruptSynchronizedEncoder : public InterruptHandler {
  public:
-  InterruptSynchronizedEncoder(Encoder *encoder) : encoder_(encoder) {}
+  InterruptSynchronizedEncoder(frc::Encoder *encoder) : encoder_(encoder) {}
 
   int32_t get() const { return output_; }
 
@@ -165,7 +163,7 @@
   void CommitValue() override { output_ = shadow_; }
   void operator()() override {}
 
-  Encoder *const encoder_;
+  frc::Encoder *const encoder_;
 
   int32_t shadow_, output_;
 };