diff --git a/src/drawing_controller/drawing_controller/svg_processor.py b/src/drawing_controller/drawing_controller/svg_processor.py index 6303563..6634661 100644 --- a/src/drawing_controller/drawing_controller/svg_processor.py +++ b/src/drawing_controller/drawing_controller/svg_processor.py @@ -197,8 +197,7 @@ class SVGProcessor(): Simplify line with https://pypi.org/project/simplification/ """ # For RDP, Try an epsilon of 1.0 to start with. Other sensible values include 0.01, 0.001 - #epsilon = 0.00005 - epsilon = 0.0008 + epsilon = 0.00005 tmp = [] out = [] diff --git a/src/lite6_controller/src/lite6_controller.cpp b/src/lite6_controller/src/lite6_controller.cpp index 9b38ce3..dc2a966 100644 --- a/src/lite6_controller/src/lite6_controller.cpp +++ b/src/lite6_controller/src/lite6_controller.cpp @@ -80,8 +80,9 @@ public: float xlim_upper = 0.305; float ylim_lower = -0.1475; float ylim_upper = 0.1475; - float zlim_lower = 0.1945; - float zlim_upper = 0.200; + //float zlim_lower = 0.1945; + float zlim_lower = 0.207493; + float zlim_upper = zlim_lower + 0.01; /** @@ -180,8 +181,8 @@ public: { moveit_msgs::msg::MotionSequenceRequest msr = moveit_msgs::msg::MotionSequenceRequest(); //waypoints.push_back(move_group.getCurrentPose().pose); - std::string ee_link = move_group.getLinkNames().back(); - //std::string ee_link = "pen_link"; + //std::string ee_link = move_group.getLinkNames().back(); + std::string ee_link = "pen_link"; RCLCPP_INFO(this->get_logger(), "Got ee_link: %s", ee_link.c_str()); geometry_msgs::msg::Point previous_point; //previous_point.point.x = -1.0; @@ -199,7 +200,7 @@ public: mpr.group_name = move_group.getName(); //mpr.max_velocity_scaling_factor = 1.0; mpr.max_velocity_scaling_factor = 1.0; - mpr.max_acceleration_scaling_factor = 1.0; + mpr.max_acceleration_scaling_factor = 0.8; //mpr.max_acceleration_scaling_factor = 0.1; mpr.allowed_planning_time = 20; //mpr.max_cartesian_speed = 2; // m/s