|
@@ -39,7 +39,7 @@ class BaseController:
|
|
|
self.base_frame = base_frame
|
|
|
self.odom_name = rospy.get_param("~odom_name", "odom")
|
|
|
self.cmd_topic = rospy.get_param("~cmd_topic", "cmd_vel")
|
|
|
- self.rate = float(rospy.get_param("~base_controller_rate", 15))
|
|
|
+ self.rate = float(rospy.get_param("~base_controller_rate", 20))
|
|
|
self.timeout = rospy.get_param("~base_controller_timeout", 0.7)
|
|
|
|
|
|
pid_params = dict()
|
|
@@ -47,24 +47,24 @@ class BaseController:
|
|
|
pid_params['wheel_track'] = rospy.get_param("~wheel_track", 0.126)
|
|
|
pid_params['encoder_resolution'] = rospy.get_param("~encoder_resolution", 11)
|
|
|
pid_params['gear_reduction'] = rospy.get_param("~gear_reduction", 103)
|
|
|
- pid_params['AWheel_Kp'] = rospy.get_param("~AWheel_Kp", 11)
|
|
|
+ pid_params['AWheel_Kp'] = rospy.get_param("~AWheel_Kp", 15)
|
|
|
pid_params['AWheel_Kd'] = rospy.get_param("~AWheel_Kd", 15)
|
|
|
pid_params['AWheel_Ki'] = rospy.get_param("~AWheel_Ki", 0)
|
|
|
pid_params['AWheel_Ko'] = rospy.get_param("~AWheel_Ko", 50)
|
|
|
|
|
|
- pid_params['BWheel_Kp'] = rospy.get_param("~BWheel_Kp", 11)
|
|
|
+ pid_params['BWheel_Kp'] = rospy.get_param("~BWheel_Kp", 15)
|
|
|
pid_params['BWheel_Kd'] = rospy.get_param("~BWheel_Kd", 15)
|
|
|
pid_params['BWheel_Ki'] = rospy.get_param("~BWheel_Ki", 0)
|
|
|
pid_params['BWheel_Ko'] = rospy.get_param("~BWheel_Ko", 50)
|
|
|
|
|
|
- pid_params['CWheel_Kp'] = rospy.get_param("~CWheel_Kp", 11)
|
|
|
+ pid_params['CWheel_Kp'] = rospy.get_param("~CWheel_Kp", 15)
|
|
|
pid_params['CWheel_Kd'] = rospy.get_param("~CWheel_Kd", 16)
|
|
|
pid_params['CWheel_Ki'] = rospy.get_param("~CWheel_Ki", 0)
|
|
|
pid_params['CWheel_Ko'] = rospy.get_param("~CWheel_Ko", 50)
|
|
|
|
|
|
self.debugPID = rospy.get_param('~debugPID', False)
|
|
|
self.accel_limit = rospy.get_param('~accel_limit', 0.05)
|
|
|
- self.linear_scale_correction = rospy.get_param("~linear_scale_correction", 1.0)
|
|
|
+ self.linear_scale_correction = rospy.get_param("~linear_scale_correction", 1.0)
|
|
|
self.angular_scale_correction = rospy.get_param("~angular_scale_correction", 1.0)
|
|
|
|
|
|
# Set up PID parameters and check for missing values
|