Reorganized sensors in the shooter.
diff --git a/frc971/control_loops/shooter/shooter.h b/frc971/control_loops/shooter/shooter.h
index 9d134af..2946b67 100755
--- a/frc971/control_loops/shooter/shooter.h
+++ b/frc971/control_loops/shooter/shooter.h
@@ -73,9 +73,8 @@
offset_ = known_position - encoder_val;
}
- bool SetCalibrationOnEdge(
- const constants::Values::ShooterLimits &shooter_values,
- JointZeroingState zeroing_state) {
+ bool SetCalibrationOnEdge(const constants::Values::Shooter &shooter_values,
+ JointZeroingState zeroing_state) {
double edge_encoder;
double known_position;
if (GetPositionOfEdge(shooter_values, &edge_encoder, &known_position)) {
@@ -110,7 +109,7 @@
// Returns true if an edge was detected in the last cycle and then sets the
// edge_position to the absolute position of the edge.
- bool GetPositionOfEdge(const constants::Values::ShooterLimits &shooter,
+ bool GetPositionOfEdge(const constants::Values::Shooter &shooter,
double *edge_encoder, double *known_position);
#undef COUNT_SETTER_GETTER