commit 4d1e74fe2411d6f3cfede9c629ad77892e82a420
author Stephan Massalt <frc971@massalt.com> Sat Jan 11 17:50:39 2020 -0800
committer Stephan Massalt <frc971@massalt.com> Sat Jan 11 17:50:39 2020 -0800
tree 36630086d1e4a6116af92a990737bdeea972210d
parent 8e8052e9bd4e19464b125c06652e8ba6a8fea87a

Refactored unwrap class from y2018 code to frc971 directory.

Change-Id: I375e1a2cf875e89944d514f333295867d1a3437b

y2018/control_loops/superstructure/intake/intake.h

diff --git a/y2018/control_loops/superstructure/intake/intake.h b/y2018/control_loops/superstructure/intake/intake.h
index ac4f971..e064c0e 100644
--- a/y2018/control_loops/superstructure/intake/intake.h
+++ b/y2018/control_loops/superstructure/intake/intake.h
@@ -5,11 +5,11 @@
 
 #include "aos/commonmath.h"
 #include "aos/controls/control_loop.h"
+#include "frc971/zeroing/wrap.h"
 #include "frc971/zeroing/zeroing.h"
 #include "y2018/constants.h"
 #include "y2018/control_loops/superstructure/intake/intake_delayed_plant.h"
 #include "y2018/control_loops/superstructure/intake/intake_plant.h"
-#include "y2018/control_loops/superstructure/intake/sensor_unwrap.h"
 #include "y2018/control_loops/superstructure/superstructure_output_generated.h"
 #include "y2018/control_loops/superstructure/superstructure_position_generated.h"
 #include "y2018/control_loops/superstructure/superstructure_status_generated.h"
@@ -121,7 +121,8 @@
     return ::y2018::constants::Values::kIntakeSpringRatio() * (2 * M_PI);
   }
 
-  UnwrapSensor spring_unwrap_{spring_offset_, spring_range()};
+  ::frc971::zeroing::UnwrapSensor spring_unwrap_{spring_offset_,
+                                                 spring_range()};
 
   State state_ = State::UNINITIALIZED;