diff --git a/rbs_mill_assist/assets/bunker/meshes/Bunker_for_labels_60х40.STL b/rbs_mill_assist/assets/bunker/meshes/Bunker_for_labels_60х40.STL
new file mode 100644
index 0000000..2ab7bf2
Binary files /dev/null and b/rbs_mill_assist/assets/bunker/meshes/Bunker_for_labels_60х40.STL differ
diff --git a/rbs_mill_assist/assets/bunker/model.sdf b/rbs_mill_assist/assets/bunker/model.sdf
index ede8a4e..54faf4f 100644
--- a/rbs_mill_assist/assets/bunker/model.sdf
+++ b/rbs_mill_assist/assets/bunker/model.sdf
@@ -6,41 +6,41 @@
- model://bunker/meshes/bunker.stl
+ model://bunker/meshes/Bunker_for_labels_60х40.STL
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 1 1 1 1
+ 1 1 1 1
+ 0.5 0.5 0.5 1
+ 0 0 0 1
+
-
+
- model://bunker/meshes/bunker.stl
+ model://bunker/meshes/Bunker_for_labels_60х40.STL
-
+
+ 1e6
+ 1e3
+ 0.1
+ 0.001
+
-
+
+ 0.3
+
-
+
+ 0.61
+ 0.47
+ 0.0
+ 0.0
+
diff --git a/rbs_mill_assist/bt/xmls/MainTree.xml b/rbs_mill_assist/bt/xmls/MainTree.xml
index 6cdae24..59258cb 100644
--- a/rbs_mill_assist/bt/xmls/MainTree.xml
+++ b/rbs_mill_assist/bt/xmls/MainTree.xml
@@ -1,8 +1,9 @@
+
-
+
-
+
+
+
diff --git a/rbs_mill_assist/config/grasping.yaml b/rbs_mill_assist/config/grasping.yaml
index 96082a3..79a08d2 100644
--- a/rbs_mill_assist/config/grasping.yaml
+++ b/rbs_mill_assist/config/grasping.yaml
@@ -3,7 +3,7 @@ to_graver:
position:
x: -0.3
y: -0.20
- z: 0.1
+ z: 0.2
orientation:
x: 0.707
y: -0.707
@@ -23,7 +23,7 @@ to_graver:
position:
x: -0.3
y: -0.20
- z: 0.1
+ z: 0.2
orientation:
x: 0.707
y: -0.707
@@ -96,7 +96,7 @@ from_graver:
position:
x: -0.3
y: 0.20
- z: 0.1
+ z: 0.2
orientation:
x: 0.707
y: -0.707
@@ -116,7 +116,7 @@ from_graver:
position:
x: -0.3
y: 0.20
- z: 0.1
+ z: 0.2
orientation:
x: 0.707
y: -0.707
diff --git a/rbs_mill_assist/world/default.sdf b/rbs_mill_assist/world/default.sdf
index 97fb3a0..944e48b 100644
--- a/rbs_mill_assist/world/default.sdf
+++ b/rbs_mill_assist/world/default.sdf
@@ -37,7 +37,7 @@
name="gz::sim::systems::SceneBroadcaster">
+ name="gz::sim::systems::Contact">
@@ -53,30 +53,30 @@
-0.5 0.1 -0.9
-
+
shildik_0
- -0.5 -0.2 0.0 0 0 1.57
+ -0.5 -0.2 0.02 0 0 1.57
model://shildik
shildik_1
- -0.5 -0.2 0.0 0 0 1.57
+ -0.5 -0.2 0.04 0 0 1.57
model://shildik
shildik_2
- -0.5 -0.2 0.0 0 0 1.57
+ -0.5 -0.2 0.05 0 0 1.57
model://shildik
shildik_3
- -0.5 -0.2 0.0 0 0 1.57
+ -0.5 -0.2 0.06 0 0 1.57
model://shildik
shildik_4
- -0.5 -0.2 0.0 0 0 1.57
+ -0.5 -0.2 0.07 0 0 1.57
model://shildik
@@ -86,67 +86,67 @@
model://laser
-
-
-
-
-
+
+ true
+ -0.505 -0.20 0.06 0.0 0.0 1.57
+ model://bunker
+
-
- 0 -0.93 0.42 0 0.4 1.81
- 1
-
+
+ 0 -0.93 0.42 0 0.4 1.81
+ 1
+
-
-
- 0 0 0 0 0 0
-
-
- 0.01 0.01 0.01
-
-
-
- 0 0 0 1
- 0 0 0 1
- 0 0 0 1
-
-
+
+
+ 0 0 0 0 0 0
+
+
+ 0.01 0.01 0.01
+
+
+
+ 0 0 0 1
+ 0 0 0 1
+ 0 0 0 1
+
+
-
-
- 0 0 0 0 0 0
-
-
- 0.01 0.01 0.01
-
-
-
+
+
+ 0 0 0 0 0 0
+
+
+ 0.01 0.01 0.01
+
+
+
-
-
-
- 1.047
-
- 1920
- 1080
- R8G8B8
-
-
- 0.1
- 3
-
-
-
-
-
- 1
- 30
- true
- /rgbd_camera/image
- true
-
-
-
+
+
+
+ 1.047
+
+ 1920
+ 1080
+ R8G8B8
+
+
+ 0.1
+ 3
+
+
+
+
+
+ 1
+ 30
+ true
+ /rgbd_camera/image
+ true
+
+
+
@@ -174,10 +174,20 @@
-
+
+ 1.0
+ 1.0
+
-
-
+
+
+
+ 0.00001
+ 0.8
+ 1e5
+ 1e3
+
+
@@ -187,17 +197,17 @@
1.2 0.69999999999999996 0.80000000000000004
-
- 0 0 1 1
- 0 0 1 1
-
+
+ 0.6 0.4 0.2 1
+ 0.6 0.4 0.2 1
+ 0.1 0.1 0.1 1
+ 0 0 0 1
+
false
-
-