@@ -30,27 +30,24 @@ private static double getEncoderTicksFromInches(int wheel_diameter, double inche
3030 double inchesPerRevolution = Math .PI * wheel_diameter ;
3131
3232 double revolutions = inches / inchesPerRevolution ;
33- double ticks = revolutions * ENCODER_TICKS_PER_REVOLUTION ;
33+ double ticks = revolutions * QUADRATURE_ENCODER_TICKS_PER_REVOLUTION ;
3434
3535 return ticks ;
3636 }
3737
38- public static double getInchesFromEncoderTicks (double encoder_ticks ) {
39- return getInchesFromEncoderTicks (WHEEL_DIAMETER , encoder_ticks );
40- }
4138
4239 private static double getInchesFromEncoderTicks (int wheel_diameter , double encoder_ticks ) {
4340
4441 double inchesPerRevolution = Math .PI * wheel_diameter ;
45- double revolutions = encoder_ticks * ENCODER_TICKS_PER_REVOLUTION ;
42+ double revolutions = encoder_ticks * QUADRATURE_ENCODER_TICKS_PER_REVOLUTION ;
4643
4744 double inches = (revolutions ) / (inchesPerRevolution );
4845
4946 return inches ;
5047 }
5148
5249 public static double getMetersFromEncoderTicks (double ticks ) {
53- return (WHEEL_CIRCUMFERENCE_METERS / ENCODER_TICKS_PER_REVOLUTION ) * ticks ;
50+ return (WHEEL_CIRCUMFERENCE_METERS / QUADRATURE_ENCODER_TICKS_PER_REVOLUTION ) * ticks ;
5451 }
5552 public static double stepsPerDecisecToMetersPerSec (double d ) {
5653 return getMetersFromEncoderTicks (d * 10 );
@@ -61,11 +58,11 @@ public static double metersPerSecToStepsPerDecisec(double metersPerSec) {
6158 }
6259
6360 public static double getEncoderTicksFromMeters (double meters ) {
64- return (meters / WHEEL_CIRCUMFERENCE_METERS ) * ENCODER_TICKS_PER_REVOLUTION ;
61+ return (meters / WHEEL_CIRCUMFERENCE_METERS ) * QUADRATURE_ENCODER_TICKS_PER_REVOLUTION ;
6562 }
6663
6764 public static double getRevolutionsFromTicks (double encoder_ticks ) {
68- double revolutions = encoder_ticks / ENCODER_TICKS_PER_REVOLUTION ;
65+ double revolutions = encoder_ticks / QUADRATURE_ENCODER_TICKS_PER_REVOLUTION ;
6966 return revolutions ;
7067 }
7168
@@ -90,15 +87,16 @@ public static double degreesToMoveHood(double ticks) {
9087 }
9188
9289 public static double ticksFromRPM (int rpm ){
93- double ticksPer100Ms = ((((rpm * ENCODER_TICKS_PER_REVOLUTION_TALON )
90+ double ticksPer100Ms = ((((rpm * ENCODER_TICKS_PER_REVOLUTION_FALCON )
9491 /SHOOTER_GEAR_RATIO )
9592 /60 ) //mintues to seconds
9693 /10 ); // seconds to 100ms
9794 return ticksPer100Ms ;
9895 }
9996
10097 public static double RPMFromTicks (double ticksPer100ms ) {
101- double rpm = ticksPer100ms * 600 * SHOOTER_GEAR_RATIO / ENCODER_TICKS_PER_REVOLUTION_TALON ;
98+ double rpm = ticksPer100ms * 600 * SHOOTER_GEAR_RATIO / ENCODER_TICKS_PER_REVOLUTION_FALCON ;
99+ //I think we are calculating ticks per minute, not the actual RPM
102100
103101 return rpm ;
104102
0 commit comments