Merge branch 'indigo_dev' of https://github.com/ipa320/cob_robots int…

…o indigo_dev Conflicts: cob_bringup/drivers/sound.launch
ipa320 · Apr 8, 2016 · b727e63 · b727e63
2 parents b2771fb + 3d5184f
commit b727e63
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cob_hardware_config/cob4-2/config/base_driver.yaml b/cob_hardware_config/cob4-2/config/base_driver.yaml
@@ -28,7 +28,10 @@ drive_wheel: &drive_wheel
   pos_to_device: "rint(pos * 4096 * 21 * 1 / (2 * pi))" # rev * gear * belt / (2 * pi)
   vel_to_device: "rint(vel * 4096 * 21 * 1 / (2 * pi))" # rev * gear * belt / (2 * pi)
   pos_from_device: "obj6064 * 2 * pi / ( 4096 * 21 * 1)" # 2 * pi / (rev * gear * belt)
-  vel_from_device: "obj606c * 2 * pi / ( 4096 * 21 * 1)" # 2 * pi / (rev * gear * belt)
+  vel_from_device: "p1 != p1 ? 0 : ((obj6064-p1) * 2 * pi / ( 4096 * 21 * 1)) / (0.02*2), p1=p0, p0 = obj6064"
+
+
+
   motor_layer:
    homing_event: 0 # -> digin
    homing_speed: 0