From 122e78cc0c3fbf99eed481264be3c7459cf1327c Mon Sep 17 00:00:00 2001 From: Kanae Kochigami Date: Tue, 20 Dec 2022 16:47:39 +0900 Subject: [PATCH 1/2] [jsk_naoqi_robot/README] update output of wstool info because naoqi_dashboard is updated --- jsk_naoqi_robot/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsk_naoqi_robot/README.md b/jsk_naoqi_robot/README.md index e719f077aa..bf009488a1 100644 --- a/jsk_naoqi_robot/README.md +++ b/jsk_naoqi_robot/README.md @@ -132,13 +132,13 @@ workspace: /home/leus/catkin_ws/src Localname S SCM Version (Spec) UID (Spec) URI (Spec) [http(s)://...] --------- - --- -------------- ----------- --------------------------- pepper_robot git master (-) efad3979b374 github.com/ros-naoqi/pepper_robot - naoqi_driver M git kochigami-develop 98c0b678286a github.com/kochigami/naoqi_driver - naoqi_dashboard git kochigami-develop 33962f146c77 github.com/kochigami/naoqi_dashboard + naoqi_driver git kochigami-develop 98c0b678286a github.com/kochigami/naoqi_driver + naoqi_dashboard git kochigami-develop 7f32005e08e0 github.com/kochigami/naoqi_dashboard naoqi_bridge_msgs git kochigami-develop d7417613690e github.com/kochigami/naoqi_bridge_msgs naoqi_bridge git kochigami-develop c28b727e1e9b github.com/kochigami/naoqi_bridge nao_robot git master (-) 67476469a137 github.com/ros-naoqi/nao_robot nao_interaction git master (-) f97ad12f3896 github.com/ros-naoqi/nao_interaction - jsk_robot git master 1f44c97c7855 github.com/jsk-ros-pkg/jsk_robot.git + jsk_robot git master d551865511c3 github.com/jsk-ros-pkg/jsk_robot.git ``` ## Interface when controlling NAO and Pepper via roseus From 897224630a56d4b6c09a7faa60582963f83e30d2 Mon Sep 17 00:00:00 2001 From: Kanae Kochigami Date: Wed, 21 Dec 2022 11:16:42 +0900 Subject: [PATCH 2/2] [jsk_naoqi_robot/README] add a note about NAOqi version and ROS version --- jsk_naoqi_robot/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsk_naoqi_robot/README.md b/jsk_naoqi_robot/README.md index bf009488a1..66aeff6fd4 100644 --- a/jsk_naoqi_robot/README.md +++ b/jsk_naoqi_robot/README.md @@ -57,6 +57,8 @@ If this happens, please connect Pepper to network with DHCP and exit Setting. For ros kinetic, please refer to install guide like [here](http://wiki.ros.org/kinetic/Installation). For ros melodic, please refer to install guide like [here](http://wiki.ros.org/melodic/Installation). +% As mentioned in https://github.com/ros-naoqi/naoqi_driver#launch, naoqi_driver for ROS melodic and greater have to be used for robots running NAOqi 2.9 and greater. Using ROS melodic on Pepper running NAOqi OS 2.5 has some known issue like this: https://github.com/ros-naoqi/naoqi_driver/issues/96 + 1. Install ``Python NAOqi SDK`` You can download it (version = 2.5.5) from [here](https://drive.google.com/file/d/1xHuYREDa78xGiikEpsjxfZQ7Gfvo1E9D/view?usp=sharing). Please unzip the downloaded file. @@ -124,6 +126,8 @@ source devel/setup.bash Confirm that you get the following output when you type `wstool info` +% UID of jsk_robot may change from below, but there is no problem. That is because this package is in active developpment. + ``` $ cd ~/catkin_ws/src $ wstool info