diff --git a/ros/kxr_controller/CMakeLists.txt b/ros/kxr_controller/CMakeLists.txt index e4b56837..4e8a6e24 100644 --- a/ros/kxr_controller/CMakeLists.txt +++ b/ros/kxr_controller/CMakeLists.txt @@ -140,6 +140,6 @@ if(CATKIN_ENABLE_TESTING) endif() add_rostest(test/kxr_controller.test ARGS namespace:="") add_rostest(test/kxr_controller.test ARGS namespace:="robot_a") - add_rostest(test/kxr_controller.test ARGS namespace:="" use_rcb4:=true) - add_rostest(test/kxr_controller.test ARGS namespace:="robot_a" use_rcb4:=true) + add_rostest(test/kxr_controller.test ARGS namespace:="" use_rcb4:=true frame_count:=5) + add_rostest(test/kxr_controller.test ARGS namespace:="robot_a" use_rcb4:=true frame_count:=5) endif() diff --git a/ros/kxr_controller/cfg/KXRParameteres.cfg b/ros/kxr_controller/cfg/KXRParameteres.cfg index bf93f5a5..866df09c 100755 --- a/ros/kxr_controller/cfg/KXRParameteres.cfg +++ b/ros/kxr_controller/cfg/KXRParameteres.cfg @@ -8,7 +8,7 @@ from dynamic_reconfigure.parameter_generator_catkin import ParameterGenerator gen = ParameterGenerator() # The value 5 for frame_count was experimentally confirmed to enable smooth interpolation -gen.add("frame_count", int_t, 0, "Frame Count", 5, 1, 255) +gen.add("frame_count", int_t, 0, "Frame Count", 50, 1, 255) gen.add("wheel_frame_count", int_t, 0, "Frame Count for Wheel", 1, 1, 255) exit(gen.generate(PACKAGE, PACKAGE, "KXRParameteres")) diff --git a/ros/kxr_controller/launch/kxr_controller.launch b/ros/kxr_controller/launch/kxr_controller.launch index 11826e8c..d6d5919a 100644 --- a/ros/kxr_controller/launch/kxr_controller.launch +++ b/ros/kxr_controller/launch/kxr_controller.launch @@ -13,6 +13,7 @@ + @@ -41,6 +42,7 @@ control_pressure: $(arg control_pressure) imu_frame_id: $(arg namespace)/$(arg imu_frame_id) use_rcb4: $(arg use_rcb4) + frame_count: $(arg frame_count) diff --git a/ros/kxr_controller/launch/kxr_controller_for_wheel.launch b/ros/kxr_controller/launch/kxr_controller_for_wheel.launch index d2f21620..485791d0 100644 --- a/ros/kxr_controller/launch/kxr_controller_for_wheel.launch +++ b/ros/kxr_controller/launch/kxr_controller_for_wheel.launch @@ -10,6 +10,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/ros/kxr_controller/test/kxr_controller.test b/ros/kxr_controller/test/kxr_controller.test index 3b7c6499..b60b48d7 100644 --- a/ros/kxr_controller/test/kxr_controller.test +++ b/ros/kxr_controller/test/kxr_controller.test @@ -2,12 +2,14 @@ + + diff --git a/ros/kxr_controller/test/test_kxr_controller.py b/ros/kxr_controller/test/test_kxr_controller.py index 7df8df1e..98162483 100644 --- a/ros/kxr_controller/test/test_kxr_controller.py +++ b/ros/kxr_controller/test/test_kxr_controller.py @@ -28,11 +28,11 @@ def setUp(self): def test_follow_joint_trajectory(self): self.ri.servo_on() - self.ri.angle_vector(self.robot_model.init_pose(), 1.0) + self.ri.angle_vector(self.robot_model.init_pose(), 3.0) self.ri.wait_interpolation() self.robot_model.HEAD_JOINT0.joint_angle(np.deg2rad(45)) self.robot_model.HEAD_JOINT1.joint_angle(np.deg2rad(45)) - self.ri.angle_vector(self.robot_model.angle_vector(), 1.0) + self.ri.angle_vector(self.robot_model.angle_vector(), 3.0) self.ri.wait_interpolation() rospy.sleep(1.0) current_angles = self.ri.angle_vector() @@ -43,7 +43,7 @@ def test_follow_joint_trajectory(self): + f"Current angles = {current_angles}, " + f"Expected angles = {expected_angles}", ) - self.ri.angle_vector(self.robot_model.init_pose(), 1.0) + self.ri.angle_vector(self.robot_model.init_pose(), 3.0) self.ri.wait_interpolation() self.ri.servo_off()