diff --git a/jsk_fetch_robot/README.md b/jsk_fetch_robot/README.md index 9aab1b786d..8363146d74 100644 --- a/jsk_fetch_robot/README.md +++ b/jsk_fetch_robot/README.md @@ -96,6 +96,19 @@ or Gazebo can be used for simulating robot's movements. It is unable to communicate to the real robot when running the simulation. +#### Create the environment + +``` bash +cd catkin_ws/src +vcs import < jsk-ros-pkg/jsk_robot/jsk_fetch_robot/jsk_fetch_gazebo.noetic.repos +rosdep install -y -r --from-paths . --ignore-src +cd ../ +catkin build +source devel/setup.bash +``` + +#### How to run + ```bash roslaunch fetch_gazebo simulation.launch roslaunch fetch_moveit_config move_group.launch @@ -106,6 +119,11 @@ Roseus script can be executed on Gazebo. The whole demo is in `jsk_fetch_gazebo_ roslaunch jsk_fetch_gazebo_demo demo.launch ``` +If you want to spawn 73B2 model +```bash +roslaunch jsk_fetch_startup fetch_gazebo_73b2.launch +``` + ## Fetcheus APIs ### Common diff --git a/jsk_fetch_robot/jsk_fetch_gazebo.noetic.repos b/jsk_fetch_robot/jsk_fetch_gazebo.noetic.repos new file mode 100644 index 0000000000..e37270f5ff --- /dev/null +++ b/jsk_fetch_robot/jsk_fetch_gazebo.noetic.repos @@ -0,0 +1,9 @@ +repositories: + ZebraDevs/fetch_gazebo: + type: git + url: git@github.com:ZebraDevs/fetch_gazebo + version: gazebo11 + GT-RAIL/robot_pose_publisher: + type: git + url: git@github.com:GT-RAIL/robot_pose_publisher + version: develop diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch index 996ee01797..a35d677887 100644 --- a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch +++ b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch @@ -12,6 +12,19 @@ + + + + + + + + + + + + + @@ -73,20 +86,20 @@ - + + name="diag_agg" args="CPP" output="screen" if="$(arg use_diagnostic_aggregator)"> + args="--diag-hostname=my_machine" if="$(arg use_cpu_monitor)"> @@ -95,7 +108,7 @@ - + @@ -103,7 +116,7 @@ - + @@ -122,9 +135,9 @@ - + - + interface_name: wlan0 @@ -132,7 +145,7 @@ + args="0 0 0.1 0 0 0 head_pan_link respeaker_base 100" if="$(arg use_respeaker)"/> @@ -140,7 +153,7 @@ - + @@ -232,7 +245,7 @@ - + @@ -245,18 +258,18 @@ - + - + email_info: /var/lib/robot/email_topic.yaml - + email_info: /var/lib/robot/email_topic.yaml @@ -264,7 +277,7 @@ - + diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_gazebo_bringup.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_gazebo_bringup.launch index 62ec7167f5..b82ed33596 100644 --- a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_gazebo_bringup.launch +++ b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_gazebo_bringup.launch @@ -39,5 +39,18 @@ + + + + + + + + + + + + + diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/gazebo/fetch_gazebo_73b2.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/gazebo/fetch_gazebo_73b2.launch index e3c898326c..07c568abfa 100644 --- a/jsk_fetch_robot/jsk_fetch_startup/launch/gazebo/fetch_gazebo_73b2.launch +++ b/jsk_fetch_robot/jsk_fetch_startup/launch/gazebo/fetch_gazebo_73b2.launch @@ -3,6 +3,7 @@ + @@ -11,6 +12,7 @@ +