Switch to c++11 enums for flatbuffers
Change-Id: I99171464bf54efbb7eb322c556760dee86648f5e
diff --git a/y2019/actors/auto_splines.cc b/y2019/actors/auto_splines.cc
index 6166ca8..397229c 100644
--- a/y2019/actors/auto_splines.cc
+++ b/y2019/actors/auto_splines.cc
@@ -33,7 +33,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(2.0);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -42,7 +42,7 @@
frc971::Constraint::Builder lateral_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
lateral_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LATERAL_ACCELERATION);
+ frc971::ConstraintType::LATERAL_ACCELERATION);
lateral_constraint_builder.add_value(2.0);
lateral_constraint_offset = lateral_constraint_builder.Finish();
}
@@ -51,7 +51,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(11.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -60,7 +60,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(4.0);
velocity_constraint_builder.add_start_distance(0.0);
velocity_constraint_builder.add_end_distance(10.0);
@@ -108,7 +108,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(3.0);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -117,7 +117,7 @@
frc971::Constraint::Builder lateral_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
lateral_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LATERAL_ACCELERATION);
+ frc971::ConstraintType::LATERAL_ACCELERATION);
lateral_constraint_builder.add_value(2.0);
lateral_constraint_offset = lateral_constraint_builder.Finish();
}
@@ -126,7 +126,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(11.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -135,7 +135,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(4.5);
velocity_constraint_builder.add_start_distance(0.0);
velocity_constraint_builder.add_end_distance(10.0);
@@ -181,7 +181,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(3.0);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -190,7 +190,7 @@
frc971::Constraint::Builder lateral_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
lateral_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LATERAL_ACCELERATION);
+ frc971::ConstraintType::LATERAL_ACCELERATION);
lateral_constraint_builder.add_value(3.0);
lateral_constraint_offset = lateral_constraint_builder.Finish();
}
@@ -199,7 +199,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(11.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -208,7 +208,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(4.0);
velocity_constraint_builder.add_start_distance(7.0);
velocity_constraint_builder.add_end_distance(15.0);
@@ -280,7 +280,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(2.0);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -289,7 +289,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(10.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -298,7 +298,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(1.6);
velocity_constraint_builder.add_start_distance(4.0);
velocity_constraint_builder.add_end_distance(10.0);
@@ -345,7 +345,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(11.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -354,7 +354,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(4.0);
velocity_constraint_builder.add_start_distance(0.0);
velocity_constraint_builder.add_end_distance(10.0);
@@ -401,7 +401,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(10.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -410,7 +410,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(3.5);
velocity_constraint_builder.add_start_distance(0.0);
velocity_constraint_builder.add_end_distance(10.0);
@@ -421,7 +421,7 @@
frc971::Constraint::Builder velocity_constraint2_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint2_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint2_builder.add_value(2.0);
velocity_constraint2_builder.add_start_distance(6.0);
velocity_constraint2_builder.add_end_distance(10.0);
@@ -465,7 +465,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(0.5);
velocity_constraint_builder.add_start_distance(0.0);
velocity_constraint_builder.add_end_distance(10.0);
@@ -511,7 +511,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(2.0);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -520,7 +520,7 @@
frc971::Constraint::Builder lateral_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
lateral_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LATERAL_ACCELERATION);
+ frc971::ConstraintType::LATERAL_ACCELERATION);
lateral_constraint_builder.add_value(2.0);
lateral_constraint_offset = lateral_constraint_builder.Finish();
}
@@ -529,7 +529,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(11.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -538,7 +538,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(1.7);
velocity_constraint_builder.add_start_distance(0.0);
velocity_constraint_builder.add_end_distance(0.8);
@@ -584,7 +584,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(1.5);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -593,7 +593,7 @@
frc971::Constraint::Builder lateral_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
lateral_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LATERAL_ACCELERATION);
+ frc971::ConstraintType::LATERAL_ACCELERATION);
lateral_constraint_builder.add_value(1.0);
lateral_constraint_offset = lateral_constraint_builder.Finish();
}
@@ -602,7 +602,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(11.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -611,7 +611,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(0.5);
velocity_constraint_builder.add_start_distance(9.5);
velocity_constraint_builder.add_end_distance(10.0);
@@ -652,7 +652,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(1.0);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -661,7 +661,7 @@
frc971::Constraint::Builder lateral_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
lateral_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LATERAL_ACCELERATION);
+ frc971::ConstraintType::LATERAL_ACCELERATION);
lateral_constraint_builder.add_value(1.0);
lateral_constraint_offset = lateral_constraint_builder.Finish();
}
@@ -670,7 +670,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(11.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
@@ -679,7 +679,7 @@
frc971::Constraint::Builder velocity_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
velocity_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VELOCITY);
+ frc971::ConstraintType::VELOCITY);
velocity_constraint_builder.add_value(0.5);
velocity_constraint_builder.add_start_distance(2.7);
velocity_constraint_builder.add_end_distance(10.0);
@@ -719,7 +719,7 @@
frc971::Constraint::Builder longitudinal_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
longitudinal_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LONGITUDINAL_ACCELERATION);
+ frc971::ConstraintType::LONGITUDINAL_ACCELERATION);
longitudinal_constraint_builder.add_value(1.0);
longitudinal_constraint_offset = longitudinal_constraint_builder.Finish();
}
@@ -728,7 +728,7 @@
frc971::Constraint::Builder lateral_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
lateral_constraint_builder.add_constraint_type(
- frc971::ConstraintType_LATERAL_ACCELERATION);
+ frc971::ConstraintType::LATERAL_ACCELERATION);
lateral_constraint_builder.add_value(1.0);
lateral_constraint_offset = lateral_constraint_builder.Finish();
}
@@ -737,7 +737,7 @@
frc971::Constraint::Builder voltage_constraint_builder =
builder->MakeBuilder<frc971::Constraint>();
voltage_constraint_builder.add_constraint_type(
- frc971::ConstraintType_VOLTAGE);
+ frc971::ConstraintType::VOLTAGE);
voltage_constraint_builder.add_value(6.0);
voltage_constraint_offset = voltage_constraint_builder.Finish();
}
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