X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=avr%2Fmotor_ctrl%2Fmain.c;fp=avr%2Fmotor_ctrl%2Fmain.c;h=805788fa4267e43dbc148a5435dac2e618393a60;hp=abbf5386146205c5b52c55780f9b971015ecf2be;hb=5bd96ab44a206b5e85d0f70213046d356f39eef2;hpb=e5d50b6babe986a2dcd4eff47a9600a6014e5d96

diff --git a/avr/motor_ctrl/main.c b/avr/motor_ctrl/main.c
index abbf538..805788f 100644
--- a/avr/motor_ctrl/main.c
+++ b/avr/motor_ctrl/main.c
@@ -105,11 +105,13 @@
 #define KI 0.10
 #define KD 0.0
 #define PID_T 0.01
-// wheel diameter=12cm, encoder=48cpr, gear ratio=1:47, real wheel diameter: 0.12454m
-#define STEP_PER_M_AVG 5766.1
-#define STEP_PER_M_LEFT (STEP_PER_M_AVG)
-#define STEP_PER_M_RIGHT (STEP_PER_M_AVG)
-#define WHEEL_DIST 0.36923 // Real: 0.252
+// wheel diameter=12cm, encoder=48cpr, gear ratio=1:47
+// STEP_PER_M = 48*47/(d*pi)
+// Left real diameter: 0.12808
+#define STEP_PER_M_LEFT 5606.7
+// Right real diameter: 0.121
+#define STEP_PER_M_RIGHT 5934.8
+#define WHEEL_DIST 0.39912 // Measured: 0.252
 #define PWM_BREAK INT16_MIN
 
 enum mode {