From 2226961ccec1bc78f453aa81f320708de0feae40 Mon Sep 17 00:00:00 2001 From: Pyo Date: Tue, 20 Mar 2018 14:15:12 +0900 Subject: [PATCH] changed package.xml to format v2 --- .travis.yml | 4 +- LICENSE | 402 +++++++++--------- README.md | 18 +- dynamixel_workbench/package.xml | 19 +- .../CMakeLists.txt | 25 +- dynamixel_workbench_controllers/package.xml | 21 +- dynamixel_workbench_operators/CMakeLists.txt | 18 +- dynamixel_workbench_operators/package.xml | 15 +- .../CMakeLists.txt | 23 +- .../package.xml | 21 +- .../CMakeLists.txt | 30 +- .../package.xml | 26 +- dynamixel_workbench_toolbox/CMakeLists.txt | 18 +- dynamixel_workbench_toolbox/package.xml | 16 +- 14 files changed, 329 insertions(+), 327 deletions(-) diff --git a/.travis.yml b/.travis.yml index becaff95..c28011ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,14 +12,14 @@ compiler: - gcc notifications: email: - on_success: always + on_success: change on_failure: always recipients: - pyo@robotis.com env: matrix: - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian - - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie +# - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie branches: only: - master diff --git a/LICENSE b/LICENSE index 5e0fd33c..8dada3ed 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,201 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, -and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by -the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all -other entities that control, are controlled by, or are under common -control with that entity. For the purposes of this definition, -"control" means (i) the power, direct or indirect, to cause the -direction or management of such entity, whether by contract or -otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity -exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation -source, and configuration files. - -"Object" form shall mean any form resulting from mechanical -transformation or translation of a Source form, including but -not limited to compiled object code, generated documentation, -and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or -Object form, made available under the License, as indicated by a -copyright notice that is included in or attached to the work -(an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object -form, that is based on (or derived from) the Work and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. For the purposes -of this License, Derivative Works shall not include works that remain -separable from, or merely link (or bind by name) to the interfaces of, -the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including -the original version of the Work and any modifications or additions -to that Work or Derivative Works thereof, that is intentionally -submitted to Licensor for inclusion in the Work by the copyright owner -or by an individual or Legal Entity authorized to submit on behalf of -the copyright owner. For the purposes of this definition, "submitted" -means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, -and issue tracking systems that are managed by, or on behalf of, the -Licensor for the purpose of discussing and improving the Work, but -excluding communication that is conspicuously marked or otherwise -designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity -on behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the -Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, -use, offer to sell, sell, import, and otherwise transfer the Work, -where such license applies only to those patent claims licensable -by such Contributor that are necessarily infringed by their -Contribution(s) alone or by combination of their Contribution(s) -with the Work to which such Contribution(s) was submitted. If You -institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work -or a Contribution incorporated within the Work constitutes direct -or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate -as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the -Work or Derivative Works thereof in any medium, with or without -modifications, and in Source or Object form, provided that You -meet the following conditions: - -(a) You must give any other recipients of the Work or -Derivative Works a copy of this License; and - -(b) You must cause any modified files to carry prominent notices -stating that You changed the files; and - -(c) You must retain, in the Source form of any Derivative Works -that You distribute, all copyright, patent, trademark, and -attribution notices from the Source form of the Work, -excluding those notices that do not pertain to any part of -the Derivative Works; and - -(d) If the Work includes a "NOTICE" text file as part of its -distribution, then any Derivative Works that You distribute must -include a readable copy of the attribution notices contained -within such NOTICE file, excluding those notices that do not -pertain to any part of the Derivative Works, in at least one -of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or -documentation, if provided along with the Derivative Works; or, -within a display generated by the Derivative Works, if and -wherever such third-party notices normally appear. The contents -of the NOTICE file are for informational purposes only and -do not modify the License. You may add Your own attribution -notices within Derivative Works that You distribute, alongside -or as an addendum to the NOTICE text from the Work, provided -that such additional attribution notices cannot be construed -as modifying the License. - -You may add Your own copyright statement to Your modifications and -may provide additional or different license terms and conditions -for use, reproduction, or distribution of Your modifications, or -for any such Derivative Works as a whole, provided Your use, -reproduction, and distribution of the Work otherwise complies with -the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, -any Contribution intentionally submitted for inclusion in the Work -by You to the Licensor shall be under the terms and conditions of -this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify -the terms of any separate license agreement you may have executed -with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade -names, trademarks, service marks, or product names of the Licensor, -except as required for reasonable and customary use in describing the -origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or -agreed to in writing, Licensor provides the Work (and each -Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied, including, without limitation, any warranties or conditions -of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any -risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, -whether in tort (including negligence), contract, or otherwise, -unless required by applicable law (such as deliberate and grossly -negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a -result of this License or out of the use or inability to use the -Work (including but not limited to damages for loss of goodwill, -work stoppage, computer failure or malfunction, or any and all -other commercial damages or losses), even if such Contributor -has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing -the Work or Derivative Works thereof, You may choose to offer, -and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this -License. However, in accepting such obligations, You may act only -on Your own behalf and on Your sole responsibility, not on behalf -of any other Contributor, and only if You agree to indemnify, -defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason -of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "{}" -replaced with your own identifying information. (Don't include -the brackets!) The text should be enclosed in the appropriate -comment syntax for the file format. We also recommend that a -file or class name and description of purpose be included on the -same "printed page" as the copyright notice for easier -identification within third-party archives. - -Copyright {yyyy} {name of copyright owner} - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 4ba6de20..4b83a4e4 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,15 @@ -# Dynamixel workbench packages +# Dynamixel Workbench Metapackage +[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fdynamixel-workbench.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fdynamixel-workbench) [![Build Status](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench) -[![Build Status](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench.svg)](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench) +# Documents for dynamixel_workbench packages +- [ROBOTIS e-Manual](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/#package-description) +- http://wiki.ros.org/dynamixel_workbench -For more information, please check the document below. +# ROS packages related to Dynamixel Workbench +- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK) +- [dynamixel_workbench](https://github.com/ROBOTIS-GIT/dynamixel-workbench) +- [dynamixel_workbench_msgs](https://github.com/ROBOTIS-GIT/dynamixel-workbench-msgs) -[ROS Wiki for Dynamixel workbench](http://wiki.ros.org/dynamixel_workbench) - -[e-Manual for Dynamixel workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/) +# Documents and Videos for Dynamixel Workbench +- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/) +- [ROBOTIS e-Manual for Dynamixel Workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/) \ No newline at end of file diff --git a/dynamixel_workbench/package.xml b/dynamixel_workbench/package.xml index c1e52991..0b1c30b5 100644 --- a/dynamixel_workbench/package.xml +++ b/dynamixel_workbench/package.xml @@ -1,5 +1,5 @@ - + dynamixel_workbench 0.2.3 @@ -8,17 +8,18 @@ Furthermore, it supports various controllers based on operating mode and Dynamixel SDK. These controllers are commanded by operators. - Apache License 2.0 + Apache 2.0 Darby Lim Pyo - https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues - https://github.com/ROBOTIS-GIT/dynamixel-workbench http://wiki.ros.org/dynamixel_workbench + http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/ + https://github.com/ROBOTIS-GIT/dynamixel-workbench + https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues catkin - dynamixel_workbench_single_manager - dynamixel_workbench_single_manager_gui - dynamixel_workbench_controllers - dynamixel_workbench_operators - dynamixel_workbench_toolbox + dynamixel_workbench_controllers + dynamixel_workbench_operators + dynamixel_workbench_single_manager + dynamixel_workbench_single_manager_gui + dynamixel_workbench_toolbox diff --git a/dynamixel_workbench_controllers/CMakeLists.txt b/dynamixel_workbench_controllers/CMakeLists.txt index 6823bcae..14daec3b 100644 --- a/dynamixel_workbench_controllers/CMakeLists.txt +++ b/dynamixel_workbench_controllers/CMakeLists.txt @@ -1,21 +1,25 @@ ################################################################################ -# CMake +# Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 2.8.3) project(dynamixel_workbench_controllers) -set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") +## Compile as C++11, supported in ROS Kinetic and newer +add_compile_options(-std=c++11) ################################################################################ -# Packages +# Find catkin packages and libraries for catkin and system dependencies ################################################################################ find_package(catkin REQUIRED COMPONENTS roscpp dynamixel_workbench_msgs - dynamixel_sdk dynamixel_workbench_toolbox ) +################################################################################ +# Setup for python modules and scripts +################################################################################ + ################################################################################ # Declare ROS messages, services and actions ################################################################################ @@ -25,20 +29,19 @@ find_package(catkin REQUIRED COMPONENTS ################################################################################ ################################################################################ -# Catkin specific configuration +# Declare catkin specific configuration to be passed to dependent projects ################################################################################ catkin_package( INCLUDE_DIRS include - LIBRARIES ${PROJECT_NAME} - CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox dynamixel_sdk + CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox ) ################################################################################ # Build ################################################################################ include_directories( - ${catkin_INCLUDE_DIRS} include + ${catkin_INCLUDE_DIRS} ) add_executable(position_control src/position_control.cpp) @@ -61,8 +64,6 @@ target_link_libraries(torque_control ${catkin_LIBRARIES}) ## Install ################################################################################# install(TARGETS position_control velocity_control multi_port torque_control - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) @@ -70,8 +71,8 @@ install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} ) -install(DIRECTORY launch/ - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch +install(DIRECTORY launch + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) ################################################################################ diff --git a/dynamixel_workbench_controllers/package.xml b/dynamixel_workbench_controllers/package.xml index dc7d2a64..822c0a6a 100644 --- a/dynamixel_workbench_controllers/package.xml +++ b/dynamixel_workbench_controllers/package.xml @@ -1,24 +1,19 @@ - + dynamixel_workbench_controllers 0.2.3 This package contains examples of applying the 'dynamixel_workbench_toolbox' library developed on the basis of dynamixel_sdk to various operating modes of Dynamixel. - Apache License 2.0 + Apache 2.0 Darby Lim Pyo - https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues + http://wiki.ros.org/dynamixel_workbench_controllers + http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/ https://github.com/ROBOTIS-GIT/dynamixel-workbench - http://wiki.ros.org/dynamixel_workbench + https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues catkin - roscpp - dynamixel_sdk - dynamixel_workbench_msgs - dynamixel_workbench_toolbox - roscpp - dynamixel_sdk - dynamixel_workbench_msgs - dynamixel_workbench_toolbox - + roscpp + dynamixel_workbench_msgs + dynamixel_workbench_toolbox diff --git a/dynamixel_workbench_operators/CMakeLists.txt b/dynamixel_workbench_operators/CMakeLists.txt index cce8c263..9454c2e6 100644 --- a/dynamixel_workbench_operators/CMakeLists.txt +++ b/dynamixel_workbench_operators/CMakeLists.txt @@ -1,19 +1,24 @@ ################################################################################ -# CMake +# Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 2.8.3) project(dynamixel_workbench_operators) -set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") +## Compile as C++11, supported in ROS Kinetic and newer +add_compile_options(-std=c++11) ################################################################################ -# Packages +# Find catkin packages and libraries for catkin and system dependencies ################################################################################ find_package(catkin REQUIRED COMPONENTS roscpp dynamixel_workbench_msgs ) +################################################################################ +# Setup for python modules and scripts +################################################################################ + ################################################################################ # Declare ROS messages, services and actions ################################################################################ @@ -23,11 +28,10 @@ find_package(catkin REQUIRED COMPONENTS ################################################################################ ################################################################################ -# Catkin specific configuration +# Declare catkin specific configuration to be passed to dependent projects ################################################################################ catkin_package( - LIBRARIES ${PROJECT_NAME} - CATKIN_DEPENDS roscpp dynamixel_workbench_msgs + CATKIN_DEPENDS roscpp dynamixel_workbench_msgs ) ################################################################################ @@ -49,8 +53,6 @@ target_link_libraries(wheel_operator ${catkin_LIBRARIES}) ## Install ################################################################################# install(TARGETS joint_operator wheel_operator - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) diff --git a/dynamixel_workbench_operators/package.xml b/dynamixel_workbench_operators/package.xml index a27f717b..9a1dc1cf 100644 --- a/dynamixel_workbench_operators/package.xml +++ b/dynamixel_workbench_operators/package.xml @@ -1,19 +1,18 @@ - + dynamixel_workbench_operators 0.2.3 This package contains nodes that control the Dynamixel by communicating with the server registered in the 'dynamixel_workbench_controllers' package - Apache License 2.0 + Apache 2.0 Darby Lim Pyo - https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues + http://wiki.ros.org/dynamixel_workbench_operators + http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/ https://github.com/ROBOTIS-GIT/dynamixel-workbench - http://wiki.ros.org/dynamixel_workbench + https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues catkin - roscpp - dynamixel_workbench_msgs - roscpp - dynamixel_workbench_msgs + roscpp + dynamixel_workbench_msgs diff --git a/dynamixel_workbench_single_manager/CMakeLists.txt b/dynamixel_workbench_single_manager/CMakeLists.txt index b64a9f35..410ace04 100644 --- a/dynamixel_workbench_single_manager/CMakeLists.txt +++ b/dynamixel_workbench_single_manager/CMakeLists.txt @@ -1,21 +1,25 @@ ################################################################################ -# CMake +# Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 2.8.3) project(dynamixel_workbench_single_manager) -set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") +## Compile as C++11, supported in ROS Kinetic and newer +add_compile_options(-std=c++11) ################################################################################ -# Packages +# Find catkin packages and libraries for catkin and system dependencies ################################################################################ find_package(catkin REQUIRED COMPONENTS roscpp - dynamixel_sdk dynamixel_workbench_msgs dynamixel_workbench_toolbox ) +################################################################################ +# Setup for python modules and scripts +################################################################################ + ################################################################################ # Declare ROS messages, services and actions ################################################################################ @@ -25,11 +29,10 @@ find_package(catkin REQUIRED COMPONENTS ################################################################################ ################################################################################ -# Catkin specific configuration +# Declare catkin specific configuration to be passed to dependent projects ################################################################################ catkin_package( INCLUDE_DIRS include - LIBRARIES ${PROJECT_NAME} CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox dynamixel_sdk ) @@ -37,8 +40,8 @@ catkin_package( # Build ################################################################################ include_directories( - ${catkin_INCLUDE_DIRS} include + ${catkin_INCLUDE_DIRS} ) add_executable(single_dynamixel_controller src/single_dynamixel_controller.cpp) @@ -53,8 +56,6 @@ target_link_libraries(single_dynamixel_monitor ${catkin_LIBRARIES}) # Install ################################################################################ install(TARGETS single_dynamixel_controller single_dynamixel_monitor - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) @@ -62,8 +63,8 @@ install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} ) -install(DIRECTORY launch/ - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch +install(DIRECTORY launch + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) ################################################################################ diff --git a/dynamixel_workbench_single_manager/package.xml b/dynamixel_workbench_single_manager/package.xml index bc84f9d1..041b9bde 100644 --- a/dynamixel_workbench_single_manager/package.xml +++ b/dynamixel_workbench_single_manager/package.xml @@ -1,25 +1,20 @@ - + dynamixel_workbench_single_manager 0.2.3 This package is single manager for a Dynamixel. It provides a terminal environment to check the status of Dynamixel and control it before using Dynamixel - Apache License 2.0 + Apache 2.0 Darby Lim Pyo - https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues + http://wiki.ros.org/dynamixel_workbench_single_manager + http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/ https://github.com/ROBOTIS-GIT/dynamixel-workbench - http://wiki.ros.org/dynamixel_workbench + https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues catkin - roscpp - dynamixel_sdk - dynamixel_workbench_msgs - dynamixel_workbench_toolbox - roscpp - dynamixel_sdk - dynamixel_workbench_msgs - dynamixel_workbench_toolbox - + roscpp + dynamixel_workbench_msgs + dynamixel_workbench_toolbox diff --git a/dynamixel_workbench_single_manager_gui/CMakeLists.txt b/dynamixel_workbench_single_manager_gui/CMakeLists.txt index fb4fde82..2daff299 100644 --- a/dynamixel_workbench_single_manager_gui/CMakeLists.txt +++ b/dynamixel_workbench_single_manager_gui/CMakeLists.txt @@ -1,22 +1,26 @@ ################################################################################ -# CMake +# Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 2.8.0) project(dynamixel_workbench_single_manager_gui) -set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") +## Compile as C++11, supported in ROS Kinetic and newer +add_compile_options(-std=c++11) ################################################################################ -# Packages +# Find catkin packages and libraries for catkin and system dependencies ################################################################################ find_package(catkin REQUIRED COMPONENTS - qt_build roscpp - dynamixel_sdk + qt_build dynamixel_workbench_msgs dynamixel_workbench_toolbox ) +################################################################################ +# Setup for python modules and scripts +################################################################################ + ################################################################################ # Declare ROS messages, services and actions ################################################################################ @@ -26,19 +30,19 @@ find_package(catkin REQUIRED COMPONENTS ################################################################################ ################################################################################ -# Catkin specific configuration +# Declare catkin specific configuration to be passed to dependent projects ################################################################################ catkin_package( INCLUDE_DIRS include - CATKIN_DEPENDS qt_build roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox dynamixel_sdk + CATKIN_DEPENDS roscpp qt_build dynamixel_workbench_msgs dynamixel_workbench_toolbox ) ################################################################################ # Build ################################################################################ include_directories( - ${catkin_INCLUDE_DIRS} include + ${catkin_INCLUDE_DIRS} ) rosbuild_prepare_qt4(QtCore QtGui) @@ -53,15 +57,13 @@ QT4_WRAP_UI(QT_FORMS_HPP ${QT_FORMS}) QT4_WRAP_CPP(QT_MOC_HPP ${QT_MOC}) add_executable(dynamixel_workbench_single_manager_gui ${QT_SOURCES} ${QT_RESOURCES_CPP} ${QT_FORMS_HPP} ${QT_MOC_HPP}) -target_link_libraries(dynamixel_workbench_single_manager_gui ${QT_LIBRARIES} ${catkin_LIBRARIES}) -install(TARGETS dynamixel_workbench_single_manager_gui RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) +add_dependencies(dynamixel_workbench_single_manager_gui ${catkin_EXPORTED_TARGETS}) +target_link_libraries(dynamixel_workbench_single_manager_gui ${catkin_LIBRARIES} ${QT_LIBRARIES}) ################################################################################# ## Install ################################################################################# install(TARGETS dynamixel_workbench_single_manager_gui - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) @@ -69,6 +71,10 @@ install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} ) +install(DIRECTORY resources ui + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +) + ################################################################################ # Test ################################################################################ diff --git a/dynamixel_workbench_single_manager_gui/package.xml b/dynamixel_workbench_single_manager_gui/package.xml index 6203b868..1e49ba76 100644 --- a/dynamixel_workbench_single_manager_gui/package.xml +++ b/dynamixel_workbench_single_manager_gui/package.xml @@ -1,27 +1,21 @@ - + dynamixel_workbench_single_manager_gui 0.2.3 It provides a grapic user interface to check the status of Dynamixel and control it before using Dynamixel - Apache License 2.0 + Apache 2.0 Darby Lim Pyo - https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues + http://wiki.ros.org/dynamixel_workbench_single_manager_gui + http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/ https://github.com/ROBOTIS-GIT/dynamixel-workbench - http://wiki.ros.org/dynamixel_workbench + https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues catkin - qt_build - roscpp - dynamixel_sdk - libqt4-dev - dynamixel_workbench_msgs - dynamixel_workbench_toolbox - qt_build - roscpp - dynamixel_sdk - libqt4-dev - dynamixel_workbench_msgs - dynamixel_workbench_toolbox + roscpp + qt_build + libqt4-dev + dynamixel_workbench_msgs + dynamixel_workbench_toolbox diff --git a/dynamixel_workbench_toolbox/CMakeLists.txt b/dynamixel_workbench_toolbox/CMakeLists.txt index 4ffaf2c8..c5b87519 100644 --- a/dynamixel_workbench_toolbox/CMakeLists.txt +++ b/dynamixel_workbench_toolbox/CMakeLists.txt @@ -1,19 +1,24 @@ ################################################################################ -# CMake +# Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 2.8.3) project(dynamixel_workbench_toolbox) -set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") +## Compile as C++11, supported in ROS Kinetic and newer +add_compile_options(-std=c++11) ################################################################################ -# Packages +# Find catkin packages and libraries for catkin and system dependencies ################################################################################ find_package(catkin REQUIRED COMPONENTS roscpp dynamixel_sdk ) +################################################################################ +# Setup for python modules and scripts +################################################################################ + ################################################################################ # Declare ROS messages, services and actions ################################################################################ @@ -23,7 +28,7 @@ find_package(catkin REQUIRED COMPONENTS ################################################################################ ################################################################################ -# Catkin specific configuration +# Declare catkin specific configuration to be passed to dependent projects ################################################################################ catkin_package( INCLUDE_DIRS include @@ -35,8 +40,8 @@ catkin_package( # Build ################################################################################ include_directories( - ${catkin_INCLUDE_DIRS} include + ${catkin_INCLUDE_DIRS} ) add_library(dynamixel_workbench_toolbox @@ -45,8 +50,7 @@ add_library(dynamixel_workbench_toolbox src/dynamixel_workbench_toolbox/dynamixel_tool.cpp src/dynamixel_workbench_toolbox/dynamixel_workbench.cpp ) - -add_dependencies(dynamixel_workbench_toolbox ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) +add_dependencies(dynamixel_workbench_toolbox ${catkin_EXPORTED_TARGETS}) target_link_libraries(dynamixel_workbench_toolbox ${catkin_LIBRARIES}) ################################################################################ diff --git a/dynamixel_workbench_toolbox/package.xml b/dynamixel_workbench_toolbox/package.xml index d45439b2..48231ebc 100644 --- a/dynamixel_workbench_toolbox/package.xml +++ b/dynamixel_workbench_toolbox/package.xml @@ -1,5 +1,5 @@ - + dynamixel_workbench_toolbox 0.2.3 @@ -9,16 +9,14 @@ The 'dynamixel_driver' class includes wraped function used in DYNAMIXEL SDK. The 'dynamixel_workbench' class make simple to use Dynamixels - Apache License 2.0 + Apache 2.0 Darby Lim Pyo - https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues + http://wiki.ros.org/dynamixel_workbench_toolbox + http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/ https://github.com/ROBOTIS-GIT/dynamixel-workbench - http://wiki.ros.org/dynamixel_workbench + https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues catkin - roscpp - dynamixel_sdk - roscpp - dynamixel_sdk - + roscpp + dynamixel_sdk