Skip to content

Commit fce9238

Browse files
committed
remove 4 m setpoints
1 parent a374a63 commit fce9238

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

components/ballistics.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ class BallisticsComponent:
4343
barge_blue_mid_end_point = Translation2d(FIELD_LENGTH / 2, FIELD_WIDTH / 2)
4444

4545
# TODO Retune for >= 4m when the space allows
46-
FLYWHEEL_DISTANCE_LOOKUP = (1.5, 2.0, 3.0, 4.0)
46+
FLYWHEEL_DISTANCE_LOOKUP = (1.5, 2.0, 3.0)
4747
# Keys of the lookup dictionaries are ball diameters in inches
4848
# Tuples are values corresponding to the distances above
4949
# fmt: off
5050
FLYWHEEL_TOP_SPEED_LOOKUP = {
51-
ALGAE_MIN_DIAMETER: (17, 19, 26.0, 44.5),
52-
ALGAE_MAX_DIAMETER: (21, 22, 24.0, 35.0),
51+
ALGAE_MIN_DIAMETER: (17, 19, 26.0),
52+
ALGAE_MAX_DIAMETER: (21, 22, 24.0),
5353
}
5454

5555
FLYWHEEL_BOTTOM_SPEED_LOOKUP = {
56-
ALGAE_MIN_DIAMETER: (33, 36, 44.0, 44.5),
57-
ALGAE_MAX_DIAMETER: (36, 37, 44.0, 70.0),
56+
ALGAE_MIN_DIAMETER: (33, 36, 44.0),
57+
ALGAE_MAX_DIAMETER: (36, 37, 44.0),
5858
}
5959

6060
FLYWHEEL_ANGLE_LOOKUP = {
61-
ALGAE_MIN_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-25), math.radians(-25)),
61+
ALGAE_MIN_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-25)),
6262
# 16.5: (math.radians(-11.0), math.radians(-19), -25),
63-
ALGAE_MAX_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-25), math.radians(-33)),
63+
ALGAE_MAX_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-25)),
6464
}
6565
# fmt: on
6666
BALL_SIZES = list(FLYWHEEL_ANGLE_LOOKUP.keys())

0 commit comments

Comments
 (0)