From f03b84b96044b5d1d720d7288a4a6d67b69032c5 Mon Sep 17 00:00:00 2001 From: Lucien Morey Date: Sun, 21 Jun 2026 16:57:43 +1000 Subject: [PATCH 1/2] redo lookup --- components/ballistics.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/ballistics.py b/components/ballistics.py index 33ce0cbd..ab4c8b2b 100644 --- a/components/ballistics.py +++ b/components/ballistics.py @@ -8,13 +8,13 @@ from wpimath.kinematics import ChassisSpeeds # fmt: off -DISTANCE_LOOKUP = np.array([1.75, 2.0, 2.5, 3.0, 3.5, 4.0], dtype=float) -SPEED_LOOKUP = np.array([67.0, 68.0, 73.0, 83.0, 89.0, 94.0], dtype=float) -TIME_LOOKUP = np.array([0.890, 0.945, 1.025, 1.267, 1.435, 1.633], dtype=float) +DISTANCE_LOOKUP = np.array([1.75, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5], dtype=float) +SPEED_LOOKUP = np.array([63.0, 67.0, 73.0, 77.0, 83.0, 87.0, 92.0, 99.0, 106.0], dtype=float) +TIME_LOOKUP = np.array([0.890, 0.945, 1.025, 1.267, 1.435, 1.633, TODO, TODO, TODO], dtype=float) MUZZLE_VELOCITY_LOOKUP = SPEED_LOOKUP * (np.pi * units.inchesToMeters(3)) # rps * pi * diameter # fmt: on -HOPPER_SURFACE_SPEED: units.meters_per_second = 12 +HOPPER_SURFACE_SPEED: units.meters_per_second = 10 @dataclass From 290632d2d4e69b5047afd06849534717f20006d0 Mon Sep 17 00:00:00 2001 From: rafzip Date: Sat, 27 Jun 2026 08:08:48 +1000 Subject: [PATCH 2/2] tof --- components/ballistics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ballistics.py b/components/ballistics.py index ab4c8b2b..059d4538 100644 --- a/components/ballistics.py +++ b/components/ballistics.py @@ -10,7 +10,7 @@ # fmt: off DISTANCE_LOOKUP = np.array([1.75, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5], dtype=float) SPEED_LOOKUP = np.array([63.0, 67.0, 73.0, 77.0, 83.0, 87.0, 92.0, 99.0, 106.0], dtype=float) -TIME_LOOKUP = np.array([0.890, 0.945, 1.025, 1.267, 1.435, 1.633, TODO, TODO, TODO], dtype=float) +TIME_LOOKUP = np.array([0.765, 0.92, 1.065, 1.20, 1.31, 1.39, 1.475, 1.56, 2.01], dtype=float) MUZZLE_VELOCITY_LOOKUP = SPEED_LOOKUP * (np.pi * units.inchesToMeters(3)) # rps * pi * diameter # fmt: on