cleaned up formatting again
diff --git a/frc971/constants.cc b/frc971/constants.cc
index da27720..4f3551d 100755
--- a/frc971/constants.cc
+++ b/frc971/constants.cc
@@ -52,62 +52,62 @@
switch (team) {
case kCompTeamNumber:
return new Values{
- kCompDrivetrainEncoderRatio,
- kCompLowGearRatio,
- kCompHighGearRatio,
- // ShooterLimits
- // TODO_ben: make these real numbers
- {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}},
- shooter_voltage,
- // shooter_total_length
- 1.0,
- shooter_hall_effect_start_position,
- shooter_zeroing_off_speed,
- shooter_zeroing_speed,
- position,
- kCompLeftDriveShifter,
- kCompRightDriveShifter,
- true,
- control_loops::MakeVClutchDrivetrainLoop,
- control_loops::MakeClutchDrivetrainLoop,
- 0.5,
- 0.1,
- 0.0,
- 1.57,
- {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
- {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
- 0.02, // claw_unimportant_epsilon
- 50505.05, // start_fine_tune_pos
+ kCompDrivetrainEncoderRatio,
+ kCompLowGearRatio,
+ kCompHighGearRatio,
+ kCompLeftDriveShifter,
+ kCompRightDriveShifter,
+ true,
+ control_loops::MakeVClutchDrivetrainLoop,
+ control_loops::MakeClutchDrivetrainLoop,
+ // ShooterLimits
+ // TODO(ben): make these real numbers
+ {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}}
+ shooter_voltage,
+ // shooter_total_length
+ 1.0,
+ shooter_hall_effect_start_position,
+ shooter_zeroing_off_speed,
+ shooter_zeroing_speed,
+ position,
+ 0.5,
+ 0.1,
+ 0.0,
+ 1.57,
+ {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
+ {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
+ 0.02, // claw_unimportant_epsilon
+ 50505.05, // start_fine_tune_pos
};
break;
case kPracticeTeamNumber:
return new Values{
- kPracticeDrivetrainEncoderRatio,
- kPracticeLowGearRatio,
- kPracticeHighGearRatio,
- // ShooterLimits
- // TODO_ben: make these real numbers
- {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}},
- shooter_voltage,
- // shooter_total_length
- 1.0,
- shooter_hall_effect_start_position,
- shooter_zeroing_off_speed,
- shooter_zeroing_speed,
- position,
- kPracticeLeftDriveShifter,
- kPracticeRightDriveShifter,
- false,
- control_loops::MakeVDogDrivetrainLoop,
- control_loops::MakeDogDrivetrainLoop,
- 0.5,
- 0.1,
- 0.0,
- 1.57,
- {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
- {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
- 0.02, // claw_unimportant_epsilon
- 50505.05, //start_fine_tune_pos
+ kPracticeDrivetrainEncoderRatio,
+ kPracticeLowGearRatio,
+ kPracticeHighGearRatio,
+ kPracticeLeftDriveShifter,
+ kPracticeRightDriveShifter,
+ false,
+ control_loops::MakeVDogDrivetrainLoop,
+ control_loops::MakeDogDrivetrainLoop,
+ // ShooterLimits
+ // TODO(ben): make these real numbers
+ {0.0, 1.0, {-0.03, 0.02}, {-0.01, 0.04}, {0.02, 0.07}}
+ shooter_voltage,
+ // shooter_total_length
+ 1.0,
+ shooter_hall_effect_start_position,
+ shooter_zeroing_off_speed,
+ shooter_zeroing_speed,
+ position,
+ 0.5,
+ 0.1,
+ 0.0,
+ 1.57,
+ {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
+ {0.0, 2.05, {-0.1, 0.05}, {1.0, 1.1}, {2.0, 2.1}},
+ 0.02, // claw_unimportant_epsilon
+ 50505.05, //start_fine_tune_pos
};
break;
default: