Separate CANFalcon from drivetrain_can_position
Signed-off-by: Maxwell Henderson <mxwhenderson@gmail.com>
Change-Id: Id72fb1e402b2fb756cd7005056c299726e1df8b4
diff --git a/y2023/wpilib_interface.cc b/y2023/wpilib_interface.cc
index fc6a4ae..d043e6f 100644
--- a/y2023/wpilib_interface.cc
+++ b/y2023/wpilib_interface.cc
@@ -224,9 +224,9 @@
ctre::phoenixpro::hardware::TalonFX *talon() { return &talon_; }
- flatbuffers::Offset<frc971::control_loops::drivetrain::CANFalcon>
- WritePosition(flatbuffers::FlatBufferBuilder *fbb) {
- frc971::control_loops::drivetrain::CANFalcon::Builder builder(*fbb);
+ flatbuffers::Offset<frc971::control_loops::CANFalcon> WritePosition(
+ flatbuffers::FlatBufferBuilder *fbb) {
+ frc971::control_loops::CANFalcon::Builder builder(*fbb);
builder.add_id(device_id_);
builder.add_device_temp(device_temp());
builder.add_supply_voltage(supply_voltage());
@@ -342,9 +342,8 @@
falcon->RefreshNontimesyncedSignals();
}
- aos::SizedArray<
- flatbuffers::Offset<frc971::control_loops::drivetrain::CANFalcon>,
- kCANFalconCount>
+ aos::SizedArray<flatbuffers::Offset<frc971::control_loops::CANFalcon>,
+ kCANFalconCount>
falcons;
for (auto falcon : {right_front_, right_back_, right_under_, left_front_,
@@ -354,8 +353,8 @@
auto falcons_list =
builder.fbb()
- ->CreateVector<flatbuffers::Offset<
- frc971::control_loops::drivetrain::CANFalcon>>(falcons);
+ ->CreateVector<
+ flatbuffers::Offset<frc971::control_loops::CANFalcon>>(falcons);
frc971::control_loops::drivetrain::CANPosition::Builder
can_position_builder =