diff --git a/examples/mujoco-sim/URDF/franka_panda/panda.urdf b/examples/mujoco-sim/URDF/franka_panda/panda.urdf deleted file mode 100644 index abb3b2ed..00000000 --- a/examples/mujoco-sim/URDF/franka_panda/panda.urdf +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/mujoco-sim/URDF/kuka_iiwa/model.urdf b/examples/mujoco-sim/URDF/kuka_iiwa/model.urdf deleted file mode 100644 index 98e54cb3..00000000 --- a/examples/mujoco-sim/URDF/kuka_iiwa/model.urdf +++ /dev/null @@ -1,289 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/mujoco-sim/basic_simulation/basic.yml b/examples/mujoco-sim/basic_simulation/basic.yml index 3bb8c3e3..ae077d78 100644 --- a/examples/mujoco-sim/basic_simulation/basic.yml +++ b/examples/mujoco-sim/basic_simulation/basic.yml @@ -3,10 +3,10 @@ nodes: build: pip install -e ../../../node-hub/dora-mujoco path: dora-mujoco inputs: - tick: dora/timer/millis/2 # 500 Hz simulation + tick: dora/timer/millis/2 # 500 Hz simulation outputs: - joint_positions - - joint_velocities + - joint_velocities - sensor_data env: - MODEL_NAME: "go2" # Load GO2 \ No newline at end of file + MODEL_NAME: "go2_mj_description" # Load GO2 diff --git a/examples/mujoco-sim/gamepad_control/gamepad_control_advanced.yml b/examples/mujoco-sim/gamepad_control/gamepad_control_advanced.yml index 9e98c369..1a0508f1 100644 --- a/examples/mujoco-sim/gamepad_control/gamepad_control_advanced.yml +++ b/examples/mujoco-sim/gamepad_control/gamepad_control_advanced.yml @@ -12,15 +12,15 @@ nodes: build: pip install -e ../../../node-hub/dora-mujoco path: dora-mujoco inputs: - tick: dora/timer/millis/2 # 500 Hz simulation + tick: dora/timer/millis/2 # 500 Hz simulation control_input: gamepad_controller/joint_commands outputs: - joint_positions - - joint_velocities + - joint_velocities - actuator_controls - sensor_data env: - MODEL_NAME: "kuka_iiwa14" + MODEL_NAME: "iiwa14_mj_description" - id: gamepad_controller path: nodes/gamepad_controller_differential_ik.py @@ -43,9 +43,9 @@ nodes: fk_request: gamepad_controller/fk_request jacobian_request: gamepad_controller/jacobian_request outputs: - - fk_request - - jacobian_request + - fk_request + - jacobian_request env: - URDF_PATH: "../URDF/kuka_iiwa/model.urdf" - END_EFFECTOR_LINK: "lbr_iiwa_link_7" + MODEL_NAME: "iiwa14_description" + END_EFFECTOR_LINK: "iiwa_link_7" TRANSFORM: "0. 0. 0. 1. 0. 0. 0." diff --git a/examples/mujoco-sim/gamepad_control/gamepad_control_basic.yml b/examples/mujoco-sim/gamepad_control/gamepad_control_basic.yml index 3811d9f8..23d32a70 100644 --- a/examples/mujoco-sim/gamepad_control/gamepad_control_basic.yml +++ b/examples/mujoco-sim/gamepad_control/gamepad_control_basic.yml @@ -12,37 +12,26 @@ nodes: build: pip install -e ../../../node-hub/dora-mujoco path: dora-mujoco inputs: - tick: dora/timer/millis/2 # 500 Hz simulation - control_input: gamepad_controller/joint_commands + tick: dora/timer/millis/2 # 500 Hz simulation + control_input: pytorch_kinematics/cmd_vel outputs: - joint_positions - - joint_velocities + - joint_velocities - actuator_controls - sensor_data env: - MODEL_NAME: "kuka_iiwa14" - - - id: gamepad_controller - path: nodes/gamepad_controller_ik.py - inputs: - joint_positions: mujoco_sim/joint_positions - raw_control: gamepad/raw_control - cmd_vel: gamepad/cmd_vel - ik_request: pytorch_kinematics/ik_request - outputs: - - joint_commands - - ik_request - - joint_state + MODEL_NAME: "iiwa14_mj_description" - id: pytorch_kinematics build: pip install -e ../../../node-hub/dora-pytorch-kinematics path: dora-pytorch-kinematics inputs: - ik_request: gamepad_controller/ik_request - joint_state: gamepad_controller/joint_state + cmd_vel: gamepad/cmd_vel + pose: mujoco_sim/joint_positions outputs: - - ik_request + - cmd_vel + - pose env: - URDF_PATH: "../URDF/kuka_iiwa/model.urdf" - END_EFFECTOR_LINK: "lbr_iiwa_link_7" - TRANSFORM: "0. 0. 0. 1. 0. 0. 0." \ No newline at end of file + MODEL_NAME: "iiwa14_description" + END_EFFECTOR_LINK: "iiwa_link_7" + TRANSFORM: "0. 0. 0. 1. 0. 0. 0." diff --git a/examples/mujoco-sim/target_pose_control/control.yml b/examples/mujoco-sim/target_pose_control/control.yml index 673814a0..1ab7388f 100644 --- a/examples/mujoco-sim/target_pose_control/control.yml +++ b/examples/mujoco-sim/target_pose_control/control.yml @@ -7,11 +7,11 @@ nodes: control_input: controller/joint_commands outputs: - joint_positions - - joint_velocities + - joint_velocities - actuator_controls - sensor_data env: - MODEL_NAME: "panda" + MODEL_NAME: "panda_mj_description" - id: controller path: nodes/controller_ik.py @@ -34,13 +34,13 @@ nodes: - ik_request - joint_state env: - URDF_PATH: "../URDF/franka_panda/panda.urdf" + MODEL_NAME: "panda_description" END_EFFECTOR_LINK: "panda_hand" - TRANSFORM: "0. 0. 0. 1. 0. 0. 0." # Pytorch kinematics uses wxyz format for quaternion + TRANSFORM: "0. 0. 0. 1. 0. 0. 0." # Pytorch kinematics uses wxyz format for quaternion - id: pose_publisher path: nodes/pose_publisher.py inputs: tick: dora/timer/millis/5000 outputs: - - target_pose \ No newline at end of file + - target_pose diff --git a/examples/mujoco-sim/target_pose_control/control_advanced.yml b/examples/mujoco-sim/target_pose_control/control_advanced.yml index c2436c3f..03336f1f 100644 --- a/examples/mujoco-sim/target_pose_control/control_advanced.yml +++ b/examples/mujoco-sim/target_pose_control/control_advanced.yml @@ -7,11 +7,11 @@ nodes: control_input: controller/joint_commands outputs: - joint_positions - - joint_velocities + - joint_velocities - actuator_controls - sensor_data env: - MODEL_NAME: "panda" + MODEL_NAME: "panda_mj_description" - id: controller path: nodes/controller_differential_ik.py @@ -33,16 +33,16 @@ nodes: fk_request: controller/fk_request jacobian_request: controller/jacobian_request outputs: - - fk_request - - jacobian_request + - fk_request + - jacobian_request env: - URDF_PATH: "../URDF/franka_panda/panda.urdf" + MODEL_NAME: "panda_description" END_EFFECTOR_LINK: "panda_hand" - TRANSFORM: "0. 0. 0. 1. 0. 0. 0." # Pytorch kinematics uses wxyz format for quaternion + TRANSFORM: "0. 0. 0. 1. 0. 0. 0." # Pytorch kinematics uses wxyz format for quaternion - id: pose_publisher path: nodes/pose_publisher.py inputs: tick: dora/timer/millis/5000 outputs: - - target_pose \ No newline at end of file + - target_pose diff --git a/node-hub/dora-mujoco/dora_mujoco/robot_models.json b/node-hub/dora-mujoco/dora_mujoco/robot_models.json deleted file mode 100644 index 529f7a56..00000000 --- a/node-hub/dora-mujoco/dora_mujoco/robot_models.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "arms": { - "arx_l5": "arx_l5_mj_description", - "fr3": "fr3_mj_description", - "franka_panda": "panda_mj_description", - "panda": "panda_mj_description", - "gen3": "gen3_mj_description", - "iiwa14": "iiwa14_mj_description", - "kuka_iiwa14": "iiwa14_mj_description", - "piper": "piper_mj_description", - "sawyer": "sawyer_mj_description", - "so_arm100": "so_arm100_mj_description", - "ur10e": "ur10e_mj_description", - "ur5e": "ur5e_mj_description", - "viper": "viper_mj_description", - "widow": "widow_mj_description", - "xarm7": "xarm7_mj_description", - "yam": "yam_mj_description", - "z1": "z1_mj_description", - "low_cost_robot_arm": "low_cost_robot_arm_mj_description" - }, - "bipeds": { - "cassie": "cassie_mj_description" - }, - "dual_arms": { - "aloha": "aloha_mj_description", - "aloha_2": "aloha_mj_description" - }, - "drones": { - "crazyflie_2": "cf2_mj_description", - "cf2": "cf2_mj_description", - "skydio_x2": "skydio_x2_mj_description" - }, - "end_effectors": { - "ability_hand": "ability_hand_mj_description", - "allegro_hand": "allegro_hand_mj_description", - "leap_hand": "leap_hand_mj_description", - "robotiq_2f85": "robotiq_2f85_mj_description", - "robotiq_2f85_v4": "robotiq_2f85_v4_mj_description", - "shadow_dexee": "shadow_dexee_mj_description", - "shadow_hand": "shadow_hand_mj_description" - }, - "humanoids": { - "apollo": "apollo_mj_description", - "adam_lite": "adam_lite_mj_description", - "elf2": "elf2_mj_description", - "g1": "g1_mj_description", - "h1": "h1_mj_description", - "jvrc": "jvrc_mj_description", - "op3": "op3_mj_description", - "talos": "talos_mj_description" - }, - "quadrupeds": { - "a1": "a1_mj_description", - "aliengo": "aliengo_mj_description", - "anymal_b": "anymal_b_mj_description", - "anymal_c": "anymal_c_mj_description", - "go1": "go1_mj_description", - "go2": "go2_mj_description", - "spot": "spot_mj_description" - } -} \ No newline at end of file