diff --git a/src/april_tag_sim/config/config.yaml b/src/april_tag_sim/config/config.yaml index f495a9560..5c5a27623 100644 --- a/src/april_tag_sim/config/config.yaml +++ b/src/april_tag_sim/config/config.yaml @@ -23,6 +23,9 @@ objectives: # Specify source folder for objectives # [Required] objective_library_paths: + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" sim_objectives: package_name: "april_tag_sim" relative_path: "objectives" diff --git a/src/april_tag_sim/description/scene.xml b/src/april_tag_sim/description/scene.xml index c79867d24..2b42bc047 100644 --- a/src/april_tag_sim/description/scene.xml +++ b/src/april_tag_sim/description/scene.xml @@ -141,11 +141,28 @@ - - - - - - - + + + + + + + + + + diff --git a/src/dual_arm_sim/config/config.yaml b/src/dual_arm_sim/config/config.yaml index 6065534fe..a82b43341 100644 --- a/src/dual_arm_sim/config/config.yaml +++ b/src/dual_arm_sim/config/config.yaml @@ -32,6 +32,7 @@ hardware: # Many of these are specific to the UR descriptions packages, and can be customized as needed. # [Optional] urdf_params: + - mujoco_keyframe: "default" - mujoco_model: "description/mujoco/scene.xml" - mujoco_viewer: false simulated_hardware_launch_file: @@ -86,6 +87,7 @@ objectives: - "moveit_pro::behaviors::MTCCoreBehaviorsLoader" - "moveit_pro::behaviors::VisionBehaviorsLoader" - "moveit_pro::behaviors::ConverterBehaviorsLoader" + - "moveit_pro::behaviors::MujocoBehaviorsLoader" # Specify source folder for objectives # [Required] objective_library_paths: @@ -101,6 +103,9 @@ objectives: visualization_objectives: package_name: "moveit_pro_objectives" relative_path: "objectives/visualization" + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" custom_objectives: package_name: "dual_arm_sim" relative_path: "objectives" diff --git a/src/factory_sim/config/config.yaml b/src/factory_sim/config/config.yaml index 2da457cc7..fc7d3c107 100644 --- a/src/factory_sim/config/config.yaml +++ b/src/factory_sim/config/config.yaml @@ -41,7 +41,7 @@ hardware: # Many of these are specific to the descriptions packages, and can be customized as needed. # [Optional] urdf_params: - # Use "mock", "mujoco", or "real" + # Use "mock", "mujoco", or "real" - hardware_interface: "mujoco" - mujoco_viewer: "false" @@ -124,6 +124,7 @@ objectives: - "moveit_pro::behaviors::MTCCoreBehaviorsLoader" - "moveit_pro::behaviors::VisionBehaviorsLoader" - "moveit_pro::behaviors::ConverterBehaviorsLoader" + - "moveit_pro::behaviors::MujocoBehaviorsLoader" # Specify source folder for objectives # [Required] objective_library_paths: @@ -139,6 +140,9 @@ objectives: visualization_objectives: package_name: "moveit_pro_objectives" relative_path: "objectives/visualization" + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" sim_objectives: package_name: "factory_sim" relative_path: "objectives" diff --git a/src/factory_sim/description/scene.xml b/src/factory_sim/description/scene.xml index 198c5773d..8a75412ab 100644 --- a/src/factory_sim/description/scene.xml +++ b/src/factory_sim/description/scene.xml @@ -412,4 +412,25 @@ + + + + + + + + + + diff --git a/src/grinding_sim/config/config.yaml b/src/grinding_sim/config/config.yaml index f144365aa..12370aafb 100644 --- a/src/grinding_sim/config/config.yaml +++ b/src/grinding_sim/config/config.yaml @@ -41,7 +41,8 @@ hardware: # Many of these are specific to the descriptions packages, and can be customized as needed. # [Optional] urdf_params: - # Use "mock", "mujoco", or "real" + - mujoco_keyframe: "default" + # Use "mock", "mujoco", or "real" - hardware_interface: "mujoco" # Sets ROS global params for launch. @@ -115,6 +116,7 @@ objectives: - "moveit_pro::behaviors::MTCCoreBehaviorsLoader" - "moveit_pro::behaviors::VisionBehaviorsLoader" - "moveit_pro::behaviors::ConverterBehaviorsLoader" + - "moveit_pro::behaviors::MujocoBehaviorsLoader" # Specify source folder for objectives # [Required] objective_library_paths: @@ -130,6 +132,9 @@ objectives: visualization_objectives: package_name: "moveit_pro_objectives" relative_path: "objectives/visualization" + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" sim_objectives: package_name: "grinding_sim" relative_path: "objectives" diff --git a/src/hangar_sim/config/config.yaml b/src/hangar_sim/config/config.yaml index 0e9ce13a1..feddea7ab 100644 --- a/src/hangar_sim/config/config.yaml +++ b/src/hangar_sim/config/config.yaml @@ -60,9 +60,13 @@ objectives: - "moveit_pro::behaviors::NavBehaviorsLoader" - "moveit_pro::behaviors::VisionBehaviorsLoader" - "moveit_pro::behaviors::ConverterBehaviorsLoader" + - "moveit_pro::behaviors::MujocoBehaviorsLoader" # Specify source folder for objectives # [Required] objective_library_paths: + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" hangar_sim_objectives: package_name: "hangar_sim" relative_path: "objectives" diff --git a/src/kitchen_sim/config/config.yaml b/src/kitchen_sim/config/config.yaml index 7a0bc2e3d..56011ad27 100644 --- a/src/kitchen_sim/config/config.yaml +++ b/src/kitchen_sim/config/config.yaml @@ -33,6 +33,7 @@ hardware: # Many of these are specific to the UR descriptions packages, and can be customized as needed. # [Optional] urdf_params: + - mujoco_keyframe: "default" - mujoco_model: "description/mujoco/scene.xml" - mujoco_viewer: false simulated_hardware_launch_file: @@ -52,6 +53,7 @@ objectives: - "moveit_pro::behaviors::MTCCoreBehaviorsLoader" - "moveit_pro::behaviors::VisionBehaviorsLoader" - "moveit_pro::behaviors::ConverterBehaviorsLoader" + - "moveit_pro::behaviors::MujocoBehaviorsLoader" # Specify source folder for objectives # [Required] objective_library_paths: @@ -67,6 +69,9 @@ objectives: visualization_objectives: package_name: "moveit_pro_objectives" relative_path: "objectives/visualization" + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" sim_objectives: package_name: "kitchen_sim" relative_path: "objectives" diff --git a/src/kitchen_sim/description/mujoco/scene.xml b/src/kitchen_sim/description/mujoco/scene.xml index ac52baaa7..ffc9c1934 100644 --- a/src/kitchen_sim/description/mujoco/scene.xml +++ b/src/kitchen_sim/description/mujoco/scene.xml @@ -157,7 +157,7 @@ fr3_finger1 - We control only one finger. --> diff --git a/src/lab_sim/config/config.yaml b/src/lab_sim/config/config.yaml index e78f0500e..e4873abf5 100644 --- a/src/lab_sim/config/config.yaml +++ b/src/lab_sim/config/config.yaml @@ -16,6 +16,7 @@ hardware: package: "lab_sim" path: "config/moveit/picknik_ur.srdf" urdf_params: + - mujoco_keyframe: "default" - mujoco_model: "description/scene.xml" - mujoco_viewer: false diff --git a/src/moveit_pro_kinova_configs/kinova_sim/config/config.yaml b/src/moveit_pro_kinova_configs/kinova_sim/config/config.yaml index c5b1d9cd5..561092ce8 100644 --- a/src/moveit_pro_kinova_configs/kinova_sim/config/config.yaml +++ b/src/moveit_pro_kinova_configs/kinova_sim/config/config.yaml @@ -51,6 +51,7 @@ hardware: # Many of these are specific to the UR descriptions packages, and can be customized as needed. # [Optional] urdf_params: + - mujoco_keyframe: "default" - arm: "gen3" - dof: "7" - vision: "false" diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim/config/config.yaml b/src/moveit_pro_kinova_configs/space_satellite_sim/config/config.yaml index f2863422d..eee4af16b 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim/config/config.yaml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim/config/config.yaml @@ -61,6 +61,9 @@ objectives: perception_objectives: package_name: "moveit_pro_objectives" relative_path: "objectives/perception" + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" sim_objectives: package_name: "space_satellite_sim" relative_path: "objectives" diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/config/config.yaml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/config/config.yaml index 8a98ea618..f66a1fd3c 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/config/config.yaml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/config/config.yaml @@ -32,6 +32,9 @@ hardware: # Configuration for loading behaviors and objectives. objectives: objective_library_paths: + mujoco_objectives: + package_name: "moveit_pro_objectives" + relative_path: "objectives/mujoco" sim_objectives: package_name: "space_satellite_sim_camera_cal" relative_path: "objectives" diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml index 3635d83c9..8937a0172 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml @@ -222,4 +222,24 @@ ctrlrange="-100 100" /> + + + + + + +