Merge pull request #418 from thedropbears/shooter_cal

Author: LucienMorey

components/ballistics.py

@@ -48,16 +48,19 @@ class BallisticsComponent:
     # Tuples are values corresponding to the distances above
     # fmt: off
     FLYWHEEL_TOP_SPEED_LOOKUP = {
-        ALGAE_MIN_DIAMETER: (31, 34, 37.0, 44.5),
-        # 16.5: (60, 80),
-        ALGAE_MAX_DIAMETER: (35, 37, 41.0, 45.0),
+        ALGAE_MIN_DIAMETER: (18, 19, 26.0, 44.5),
+        ALGAE_MAX_DIAMETER: (21, 22, 24.0, 35.0),
     }
-    # Currently we use the same speed top and bottom, but this could be seperate
-    FLYWHEEL_BOTTOM_SPEED_LOOKUP = FLYWHEEL_TOP_SPEED_LOOKUP
+
+    FLYWHEEL_BOTTOM_SPEED_LOOKUP = {
+        ALGAE_MIN_DIAMETER: (36, 40, 44.0, 44.5),
+        ALGAE_MAX_DIAMETER: (36, 37, 44.0, 70.0),
+    }
+
     FLYWHEEL_ANGLE_LOOKUP = {
-        ALGAE_MIN_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-19), math.radians(-25)),
-        # 16.5: (math.radians(-15), math.radians(-20)),
-        ALGAE_MAX_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-19), math.radians(-25)),
+        ALGAE_MIN_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-25), math.radians(-25)),
+        # 16.5: (math.radians(-11.0), math.radians(-19), -25),
+        ALGAE_MAX_DIAMETER: (math.radians(-10), math.radians(-15), math.radians(-25), math.radians(-33)),
     }
     # fmt: on
     BALL_SIZES = list(FLYWHEEL_ANGLE_LOOKUP.keys())