commit 6175066e4d1294c9b2e4e49ea22b3bb7bd7ee41c
author James Kuszmaul <jabukuszmaul+collab@gmail.com> Mon Jun 21 21:32:33 2021 -0700
committer James Kuszmaul <jabukuszmaul@gmail.com> Sun Jun 27 13:50:16 2021 -0700
tree 734cf51117459826d67457d6d35637887f4a8f38
parent eeaaed70bebee707f88cfd9159138e5041948569

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>

y2014_bot3/control_loops/rollers/BUILD

diff --git a/y2014_bot3/control_loops/rollers/BUILD b/y2014_bot3/control_loops/rollers/BUILD
index 2f9d7c4..a4ee768 100644
--- a/y2014_bot3/control_loops/rollers/BUILD
+++ b/y2014_bot3/control_loops/rollers/BUILD
@@ -52,7 +52,7 @@
         ":rollers_output_fbs",
         ":rollers_position_fbs",
         ":rollers_status_fbs",
-        "//aos/controls:control_loop",
+        "//frc971/control_loops:control_loop",
         "//aos/logging",
     ],
 )

y2014_bot3/control_loops/rollers/rollers.cc

diff --git a/y2014_bot3/control_loops/rollers/rollers.cc b/y2014_bot3/control_loops/rollers/rollers.cc
index d62831a..5fcb692 100644
--- a/y2014_bot3/control_loops/rollers/rollers.cc
+++ b/y2014_bot3/control_loops/rollers/rollers.cc
@@ -11,8 +11,8 @@
 namespace rollers {
 
 Rollers::Rollers(::aos::EventLoop *event_loop, const ::std::string &name)
-    : aos::controls::ControlLoop<Goal, Position, Status, Output>(event_loop,
-                                                                 name) {}
+    : frc971::controls::ControlLoop<Goal, Position, Status, Output>(event_loop,
+                                                                    name) {}
 
 void Rollers::RunIteration(const Goal *goal, const Position * /*position*/,
                            aos::Sender<Output>::Builder *output,

y2014_bot3/control_loops/rollers/rollers.h

diff --git a/y2014_bot3/control_loops/rollers/rollers.h b/y2014_bot3/control_loops/rollers/rollers.h
index 8903cd2..3d08f59 100644
--- a/y2014_bot3/control_loops/rollers/rollers.h
+++ b/y2014_bot3/control_loops/rollers/rollers.h
@@ -1,8 +1,7 @@
 #ifndef Y2014_BOT3_CONTROL_LOOPS_ROLLERS_H_
 #define Y2014_BOT3_CONTROL_LOOPS_ROLLERS_H_
 
-#include "aos/controls/control_loop.h"
-
+#include "frc971/control_loops/control_loop.h"
 #include "y2014_bot3/control_loops/rollers/rollers_goal_generated.h"
 #include "y2014_bot3/control_loops/rollers/rollers_output_generated.h"
 #include "y2014_bot3/control_loops/rollers/rollers_position_generated.h"
@@ -13,7 +12,7 @@
 namespace rollers {
 
 class Rollers
-    : public aos::controls::ControlLoop<Goal, Position, Status, Output> {
+    : public frc971::controls::ControlLoop<Goal, Position, Status, Output> {
  public:
   // Constructs a control loops which can take a rollers or defaults to the
   // rollers at ::2014_bot3::control_loops::rollers.