Move aos/controls to frc971/control_loops
Also put what was aos/controls/control_loops.fbs in y2012/control_loops
because that's the only user.
Change-Id: I8f402b0708103077e135a41e55ef5e4f23681d87
Signed-off-by: James Kuszmaul <jabukuszmaul@gmail.com>
diff --git a/y2014/control_loops/claw/claw.h b/y2014/control_loops/claw/claw.h
index 5bcccc1..07a5d2a 100644
--- a/y2014/control_loops/claw/claw.h
+++ b/y2014/control_loops/claw/claw.h
@@ -3,8 +3,8 @@
#include <memory>
-#include "aos/controls/control_loop.h"
-#include "aos/controls/polytope.h"
+#include "frc971/control_loops/control_loop.h"
+#include "frc971/control_loops/polytope.h"
#include "frc971/control_loops/coerce_goal.h"
#include "frc971/control_loops/hall_effect_tracker.h"
#include "frc971/control_loops/state_feedback_loop.h"
@@ -49,7 +49,7 @@
bool top_known_ = false, bottom_known_ = false;
- const ::aos::controls::HPolytope<2> U_Poly_, U_Poly_zeroing_;
+ const ::frc971::controls::HPolytope<2> U_Poly_, U_Poly_zeroing_;
};
class ClawMotor;
@@ -88,7 +88,9 @@
double absolute_position() const { return encoder() + offset(); }
const ::frc971::HallEffectTracker &front() const { return front_; }
- const ::frc971::HallEffectTracker &calibration() const { return calibration_; }
+ const ::frc971::HallEffectTracker &calibration() const {
+ return calibration_;
+ }
const ::frc971::HallEffectTracker &back() const { return back_; }
bool any_hall_effect_changed() const {
@@ -143,8 +145,8 @@
double last_off_encoder_;
bool any_triggered_last_;
- const ::frc971::HallEffectTracker* posedge_filter_ = nullptr;
- const ::frc971::HallEffectTracker* negedge_filter_ = nullptr;
+ const ::frc971::HallEffectTracker *posedge_filter_ = nullptr;
+ const ::frc971::HallEffectTracker *negedge_filter_ = nullptr;
private:
// Does the edges of 1 sensor for GetPositionOfEdge.
@@ -187,7 +189,7 @@
};
class ClawMotor
- : public aos::controls::ControlLoop<Goal, Position, Status, Output> {
+ : public frc971::controls::ControlLoop<Goal, Position, Status, Output> {
public:
explicit ClawMotor(::aos::EventLoop *event_loop,
const ::std::string &name = "/claw");