commit 91a4e5549d445e42c1b70009df20ab2b4c175b1a
author Austin Schuh <austin.linux@gmail.com> Fri Feb 24 20:34:01 2023 -0800
committer Austin Schuh <austin.linux@gmail.com> Fri Feb 24 20:36:06 2023 -0800
tree 3093ad49a99e8784828a0f15727bece936fe351f
parent 92fa3e29c4a3ab5d198b44c70f1e0d5e6003504e

Make PistolDrivetrainInputReader more style compliant.

Change-Id: I293d2a8071462aa5efc26f42828c53189d49fa28
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

frc971/input/drivetrain_input.cc

diff --git a/frc971/input/drivetrain_input.cc b/frc971/input/drivetrain_input.cc
index ab3afef..69795dd 100644
--- a/frc971/input/drivetrain_input.cc
+++ b/frc971/input/drivetrain_input.cc
@@ -274,25 +274,25 @@
 
   const ButtonLocation kQuickTurn(1, 3);
 
-  const ButtonLocation TopButton(1, 1);
-  const ButtonLocation SecondButton(1, 2);
-  const ButtonLocation BottomButton(1, 4);
+  const ButtonLocation kTopButton(1, 1);
+  const ButtonLocation kSecondButton(1, 2);
+  const ButtonLocation kBottomButton(1, 4);
   // Non-existant button for nops.
-  const ButtonLocation DummyButton(1, 10);
+  const ButtonLocation kDummyButton(1, 10);
 
   // TODO(james): Make a copy assignment operator for ButtonLocation so we don't
   // have to shoehorn in these ternary operators.
   const ButtonLocation kTurn1 = (top_button_use == TopButtonUse::kLineFollow)
-                                    ? SecondButton
-                                    : DummyButton;
+                                    ? kSecondButton
+                                    : kDummyButton;
   // Turn2 does closed loop driving.
   const ButtonLocation kTurn2 =
-      (top_button_use == TopButtonUse::kLineFollow) ? TopButton : DummyButton;
+      (top_button_use == TopButtonUse::kLineFollow) ? kTopButton : kDummyButton;
 
   const ButtonLocation kShiftHigh =
-      (top_button_use == TopButtonUse::kShift) ? TopButton : DummyButton;
+      (top_button_use == TopButtonUse::kShift) ? kTopButton : kDummyButton;
   const ButtonLocation kShiftLow =
-      (top_button_use == TopButtonUse::kShift) ? SecondButton : DummyButton;
+      (top_button_use == TopButtonUse::kShift) ? kSecondButton : kDummyButton;
 
   std::unique_ptr<PistolDrivetrainInputReader> result(
       new PistolDrivetrainInputReader(
@@ -300,7 +300,7 @@
           kTriggerVelocityLow, kTriggerTorqueHigh, kTriggerTorqueLow,
           kTriggerHigh, kTriggerLow, kWheelVelocityHigh, kWheelVelocityLow,
           kWheelTorqueHigh, kWheelTorqueLow, kQuickTurn, kShiftHigh, kShiftLow,
-          kTurn1, kTurn2, BottomButton));
+          kTurn1, kTurn2, kBottomButton));
 
   result->set_default_high_gear(default_high_gear);
   return result;