avr/motor_ctrl: odom fixes

[ros_wild_thumper.git] / avr / motor_ctrl / main.c

diff --git a/avr/motor_ctrl/main.c b/avr/motor_ctrl/main.c
index bd9fc9e31d634c73f3e622b3508db4d850e4ae3d..fbdc1cecd5ed095a1cec4eb3f6f5186c3dfc2283 100644 (file)
--- a/avr/motor_ctrl/main.c
+++ b/avr/motor_ctrl/main.c
@@ -106,7 +106,7 @@
 #define KI 0.051429
 #define KD 0.000378
 #define PID_T 0.01
-#define STEP_PER_M 3376.1 // wheel diameter=12cm, encoder=48cpr, gear ratio=1:34
+#define STEP_PER_M 4171.4 // wheel diameter=12cm, encoder=48cpr, gear ratio=1:34
 #define WHEEL_DIST 0.252
 
 enum mode {
@@ -778,7 +778,7 @@ static void update_pos(void) {
 
        angle_new = angle.f + angle_diff;
        if (angle_new > 2*M_PI) angle_new-=2*M_PI;
-       else if (angle_new < 2*M_PI) angle_new+=2*M_PI;
+       else if (angle_new < -2*M_PI) angle_new+=2*M_PI;
 
        translation = (diff_left_m + diff_right_m)/2.0;
        pos_x_new = pos_x.f + cos(angle_new)*translation;