@@ -264,8 +264,8 @@ public static final class Settings {
264
264
FLYWHEEL_SPEAKER_DISTANCE_LUT .put (0.0 , 4000 / 60.0 );
265
265
FLYWHEEL_SPEAKER_DISTANCE_LUT .put (Units .feetToMeters (5 ), 4000 / 60.0 );
266
266
FLYWHEEL_SPEAKER_DISTANCE_LUT .put (
267
- Units .feetToMeters (10 ), Flywheel .Settings .BASE_SHOT_VELOCITY );
268
- FLYWHEEL_SPEAKER_DISTANCE_LUT .put (20.0 , Flywheel .Settings .BASE_SHOT_VELOCITY );
267
+ Units .feetToMeters (10 ), Flywheel .Settings .PARTIAL_SPINUP_VELOCITY );
268
+ FLYWHEEL_SPEAKER_DISTANCE_LUT .put (20.0 , Flywheel .Settings .PARTIAL_SPINUP_VELOCITY );
269
269
270
270
// ARM SPEAKER OFFSETS
271
271
ORIGINAL_SPEAKER_LUT .put (0.0 , 0.0 );
@@ -274,7 +274,7 @@ public static final class Settings {
274
274
ORIGINAL_SPEAKER_LUT .put (Units .feetToMeters (14 ), Math .toRadians (3 ));
275
275
ORIGINAL_SPEAKER_LUT .put (Units .feetToMeters (16 ), Math .toRadians (4.5 ));
276
276
ORIGINAL_SPEAKER_LUT .put (Units .feetToMeters (18 ), Math .toRadians (5.5 ));
277
- ORIGINAL_SPEAKER_LUT .put (Units .feetToMeters (20 ), Math .toRadians (8 ));
277
+ ORIGINAL_SPEAKER_LUT .put (Units .feetToMeters (20 ), Math .toRadians (7.75 ));
278
278
ORIGINAL_SPEAKER_LUT .put (Units .feetToMeters (22 ), Math .toRadians (9 ));
279
279
ORIGINAL_SPEAKER_LUT .put (Units .feetToMeters (24 ), Math .toRadians (10 ));
280
280
ORIGINAL_SPEAKER_LUT .put (100.0 , Math .toRadians (10 ));
@@ -369,7 +369,7 @@ public static final class Settings {
369
369
370
370
public static final double POSITION_READY_TOLERANCE = 2 * (Math .PI / 180 ); // RAD
371
371
372
- public static final double BASE_SHOT_POSITION = 55 * (Math .PI / 180 ); // RAD - Originally 59
372
+ public static final double BASE_SHOT_POSITION = 55 * (Math .PI / 180 ); // RAD - originally 59
373
373
public static final double AUTO_START_POSITION = 55 * (Math .PI / 180 ); // RAD
374
374
public static final double AMP_POSITION = 50 * (Math .PI / 180 ); // RAD
375
375
public static final double FULL_STOW_POSITION = 20.5 * (Math .PI / 180 ); // RAD
@@ -435,9 +435,9 @@ public static final class Hardware {
435
435
}
436
436
437
437
public static final class Settings {
438
- public static final double BASE_SHOT_VELOCITY = 5520 / 60.0 ; // RPS
438
+ public static final double BASE_SHOT_VELOCITY = 3970 / 60.0 ; // RPS
439
439
440
- public static final double PARTIAL_SPINUP_VELOCITY = BASE_SHOT_VELOCITY / 1 ;
440
+ public static final double PARTIAL_SPINUP_VELOCITY = 5520 / 60.0 ; // RPS
441
441
442
442
public static final double SPIN_UP_READY_TOLERANCE = 5 ; // RPS
443
443
0 commit comments