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

frc971/control_loops/drivetrain/splinedrivetrain.cc

diff --git a/frc971/control_loops/drivetrain/splinedrivetrain.cc b/frc971/control_loops/drivetrain/splinedrivetrain.cc
index bfd0c96..2790978 100644
--- a/frc971/control_loops/drivetrain/splinedrivetrain.cc
+++ b/frc971/control_loops/drivetrain/splinedrivetrain.cc
@@ -42,7 +42,7 @@
     past_distance_spline_.reset();
     past_trajectory_.reset();
 
-    plan_state_ = PlanningState_BUILDING_TRAJECTORY;
+    plan_state_ = PlanningState::BUILDING_TRAJECTORY;
     future_spline_idx_ = goal_.spline_idx;
     planning_spline_idx_ = future_spline_idx_;
     const MultiSpline &multispline = goal_.spline;
@@ -70,28 +70,28 @@
     for (size_t i = 0; i < multispline.constraints.size(); ++i) {
       const ::frc971::ConstraintT &constraint = multispline.constraints[i];
       switch (constraint.constraint_type) {
-        case frc971::ConstraintType_CONSTRAINT_TYPE_UNDEFINED:
+        case frc971::ConstraintType::CONSTRAINT_TYPE_UNDEFINED:
           break;
-        case frc971::ConstraintType_LONGITUDINAL_ACCELERATION:
+        case frc971::ConstraintType::LONGITUDINAL_ACCELERATION:
           future_trajectory_->set_longitudinal_acceleration(constraint.value);
           break;
-        case frc971::ConstraintType_LATERAL_ACCELERATION:
+        case frc971::ConstraintType::LATERAL_ACCELERATION:
           future_trajectory_->set_lateral_acceleration(constraint.value);
           break;
-        case frc971::ConstraintType_VOLTAGE:
+        case frc971::ConstraintType::VOLTAGE:
           future_trajectory_->set_voltage_limit(constraint.value);
           break;
-        case frc971::ConstraintType_VELOCITY:
+        case frc971::ConstraintType::VELOCITY:
           future_trajectory_->LimitVelocity(constraint.start_distance,
                                             constraint.end_distance,
                                             constraint.value);
           break;
       }
     }
-    plan_state_ = PlanningState_PLANNING_TRAJECTORY;
+    plan_state_ = PlanningState::PLANNING_TRAJECTORY;
 
     future_trajectory_->Plan();
-    plan_state_ = PlanningState_PLANNED;
+    plan_state_ = PlanningState::PLANNED;
   }
 }
 
@@ -137,7 +137,7 @@
               &goal_.spline.constraints[i]);
         } else {
           goal_.spline.constraints[i].constraint_type =
-              ConstraintType_CONSTRAINT_TYPE_UNDEFINED;
+              ConstraintType::CONSTRAINT_TYPE_UNDEFINED;
         }
       }