diff --git a/.robotis_humanoid_robot_demo.rosinstall b/.robotis_humanoid_robot_demo.rosinstall new file mode 100644 index 0000000..ae00de8 --- /dev/null +++ b/.robotis_humanoid_robot_demo.rosinstall @@ -0,0 +1,2 @@ +- git: {local-name: robotis_humanoid_robot_tools, uri: 'https://github.com/Robotics-Sensors/ROBOTIS-HUMANOID_ROBOT-Tools.git', version: noetic} +- git: {local-name: humanoid_navigation, uri: 'https://github.com/Robotics-Sensors/humanoid_navigation.git', version: noetic} diff --git a/.robotis_op3_demo.rosinstall b/.robotis_op3_demo.rosinstall deleted file mode 100644 index ab42395..0000000 --- a/.robotis_op3_demo.rosinstall +++ /dev/null @@ -1,2 +0,0 @@ -- git: {local-name: robotis_op3_tools, uri: 'https://github.com/Robotics-Sensors/ROBOTIS-OP3-Tools.git', version: noetic} -- git: {local-name: humanoid_navigation, uri: 'https://github.com/Robotics-Sensors/humanoid_navigation.git', version: noetic} diff --git a/.travis.yml b/.travis.yml index edbc427..8bae4ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ notifications: - ronaldsonbellande@gmail.com env: matrix: - - ROS_DISTRO=noetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file OS_NAME=ubuntu OS_CODE_NAME=focal $ROSINSTALL_FILENAME=".robotis_op3_demo.rosinstall" + - ROS_DISTRO=noetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=file OS_NAME=ubuntu OS_CODE_NAME=focal $ROSINSTALL_FILENAME=".robotis_humanoid_robot_demo.rosinstall" branches: only: - master diff --git a/README.md b/README.md index cd34832..a6a7663 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,19 @@ -# ROBOTIS OP3 - +# ROS/ROS2 Humanoid Robot Demos -## ROS Packages for ROBOTIS OP3 Demo -|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic| -|:---:|:---:|:---:| -|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-OP3-Demo.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-OP3-Demo)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-OP3-Demo.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-OP3-Demo)|-| +-------------------------------------------------------------------------------------------------------- +Updated Version [humanoid_robot_module](https://github.com/Robotics-Sensors/humanoid_robot_demos) readme. -## ROBOTIS e-Manual for ROBOTIS OP3 -- [ROBOTIS e-Manual for ROBOTIS OP3](http://emanual.robotis.com/docs/en/platform/op3/introduction/) +-------------------------------------------------------------------------------------------------------- +## Important +The repository has diverged, as the old commits and codes are under the previous License and +the new commits and codes are under New License -## Wiki for robotis_op3_demo Packages -- http://wiki.ros.org/robotis_op3_demo (metapackage) -- http://wiki.ros.org/op3_ball_detector -- http://wiki.ros.org/op3_bringup -- http://wiki.ros.org/op3_demo +-------------------------------------------------------------------------------------------------------- +Latest versions and Maintainer is on organization https://github.com/Robotics-Sensors -## Open Source related to ROBOTIS OP3 -- [robotis_op3](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3) -- [robotis_op3_msgs](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-msgs) -- [robotis_op3_common](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Common) -- [robotis_op3_tools](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Tools) -- [robotis_op3_demo](https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo) -- [robotis_framework](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework) -- [robotis_controller_msgs](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework-msgs) -- [robotis_utility](https://github.com/ROBOTIS-GIT/ROBOTIS-Utility) -- [robotis_math](https://github.com/ROBOTIS-GIT/ROBOTIS-Math) -- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK) -- [OpenCR-Hardware](https://github.com/ROBOTIS-GIT/OpenCR-Hardware) -- [OpenCR](https://github.com/ROBOTIS-GIT/OpenCR) -## Documents and Videos related to ROBOTIS OP3 -- [ROBOTIS e-Manual for ROBOTIS OP3](http://emanual.robotis.com/docs/en/platform/op3/introduction/) -- [ROBOTIS e-Manual for ROBOTIS THORMANG3](http://emanual.robotis.com/docs/en/platform/thormang3/introduction/) -- [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/) -- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/) +### Maintainer +* Ronaldson Bellande + +## License +This SDK is distributed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0), see [LICENSE](https://github.com/Robotics-Sensors/humanoid_robot_demos/blob/main/LICENSE) and [NOTICE](https://github.com/Robotics-Sensors/humanoid_robot_demos/blob/main/LICENSE) for more information. diff --git a/fix_errors.sh b/fix_errors.sh new file mode 100755 index 0000000..2ebdbee --- /dev/null +++ b/fix_errors.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# Get the URL from .git/config +git_url=$(git config --get remote.origin.url) + +# Check if a URL is found +if [ -z "$git_url" ]; then + echo "No remote URL found in .git/config." + exit 1 +fi + +# Clone the repository into a temporary folder +git clone "$git_url" tmp_clone + +# Check if the clone was successful +if [ $? -eq 0 ]; then + # Remove the existing .git directory if it exists + if [ -d ".git" ]; then + rm -rf .git + fi + + # Copy the .git directory from the clone to the current repository + cp -r tmp_clone/.git . + + # Remove the clone directory + rm -rf tmp_clone + + echo "Repository cloned and .git directory copied successfully." +else + echo "Failed to clone the repository." +fi diff --git a/op3_ball_detector/CHANGELOG.rst b/humanoid_robot_ball_detector/CHANGELOG.rst similarity index 66% rename from op3_ball_detector/CHANGELOG.rst rename to humanoid_robot_ball_detector/CHANGELOG.rst index 17f4188..91554a7 100644 --- a/op3_ball_detector/CHANGELOG.rst +++ b/humanoid_robot_ball_detector/CHANGELOG.rst @@ -1,5 +1,5 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package op3_ball_detector +Changelog for package humanoid_robot_ball_detector ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.3.0 (2021-05-05) @@ -10,8 +10,8 @@ Changelog for package op3_ball_detector 0.1.0 (2018-04-19) ------------------ * first release for ROS Kinetic -* added launch files in order to move the camera setting to op3_camera_setting package +* added launch files in order to move the camera setting to humanoid_robot_camera_setting package * added missing package in find_package() * refacoring to release -* split repositoryfrom ROBOTIS-OP3 +* split repositoryfrom ROBOTIS-HUMANOID_ROBOT * Contributors: Kayman, Zerom, Pyo diff --git a/op3_ball_detector/CMakeLists.txt b/humanoid_robot_ball_detector/CMakeLists.txt similarity index 99% rename from op3_ball_detector/CMakeLists.txt rename to humanoid_robot_ball_detector/CMakeLists.txt index 80e85e3..2f78705 100644 --- a/op3_ball_detector/CMakeLists.txt +++ b/humanoid_robot_ball_detector/CMakeLists.txt @@ -2,7 +2,7 @@ # Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 3.0.2) -project(op3_ball_detector) +project(humanoid_robot_ball_detector) ################################################################################ # Find catkin packages and libraries for catkin and system dependencies diff --git a/op3_ball_detector/cfg/DetectorParams.cfg b/humanoid_robot_ball_detector/cfg/DetectorParams.cfg similarity index 98% rename from op3_ball_detector/cfg/DetectorParams.cfg rename to humanoid_robot_ball_detector/cfg/DetectorParams.cfg index e627907..203fd0c 100755 --- a/op3_ball_detector/cfg/DetectorParams.cfg +++ b/humanoid_robot_ball_detector/cfg/DetectorParams.cfg @@ -1,5 +1,5 @@ #!/usr/bin/env python -PACKAGE='op3_ball_detector' +PACKAGE='humanoid_robot_ball_detector' from dynamic_reconfigure.parameter_generator_catkin import * diff --git a/op3_ball_detector/cfg/DetectorParamsBlue.cfg b/humanoid_robot_ball_detector/cfg/DetectorParamsBlue.cfg similarity index 98% rename from op3_ball_detector/cfg/DetectorParamsBlue.cfg rename to humanoid_robot_ball_detector/cfg/DetectorParamsBlue.cfg index 391e99f..2884c7d 100755 --- a/op3_ball_detector/cfg/DetectorParamsBlue.cfg +++ b/humanoid_robot_ball_detector/cfg/DetectorParamsBlue.cfg @@ -1,5 +1,5 @@ #!/usr/bin/env python -PACKAGE='op3_ball_detector' +PACKAGE='humanoid_robot_ball_detector' from dynamic_reconfigure.parameter_generator_catkin import * diff --git a/op3_ball_detector/cfg/DetectorParamsRed.cfg b/humanoid_robot_ball_detector/cfg/DetectorParamsRed.cfg similarity index 98% rename from op3_ball_detector/cfg/DetectorParamsRed.cfg rename to humanoid_robot_ball_detector/cfg/DetectorParamsRed.cfg index 6d8dbad..5e78e85 100755 --- a/op3_ball_detector/cfg/DetectorParamsRed.cfg +++ b/humanoid_robot_ball_detector/cfg/DetectorParamsRed.cfg @@ -1,5 +1,5 @@ #!/usr/bin/env python -PACKAGE='op3_ball_detector' +PACKAGE='humanoid_robot_ball_detector' from dynamic_reconfigure.parameter_generator_catkin import * diff --git a/op3_ball_detector/config/ball_detector_params.yaml b/humanoid_robot_ball_detector/config/ball_detector_params.yaml similarity index 100% rename from op3_ball_detector/config/ball_detector_params.yaml rename to humanoid_robot_ball_detector/config/ball_detector_params.yaml diff --git a/op3_ball_detector/config/ball_detector_params_default.yaml b/humanoid_robot_ball_detector/config/ball_detector_params_default.yaml similarity index 100% rename from op3_ball_detector/config/ball_detector_params_default.yaml rename to humanoid_robot_ball_detector/config/ball_detector_params_default.yaml diff --git a/op3_ball_detector/config/ball_detector_params_op.yaml b/humanoid_robot_ball_detector/config/ball_detector_params_op.yaml similarity index 100% rename from op3_ball_detector/config/ball_detector_params_op.yaml rename to humanoid_robot_ball_detector/config/ball_detector_params_op.yaml diff --git a/op3_ball_detector/include/op3_ball_detector/ball_detector.h b/humanoid_robot_ball_detector/include/humanoid_robot_ball_detector/ball_detector.h similarity index 82% rename from op3_ball_detector/include/op3_ball_detector/ball_detector.h rename to humanoid_robot_ball_detector/include/humanoid_robot_ball_detector/ball_detector.h index c6b4833..0435d13 100644 --- a/op3_ball_detector/include/op3_ball_detector/ball_detector.h +++ b/humanoid_robot_ball_detector/include/humanoid_robot_ball_detector/ball_detector.h @@ -36,12 +36,12 @@ #include #include -#include "op3_ball_detector/ball_detector_config.h" +#include "humanoid_robot_ball_detector/ball_detector_config.h" -#include "op3_ball_detector/CircleSetStamped.h" -#include "op3_ball_detector/DetectorParamsConfig.h" -#include "op3_ball_detector/GetParameters.h" -#include "op3_ball_detector/SetParameters.h" +#include "humanoid_robot_ball_detector/CircleSetStamped.h" +#include "humanoid_robot_ball_detector/DetectorParamsConfig.h" +#include "humanoid_robot_ball_detector/GetParameters.h" +#include "humanoid_robot_ball_detector/SetParameters.h" namespace robotis_op { @@ -71,15 +71,15 @@ protected: // callbacks to camera info subscription void cameraInfoCallback(const sensor_msgs::CameraInfo &msg); - void dynParamCallback(op3_ball_detector::DetectorParamsConfig &config, + void dynParamCallback(humanoid_robot_ball_detector::DetectorParamsConfig &config, uint32_t level); void enableCallback(const std_msgs::Bool::ConstPtr &msg); void paramCommandCallback(const std_msgs::String::ConstPtr &msg); - bool setParamCallback(op3_ball_detector::SetParameters::Request &req, - op3_ball_detector::SetParameters::Response &res); - bool getParamCallback(op3_ball_detector::GetParameters::Request &req, - op3_ball_detector::GetParameters::Response &res); + bool setParamCallback(humanoid_robot_ball_detector::SetParameters::Request &req, + humanoid_robot_ball_detector::SetParameters::Response &res); + bool getParamCallback(humanoid_robot_ball_detector::GetParameters::Request &req, + humanoid_robot_ball_detector::GetParameters::Response &res); void resetParameter(); void publishParam(); @@ -117,7 +117,7 @@ protected: int not_found_count_; // circle set publisher - op3_ball_detector::CircleSetStamped circles_msg_; + humanoid_robot_ball_detector::CircleSetStamped circles_msg_; ros::Publisher circles_pub_; // camera info subscriber @@ -159,10 +159,10 @@ protected: cv::Mat in_image_; cv::Mat out_image_; - dynamic_reconfigure::Server + dynamic_reconfigure::Server param_server_; dynamic_reconfigure::Server< - op3_ball_detector::DetectorParamsConfig>::CallbackType callback_fnc_; + humanoid_robot_ball_detector::DetectorParamsConfig>::CallbackType callback_fnc_; }; } // namespace robotis_op diff --git a/op3_ball_detector/include/op3_ball_detector/ball_detector_config.h b/humanoid_robot_ball_detector/include/humanoid_robot_ball_detector/ball_detector_config.h similarity index 100% rename from op3_ball_detector/include/op3_ball_detector/ball_detector_config.h rename to humanoid_robot_ball_detector/include/humanoid_robot_ball_detector/ball_detector_config.h diff --git a/op3_ball_detector/launch/ball_detector.launch b/humanoid_robot_ball_detector/launch/ball_detector.launch similarity index 61% rename from op3_ball_detector/launch/ball_detector.launch rename to humanoid_robot_ball_detector/launch/ball_detector.launch index 475eb62..a984f30 100644 --- a/op3_ball_detector/launch/ball_detector.launch +++ b/humanoid_robot_ball_detector/launch/ball_detector.launch @@ -1,9 +1,9 @@ - + - + diff --git a/op3_ball_detector/launch/ball_detector_from_usb_cam.launch b/humanoid_robot_ball_detector/launch/ball_detector_from_usb_cam.launch similarity index 94% rename from op3_ball_detector/launch/ball_detector_from_usb_cam.launch rename to humanoid_robot_ball_detector/launch/ball_detector_from_usb_cam.launch index 7f3ae14..3d3d285 100644 --- a/op3_ball_detector/launch/ball_detector_from_usb_cam.launch +++ b/humanoid_robot_ball_detector/launch/ball_detector_from_usb_cam.launch @@ -23,5 +23,5 @@ - + diff --git a/op3_ball_detector/launch/ball_detector_from_uvc.launch b/humanoid_robot_ball_detector/launch/ball_detector_from_uvc.launch similarity index 91% rename from op3_ball_detector/launch/ball_detector_from_uvc.launch rename to humanoid_robot_ball_detector/launch/ball_detector_from_uvc.launch index 4b5ed9a..87c5654 100644 --- a/op3_ball_detector/launch/ball_detector_from_uvc.launch +++ b/humanoid_robot_ball_detector/launch/ball_detector_from_uvc.launch @@ -28,5 +28,5 @@ - + diff --git a/op3_ball_detector/msg/BallDetectorParams.msg b/humanoid_robot_ball_detector/msg/BallDetectorParams.msg similarity index 100% rename from op3_ball_detector/msg/BallDetectorParams.msg rename to humanoid_robot_ball_detector/msg/BallDetectorParams.msg diff --git a/op3_ball_detector/msg/CircleSetStamped.msg b/humanoid_robot_ball_detector/msg/CircleSetStamped.msg similarity index 100% rename from op3_ball_detector/msg/CircleSetStamped.msg rename to humanoid_robot_ball_detector/msg/CircleSetStamped.msg diff --git a/op3_ball_detector/package.xml b/humanoid_robot_ball_detector/package.xml similarity index 93% rename from op3_ball_detector/package.xml rename to humanoid_robot_ball_detector/package.xml index 8713a7a..1a5c1fc 100644 --- a/op3_ball_detector/package.xml +++ b/humanoid_robot_ball_detector/package.xml @@ -1,6 +1,6 @@ - op3_ball_detector + humanoid_robot_ball_detector 0.1.0 This package implements a circle-like shape detector of the input image @@ -12,10 +12,10 @@ Zerom Ronaldson Bellande - http://wiki.ros.org/op3_ball_detector - http://emanual.robotis.com/docs/en/platform/op3/introduction/ - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues + http://wiki.ros.org/humanoid_robot_ball_detector + http://emanual.robotis.com/docs/en/platform/humanoid_robot/introduction/ + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo/issues catkin diff --git a/op3_ball_detector/rviz/ball_detector.rviz b/humanoid_robot_ball_detector/rviz/ball_detector.rviz similarity index 100% rename from op3_ball_detector/rviz/ball_detector.rviz rename to humanoid_robot_ball_detector/rviz/ball_detector.rviz diff --git a/op3_ball_detector/src/ball_detector.cpp b/humanoid_robot_ball_detector/src/ball_detector.cpp similarity index 98% rename from op3_ball_detector/src/ball_detector.cpp rename to humanoid_robot_ball_detector/src/ball_detector.cpp index 9659133..e246d3d 100644 --- a/op3_ball_detector/src/ball_detector.cpp +++ b/humanoid_robot_ball_detector/src/ball_detector.cpp @@ -18,7 +18,7 @@ #include -#include "op3_ball_detector/ball_detector.h" +#include "humanoid_robot_ball_detector/ball_detector.h" namespace robotis_op { @@ -88,7 +88,7 @@ BallDetector::BallDetector() // sets publishers image_pub_ = it_.advertise("image_out", 100); circles_pub_ = - nh_.advertise("circle_set", 100); + nh_.advertise("circle_set", 100); camera_info_pub_ = nh_.advertise("camera_info", 100); // sets subscribers @@ -106,7 +106,7 @@ BallDetector::BallDetector() // web setting param_pub_ = - nh_.advertise("current_params", 1); + nh_.advertise("current_params", 1); param_command_sub_ = nh_.subscribe("param_command", 1, &BallDetector::paramCommandCallback, this); set_param_client_ = @@ -243,7 +243,7 @@ void BallDetector::imageCallback(const sensor_msgs::ImageConstPtr &msg) { } void BallDetector::dynParamCallback( - op3_ball_detector::DetectorParamsConfig &config, uint32_t level) { + humanoid_robot_ball_detector::DetectorParamsConfig &config, uint32_t level) { params_config_.gaussian_blur_size = config.gaussian_blur_size; params_config_.gaussian_blur_sigma = config.gaussian_blur_sigma; params_config_.canny_edge_th = config.canny_edge_th; @@ -299,8 +299,8 @@ void BallDetector::paramCommandCallback(const std_msgs::String::ConstPtr &msg) { } bool BallDetector::setParamCallback( - op3_ball_detector::SetParameters::Request &req, - op3_ball_detector::SetParameters::Response &res) { + humanoid_robot_ball_detector::SetParameters::Request &req, + humanoid_robot_ball_detector::SetParameters::Response &res) { params_config_.gaussian_blur_size = req.params.gaussian_blur_size; params_config_.gaussian_blur_sigma = req.params.gaussian_blur_sigma; params_config_.canny_edge_th = req.params.canny_edge_th; @@ -325,8 +325,8 @@ bool BallDetector::setParamCallback( } bool BallDetector::getParamCallback( - op3_ball_detector::GetParameters::Request &req, - op3_ball_detector::GetParameters::Response &res) { + humanoid_robot_ball_detector::GetParameters::Request &req, + humanoid_robot_ball_detector::GetParameters::Response &res) { res.returns.gaussian_blur_size = params_config_.gaussian_blur_size; res.returns.gaussian_blur_sigma = params_config_.gaussian_blur_sigma; res.returns.canny_edge_th = params_config_.canny_edge_th; @@ -399,7 +399,7 @@ void BallDetector::resetParameter() { } void BallDetector::publishParam() { - op3_ball_detector::BallDetectorParams params; + humanoid_robot_ball_detector::BallDetectorParams params; params.gaussian_blur_size = params_config_.gaussian_blur_size; params.gaussian_blur_sigma = params_config_.gaussian_blur_sigma; diff --git a/op3_ball_detector/src/ball_detector_node.cpp b/humanoid_robot_ball_detector/src/ball_detector_node.cpp similarity index 96% rename from op3_ball_detector/src/ball_detector_node.cpp rename to humanoid_robot_ball_detector/src/ball_detector_node.cpp index 421ff6a..770dd4c 100644 --- a/op3_ball_detector/src/ball_detector_node.cpp +++ b/humanoid_robot_ball_detector/src/ball_detector_node.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_ball_detector/ball_detector.h" +#include "humanoid_robot_ball_detector/ball_detector.h" // node main int main(int argc, char **argv) { diff --git a/op3_ball_detector/srv/GetParameters.srv b/humanoid_robot_ball_detector/srv/GetParameters.srv similarity index 100% rename from op3_ball_detector/srv/GetParameters.srv rename to humanoid_robot_ball_detector/srv/GetParameters.srv diff --git a/op3_ball_detector/srv/SetParameters.srv b/humanoid_robot_ball_detector/srv/SetParameters.srv similarity index 100% rename from op3_ball_detector/srv/SetParameters.srv rename to humanoid_robot_ball_detector/srv/SetParameters.srv diff --git a/op3_bringup/CHANGELOG.rst b/humanoid_robot_bringup/CHANGELOG.rst similarity index 75% rename from op3_bringup/CHANGELOG.rst rename to humanoid_robot_bringup/CHANGELOG.rst index acc44a0..eb8094c 100644 --- a/op3_bringup/CHANGELOG.rst +++ b/humanoid_robot_bringup/CHANGELOG.rst @@ -1,5 +1,5 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package op3_bringup +Changelog for package humanoid_robot_bringup ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.3.0 (2021-05-05) @@ -10,7 +10,7 @@ Changelog for package op3_bringup 0.1.0 (2018-04-19) ------------------ * first release for ROS Kinetic -* updated CMakeLists.txt and package.xml of op3_bringup +* updated CMakeLists.txt and package.xml of humanoid_robot_bringup * changed rviz config file * refacoring to release * Contributors: Kayman, Pyo diff --git a/op3_bringup/CMakeLists.txt b/humanoid_robot_bringup/CMakeLists.txt similarity index 98% rename from op3_bringup/CMakeLists.txt rename to humanoid_robot_bringup/CMakeLists.txt index 629dcb4..631edc8 100644 --- a/op3_bringup/CMakeLists.txt +++ b/humanoid_robot_bringup/CMakeLists.txt @@ -2,7 +2,7 @@ # Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 3.0.2) -project(op3_bringup) +project(humanoid_robot_bringup) ################################################################################ # Find catkin packages and libraries for catkin and system dependencies diff --git a/op3_bringup/launch/op3_bringup.launch b/humanoid_robot_bringup/launch/humanoid_robot_bringup.launch similarity index 80% rename from op3_bringup/launch/op3_bringup.launch rename to humanoid_robot_bringup/launch/humanoid_robot_bringup.launch index 63aa7c8..6d01824 100644 --- a/op3_bringup/launch/op3_bringup.launch +++ b/humanoid_robot_bringup/launch/humanoid_robot_bringup.launch @@ -1,7 +1,7 @@ - - + + diff --git a/op3_bringup/launch/op3_bringup_visualization.launch b/humanoid_robot_bringup/launch/humanoid_robot_bringup_visualization.launch similarity index 75% rename from op3_bringup/launch/op3_bringup_visualization.launch rename to humanoid_robot_bringup/launch/humanoid_robot_bringup_visualization.launch index 0ce6a5f..709928d 100644 --- a/op3_bringup/launch/op3_bringup_visualization.launch +++ b/humanoid_robot_bringup/launch/humanoid_robot_bringup_visualization.launch @@ -1,6 +1,6 @@ - + @@ -14,5 +14,5 @@ - + diff --git a/op3_bringup/package.xml b/humanoid_robot_bringup/package.xml similarity index 68% rename from op3_bringup/package.xml rename to humanoid_robot_bringup/package.xml index 93ffc2f..0516dcd 100644 --- a/op3_bringup/package.xml +++ b/humanoid_robot_bringup/package.xml @@ -1,6 +1,6 @@ - op3_bringup + humanoid_robot_bringup 0.3.0 This package is a demo for first time users. @@ -10,29 +10,29 @@ Kayman Ronaldson Bellande - http://wiki.ros.org/op3_bringup - http://emanual.robotis.com/docs/en/platform/op3/introduction/ - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues + http://wiki.ros.org/humanoid_robot_bringup + http://emanual.robotis.com/docs/en/platform/humanoid_robot/introduction/ + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo/issues catkin - op3_manager - op3_description + humanoid_robot_manager + humanoid_robot_description usb_cam joint_state_publisher robot_state_publisher rviz - op3_manager - op3_description + humanoid_robot_manager + humanoid_robot_description usb_cam joint_state_publisher robot_state_publisher rviz - op3_manager - op3_description + humanoid_robot_manager + humanoid_robot_description usb_cam joint_state_publisher robot_state_publisher diff --git a/op3_bringup/rviz/op3_bringup.rviz b/humanoid_robot_bringup/rviz/humanoid_robot_bringup.rviz similarity index 100% rename from op3_bringup/rviz/op3_bringup.rviz rename to humanoid_robot_bringup/rviz/humanoid_robot_bringup.rviz diff --git a/op3_demo/CHANGELOG.rst b/humanoid_robot_demo/CHANGELOG.rst similarity index 67% rename from op3_demo/CHANGELOG.rst rename to humanoid_robot_demo/CHANGELOG.rst index 9558d4d..7effbb2 100644 --- a/op3_demo/CHANGELOG.rst +++ b/humanoid_robot_demo/CHANGELOG.rst @@ -1,5 +1,5 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package op3_demo +Changelog for package humanoid_robot_demo ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.3.0 (2021-05-05) @@ -10,8 +10,8 @@ Changelog for package op3_demo 0.1.0 (2018-04-19) ------------------ * first release for ROS Kinetic -* added launch files in order to move the camera setting to op3_camera_setting package +* added launch files in order to move the camera setting to humanoid_robot_camera_setting package * added missing package in find_package() * refacoring to release -* split repositoryfrom ROBOTIS-OP3 +* split repositoryfrom ROBOTIS-HUMANOID_ROBOT * Contributors: Kayman, Zerom, Yoshimaru Tanaka, Pyo diff --git a/op3_demo/CMakeLists.txt b/humanoid_robot_demo/CMakeLists.txt similarity index 94% rename from op3_demo/CMakeLists.txt rename to humanoid_robot_demo/CMakeLists.txt index c9baf11..d3757fd 100644 --- a/op3_demo/CMakeLists.txt +++ b/humanoid_robot_demo/CMakeLists.txt @@ -2,7 +2,7 @@ # Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 3.0.2) -project(op3_demo) +project(humanoid_robot_demo) ################################################################################ # Find catkin packages and libraries for catkin and system dependencies @@ -15,11 +15,11 @@ find_package( sensor_msgs geometry_msgs robotis_controller_msgs - op3_walking_module_msgs - op3_action_module_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs cmake_modules robotis_math - op3_ball_detector + humanoid_robot_ball_detector ) find_package(Boost REQUIRED COMPONENTS thread) @@ -70,11 +70,11 @@ catkin_package( sensor_msgs geometry_msgs robotis_controller_msgs - op3_walking_module_msgs - op3_action_module_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs cmake_modules robotis_math - op3_ball_detector + humanoid_robot_ball_detector DEPENDS Boost EIGEN3 ) diff --git a/op3_demo/data/mp3/Autonomous soccer mode.mp3 b/humanoid_robot_demo/data/mp3/Autonomous soccer mode.mp3 similarity index 100% rename from op3_demo/data/mp3/Autonomous soccer mode.mp3 rename to humanoid_robot_demo/data/mp3/Autonomous soccer mode.mp3 diff --git a/op3_demo/data/mp3/Bye bye.mp3 b/humanoid_robot_demo/data/mp3/Bye bye.mp3 similarity index 100% rename from op3_demo/data/mp3/Bye bye.mp3 rename to humanoid_robot_demo/data/mp3/Bye bye.mp3 diff --git a/op3_demo/data/mp3/Clap please.mp3 b/humanoid_robot_demo/data/mp3/Clap please.mp3 similarity index 100% rename from op3_demo/data/mp3/Clap please.mp3 rename to humanoid_robot_demo/data/mp3/Clap please.mp3 diff --git a/op3_demo/data/mp3/Demonstration ready mode.mp3 b/humanoid_robot_demo/data/mp3/Demonstration ready mode.mp3 similarity index 100% rename from op3_demo/data/mp3/Demonstration ready mode.mp3 rename to humanoid_robot_demo/data/mp3/Demonstration ready mode.mp3 diff --git a/op3_demo/data/mp3/Headstand.mp3 b/humanoid_robot_demo/data/mp3/Headstand.mp3 similarity index 100% rename from op3_demo/data/mp3/Headstand.mp3 rename to humanoid_robot_demo/data/mp3/Headstand.mp3 diff --git a/op3_demo/data/mp3/Interactive motion mode.mp3 b/humanoid_robot_demo/data/mp3/Interactive motion mode.mp3 similarity index 100% rename from op3_demo/data/mp3/Interactive motion mode.mp3 rename to humanoid_robot_demo/data/mp3/Interactive motion mode.mp3 diff --git a/op3_demo/data/mp3/Intro01.mp3 b/humanoid_robot_demo/data/mp3/Intro01.mp3 similarity index 100% rename from op3_demo/data/mp3/Intro01.mp3 rename to humanoid_robot_demo/data/mp3/Intro01.mp3 diff --git a/op3_demo/data/mp3/Intro02.mp3 b/humanoid_robot_demo/data/mp3/Intro02.mp3 similarity index 100% rename from op3_demo/data/mp3/Intro02.mp3 rename to humanoid_robot_demo/data/mp3/Intro02.mp3 diff --git a/op3_demo/data/mp3/Intro03.mp3 b/humanoid_robot_demo/data/mp3/Intro03.mp3 similarity index 100% rename from op3_demo/data/mp3/Intro03.mp3 rename to humanoid_robot_demo/data/mp3/Intro03.mp3 diff --git a/op3_demo/data/mp3/Introduction.mp3 b/humanoid_robot_demo/data/mp3/Introduction.mp3 similarity index 100% rename from op3_demo/data/mp3/Introduction.mp3 rename to humanoid_robot_demo/data/mp3/Introduction.mp3 diff --git a/op3_demo/data/mp3/Left kick.mp3 b/humanoid_robot_demo/data/mp3/Left kick.mp3 similarity index 100% rename from op3_demo/data/mp3/Left kick.mp3 rename to humanoid_robot_demo/data/mp3/Left kick.mp3 diff --git a/op3_demo/data/mp3/No.mp3 b/humanoid_robot_demo/data/mp3/No.mp3 similarity index 100% rename from op3_demo/data/mp3/No.mp3 rename to humanoid_robot_demo/data/mp3/No.mp3 diff --git a/op3_demo/data/mp3/Oops.mp3 b/humanoid_robot_demo/data/mp3/Oops.mp3 similarity index 100% rename from op3_demo/data/mp3/Oops.mp3 rename to humanoid_robot_demo/data/mp3/Oops.mp3 diff --git a/op3_demo/data/mp3/Right kick.mp3 b/humanoid_robot_demo/data/mp3/Right kick.mp3 similarity index 100% rename from op3_demo/data/mp3/Right kick.mp3 rename to humanoid_robot_demo/data/mp3/Right kick.mp3 diff --git a/op3_demo/data/mp3/Sensor calibration complete.mp3 b/humanoid_robot_demo/data/mp3/Sensor calibration complete.mp3 similarity index 100% rename from op3_demo/data/mp3/Sensor calibration complete.mp3 rename to humanoid_robot_demo/data/mp3/Sensor calibration complete.mp3 diff --git a/op3_demo/data/mp3/Sensor calibration fail.mp3 b/humanoid_robot_demo/data/mp3/Sensor calibration fail.mp3 similarity index 100% rename from op3_demo/data/mp3/Sensor calibration fail.mp3 rename to humanoid_robot_demo/data/mp3/Sensor calibration fail.mp3 diff --git a/op3_demo/data/mp3/Shoot.mp3 b/humanoid_robot_demo/data/mp3/Shoot.mp3 similarity index 100% rename from op3_demo/data/mp3/Shoot.mp3 rename to humanoid_robot_demo/data/mp3/Shoot.mp3 diff --git a/op3_demo/data/mp3/Sit down.mp3 b/humanoid_robot_demo/data/mp3/Sit down.mp3 similarity index 100% rename from op3_demo/data/mp3/Sit down.mp3 rename to humanoid_robot_demo/data/mp3/Sit down.mp3 diff --git a/op3_demo/data/mp3/Stand up.mp3 b/humanoid_robot_demo/data/mp3/Stand up.mp3 similarity index 100% rename from op3_demo/data/mp3/Stand up.mp3 rename to humanoid_robot_demo/data/mp3/Stand up.mp3 diff --git a/op3_demo/data/mp3/Start motion demonstration.mp3 b/humanoid_robot_demo/data/mp3/Start motion demonstration.mp3 similarity index 100% rename from op3_demo/data/mp3/Start motion demonstration.mp3 rename to humanoid_robot_demo/data/mp3/Start motion demonstration.mp3 diff --git a/op3_demo/data/mp3/Start soccer demonstration.mp3 b/humanoid_robot_demo/data/mp3/Start soccer demonstration.mp3 similarity index 100% rename from op3_demo/data/mp3/Start soccer demonstration.mp3 rename to humanoid_robot_demo/data/mp3/Start soccer demonstration.mp3 diff --git a/op3_demo/data/mp3/Start vision processing demonstration.mp3 b/humanoid_robot_demo/data/mp3/Start vision processing demonstration.mp3 similarity index 100% rename from op3_demo/data/mp3/Start vision processing demonstration.mp3 rename to humanoid_robot_demo/data/mp3/Start vision processing demonstration.mp3 diff --git a/op3_demo/data/mp3/System shutdown.mp3 b/humanoid_robot_demo/data/mp3/System shutdown.mp3 similarity index 100% rename from op3_demo/data/mp3/System shutdown.mp3 rename to humanoid_robot_demo/data/mp3/System shutdown.mp3 diff --git a/op3_demo/data/mp3/Thank you.mp3 b/humanoid_robot_demo/data/mp3/Thank you.mp3 similarity index 100% rename from op3_demo/data/mp3/Thank you.mp3 rename to humanoid_robot_demo/data/mp3/Thank you.mp3 diff --git a/op3_demo/data/mp3/Vision processing mode.mp3 b/humanoid_robot_demo/data/mp3/Vision processing mode.mp3 similarity index 100% rename from op3_demo/data/mp3/Vision processing mode.mp3 rename to humanoid_robot_demo/data/mp3/Vision processing mode.mp3 diff --git a/op3_demo/data/mp3/Wow.mp3 b/humanoid_robot_demo/data/mp3/Wow.mp3 similarity index 100% rename from op3_demo/data/mp3/Wow.mp3 rename to humanoid_robot_demo/data/mp3/Wow.mp3 diff --git a/op3_demo/data/mp3/Yes go.mp3 b/humanoid_robot_demo/data/mp3/Yes go.mp3 similarity index 100% rename from op3_demo/data/mp3/Yes go.mp3 rename to humanoid_robot_demo/data/mp3/Yes go.mp3 diff --git a/op3_demo/data/mp3/Yes.mp3 b/humanoid_robot_demo/data/mp3/Yes.mp3 similarity index 100% rename from op3_demo/data/mp3/Yes.mp3 rename to humanoid_robot_demo/data/mp3/Yes.mp3 diff --git a/op3_demo/data/mp3/intro_test.mp3 b/humanoid_robot_demo/data/mp3/intro_test.mp3 similarity index 100% rename from op3_demo/data/mp3/intro_test.mp3 rename to humanoid_robot_demo/data/mp3/intro_test.mp3 diff --git a/op3_demo/data/mp3/test/Announce mic test.mp3 b/humanoid_robot_demo/data/mp3/test/Announce mic test.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Announce mic test.mp3 rename to humanoid_robot_demo/data/mp3/test/Announce mic test.mp3 diff --git a/op3_demo/data/mp3/test/Button test mode.mp3 b/humanoid_robot_demo/data/mp3/test/Button test mode.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Button test mode.mp3 rename to humanoid_robot_demo/data/mp3/test/Button test mode.mp3 diff --git a/op3_demo/data/mp3/test/Mic test mode.mp3 b/humanoid_robot_demo/data/mp3/test/Mic test mode.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Mic test mode.mp3 rename to humanoid_robot_demo/data/mp3/test/Mic test mode.mp3 diff --git a/op3_demo/data/mp3/test/Mode button long pressed.mp3 b/humanoid_robot_demo/data/mp3/test/Mode button long pressed.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Mode button long pressed.mp3 rename to humanoid_robot_demo/data/mp3/test/Mode button long pressed.mp3 diff --git a/op3_demo/data/mp3/test/Mode button pressed.mp3 b/humanoid_robot_demo/data/mp3/test/Mode button pressed.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Mode button pressed.mp3 rename to humanoid_robot_demo/data/mp3/test/Mode button pressed.mp3 diff --git a/op3_demo/data/mp3/test/Self test ready mode.mp3 b/humanoid_robot_demo/data/mp3/test/Self test ready mode.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Self test ready mode.mp3 rename to humanoid_robot_demo/data/mp3/test/Self test ready mode.mp3 diff --git a/op3_demo/data/mp3/test/Start button long pressed.mp3 b/humanoid_robot_demo/data/mp3/test/Start button long pressed.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Start button long pressed.mp3 rename to humanoid_robot_demo/data/mp3/test/Start button long pressed.mp3 diff --git a/op3_demo/data/mp3/test/Start button pressed.mp3 b/humanoid_robot_demo/data/mp3/test/Start button pressed.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Start button pressed.mp3 rename to humanoid_robot_demo/data/mp3/test/Start button pressed.mp3 diff --git a/op3_demo/data/mp3/test/Start button test mode.mp3 b/humanoid_robot_demo/data/mp3/test/Start button test mode.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Start button test mode.mp3 rename to humanoid_robot_demo/data/mp3/test/Start button test mode.mp3 diff --git a/op3_demo/data/mp3/test/Start mic test mode.mp3 b/humanoid_robot_demo/data/mp3/test/Start mic test mode.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Start mic test mode.mp3 rename to humanoid_robot_demo/data/mp3/test/Start mic test mode.mp3 diff --git a/op3_demo/data/mp3/test/Start playing.mp3 b/humanoid_robot_demo/data/mp3/test/Start playing.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Start playing.mp3 rename to humanoid_robot_demo/data/mp3/test/Start playing.mp3 diff --git a/op3_demo/data/mp3/test/Start recording.mp3 b/humanoid_robot_demo/data/mp3/test/Start recording.mp3 similarity index 100% rename from op3_demo/data/mp3/test/Start recording.mp3 rename to humanoid_robot_demo/data/mp3/test/Start recording.mp3 diff --git a/op3_demo/data/mp3/test/User button long pressed.mp3 b/humanoid_robot_demo/data/mp3/test/User button long pressed.mp3 similarity index 100% rename from op3_demo/data/mp3/test/User button long pressed.mp3 rename to humanoid_robot_demo/data/mp3/test/User button long pressed.mp3 diff --git a/op3_demo/data/mp3/test/User button pressed.mp3 b/humanoid_robot_demo/data/mp3/test/User button pressed.mp3 similarity index 100% rename from op3_demo/data/mp3/test/User button pressed.mp3 rename to humanoid_robot_demo/data/mp3/test/User button pressed.mp3 diff --git a/op3_demo/include/op3_demo/action_demo.h b/humanoid_robot_demo/include/humanoid_robot_demo/action_demo.h similarity index 96% rename from op3_demo/include/op3_demo/action_demo.h rename to humanoid_robot_demo/include/humanoid_robot_demo/action_demo.h index b3ff459..d0c322f 100644 --- a/op3_demo/include/op3_demo/action_demo.h +++ b/humanoid_robot_demo/include/humanoid_robot_demo/action_demo.h @@ -27,8 +27,8 @@ #include #include -#include "op3_action_module_msgs/IsRunning.h" -#include "op3_demo/op_demo.h" +#include "humanoid_robot_action_module_msgs/IsRunning.h" +#include "humanoid_robot_demo/op_demo.h" #include "robotis_controller_msgs/JointCtrlModule.h" #include "robotis_controller_msgs/SetModule.h" diff --git a/op3_demo/include/op3_demo/ball_follower.h b/humanoid_robot_demo/include/humanoid_robot_demo/ball_follower.h similarity index 93% rename from op3_demo/include/op3_demo/ball_follower.h rename to humanoid_robot_demo/include/humanoid_robot_demo/ball_follower.h index 06984e7..1f2cb12 100644 --- a/op3_demo/include/op3_demo/ball_follower.h +++ b/humanoid_robot_demo/include/humanoid_robot_demo/ball_follower.h @@ -29,9 +29,9 @@ #include #include -#include "op3_ball_detector/CircleSetStamped.h" -#include "op3_walking_module_msgs/GetWalkingParam.h" -#include "op3_walking_module_msgs/WalkingParam.h" +#include "humanoid_robot_ball_detector/CircleSetStamped.h" +#include "humanoid_robot_walking_module_msgs/GetWalkingParam.h" +#include "humanoid_robot_walking_module_msgs/WalkingParam.h" #include "robotis_controller_msgs/JointCtrlModule.h" namespace robotis_op { @@ -109,7 +109,7 @@ protected: // (x, y) is the center position of the ball in image coordinates // z is the ball radius geometry_msgs::Point ball_position_; - op3_walking_module_msgs::WalkingParam current_walking_param_; + humanoid_robot_walking_module_msgs::WalkingParam current_walking_param_; int count_not_found_; int count_to_kick_; diff --git a/op3_demo/include/op3_demo/ball_tracker.h b/humanoid_robot_demo/include/humanoid_robot_demo/ball_tracker.h similarity index 91% rename from op3_demo/include/op3_demo/ball_tracker.h rename to humanoid_robot_demo/include/humanoid_robot_demo/ball_tracker.h index f6d996e..99aeff2 100644 --- a/op3_demo/include/op3_demo/ball_tracker.h +++ b/humanoid_robot_demo/include/humanoid_robot_demo/ball_tracker.h @@ -28,9 +28,9 @@ #include #include -#include "op3_ball_detector/CircleSetStamped.h" -#include "op3_walking_module_msgs/GetWalkingParam.h" -#include "op3_walking_module_msgs/WalkingParam.h" +#include "humanoid_robot_ball_detector/CircleSetStamped.h" +#include "humanoid_robot_walking_module_msgs/GetWalkingParam.h" +#include "humanoid_robot_walking_module_msgs/WalkingParam.h" #include "robotis_controller_msgs/JointCtrlModule.h" namespace robotis_op { @@ -73,7 +73,7 @@ protected: const bool DEBUG_PRINT; void ballPositionCallback( - const op3_ball_detector::CircleSetStamped::ConstPtr &msg); + const humanoid_robot_ball_detector::CircleSetStamped::ConstPtr &msg); void ballTrackerCommandCallback(const std_msgs::String::ConstPtr &msg); void publishHeadJoint(double pan, double tilt); void scanBall(); diff --git a/op3_demo/include/op3_demo/button_test.h b/humanoid_robot_demo/include/humanoid_robot_demo/button_test.h similarity index 97% rename from op3_demo/include/op3_demo/button_test.h rename to humanoid_robot_demo/include/humanoid_robot_demo/button_test.h index 0090702..f9d13c9 100644 --- a/op3_demo/include/op3_demo/button_test.h +++ b/humanoid_robot_demo/include/humanoid_robot_demo/button_test.h @@ -24,7 +24,7 @@ #include #include -#include "op3_demo/op_demo.h" +#include "humanoid_robot_demo/op_demo.h" #include "robotis_controller_msgs/SyncWriteItem.h" namespace robotis_op { diff --git a/op3_demo/include/op3_demo/face_tracker.h b/humanoid_robot_demo/include/humanoid_robot_demo/face_tracker.h similarity index 100% rename from op3_demo/include/op3_demo/face_tracker.h rename to humanoid_robot_demo/include/humanoid_robot_demo/face_tracker.h diff --git a/op3_demo/include/op3_demo/mic_test.h b/humanoid_robot_demo/include/humanoid_robot_demo/mic_test.h similarity index 98% rename from op3_demo/include/op3_demo/mic_test.h rename to humanoid_robot_demo/include/humanoid_robot_demo/mic_test.h index ceb2f17..4d883b4 100644 --- a/op3_demo/include/op3_demo/mic_test.h +++ b/humanoid_robot_demo/include/humanoid_robot_demo/mic_test.h @@ -25,7 +25,7 @@ #include #include -#include "op3_demo/op_demo.h" +#include "humanoid_robot_demo/op_demo.h" #include "robotis_controller_msgs/SyncWriteItem.h" namespace robotis_op { diff --git a/op3_demo/include/op3_demo/op_demo.h b/humanoid_robot_demo/include/humanoid_robot_demo/op_demo.h similarity index 100% rename from op3_demo/include/op3_demo/op_demo.h rename to humanoid_robot_demo/include/humanoid_robot_demo/op_demo.h diff --git a/op3_demo/include/op3_demo/soccer_demo.h b/humanoid_robot_demo/include/humanoid_robot_demo/soccer_demo.h similarity index 95% rename from op3_demo/include/op3_demo/soccer_demo.h rename to humanoid_robot_demo/include/humanoid_robot_demo/soccer_demo.h index ae7b553..919c691 100644 --- a/op3_demo/include/op3_demo/soccer_demo.h +++ b/humanoid_robot_demo/include/humanoid_robot_demo/soccer_demo.h @@ -26,14 +26,14 @@ #include #include -#include "op3_action_module_msgs/IsRunning.h" +#include "humanoid_robot_action_module_msgs/IsRunning.h" #include "robotis_controller_msgs/JointCtrlModule.h" #include "robotis_controller_msgs/SetJointModule.h" #include "robotis_controller_msgs/SyncWriteItem.h" -#include "op3_demo/ball_follower.h" -#include "op3_demo/ball_tracker.h" -#include "op3_demo/op_demo.h" +#include "humanoid_robot_demo/ball_follower.h" +#include "humanoid_robot_demo/ball_tracker.h" +#include "humanoid_robot_demo/op_demo.h" #include "robotis_math/robotis_linear_algebra.h" namespace robotis_op { diff --git a/op3_demo/include/op3_demo/vision_demo.h b/humanoid_robot_demo/include/humanoid_robot_demo/vision_demo.h similarity index 96% rename from op3_demo/include/op3_demo/vision_demo.h rename to humanoid_robot_demo/include/humanoid_robot_demo/vision_demo.h index 523bcc8..1090fac 100644 --- a/op3_demo/include/op3_demo/vision_demo.h +++ b/humanoid_robot_demo/include/humanoid_robot_demo/vision_demo.h @@ -28,8 +28,8 @@ #include "robotis_controller_msgs/SetModule.h" #include "robotis_controller_msgs/SyncWriteItem.h" -#include "op3_demo/face_tracker.h" -#include "op3_demo/op_demo.h" +#include "humanoid_robot_demo/face_tracker.h" +#include "humanoid_robot_demo/op_demo.h" namespace robotis_op { diff --git a/humanoid_robot_demo/launch/demo.launch b/humanoid_robot_demo/launch/demo.launch new file mode 100644 index 0000000..e3267c2 --- /dev/null +++ b/humanoid_robot_demo/launch/demo.launch @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/op3_demo/launch/face_detection_op3.launch b/humanoid_robot_demo/launch/face_detection_humanoid_robot.launch similarity index 100% rename from op3_demo/launch/face_detection_op3.launch rename to humanoid_robot_demo/launch/face_detection_humanoid_robot.launch diff --git a/humanoid_robot_demo/launch/self_test.launch b/humanoid_robot_demo/launch/self_test.launch new file mode 100644 index 0000000..e57be40 --- /dev/null +++ b/humanoid_robot_demo/launch/self_test.launch @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/humanoid_robot_demo/list/action_script.yaml b/humanoid_robot_demo/list/action_script.yaml new file mode 100644 index 0000000..8f520db --- /dev/null +++ b/humanoid_robot_demo/list/action_script.yaml @@ -0,0 +1,23 @@ +# combination action page number and mp3 file path +action_and_sound: + 4 : "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Thank you.mp3" + 41: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Introduction.mp3" + 24: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Wow.mp3" + 23: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Yes go.mp3" + 15: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Sit down.mp3" + 1: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Stand up.mp3" + 54: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Clap please.mp3" + 27: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Oops.mp3" + 38: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Bye bye.mp3" +# 101 : "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Oops.mp3" + 110 : "" + 111 : "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Intro01.mp3" + 115 : "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Intro02.mp3" + 118 : "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Intro03.mp3" + +# play list +prev_default: [4, 41, 24, 23, 15, 1, 54, 27, 38] +default: [4, 110, 111, 115, 118, 24, 54, 27, 38] + +# example of play list +#certification: [101] diff --git a/humanoid_robot_demo/list/action_script_bk.yaml b/humanoid_robot_demo/list/action_script_bk.yaml new file mode 100644 index 0000000..4d1e977 --- /dev/null +++ b/humanoid_robot_demo/list/action_script_bk.yaml @@ -0,0 +1,18 @@ +# combination action page number and mp3 file path +action_and_sound: + 4 : "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Thank you.mp3" + 41: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Introduction.mp3" + 24: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Wow.mp3" + 23: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Yes go.mp3" + 15: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Sit down.mp3" + 1: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Stand up.mp3" + 54: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Clap please.mp3" + 27: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Oops.mp3" + 38: "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Bye bye.mp3" + 101 : "/home/robotis/catkin_ws/src/ROBOTIS-HUMANOID_ROBOT/ROBOTIS-HUMANOID_ROBOT-Demo/humanoid_robot_demo/data/mp3/Oops.mp3" + +# play list +default: [4, 41, 24, 23, 15, 1, 54, 27, 38] + +# example of play list +certificatino: [101] diff --git a/op3_demo/package.xml b/humanoid_robot_demo/package.xml similarity index 63% rename from op3_demo/package.xml rename to humanoid_robot_demo/package.xml index 9604a04..9d1cee5 100644 --- a/op3_demo/package.xml +++ b/humanoid_robot_demo/package.xml @@ -1,19 +1,19 @@ - op3_demo + humanoid_robot_demo 0.3.0 - OP3 default demo + HUMANOID_ROBOT default demo It includes three demontrations(soccer demo, vision demo, action script demo) Apache 2.0 Kayman Ronaldson Bellande - http://wiki.ros.org/op3_demo - http://emanual.robotis.com/docs/en/platform/op3/introduction/ - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues + http://wiki.ros.org/humanoid_robot_demo + http://emanual.robotis.com/docs/en/platform/humanoid_robot/introduction/ + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo/issues catkin @@ -23,17 +23,17 @@ sensor_msgs geometry_msgs robotis_controller_msgs - op3_walking_module_msgs - op3_action_module_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs cmake_modules robotis_math - op3_ball_detector + humanoid_robot_ball_detector boost eigen yaml-cpp - op3_manager - op3_camera_setting_tool - op3_web_setting_tool + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool ros_madplay_player face_detection @@ -43,17 +43,17 @@ sensor_msgs geometry_msgs robotis_controller_msgs - op3_walking_module_msgs - op3_action_module_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs cmake_modules robotis_math - op3_ball_detector + humanoid_robot_ball_detector boost eigen yaml-cpp - op3_manager - op3_camera_setting_tool - op3_web_setting_tool + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool ros_madplay_player face_detection @@ -63,17 +63,17 @@ sensor_msgs geometry_msgs robotis_controller_msgs - op3_walking_module_msgs - op3_action_module_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs cmake_modules robotis_math - op3_ball_detector + humanoid_robot_ball_detector boost eigen yaml-cpp - op3_manager - op3_camera_setting_tool - op3_web_setting_tool + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool ros_madplay_player face_detection diff --git a/op3_demo/src/action/action_demo.cpp b/humanoid_robot_demo/src/action/action_demo.cpp similarity index 96% rename from op3_demo/src/action/action_demo.cpp rename to humanoid_robot_demo/src/action/action_demo.cpp index 30fbdda..5ee0565 100644 --- a/op3_demo/src/action/action_demo.cpp +++ b/humanoid_robot_demo/src/action/action_demo.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/action_demo.h" +#include "humanoid_robot_demo/action_demo.h" namespace robotis_op { @@ -28,7 +28,7 @@ ActionDemo::ActionDemo() ros::NodeHandle nh(ros::this_node::getName()); std::string default_path = - ros::package::getPath("op3_demo") + "/list/action_script.yaml"; + ros::package::getPath("humanoid_robot_demo") + "/list/action_script.yaml"; script_path_ = nh.param("action_script", default_path); std::string default_play_list = "default"; @@ -158,7 +158,7 @@ void ActionDemo::callbackThread() { buttuon_sub_ = nh.subscribe("/robotis/open_cr/button", 1, &ActionDemo::buttonHandlerCallback, this); - is_running_client_ = nh.serviceClient( + is_running_client_ = nh.serviceClient( "/robotis/action/is_running"); set_joint_module_client_ = nh.serviceClient( @@ -272,7 +272,7 @@ void ActionDemo::brakeAction() { // check running of action bool ActionDemo::isActionRunning() { - op3_action_module_msgs::IsRunning is_running_srv; + humanoid_robot_action_module_msgs::IsRunning is_running_srv; if (is_running_client_.call(is_running_srv) == false) { ROS_ERROR("Failed to get action status"); diff --git a/op3_demo/src/demo_node.cpp b/humanoid_robot_demo/src/demo_node.cpp similarity index 95% rename from op3_demo/src/demo_node.cpp rename to humanoid_robot_demo/src/demo_node.cpp index 90fb0a8..7ff137e 100644 --- a/op3_demo/src/demo_node.cpp +++ b/humanoid_robot_demo/src/demo_node.cpp @@ -19,9 +19,9 @@ #include #include -#include "op3_demo/action_demo.h" -#include "op3_demo/soccer_demo.h" -#include "op3_demo/vision_demo.h" +#include "humanoid_robot_demo/action_demo.h" +#include "humanoid_robot_demo/soccer_demo.h" +#include "humanoid_robot_demo/vision_demo.h" #include "robotis_controller_msgs/SyncWriteItem.h" #include "robotis_math/robotis_linear_algebra.h" @@ -78,7 +78,7 @@ int main(int argc, char **argv) { ros::Subscriber mode_command_sub = nh.subscribe("/robotis/mode_command", 1, demoModeCommandCallback); - default_mp3_path = ros::package::getPath("op3_demo") + "/data/mp3/"; + default_mp3_path = ros::package::getPath("humanoid_robot_demo") + "/data/mp3/"; ros::start(); @@ -86,7 +86,7 @@ int main(int argc, char **argv) { ros::Rate loop_rate(SPIN_RATE); // wait for starting of manager - std::string manager_name = "/op3_manager"; + std::string manager_name = "/humanoid_robot_manager"; while (ros::ok()) { ros::Duration(1.0).sleep(); @@ -94,7 +94,7 @@ int main(int argc, char **argv) { break; ROS_INFO_COND(DEBUG_PRINT, "Succeed to connect"); } - ROS_WARN("Waiting for op3 manager"); + ROS_WARN("Waiting for humanoid_robot manager"); } // init procedure @@ -184,7 +184,7 @@ void buttonHandlerCallback(const std_msgs::String::ConstPtr &msg) { playSound(default_mp3_path + "Demonstration ready mode.mp3"); setLED(0x01 | 0x02 | 0x04); } else if (msg->data == "user_long") { - // it's using in op3_manager + // it's using in humanoid_robot_manager // torque on and going to init pose } } @@ -284,7 +284,7 @@ bool checkManagerRunning(std::string &manager_name) { return true; } - ROS_ERROR("Can't find op3_manager"); + ROS_ERROR("Can't find humanoid_robot_manager"); return false; } diff --git a/op3_demo/src/soccer/ball_follower.cpp b/humanoid_robot_demo/src/soccer/ball_follower.cpp similarity index 97% rename from op3_demo/src/soccer/ball_follower.cpp rename to humanoid_robot_demo/src/soccer/ball_follower.cpp index f4ef1e0..469e1d3 100644 --- a/op3_demo/src/soccer/ball_follower.cpp +++ b/humanoid_robot_demo/src/soccer/ball_follower.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/ball_follower.h" +#include "humanoid_robot_demo/ball_follower.h" namespace robotis_op { @@ -39,10 +39,10 @@ BallFollower::BallFollower() set_walking_command_pub_ = nh_.advertise("/robotis/walking/command", 0); - set_walking_param_pub_ = nh_.advertise( + set_walking_param_pub_ = nh_.advertise( "/robotis/walking/set_params", 0); get_walking_param_client_ = - nh_.serviceClient( + nh_.serviceClient( "/robotis/walking/get_params"); prev_time_ = ros::Time::now(); @@ -305,7 +305,7 @@ void BallFollower::setWalkingParam(double x_move, double y_move, } bool BallFollower::getWalkingParam() { - op3_walking_module_msgs::GetWalkingParam walking_param_msg; + humanoid_robot_walking_module_msgs::GetWalkingParam walking_param_msg; if (get_walking_param_client_.call(walking_param_msg)) { current_walking_param_ = walking_param_msg.response.parameters; diff --git a/op3_demo/src/soccer/ball_tracker.cpp b/humanoid_robot_demo/src/soccer/ball_tracker.cpp similarity index 98% rename from op3_demo/src/soccer/ball_tracker.cpp rename to humanoid_robot_demo/src/soccer/ball_tracker.cpp index 780613c..7d3db63 100644 --- a/op3_demo/src/soccer/ball_tracker.cpp +++ b/humanoid_robot_demo/src/soccer/ball_tracker.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/ball_tracker.h" +#include "humanoid_robot_demo/ball_tracker.h" namespace robotis_op { @@ -54,7 +54,7 @@ BallTracker::BallTracker() BallTracker::~BallTracker() {} void BallTracker::ballPositionCallback( - const op3_ball_detector::CircleSetStamped::ConstPtr &msg) { + const humanoid_robot_ball_detector::CircleSetStamped::ConstPtr &msg) { for (int idx = 0; idx < msg->circles.size(); idx++) { if (ball_position_.z >= msg->circles[idx].z) continue; diff --git a/op3_demo/src/soccer/soccer_demo.cpp b/humanoid_robot_demo/src/soccer/soccer_demo.cpp similarity index 98% rename from op3_demo/src/soccer/soccer_demo.cpp rename to humanoid_robot_demo/src/soccer/soccer_demo.cpp index 3951b28..93762a6 100644 --- a/op3_demo/src/soccer/soccer_demo.cpp +++ b/humanoid_robot_demo/src/soccer/soccer_demo.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/soccer_demo.h" +#include "humanoid_robot_demo/soccer_demo.h" namespace robotis_op { @@ -33,7 +33,7 @@ SoccerDemo::SoccerDemo() ros::NodeHandle nh(ros::this_node::getName()); std::string default_path = - ros::package::getPath("op3_gui_demo") + "/config/gui_config.yaml"; + ros::package::getPath("humanoid_robot_gui_demo") + "/config/gui_config.yaml"; std::string path = nh.param("demo_config", default_path); parseJointNameFromYaml(path); @@ -180,7 +180,7 @@ void SoccerDemo::callbackThread() { imu_data_sub_ = nh.subscribe("/robotis/open_cr/imu", 1, &SoccerDemo::imuDataCallback, this); - is_running_client_ = nh.serviceClient( + is_running_client_ = nh.serviceClient( "/robotis/action/is_running"); set_joint_module_client_ = nh.serviceClient( @@ -593,7 +593,7 @@ void SoccerDemo::setRGBLED(int blue, int green, int red) { // check running of action bool SoccerDemo::isActionRunning() { - op3_action_module_msgs::IsRunning is_running_srv; + humanoid_robot_action_module_msgs::IsRunning is_running_srv; if (is_running_client_.call(is_running_srv) == false) { ROS_ERROR("Failed to get action status"); diff --git a/op3_demo/src/test/button_test.cpp b/humanoid_robot_demo/src/test/button_test.cpp similarity index 96% rename from op3_demo/src/test/button_test.cpp rename to humanoid_robot_demo/src/test/button_test.cpp index 20049f3..ed323f9 100644 --- a/op3_demo/src/test/button_test.cpp +++ b/humanoid_robot_demo/src/test/button_test.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/button_test.h" +#include "humanoid_robot_demo/button_test.h" namespace robotis_op { @@ -30,7 +30,7 @@ ButtonTest::ButtonTest() : SPIN_RATE(30), led_count_(0), rgb_led_count_(0) { boost::thread process_thread = boost::thread(boost::bind(&ButtonTest::processThread, this)); - default_mp3_path_ = ros::package::getPath("op3_demo") + "/data/mp3/test/"; + default_mp3_path_ = ros::package::getPath("humanoid_robot_demo") + "/data/mp3/test/"; } ButtonTest::~ButtonTest() {} diff --git a/op3_demo/src/test/mic_test.cpp b/humanoid_robot_demo/src/test/mic_test.cpp similarity index 96% rename from op3_demo/src/test/mic_test.cpp rename to humanoid_robot_demo/src/test/mic_test.cpp index 61bc1ea..f38ceca 100644 --- a/op3_demo/src/test/mic_test.cpp +++ b/humanoid_robot_demo/src/test/mic_test.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/mic_test.h" +#include "humanoid_robot_demo/mic_test.h" namespace robotis_op { @@ -33,8 +33,8 @@ MicTest::MicTest() boost::thread(boost::bind(&MicTest::processThread, this)); recording_file_name_ = - ros::package::getPath("op3_demo") + "/data/mp3/test/mic-test.wav"; - default_mp3_path_ = ros::package::getPath("op3_demo") + "/data/mp3/test/"; + ros::package::getPath("humanoid_robot_demo") + "/data/mp3/test/mic-test.wav"; + default_mp3_path_ = ros::package::getPath("humanoid_robot_demo") + "/data/mp3/test/"; start_time_ = ros::Time::now(); } diff --git a/op3_demo/src/test_node.cpp b/humanoid_robot_demo/src/test_node.cpp similarity index 95% rename from op3_demo/src/test_node.cpp rename to humanoid_robot_demo/src/test_node.cpp index 65e85ea..58fa24f 100644 --- a/op3_demo/src/test_node.cpp +++ b/humanoid_robot_demo/src/test_node.cpp @@ -20,11 +20,11 @@ #include #include -#include "op3_demo/action_demo.h" -#include "op3_demo/button_test.h" -#include "op3_demo/mic_test.h" -#include "op3_demo/soccer_demo.h" -#include "op3_demo/vision_demo.h" +#include "humanoid_robot_demo/action_demo.h" +#include "humanoid_robot_demo/button_test.h" +#include "humanoid_robot_demo/mic_test.h" +#include "humanoid_robot_demo/soccer_demo.h" +#include "humanoid_robot_demo/vision_demo.h" #include "robotis_controller_msgs/SyncWriteItem.h" #include "robotis_math/robotis_linear_algebra.h" @@ -85,7 +85,7 @@ int main(int argc, char **argv) { ros::Subscriber mode_command_sub = nh.subscribe("/robotis/mode_command", 1, demoModeCommandCallback); - default_mp3_path = ros::package::getPath("op3_demo") + "/data/mp3/"; + default_mp3_path = ros::package::getPath("humanoid_robot_demo") + "/data/mp3/"; ros::start(); @@ -93,7 +93,7 @@ int main(int argc, char **argv) { ros::Rate loop_rate(SPIN_RATE); // wait for starting of manager - std::string manager_name = "/op3_manager"; + std::string manager_name = "/humanoid_robot_manager"; while (ros::ok()) { ros::Duration(1.0).sleep(); @@ -101,7 +101,7 @@ int main(int argc, char **argv) { break; ROS_INFO_COND(DEBUG_PRINT, "Succeed to connect"); } - ROS_WARN("Waiting for op3 manager"); + ROS_WARN("Waiting for humanoid_robot manager"); } // init procedure @@ -212,7 +212,7 @@ void buttonHandlerCallback(const std_msgs::String::ConstPtr &msg) { playSound(default_mp3_path + "test/Self test ready mode.mp3"); setLED(0x01 | 0x02 | 0x04); } else if (msg->data == "user_long") { - // it's using in op3_manager + // it's using in humanoid_robot_manager // torque on and going to init pose } } @@ -332,7 +332,7 @@ bool checkManagerRunning(std::string &manager_name) { return true; } - ROS_ERROR("Can't find op3_manager"); + ROS_ERROR("Can't find humanoid_robot_manager"); return false; } diff --git a/op3_demo/src/vision/face_tracker.cpp b/humanoid_robot_demo/src/vision/face_tracker.cpp similarity index 99% rename from op3_demo/src/vision/face_tracker.cpp rename to humanoid_robot_demo/src/vision/face_tracker.cpp index a0079f2..c59341f 100644 --- a/op3_demo/src/vision/face_tracker.cpp +++ b/humanoid_robot_demo/src/vision/face_tracker.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/face_tracker.h" +#include "humanoid_robot_demo/face_tracker.h" namespace robotis_op { diff --git a/op3_demo/src/vision/vision_demo.cpp b/humanoid_robot_demo/src/vision/vision_demo.cpp similarity index 99% rename from op3_demo/src/vision/vision_demo.cpp rename to humanoid_robot_demo/src/vision/vision_demo.cpp index cc18b50..121ff17 100644 --- a/op3_demo/src/vision/vision_demo.cpp +++ b/humanoid_robot_demo/src/vision/vision_demo.cpp @@ -16,7 +16,7 @@ /* Author: Kayman Jung */ -#include "op3_demo/vision_demo.h" +#include "humanoid_robot_demo/vision_demo.h" namespace robotis_op { diff --git a/op3_read_write_demo/CHANGELOG.rst b/humanoid_robot_read_write_demo/CHANGELOG.rst similarity index 80% rename from op3_read_write_demo/CHANGELOG.rst rename to humanoid_robot_read_write_demo/CHANGELOG.rst index 6f0e796..d124bc3 100644 --- a/op3_read_write_demo/CHANGELOG.rst +++ b/humanoid_robot_read_write_demo/CHANGELOG.rst @@ -1,5 +1,5 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package robotis_op3_demo +Changelog for package robotis_humanoid_robot_demo ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.3.0 (2021-05-05) diff --git a/op3_read_write_demo/CMakeLists.txt b/humanoid_robot_read_write_demo/CMakeLists.txt similarity index 98% rename from op3_read_write_demo/CMakeLists.txt rename to humanoid_robot_read_write_demo/CMakeLists.txt index 3dfc844..00ae19d 100644 --- a/op3_read_write_demo/CMakeLists.txt +++ b/humanoid_robot_read_write_demo/CMakeLists.txt @@ -2,7 +2,7 @@ # Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 3.0.2) -project(op3_read_write_demo) +project(humanoid_robot_read_write_demo) ################################################################################ # Find catkin packages and libraries for catkin and system dependencies diff --git a/humanoid_robot_read_write_demo/launch/humanoid_robot_read_write.launch b/humanoid_robot_read_write_demo/launch/humanoid_robot_read_write.launch new file mode 100644 index 0000000..f27c2b8 --- /dev/null +++ b/humanoid_robot_read_write_demo/launch/humanoid_robot_read_write.launch @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/op3_read_write_demo/package.xml b/humanoid_robot_read_write_demo/package.xml similarity index 71% rename from op3_read_write_demo/package.xml rename to humanoid_robot_read_write_demo/package.xml index 5cc8f71..e9adbf2 100644 --- a/op3_read_write_demo/package.xml +++ b/humanoid_robot_read_write_demo/package.xml @@ -1,19 +1,19 @@ - op3_read_write_demo + humanoid_robot_read_write_demo 0.3.0 - The op3_read_write_demo package + The humanoid_robot_read_write_demo package Apache 2.0 Kayman Ronaldson Bellande - http://wiki.ros.org/op3_demo - http://emanual.robotis.com/docs/en/platform/op3/introduction/ - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues + http://wiki.ros.org/humanoid_robot_demo + http://emanual.robotis.com/docs/en/platform/humanoid_robot/introduction/ + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo/issues catkin @@ -21,18 +21,18 @@ std_msgs sensor_msgs robotis_controller_msgs - op3_manager + humanoid_robot_manager roscpp std_msgs sensor_msgs robotis_controller_msgs - op3_manager + humanoid_robot_manager roscpp std_msgs sensor_msgs robotis_controller_msgs - op3_manager + humanoid_robot_manager diff --git a/op3_read_write_demo/src/read_write.cpp b/humanoid_robot_read_write_demo/src/read_write.cpp similarity index 96% rename from op3_read_write_demo/src/read_write.cpp rename to humanoid_robot_read_write_demo/src/read_write.cpp index b415400..6af9fe1 100644 --- a/op3_read_write_demo/src/read_write.cpp +++ b/humanoid_robot_read_write_demo/src/read_write.cpp @@ -86,8 +86,8 @@ int main(int argc, char **argv) { // set node loop rate ros::Rate loop_rate(SPIN_RATE); - // wait for starting of op3_manager - std::string manager_name = "/op3_manager"; + // wait for starting of humanoid_robot_manager + std::string manager_name = "/humanoid_robot_manager"; while (ros::ok()) { ros::Duration(1.0).sleep(); @@ -95,7 +95,7 @@ int main(int argc, char **argv) { break; ROS_INFO_COND(DEBUG_PRINT, "Succeed to connect"); } - ROS_WARN("Waiting for op3 manager"); + ROS_WARN("Waiting for humanoid_robot manager"); } readyToDemo(); @@ -128,7 +128,7 @@ void buttonHandlerCallback(const std_msgs::String::ConstPtr &msg) { ROS_INFO("Button : start | Direct control module"); readyToDemo(); } - // torque on all joints of ROBOTIS-OP3 + // torque on all joints of ROBOTIS-HUMANOID_ROBOT else if (msg->data == "user") { torqueOnAll(); control_module = None; @@ -186,7 +186,7 @@ void readyToDemo() { goInitPose(); ROS_INFO("Go Init pose"); - // wait while ROBOTIS-OP3 goes to the init posture. + // wait while ROBOTIS-HUMANOID_ROBOT goes to the init posture. ros::Duration(4.0).sleep(); // turn on R/G/B LED [0x01 | 0x02 | 0x04] @@ -233,7 +233,7 @@ bool checkManagerRunning(std::string &manager_name) { return true; } - ROS_ERROR("Can't find op3_manager"); + ROS_ERROR("Can't find humanoid_robot_manager"); return false; } diff --git a/op3_demo/launch/demo.launch b/op3_demo/launch/demo.launch deleted file mode 100644 index 9d7c184..0000000 --- a/op3_demo/launch/demo.launch +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/op3_demo/launch/self_test.launch b/op3_demo/launch/self_test.launch deleted file mode 100644 index 1979ba7..0000000 --- a/op3_demo/launch/self_test.launch +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/op3_demo/list/action_script.yaml b/op3_demo/list/action_script.yaml deleted file mode 100644 index 18ae60f..0000000 --- a/op3_demo/list/action_script.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# combination action page number and mp3 file path -action_and_sound: - 4 : "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Thank you.mp3" - 41: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Introduction.mp3" - 24: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Wow.mp3" - 23: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Yes go.mp3" - 15: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Sit down.mp3" - 1: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Stand up.mp3" - 54: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Clap please.mp3" - 27: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Oops.mp3" - 38: "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Bye bye.mp3" -# 101 : "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Oops.mp3" - 110 : "" - 111 : "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Intro01.mp3" - 115 : "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Intro02.mp3" - 118 : "/home/robotis/catkin_ws/src/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Intro03.mp3" - -# play list -prev_default: [4, 41, 24, 23, 15, 1, 54, 27, 38] -default: [4, 110, 111, 115, 118, 24, 54, 27, 38] - -# example of play list -#certification: [101] diff --git a/op3_demo/list/action_script_bk.yaml b/op3_demo/list/action_script_bk.yaml deleted file mode 100644 index 2dd155b..0000000 --- a/op3_demo/list/action_script_bk.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# combination action page number and mp3 file path -action_and_sound: - 4 : "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Thank you.mp3" - 41: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Introduction.mp3" - 24: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Wow.mp3" - 23: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Yes go.mp3" - 15: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Sit down.mp3" - 1: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Stand up.mp3" - 54: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Clap please.mp3" - 27: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Oops.mp3" - 38: "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Bye bye.mp3" - 101 : "/home/robotis/catkin_ws/src/ROBOTIS-OP3/ROBOTIS-OP3-Demo/op3_demo/data/mp3/Oops.mp3" - -# play list -default: [4, 41, 24, 23, 15, 1, 54, 27, 38] - -# example of play list -certificatino: [101] diff --git a/op3_read_write_demo/launch/op3_read_write.launch b/op3_read_write_demo/launch/op3_read_write.launch deleted file mode 100644 index 3c70adb..0000000 --- a/op3_read_write_demo/launch/op3_read_write.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/requirements/ros_repository_requirements.txt b/requirements/ros_repository_requirements.txt index 09c4578..e3c338f 100644 --- a/requirements/ros_repository_requirements.txt +++ b/requirements/ros_repository_requirements.txt @@ -1,9 +1,9 @@ -git clone -b https://github.com/Robotics-Sensors/ROBOTIS-OP3-msgs -git clone -b https://github.com/Robotics-Sensors/ROBOTIS-OP3 -git clone -b https://github.com/Robotics-Sensors/ROBOTIS-OP3-Tools +git clone -b https://github.com/Robotics-Sensors/ROBOTIS-HUMANOID_ROBOT-msgs +git clone -b https://github.com/Robotics-Sensors/ROBOTIS-HUMANOID_ROBOT +git clone -b https://github.com/Robotics-Sensors/ROBOTIS-HUMANOID_ROBOT-Tools git clone -b https://github.com/Robotics-Sensors/ROBOTIS-Framework-msgs git clone -b https://github.com/Robotics-Sensors/ROBOTIS-Framework -git clone -b https://github.com/Robotics-Sensors/ROBOTIS-OP3-Common +git clone -b https://github.com/Robotics-Sensors/ROBOTIS-HUMANOID_ROBOT-Common git clone -b https://github.com/Robotics-Sensors/ROBOTIS-Utility -git clone -b https://github.com/Robotics-Sensors/ROBOTIS-OP3-Demo +git clone -b https://github.com/Robotics-Sensors/ROBOTIS-HUMANOID_ROBOT-Demo git clone -b https://github.com/Robotics-Sensors/ROBOTIS-Math diff --git a/robotis_op3_demo/CHANGELOG.rst b/robotis_humanoid_robot_demo/CHANGELOG.rst similarity index 62% rename from robotis_op3_demo/CHANGELOG.rst rename to robotis_humanoid_robot_demo/CHANGELOG.rst index 34b4ee4..0a864c0 100644 --- a/robotis_op3_demo/CHANGELOG.rst +++ b/robotis_humanoid_robot_demo/CHANGELOG.rst @@ -1,5 +1,5 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package robotis_op3_demo +Changelog for package robotis_humanoid_robot_demo ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.3.0 (2021-05-05) @@ -10,10 +10,10 @@ Changelog for package robotis_op3_demo 0.1.0 (2018-04-19) ------------------ * first release for ROS Kinetic -* added launch files in order to move the camera setting to op3_camera_setting package +* added launch files in order to move the camera setting to humanoid_robot_camera_setting package * added missing package in find_package() -* updated CMakeLists.txt and package.xml of op3_bringup +* updated CMakeLists.txt and package.xml of humanoid_robot_bringup * changed rviz config file * refacoring to release -* split repositoryfrom ROBOTIS-OP3 +* split repositoryfrom ROBOTIS-HUMANOID_ROBOT * Contributors: Kayman, Zerom, Yoshimaru Tanaka, Pyo diff --git a/robotis_op3_demo/CMakeLists.txt b/robotis_humanoid_robot_demo/CMakeLists.txt similarity index 70% rename from robotis_op3_demo/CMakeLists.txt rename to robotis_humanoid_robot_demo/CMakeLists.txt index aa20e05..3314ba3 100644 --- a/robotis_op3_demo/CMakeLists.txt +++ b/robotis_humanoid_robot_demo/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 3.0.2) -project(robotis_op3_demo) +project(robotis_humanoid_robot_demo) find_package(catkin REQUIRED) catkin_metapackage() diff --git a/robotis_humanoid_robot_demo/package.xml b/robotis_humanoid_robot_demo/package.xml new file mode 100644 index 0000000..7fb9624 --- /dev/null +++ b/robotis_humanoid_robot_demo/package.xml @@ -0,0 +1,34 @@ + + + robotis_humanoid_robot_demo + 0.3.0 + + ROS packages for the robotis_humanoid_robot_demo (meta package) + + Apache 2.0 + Kayman + Ronaldson Bellande + + http://wiki.ros.org/robotis_humanoid_robot_demo + http://emanual.robotis.com/docs/en/platform/humanoid_robot/introduction/ + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo + https://github.com/ROBOTIS-GIT/ROBOTIS-HUMANOID_ROBOT-Demo/issues + + catkin + + humanoid_robot_ball_detector + humanoid_robot_bringup + humanoid_robot_demo + + humanoid_robot_ball_detector + humanoid_robot_bringup + humanoid_robot_demo + + humanoid_robot_ball_detector + humanoid_robot_bringup + humanoid_robot_demo + + + + + diff --git a/robotis_op3_demo/package.xml b/robotis_op3_demo/package.xml deleted file mode 100644 index 3922372..0000000 --- a/robotis_op3_demo/package.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - robotis_op3_demo - 0.3.0 - - ROS packages for the robotis_op3_demo (meta package) - - Apache 2.0 - Kayman - Ronaldson Bellande - - http://wiki.ros.org/robotis_op3_demo - http://emanual.robotis.com/docs/en/platform/op3/introduction/ - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo - https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo/issues - - catkin - - op3_ball_detector - op3_bringup - op3_demo - - op3_ball_detector - op3_bringup - op3_demo - - op3_ball_detector - op3_bringup - op3_demo - - - - -