diff --git a/jsk_naoqi_robot/README.md b/jsk_naoqi_robot/README.md index 63cc1f4a67..399e8452a3 100644 --- a/jsk_naoqi_robot/README.md +++ b/jsk_naoqi_robot/README.md @@ -91,7 +91,7 @@ export ROS_IP="133.11.216.yyy" % OR run rossetip command to set ROS_IP mkdir -p catkin_ws/src cd catkin_ws wstool init src -wstool merge -t src https://raw.githubusercontent.com/jsk-ros-pkg/jsk_robot/master/jsk_naoqi_robot/pepper.rosinstall +wstool merge -t src https://raw.githubusercontent.com/jsk-ros-pkg/jsk_robot/master/jsk_naoqi_robot/naoqi.rosinstall wstool update -t src source /opt/ros/kinetic/setup.bash rosdep install -y -r --from-paths src --ignore-src @@ -104,23 +104,15 @@ sudo apt-get install ros-kinetic-pepper-meshes sudo apt-get install ros-kinetic-nao-meshes ``` -If you have ROS kinetic, please use [naoqi_dashboard (kochigami-develop)](https://github.com/kochigami/naoqi_dashboard/tree/kochigami-develop). -This includes [Important PR](https://github.com/ros-naoqi/naoqi_dashboard/pull/3) for ROS kinetic. - -``` -cd catkin_ws/src -wstool set naoqi_dashboard --git https://github.com/ros-naoqi/naoqi_dashboard -wstool update naoqi_dashboard -cd naoqi_dashboard -git remote add kochigami https://github.com/kochigami/naoqi_dashboard.git -git fetch kochigami -git checkout -b modify-for-kinetic kochigami/kochigami-develop -``` +Note that `naoqi.rosinstall` includes necessary patches for ROS kinetic, such as [naoqi_dashboard (kochigami-develop)](https://github.com/kochigami/naoqi_dashboard/tree/kochigami-develop). Finally, please compile them. ``` -catkin build --continue-on-failure +catkin build peppereus +catkin build jsk_pepper_startup +catkin build naoeus +catkin build jsk_nao_startup source devel/setup.bash ``` @@ -129,56 +121,10 @@ source devel/setup.bash 4. (optional) For NAO and Pepper developers -Please add following source codes which you need for debugging. - -``` -cd catkin_ws/src -wstool set nao_robot --git https://github.com/ros-naoqi/nao_robot -wstool set pepper_robot --git https://github.com/ros-naoqi/pepper_robot -wstool set naoqi_driver --git https://github.com/ros-naoqi/naoqi_driver -wstool set naoqi_bridge --git https://github.com/ros-naoqi/naoqi_bridge -wstool set naoqi_bridge_msgs --git https://github.com/ros-naoqi/naoqi_bridge_msgs -wstool set naoqi_dashboard --git https://github.com/ros-naoqi/naoqi_dashboard -``` - ## Interface when controlling NAO and Pepper via roseus Common methods for NAO and Pepper are defined in `naoqieus/naoqi-interface.l`. NAO-specific methods are defined in `naoeus/nao-interface.l`. Pepper-specific methods are defined in `peppereus/pepper-interface.l`. For further details about each method, please refer to [**_naoqieus_**](naoqieus/README.md), [**_naoeus_**](naoeus/README.md), and [**_peppereus_**](peppereus/README.md) respectively. -For some methods, they require specific branch (kochigami-develop) because they are not merged into master. If you need this, please change your branch of `naoqi_driver`, `naoqi_bridge` and `naoqi_bridge_msgs` as follows: - -``` -cd catkin_ws/src -wstool set naoqi_driver --git https://github.com/ros-naoqi/naoqi_driver -wstool update naoqi_driver -cd naoqi_driver -git remote add kochigami https://github.com/kochigami/naoqi_driver.git -git fetch kochigami -git checkout -b kochigami-develop kochigami/kochigami-develop - -cd .. # catkin_ws/src -wstool set naoqi_bridge --git https://github.com/ros-naoqi/naoqi_bridge -wstool update naoqi_bridge -cd naoqi_bridge -git remote add kochigami https://github.com/kochigami/naoqi_bridge.git -git fetch kochigami -git checkout -b kochigami-develop kochigami/kochigami-develop - -cd .. # catkin_ws/src -wstool set naoqi_bridge_msgs --git https://github.com/ros-naoqi/naoqi_bridge_msgs -wstool update naoqi_bridge_msgs -cd naoqi_bridge_msgs -git remote add kochigami https://github.com/kochigami/naoqi_bridge_msgs.git -git fetch kochigami -git checkout -b kochigami-develop kochigami/kochigami-develop -``` - -In addition, if you have ROS kinetic, please fetch the source of `nao_interaction` (master branch) for the time being ([related issue](https://github.com/ros-naoqi/nao_interaction/issues/12)). - -``` -cd .. # catkin_ws/src -wstool set nao_interaction --git https://github.com/ros-naoqi/nao_interaction -wstool update nao_interaction -``` +For some methods, they require specific branch (kochigami-develop) because they are not merged into master. [naoqi.rosinstall](https://raw.githubusercontent.com/jsk-ros-pkg/jsk_robot/master/jsk_naoqi_robot/naoqi.rosinstall) file includes this branch for `naoqi_driver`, `naoqi_bridge` and `naoqi_bridge_msgs` repositories. ## NAO & Pepper diff --git a/jsk_naoqi_robot/naoqi.rosinstall b/jsk_naoqi_robot/naoqi.rosinstall new file mode 100644 index 0000000000..82ba2b279b --- /dev/null +++ b/jsk_naoqi_robot/naoqi.rosinstall @@ -0,0 +1,42 @@ +- git: + local-name: jsk_robot + uri: https://github.com/jsk-ros-pkg/jsk_robot.git + version: master +# fix qt> 5 (https://github.com/ros-naoqi/naoqi_dashboard/pull/3) +- git: + local-name: naoqi_dashboard + uri: https://github.com/kochigami/naoqi_dashboard + version: kochigami-develop +# wait for 0.5.16 release +- git: + local-name: nao_robot + uri: https://github.com/ros-naoqi/nao_robot +# wait for 0.1.11 +- git: + local-name: pepper_robot + uri: https://github.com/ros-naoqi/pepper_robot +# add service to get/set volumes (https://github.com/ros-naoqi/naoqi_driver/pull/110) +# add play audio file service (https://github.com/ros-naoqi/naoqi_driver/pull/109) +# add fading/resetting leds services (https://github.com/ros-naoqi/naoqi_driver/pull/100) +# [ALChestButton] add chest button topic (pressed or not) (https://github.com/ros-naoqi/naoqi_driver/pull/99) +# for more info https://github.com/kochigami/naoqi_driver/issues/2 +- git: + local-name: naoqi_driver + uri: https://github.com/kochigami/naoqi_driver + version: kochigami-develop +# add many nodes..... wait for 0.5.6 +- git: + local-name: naoqi_bridge + uri: https://github.com/kochigami/naoqi_bridge + version: kochigami-develop +# add fade leds srv (https://github.com/ros-naoqi/naoqi_bridge_msgs/pull/41) +# [ALChestButton] add msg for ChestButtonPressed (https://github.com/ros-naoqi/naoqi_bridge_msgs/pull/40) +- git: + local-name: naoqi_bridge_msgs + uri: https://github.com/kochigami/naoqi_bridge_msgs + version: kochigami-develop +# wait for 0.1.6 (https://github.com/ros-naoqi/nao_interaction/issues/12) +- git: + local-name: nao_interaction + uri: https://github.com/ros-naoqi/nao_interaction + diff --git a/jsk_naoqi_robot/pepper.rosinstall b/jsk_naoqi_robot/pepper.rosinstall deleted file mode 100644 index c98bb8b665..0000000000 --- a/jsk_naoqi_robot/pepper.rosinstall +++ /dev/null @@ -1,5 +0,0 @@ -- git: - local-name: jsk_robot - uri: https://github.com/jsk-ros-pkg/jsk_robot.git - version: master -