Autonomous changes for champs
* Add and tune two-piece-via-stage auto
* Tweak five note for champs fields
Change-Id: Ie191bcd4d3a7fe8d3a7f215190e9c84859c43acc
Signed-off-by: James Kuszmaul <jabukuszmaul+collab@gmail.com>
diff --git a/y2024/autonomous/auto_splines.h b/y2024/autonomous/auto_splines.h
index f477cee..8ba7f70 100644
--- a/y2024/autonomous/auto_splines.h
+++ b/y2024/autonomous/auto_splines.h
@@ -44,7 +44,19 @@
"splines/2_piece_steal.2.json")),
two_piece_steal_spline_4_(
aos::JsonFileToFlatbuffer<frc971::MultiSpline>(
- "splines/2_piece_steal.3.json")) {}
+ "splines/2_piece_steal.3.json")),
+ two_piece_via_stage_spline_1_(
+ aos::JsonFileToFlatbuffer<frc971::MultiSpline>(
+ "splines/2_piece_via_stage.0.json")),
+ two_piece_via_stage_spline_2_(
+ aos::JsonFileToFlatbuffer<frc971::MultiSpline>(
+ "splines/2_piece_via_stage.1.json")),
+ two_piece_via_stage_spline_3_(
+ aos::JsonFileToFlatbuffer<frc971::MultiSpline>(
+ "splines/2_piece_via_stage.2.json")),
+ two_piece_via_stage_spline_4_(
+ aos::JsonFileToFlatbuffer<frc971::MultiSpline>(
+ "splines/2_piece_via_stage.3.json")) {}
static flatbuffers::Offset<frc971::MultiSpline> BasicSSpline(
aos::Sender<frc971::control_loops::drivetrain::SplineGoal>::Builder
*builder,
@@ -100,6 +112,23 @@
*builder,
aos::Alliance alliance);
+ flatbuffers::Offset<frc971::MultiSpline> TwoPieceViaStageSpline1(
+ aos::Sender<frc971::control_loops::drivetrain::SplineGoal>::Builder
+ *builder,
+ aos::Alliance alliance);
+ flatbuffers::Offset<frc971::MultiSpline> TwoPieceViaStageSpline2(
+ aos::Sender<frc971::control_loops::drivetrain::SplineGoal>::Builder
+ *builder,
+ aos::Alliance alliance);
+ flatbuffers::Offset<frc971::MultiSpline> TwoPieceViaStageSpline3(
+ aos::Sender<frc971::control_loops::drivetrain::SplineGoal>::Builder
+ *builder,
+ aos::Alliance alliance);
+ flatbuffers::Offset<frc971::MultiSpline> TwoPieceViaStageSpline4(
+ aos::Sender<frc971::control_loops::drivetrain::SplineGoal>::Builder
+ *builder,
+ aos::Alliance alliance);
+
private:
aos::FlatbufferDetachedBuffer<frc971::MultiSpline> test_spline_;
aos::FlatbufferDetachedBuffer<frc971::MultiSpline> mobility_and_shoot_spline_;
@@ -113,6 +142,15 @@
aos::FlatbufferDetachedBuffer<frc971::MultiSpline> two_piece_steal_spline_2_;
aos::FlatbufferDetachedBuffer<frc971::MultiSpline> two_piece_steal_spline_3_;
aos::FlatbufferDetachedBuffer<frc971::MultiSpline> two_piece_steal_spline_4_;
+
+ aos::FlatbufferDetachedBuffer<frc971::MultiSpline>
+ two_piece_via_stage_spline_1_;
+ aos::FlatbufferDetachedBuffer<frc971::MultiSpline>
+ two_piece_via_stage_spline_2_;
+ aos::FlatbufferDetachedBuffer<frc971::MultiSpline>
+ two_piece_via_stage_spline_3_;
+ aos::FlatbufferDetachedBuffer<frc971::MultiSpline>
+ two_piece_via_stage_spline_4_;
};
} // namespace y2024::autonomous