Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history 
some fixes

See merge request niryo/niryo-one-s/ned_ros_stack!299
  • Loading branch information
Valentin Pitre committed Apr 13, 2022
2 parents fe77798 + 77ac074 commit d37bb08
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion niryo_robot_poses_handlers/grips/ned2/default_Electromagnet_1.grip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"translation": [
0.0,
0.0,
0.035
0.027
],
"quaternion": [
0.0,
Expand Down
2 changes: 1 addition & 1 deletion niryo_robot_poses_handlers/grips/ned2/default_Gripper_1.grip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"translation": [
0.0,
0.0,
0.095
0.085
],
"quaternion": [
0.0,
Expand Down
2 changes: 1 addition & 1 deletion niryo_robot_poses_handlers/grips/ned2/default_Gripper_2.grip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"translation": [
0.0,
0.0,
0.120
0.110
],
"quaternion": [
0.0,
Expand Down
2 changes: 1 addition & 1 deletion niryo_robot_poses_handlers/grips/ned2/default_Gripper_3.grip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"translation": [
0.0,
0.0,
0.125
0.114
],
"quaternion": [
0.0,
Expand Down
2 changes: 1 addition & 1 deletion niryo_robot_poses_handlers/grips/ned2/default_No_Tool.grip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"translation": [
0.0,
0.0,
0.007
0.0
],
"quaternion": [
0.0,
Expand Down
2 changes: 1 addition & 1 deletion niryo_robot_poses_handlers/grips/ned2/default_Vacuum_Pump_1.grip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"translation": [
0.0,
0.0,
0.043
0.045
],
"quaternion": [
0.0,
Expand Down
12 changes: 6 additions & 6 deletions niryo_robot_tools_commander/config/ned2/tools_definition.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ tool_list:
available_commands:
[ ]
transformation:
translation: [0.007, 0.0, 0.0]
translation: [0.00, 0.0, 0.0]
quaternion: [0.0, 0.0, 0.0, 1.0]
- name: "Gripper 1"
type: "gripper"
Expand All @@ -33,7 +33,7 @@ tool_list:
min: -1400
max: 1400
transformation:
translation: [0.095, 0.0, 0.0]
translation: [0.085, 0.0, 0.0]
quaternion: [0.0, 0.0, 0.0, 1.0]
- name: "Gripper 2"
type: "gripper"
Expand All @@ -54,7 +54,7 @@ tool_list:
min: -1000
max: 1000
transformation:
translation: [0.120, 0.0, 0.0]
translation: [0.110, 0.0, 0.0]
quaternion: [0.0, 0.0, 0.0, 1.0]
- name: "Gripper 3"
type: "gripper"
Expand All @@ -73,7 +73,7 @@ tool_list:
min: -1000
max: 1000
transformation:
translation: [0.125, 0.0, 0.0]
translation: [0.114, 0.0, 0.0]
quaternion: [0.0, 0.0, 0.0, 1.0]
- name: "Electromagnet 1"
type: "electromagnet"
Expand All @@ -85,7 +85,7 @@ tool_list:
specs:
[ ]
transformation:
translation: [0.035, 0.0, 0.0]
translation: [0.027, 0.0, 0.0]
quaternion: [0.0, 0.0, 0.0, 1.0]
- name: "Vacuum Pump 1"
type: "vacuum_pump"
Expand All @@ -103,7 +103,7 @@ tool_list:
min: -1000
max: 1000
transformation:
translation: [0.043, 0.0, 0.0]
translation: [0.045, 0.0, 0.0]
quaternion: [0.0, 0.0, 0.0, 1.0]


0 comments on commit d37bb08

Please sign in to comment.