|
53 | 53 | moveJ_1.joint_positions = [1.57, -1.57, 1.57, -1.57, -1.57, -1.57]
|
54 | 54 | moveJ_1.blend_radius = 0.1
|
55 | 55 | moveJ_1.additional_arguments = [
|
56 |
| - MotionArgument(argument_name="velocity", argument_value=joint_velocity), |
57 |
| - MotionArgument(argument_name="acceleration", argument_value=joint_acceleration), |
58 |
| - MotionArgument(argument_name="move_time", argument_value=move_time), |
| 56 | + MotionArgument(name="velocity", value=joint_velocity), |
| 57 | + MotionArgument(name="acceleration", value=joint_acceleration), |
| 58 | + MotionArgument(name="move_time", value=move_time), |
59 | 59 | ]
|
60 | 60 | # Linear movement down
|
61 | 61 | moveL_1 = MotionPrimitive()
|
62 | 62 | moveL_1.type = MotionPrimitive.LINEAR_CARTESIAN
|
63 | 63 | moveL_1.blend_radius = 0.05
|
64 | 64 | moveL_1.additional_arguments = [
|
65 |
| - MotionArgument(argument_name="velocity", argument_value=cart_velocity), |
66 |
| - MotionArgument(argument_name="acceleration", argument_value=cart_acceleration), |
| 65 | + MotionArgument(name="velocity", value=cart_velocity), |
| 66 | + MotionArgument(name="acceleration", value=cart_acceleration), |
67 | 67 | ]
|
68 | 68 | pose_L1 = PoseStamped()
|
69 | 69 | pose_L1.pose.position.x = 0.174
|
|
129 | 129 | moveJ_eval_0.joint_positions = [1.57, -1.57, 1.57, -1.57, -1.57, -1.57]
|
130 | 130 | moveJ_eval_0.blend_radius = eval_blend_radius
|
131 | 131 | moveJ_eval_0.additional_arguments = [
|
132 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 132 | + MotionArgument(name="move_time", value=eval_move_time), |
133 | 133 | ]
|
134 | 134 | moveJ_eval_1 = MotionPrimitive()
|
135 | 135 | moveJ_eval_1.type = MotionPrimitive.LINEAR_JOINT
|
136 | 136 | moveJ_eval_1.joint_positions = [1.57, -1.1, 1.0, -1.57, -1.57, -1.57]
|
137 | 137 | moveJ_eval_1.blend_radius = eval_blend_radius
|
138 | 138 | moveJ_eval_1.additional_arguments = [
|
139 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 139 | + MotionArgument(name="move_time", value=eval_move_time), |
140 | 140 | ]
|
141 | 141 | moveJ_eval_2 = MotionPrimitive()
|
142 | 142 | moveJ_eval_2.type = MotionPrimitive.LINEAR_JOINT
|
143 | 143 | moveJ_eval_2.joint_positions = [2.0, -0.9, 0.7, -1.57, -1.57, -1.57]
|
144 | 144 | moveJ_eval_2.blend_radius = eval_blend_radius
|
145 | 145 | moveJ_eval_2.additional_arguments = [
|
146 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 146 | + MotionArgument(name="move_time", value=eval_move_time), |
147 | 147 | ]
|
148 | 148 | moveJ_eval_3 = MotionPrimitive()
|
149 | 149 | moveJ_eval_3.type = MotionPrimitive.LINEAR_JOINT
|
150 | 150 | moveJ_eval_3.joint_positions = [2.4, -1.57, 1.57, -1.57, -1.57, -1.57]
|
151 | 151 | moveJ_eval_3.blend_radius = eval_blend_radius
|
152 | 152 | moveJ_eval_3.additional_arguments = [
|
153 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 153 | + MotionArgument(name="move_time", value=eval_move_time), |
154 | 154 | ]
|
155 | 155 | moveJ_eval_4 = MotionPrimitive()
|
156 | 156 | moveJ_eval_4.type = MotionPrimitive.LINEAR_JOINT
|
157 | 157 | moveJ_eval_4.joint_positions = [1.57, -1.57, 1.57, -1.57, -1.57, -1.57]
|
158 | 158 | moveJ_eval_4.blend_radius = eval_blend_radius
|
159 | 159 | moveJ_eval_4.additional_arguments = [
|
160 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 160 | + MotionArgument(name="move_time", value=eval_move_time), |
161 | 161 | ]
|
162 | 162 | moveJ_eval_5 = MotionPrimitive()
|
163 | 163 | moveJ_eval_5.type = MotionPrimitive.LINEAR_JOINT
|
164 | 164 | moveJ_eval_5.joint_positions = [1.57, -1.1, 1.0, -1.57, -1.57, -1.57]
|
165 | 165 | moveJ_eval_5.blend_radius = eval_blend_radius
|
166 | 166 | moveJ_eval_5.additional_arguments = [
|
167 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 167 | + MotionArgument(name="move_time", value=eval_move_time), |
168 | 168 | ]
|
169 | 169 | moveJ_eval_6 = MotionPrimitive()
|
170 | 170 | moveJ_eval_6.type = MotionPrimitive.LINEAR_JOINT
|
171 | 171 | moveJ_eval_6.joint_positions = [1.1, -0.9, 0.7, -1.57, -1.57, -1.57]
|
172 | 172 | moveJ_eval_6.blend_radius = eval_blend_radius
|
173 | 173 | moveJ_eval_6.additional_arguments = [
|
174 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 174 | + MotionArgument(name="move_time", value=eval_move_time), |
175 | 175 | ]
|
176 | 176 | moveJ_eval_7 = MotionPrimitive()
|
177 | 177 | moveJ_eval_7.type = MotionPrimitive.LINEAR_JOINT
|
178 | 178 | moveJ_eval_7.joint_positions = [0.7, -1.57, 1.57, -1.57, -1.57, -1.57]
|
179 | 179 | moveJ_eval_7.blend_radius = eval_blend_radius
|
180 | 180 | moveJ_eval_7.additional_arguments = [
|
181 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 181 | + MotionArgument(name="move_time", value=eval_move_time), |
182 | 182 | ]
|
183 | 183 | moveJ_eval_8 = MotionPrimitive()
|
184 | 184 | moveJ_eval_8.type = MotionPrimitive.LINEAR_JOINT
|
185 | 185 | moveJ_eval_8.joint_positions = [1.57, -1.57, 1.57, -1.57, -1.57, -1.57]
|
186 | 186 | moveJ_eval_8.blend_radius = eval_blend_radius
|
187 | 187 | moveJ_eval_8.additional_arguments = [
|
188 |
| - MotionArgument(argument_name="move_time", argument_value=eval_move_time), |
| 188 | + MotionArgument(name="move_time", value=eval_move_time), |
189 | 189 | ]
|
190 | 190 |
|
191 | 191 |
|
|
0 commit comments