From cc509b299e8bc8ee0f9bce9d575a34022d11e387 Mon Sep 17 00:00:00 2001
From: armar6-demo <armar6-demo@kit.edu>
Date: Fri, 26 Feb 2021 17:05:54 +0100
Subject: [PATCH] (FPK) Fix obstacles of guard and table
---
.../2d_scene_obstacles.json | 36 +++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json b/data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json
index 1ac501d40..52465424e 100644
--- a/data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json
+++ b/data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json
@@ -1,25 +1,25 @@
[{
"name": "guard_frame_right",
- "posX": 3170,
- "posY": 2380,
+ "posX": 3100,
+ "posY": 2330,
"yaw": 0.0,
- "axisLengthX": 150,
- "axisLengthY": 650,
+ "axisLengthX": 170,
+ "axisLengthY": 600,
"refPosX": 3170,
"refPosY": 2320,
- "safetyMarginX": 400,
- "safetyMarginY": 400
+ "safetyMarginX": 300,
+ "safetyMarginY": 300
},{
"name": "guard_corner_fix",
"posX": 3670,
- "posY": 2820,
+ "posY": 2780,
"yaw": 0.0,
- "axisLengthX": 150,
+ "axisLengthX": 100,
"axisLengthY": 150,
"refPosX": 3170,
"refPosY": 2320,
- "safetyMarginX": 400,
- "safetyMarginY": 400
+ "safetyMarginX": 300,
+ "safetyMarginY": 300
},{
"name": "ctrl_table",
"posX": 4400,
@@ -29,11 +29,11 @@
"axisLengthY": 150,
"refPosX": 3170,
"refPosY": 2000,
- "safetyMarginX": 400,
+ "safetyMarginX": 200,
"safetyMarginY": 400
},{
"name": "guard_frame_left",
- "posX": 500,
+ "posX": 700,
"posY": 2380,
"yaw": 0.0,
"axisLengthX": 200,
@@ -77,14 +77,14 @@
"safetyMarginY": 400
},{
"name": "table_corner",
- "posX": 3300,
- "posY": 4850,
+ "posX": 3400,
+ "posY": 4750,
"yaw": 0,
- "axisLengthX": 400,
- "axisLengthY": 600,
+ "axisLengthX": 800,
+ "axisLengthY": 650,
"refPosX": 3400,
"refPosY": 5216,
- "safetyMarginX": 500,
- "safetyMarginY": 500
+ "safetyMarginX": 300,
+ "safetyMarginY": 300
}
]
--
GitLab