commit 872723ceaa8f2879ebdf1b41ed0ccd5f0bbdfe7a
author Austin Schuh <austin.linux@gmail.com> Wed Dec 25 14:38:09 2019 -0800
committer Austin Schuh <austin.linux@gmail.com> Sat Dec 28 13:10:22 2019 -0800
tree 1c7aba94dee4564dc2618be9be78c6073c57a5b7
parent a28cbc36df05d17b2c6504d26faf8e82ad231dfb

Switch to c++11 enums for flatbuffers

Change-Id: I99171464bf54efbb7eb322c556760dee86648f5e

y2019/actors/autonomous_actor.cc

diff --git a/y2019/actors/autonomous_actor.cc b/y2019/actors/autonomous_actor.cc
index fbde0be..aa2c808 100644
--- a/y2019/actors/autonomous_actor.cc
+++ b/y2019/actors/autonomous_actor.cc
@@ -198,14 +198,14 @@
 
     if (!spline1.WaitForSplineDistanceRemaining(0.2)) return true;
     LineFollowAtVelocity(1.3,
-                         control_loops::drivetrain::SelectionHint_FAR_ROCKET);
+                         control_loops::drivetrain::SelectionHint::FAR_ROCKET);
     if (!WaitForMilliseconds(::std::chrono::milliseconds(1200))) return true;
 
     set_suction_goal(false, 1);
     SendSuperstructureGoal();
     if (!WaitForMilliseconds(::std::chrono::milliseconds(200))) return true;
     LineFollowAtVelocity(-1.0,
-                         control_loops::drivetrain::SelectionHint_FAR_ROCKET);
+                         control_loops::drivetrain::SelectionHint::FAR_ROCKET);
     SplineHandle spline2 =
         PlanSpline(BindIsLeft(AutonomousSplines::FarRocketToHP, is_left),
                    SplineDirection::kBackward);
@@ -240,7 +240,7 @@
     SendSuperstructureGoal();
     if (!WaitForDriveXGreater(7.1)) return true;
     LineFollowAtVelocity(-1.5,
-                         control_loops::drivetrain::SelectionHint_FAR_ROCKET);
+                         control_loops::drivetrain::SelectionHint::FAR_ROCKET);
     if (!WaitForMilliseconds(::std::chrono::milliseconds(1000))) return true;
     set_elevator_wrist_goal(kPanelBackwardUpperPos);
     SendSuperstructureGoal();
@@ -249,7 +249,7 @@
     SendSuperstructureGoal();
     if (!WaitForMilliseconds(::std::chrono::milliseconds(400))) return true;
     LineFollowAtVelocity(1.0,
-                         control_loops::drivetrain::SelectionHint_FAR_ROCKET);
+                         control_loops::drivetrain::SelectionHint::FAR_ROCKET);
     SendSuperstructureGoal();
     if (!WaitForMilliseconds(::std::chrono::milliseconds(200))) return true;
   } else if (mode == Mode::kCargoship) {
@@ -282,7 +282,7 @@
     if (!spline1.WaitForSplineDistanceRemaining(0.8)) return true;
     // Line follow in to the first disc.
     LineFollowAtVelocity(-0.9,
-                         control_loops::drivetrain::SelectionHint_MID_SHIP);
+                         control_loops::drivetrain::SelectionHint::MID_SHIP);
     if (!WaitForDriveYCloseToZero(1.2)) return true;
 
     set_suction_goal(false, 1);
@@ -294,7 +294,7 @@
     if (!WaitForMilliseconds(::std::chrono::milliseconds(300))) return true;
 
     LineFollowAtVelocity(0.9,
-                         control_loops::drivetrain::SelectionHint_MID_SHIP);
+                         control_loops::drivetrain::SelectionHint::MID_SHIP);
     SplineHandle spline2 = PlanSpline(
         BindIsLeft(AutonomousSplines::SecondCargoShipBayToHP, is_left),
         SplineDirection::kForward);
@@ -331,7 +331,7 @@
     if (!spline3.WaitForSplineDistanceRemaining(0.7)) return true;
     // Line follow in to the second disc.
     LineFollowAtVelocity(-0.7,
-                         control_loops::drivetrain::SelectionHint_FAR_SHIP);
+                         control_loops::drivetrain::SelectionHint::FAR_SHIP);
     AOS_LOG(INFO, "Drawing in disc 2 %f\n",
             ::aos::time::DurationInSeconds(monotonic_now() - start_time));
     if (!WaitForDriveYCloseToZero(1.2)) return true;
@@ -346,7 +346,7 @@
     AOS_LOG(INFO, "Backing up %f\n",
             ::aos::time::DurationInSeconds(monotonic_now() - start_time));
     LineFollowAtVelocity(0.9,
-                         control_loops::drivetrain::SelectionHint_FAR_SHIP);
+                         control_loops::drivetrain::SelectionHint::FAR_SHIP);
     if (!WaitForMilliseconds(::std::chrono::milliseconds(400))) return true;
   } else {
     // Grab the disk, wait until we have vacuum, then jump