diff --git a/mycobot_pro/mycobot_600_moveit/config/firefighter.srdf b/mycobot_pro/mycobot_600_moveit/config/firefighter.srdf
index 07152c0..a38b519 100644
--- a/mycobot_pro/mycobot_600_moveit/config/firefighter.srdf
+++ b/mycobot_pro/mycobot_600_moveit/config/firefighter.srdf
@@ -27,7 +27,10 @@
-
+
+
+
+
diff --git a/mycobot_pro/mycobot_600_moveit/config/ompl_planning.yaml b/mycobot_pro/mycobot_600_moveit/config/ompl_planning.yaml
index 6c2d3f5..3f4d0c2 100644
--- a/mycobot_pro/mycobot_600_moveit/config/ompl_planning.yaml
+++ b/mycobot_pro/mycobot_600_moveit/config/ompl_planning.yaml
@@ -121,7 +121,7 @@ planner_configs:
dense_delta_fraction: 0.001 # delta fraction for interface detection. default: 0.001
max_failures: 5000 # maximum consecutive failure limit. default: 5000
arm_group:
- default_planner_config: RRT
+ default_planner_config: None
planner_configs:
- SBL
- EST
diff --git a/mycobot_pro/mycobot_600_moveit/config/ros_controllers.yaml b/mycobot_pro/mycobot_600_moveit/config/ros_controllers.yaml
index 3f053a8..6b814df 100644
--- a/mycobot_pro/mycobot_600_moveit/config/ros_controllers.yaml
+++ b/mycobot_pro/mycobot_600_moveit/config/ros_controllers.yaml
@@ -23,9 +23,4 @@ joint_state_controller:
type: joint_state_controller/JointStateController
publish_rate: 50
controller_list:
- []
- # - name: arm_controller
- # action_ns: follow_joint_trajectory
- # type: FollowJointTrajectory
- # allowed_execution_duration_scaling: 1.2
- # allowed_goal_duration_margin: 0.5
\ No newline at end of file
+ []
\ No newline at end of file
diff --git a/mycobot_pro/mycobot_600_moveit/launch/demo.launch b/mycobot_pro/mycobot_600_moveit/launch/demo.launch
index 987d8e9..5953d25 100644
--- a/mycobot_pro/mycobot_600_moveit/launch/demo.launch
+++ b/mycobot_pro/mycobot_600_moveit/launch/demo.launch
@@ -1,11 +1,14 @@
+
+
+
+
@@ -27,15 +31,18 @@
+
[move_group/fake_controller_joint_states]
+
+
@@ -44,12 +51,14 @@
+
+
diff --git a/mycobot_pro/mycobot_600_moveit/launch/gazebo.launch b/mycobot_pro/mycobot_600_moveit/launch/gazebo.launch
index 108fd57..dd6140b 100644
--- a/mycobot_pro/mycobot_600_moveit/launch/gazebo.launch
+++ b/mycobot_pro/mycobot_600_moveit/launch/gazebo.launch
@@ -2,7 +2,7 @@
-
+
diff --git a/mycobot_pro/mycobot_600_moveit/launch/moveit.rviz b/mycobot_pro/mycobot_600_moveit/launch/moveit.rviz
index b796923..04b69cf 100644
--- a/mycobot_pro/mycobot_600_moveit/launch/moveit.rviz
+++ b/mycobot_pro/mycobot_600_moveit/launch/moveit.rviz
@@ -5,9 +5,13 @@ Panels:
Property Tree Widget:
Expanded:
- /Global Options1
- - /Grid1
+ - /Status1
- /MotionPlanning1
- Splitter Ratio: 0.742560029
+ - /MotionPlanning1/Scene Geometry1
+ - /MotionPlanning1/Scene Robot1
+ - /MotionPlanning1/Planning Request1
+ - /MotionPlanning1/Planned Path1
+ Splitter Ratio: 0.44475922
Tree Height: 195
- Class: rviz/Help
Name: Help
@@ -107,7 +111,7 @@ Visualization Manager:
Show Axes: false
Show Trail: false
Value: true
- Loop Animation: true
+ Loop Animation: false
Robot Alpha: 0.5
Robot Color: 150; 50; 150
Show Robot Collision: false
@@ -131,7 +135,7 @@ Visualization Manager:
Joint Violation Color: 255; 0; 255
Planning Group: arm_group
Query Goal State: true
- Query Start State: false
+ Query Start State: true
Show Workspace: false
Start State Alpha: 1
Start State Color: 0; 255; 0
@@ -189,7 +193,7 @@ Visualization Manager:
Value: true
Robot Alpha: 0.5
Show Robot Collision: false
- Show Robot Visual: true
+ Show Robot Visual: false
Value: true
Velocity_Scaling_Factor: 1
Enabled: true
@@ -208,7 +212,7 @@ Visualization Manager:
Views:
Current:
Class: rviz/XYOrbit
- Distance: 2.99650002
+ Distance: 1.39158678
Enable Stereo Rendering:
Stereo Eye Separation: 0.0599999987
Stereo Focal Distance: 1
@@ -223,10 +227,10 @@ Visualization Manager:
Invert Z Axis: false
Name: Current View
Near Clip Distance: 0.00999999978
- Pitch: -0.340202928
- Target Frame: base
+ Pitch: -0.040203426
+ Target Frame: joint1
Value: XYOrbit (rviz)
- Yaw: 3.98176312
+ Yaw: 6.21176481
Saved: ~
Window Geometry:
Displays:
@@ -240,7 +244,7 @@ Window Geometry:
collapsed: false
MotionPlanning - Trajectory Slider:
collapsed: false
- QMainWindow State: 000000ff00000000fd0000000100000000000002ad0000033cfc0200000007fb000000100044006900730070006c006100790073010000002800000158000000d700fffffffb0000000800480065006c00700000000342000000bb0000007300fffffffb0000000a0056006900650077007300000003b0000000b0000000ad00fffffffb0000000c00430061006d00650072006100000002ff000001610000000000000000fb0000001e004d006f00740069006f006e00200050006c0061006e006e0069006e00670100000374000001890000000000000000fb00000044004d006f00740069006f006e0050006c0061006e006e0069006e00670020002d0020005400720061006a006500630074006f0072007900200053006c006900640065007201000001860000004a0000004a00fffffffb0000001c004d006f00740069006f006e0050006c0061006e006e0069006e006701000001d60000018e0000018300ffffff000004710000033c00000001000000020000000100000002fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
+ QMainWindow State: 000000ff00000000fd0000000100000000000002d10000033cfc0200000007fb000000100044006900730070006c006100790073010000002800000158000000d700fffffffb0000000800480065006c00700000000342000000bb0000007300fffffffb0000000a0056006900650077007300000003b0000000b0000000ad00fffffffb0000000c00430061006d00650072006100000002ff000001610000000000000000fb0000001e004d006f00740069006f006e00200050006c0061006e006e0069006e00670100000374000001890000000000000000fb00000044004d006f00740069006f006e0050006c0061006e006e0069006e00670020002d0020005400720061006a006500630074006f0072007900200053006c006900640065007201000001860000004a0000004a00fffffffb0000001c004d006f00740069006f006e0050006c0061006e006e0069006e006701000001d60000018e0000018300ffffff0000044d0000033c00000001000000020000000100000002fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
Views:
collapsed: false
Width: 1828
diff --git a/mycobot_pro/mycobot_600_moveit/launch/mycobot600_moveit.launch b/mycobot_pro/mycobot_600_moveit/launch/mycobot600_moveit.launch
index b0f1449..a5395fc 100644
--- a/mycobot_pro/mycobot_600_moveit/launch/mycobot600_moveit.launch
+++ b/mycobot_pro/mycobot_600_moveit/launch/mycobot600_moveit.launch
@@ -12,6 +12,7 @@