diff --git a/examples/so100-remote/no_torque.yml b/examples/so100-remote/no_torque.yml index a3c2ff1d..75c0a9cf 100644 --- a/examples/so100-remote/no_torque.yml +++ b/examples/so100-remote/no_torque.yml @@ -3,7 +3,7 @@ nodes: path: dora-rustypot inputs: tick: dora/timer/millis/33 - pose: pytorch-kinematics/action + #pose: pytorch-kinematics/action outputs: - pose env: @@ -20,7 +20,7 @@ nodes: - pose - action env: - URDF_PATH: so100.urdf + URDF_PATH: so100_2.urdf END_EFFECTOR_LINK: "Fixed_Jaw" so100_transform: 0 -0.3 0 @@ -30,7 +30,7 @@ nodes: inputs: # series_so100: so100/pose series_pose: pytorch-kinematics/pose - #jointstate_so100: so100/position + jointstate_so100: so100/pose env: - so100_urdf: so100.urdf + so100_urdf: so100_2.urdf so100_transform: 0 -0.3 0 diff --git a/examples/so100-remote/parse_keyboard.py b/examples/so100-remote/parse_keyboard.py index 95ba3435..21322ae4 100644 --- a/examples/so100-remote/parse_keyboard.py +++ b/examples/so100-remote/parse_keyboard.py @@ -14,16 +14,11 @@ now = time.time() for j in range(0, 100): for i in range(110): time.sleep(0.033) - x = 0.0 + (j * 0.005) - y = -0.1 - (i * 0.001) - if x == 0: - theta = -1.8 - else: - theta = np.arctan(y / x) + y = 0.0 + (j * 0.1) + x = -0.1 - (i * 0.01) - print("Sending action: ", x, y, theta) node.send_output( "action", - pa.array([0.0 + (j * 0.005), -0.1 - (i * 0.001), 0.18, -3.1, theta, 0.45]), + pa.array([0.0 + (j * 0.05), -0.1 - (i * 0.001), 0.1, -1.6, -0.9, -3.14]), metadata={"encoding": "xyzrpy"}, ) diff --git a/examples/so100-remote/so100.urdf b/examples/so100-remote/so100.urdf index 4c4805ed..f13689fb 100644 --- a/examples/so100-remote/so100.urdf +++ b/examples/so100-remote/so100.urdf @@ -95,7 +95,7 @@ + xyz="0 1 0" /> + name="base_link"> + link="base_link" /> + xyz="0 -1 0" /> @@ -248,7 +248,7 @@ type="continuous"> + rpy="-1.57 0 0" /> + rpy="0 1.57 0" /> + rpy="0 0 0" />