Update intake gear ratio
It was too slow, so we sped it up. Retune the loop slightly and update
the accel in joystick reader now that we can.
Change-Id: I4cc6bff7449b218a17b11230a08bc17d10b470bb
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/y2020/control_loops/python/intake.py b/y2020/control_loops/python/intake.py
index de60b28..1035070 100644
--- a/y2020/control_loops/python/intake.py
+++ b/y2020/control_loops/python/intake.py
@@ -20,8 +20,8 @@
kIntake = angular_system.AngularSystemParams(
name='Intake',
motor=control_loop.BAG(),
- G=(12.0 / 24.0) * (1.0 / 7.0) * (1.0 / 7.0) * (16.0 / 32.0),
- J=6 * 0.139 * 0.139,
+ G=(12.0 / 24.0) * (1.0 / 5.0) * (1.0 / 5.0) * (16.0 / 32.0),
+ J=8 * 0.139 * 0.139,
q_pos=0.40,
q_vel=20.0,
kalman_q_pos=0.12,