updated values

[ros_roboint.git] / scripts / robo_explorer.py

diff --git a/scripts/robo_explorer.py b/scripts/robo_explorer.py
index 039fbd41e0cd670279860468e8d7fa0150455e62..24584e78a3443e82a900b530e0925f1d717a8095 100755 (executable)
--- a/scripts/robo_explorer.py
+++ b/scripts/robo_explorer.py
@@ -27,12 +27,20 @@ class RoboExplorer:
                self.y_last = 0
                self.alpha_last = 0
 
-               self.enable_ultrasonic_laser = int(rospy.get_param('~ultrasonic_laser', "1"))
-               self.wheel_dist = float(rospy.get_param('~wheel_dist', "0.188"))
-               self.wheel_size = float(rospy.get_param('~wheel_size', "0.0255"))
+               # fake laser scan with ultra sonic range finder
+               self.enable_ultrasonic_laser = bool(rospy.get_param('~ultrasonic_laser', "True"))
+               # Distance between both wheels in meter (18.55cm)
+               self.wheel_dist = float(rospy.get_param('~wheel_dist', "0.1855"))
+               # Size of wheel Diameter in meter (5.15cm) * gear ratio (0.5) = 2.575cm 
+               self.wheel_size = float(rospy.get_param('~wheel_size', "0.02575"))
+               # Speed to PWM equation gradiant (The m in pwm = speed*m+b)
+               self.speed_gradiant = float(rospy.get_param('~speed_gradiant', "64.3"))
+               # Speed to PWM equation constant (The b in pwm = speed*m+b)
+               self.speed_constant = float(rospy.get_param('~speed_constant', "-1.7"))
 
                self.pub_motor = rospy.Publisher("ft/set_motor", Motor)
-               self.pub_scan = rospy.Publisher("scan", LaserScan)
+               if self.enable_ultrasonic_laser:
+                       self.pub_scan = rospy.Publisher("scan", LaserScan)
                self.pub_odom = rospy.Publisher("odom", Odometry)
                
                rospy.Subscriber("cmd_vel", Twist, self.cmdVelReceived)
@@ -155,14 +163,14 @@ class RoboExplorer:
                # handle translation
                speed_l = 0
                wish_speed_left = trans - speed_offset
-               if abs(wish_speed_left) > 1.7/64.3:
-                       speed_l = 64.3*abs(wish_speed_left) - 1.7
+               if abs(wish_speed_left) > 0:
+                       speed_l = self.speed_gradiant*abs(wish_speed_left) + self.speed_constant
                        if wish_speed_left < 0:
                                speed_l*=-1
                speed_r = 0
                wish_speed_right = trans + speed_offset
-               if abs(wish_speed_right) > 1.7/64.3:
-                       speed_r = 64.3*abs(wish_speed_right) - 1.7
+               if abs(wish_speed_right) > 0:
+                       speed_r = self.speed_gradiant*abs(wish_speed_right) + self.speed_constant
                        if wish_speed_right < 0:
                                speed_r*=-1
 
@@ -172,7 +180,7 @@ class RoboExplorer:
                if speed_r < -7: speed_r = -7
                elif speed_r > 7: speed_r = 7
 
-               #print "Speed wanted: %.2f %.2f, set: %d %d" % (trans, rot*180/pi, round(speed_l), round(speed_r))
+               #print "Speed wanted: %.2f m/s %.2f rad/s, set: %d %d" % (trans, rot, round(speed_l), round(speed_r))
 
                outmsg = Motor()
                outmsg.num = 1