diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..31153bd0 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,26 @@ +# Contribution Guide + +本リポジトリへのコントリビュート方法について記載しています。 + +## Issues + +リポジトリの品質向上にご協力頂きありがとうございます。 + +Issueの作成を簡単にするテンプレートを用意しているので活用してください。 + +## Pull Requests + +Pull Requestの作成ありがとうございます。 +提出したPull Request（PR）には次のルールが適用されます。 + +- PRの内容には本リポジトリのライセンス（[LICENSE](./LICENSE)と[README.md](./README.md)に記載されています）が適用されます +- PRは`rt-net`のメンバーによるレビューを経てからマージされます + - すべてのPRがマージされるわけではなく、希望に添えない場合もありますのでご容赦ください +- リポジトリにテストが設定されている場合はできるだけテストを通してください + - 何かしらの理由（テストに間違いがある場合など）でテストを通さずPRを出す場合はその旨をPRに記載してください +- マージする際にはPR内の全コミットが1つのコミットに`squash`されます + - [プルリクエストのコミットのsquashとマージ | GitHubヘルプ](https://help.github.com/ja/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges#squash-and-merge-your-pull-request-commits) +- 1つのPRでリクエストする変更はできるだけシンプルにしてください + - 異なる内容の変更を含む場合はPRを分割してください + - 例えば、複数の機能追加したり、機能追加とリファクタリングを同時にする場合はそれぞれ別々のPRとしてください + - squashマージしても履歴を辿りやすくするためです \ No newline at end of file diff --git a/LICENSE b/LICENSE index 7846d5dd..261eeb9e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,149 +1,201 @@ -　　　　　　　　　　　　　　　　　　　　　　　　　非商用使用許諾規約 - -株式会社アールティ（以下「弊社」といいます。）の商品（CRANE-X7、SCIURIUS17および弊社が開発・製造・販売するその他の商品。 -以下「弊社商品」といいます。）をご購入頂き誠にありがとうございます。本非商用使用許諾規約（以下「本規約」といいます。）は、 -弊社商品に関連して弊社が制作したソースファイル、ディレクトリ、実行可能ファイル、データ、開発ツールおよびその他の資料 -（以下「弊社資料」といいます。）の使用に際し適用される条件を定めるものです。弊社資料を使用する方（以下「使用者」といいま -す。）は、個人または法人を問わず、本非商用使用許諾規約をお読み頂き、その内容にご同意頂きますようお願いします。もしご同意 -できない場合、弊社資料のご使用はお控え頂きますようお願いします。 - -第１条（保証） -１． 弊社資料は、現状有姿のまま提供されます。 -２． 法令で定める場合を除き、弊社は、弊社資料の性能、正確性、特定目的への適合性に関して一切保証しません。 -　　 また、弊社資料にエラー、セキュリティ上の欠陥、中断等の障害が起こり得ることについてもご了承頂きますようお願いします。 - -第２条（非商用使用） -１． 弊社資料には、非商用目的でご使用頂きますようお願いします。なお、本規約において「非商用使用」とは、以下の各号に該当する場合をいいます。 -（ア） 間接的または直接的な収益、報酬、商業利益等の獲得を目的としない研究および教育 -（イ） 教育機関において非商業的な学習、教育または研究を目的とする学生および教職員による使用 -２． 弊社資料を間接的または直接的な収益、報酬、商業利益等の金銭的利益の獲得を目的としたり、商業的な環境において使用したりする場合、 -　　　商用使用許諾または協業等について協議するため、事前に弊社までお問合せ頂きますようお願いします。 - -第３条（オープンソース資料） -１． 弊社資料は、オープンソース資料を含みます。オープンソース資料に関する使用条件は、以下に引用するライセンスに定められています。 -　　 ご参照のうえ、当該ライセンスの定めに従いオープンソース資料をご使用頂きますようお願いします。なお、オープンソース資料は、 -　　 法令で定める場合または書面による特段の合意がある場合を除き、現状有姿のまま、かつ黙示的または明示的な保証を一切付さずに提供されます。 -（ア） Apache License, Version 2.0 (https://opensource.org/licenses/Apache-2.0) -（イ） Robot Operating System (ROS) のコア部分に関する3条項BSDライセンス -　　　　(https://opensource.org/licenses/BSD-3-Clause) -（ウ） Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License -　　　　(https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode) -２． 万一、オープンソース資料に関するライセンスの定めと本規約の定めとの間で不一致が生じた場合、本規約の定めが優先するものとします。 -　 　なお、弊社は、弊社資料に含まれているオープンソース資料について一切保証しません。 - -第４条（使用許諾） -１． 弊社は、以下の条件のもとで弊社資料の使用にかかる権利を許諾します。 -（ア） 本規約の定めに従うこと -（イ） 弊社資料または弊社商品に添付された仕様書・マニュアル・ガイドライン等を順守すること -（ウ） 本規約第２条第1項に定める目的のみをもって使用すること -２． 使用権の特徴は、以下の通りとします。 -（ア） 世界中どこでもご使用頂けます。 -（イ） 理由の如何を問わず、解除または取消可能とします。 -（ウ） 非独占的な使用権とします。 -（エ） 無償とします。 -（オ） 譲渡不能とします。 -（カ） 使用期間は、無期限とします。 -（キ） サブライセンスはできないものとします。 - -第５条（禁止事項） -以下の行為を禁止します。 -（ア） 収益、商業利益等の獲得を目的とした弊社資料およびこれらの派生製品を製造、研究、使用等 -　　　（販売、貸与、リース、ライセンス、譲渡を含みます。）すること -（イ） 弊社資料のディスアセンブル、デコンパイル、リバースエンジニアリングまたは弊社資料へ不正アクセスをすること -（ウ） 弊社の事前の承諾なく、第三者に対して弊社資料へのアクセスを許可すること。ただし、当該第三者に対するアクセス許可が -　　　 非商業目的の研究または教育の一環である場合、この限りではありません。 -（エ） 弊社の事前の承諾なく、第三者に対して本規約に定める使用許諾、権利および義務を譲渡、移転またはサブライセンスすること -（オ） 法令に反して弊社資料を使用すること - -第６条（権利の帰属） -弊社は、弊社資料およびこれらの一部として使用者に開示したノウハウ、仕様書、コンセプト、デザイン、その他の技術および知的財産にかかる -一切の権利を留保するものとします。本規約は、弊社の商標、商号、役務商標、商品名、ロゴの使用を許諾するものではありません。 -ただし、弊社資料の説明または記述に合理的に必要な範囲において当該商標等を使用する場合は、この限りでないものとします。 -なお、弊社資料に付された商品識別番号、商標、コピーライト、その他の注意事項は、除去しないようお願いします。 - -第７条（免責事項） -弊社は、弊社の故意または過失による場合を除き、使用者に対して一切の損害賠償の責めを負わないものとします。 -また弊社は、本契約に起因する逸失利益および事業機会の喪失を含む間接損害、特別損害派生的損害および付随的損害を賠償する責めを負わないものとします。 - -第８条（不正使用および解除） -本規約に定められた使用許諾の範囲を超えて弊社資料を使用する行為は、本規約違反とみなします。 -この場合、弊社は、使用許諾を取り消すほか、法令上認められる救済手段を行使し、使用者は、本規約違反に起因する損害（第三者による請求を含みます） -を賠償するものとします。使用許諾の取消後、使用者は、弊社の要請に応じて、直ちに弊社資料の使用を中止、破棄または返却するようお願いします。 - -第９条（準拠法） -本規約は、日本法に準拠するものとします。 - - - NON-COMMERCIAL LICENSE AGREEMENT - -This Non-Commercial License Agreement (“Agreement”) is a binding contract between RT Corporation, -a company duly organized and existing under the laws of Japan (“we”, “our”) and you, the entity or -individual (“you”, “your”) using our source files, directories, executables, data, development tools -and other materials (collectively, the “Materials”) we make available to you under this Agreement -in connection with CRANE-X7, SCIURIUS17, and other products (collectively the “Products”). -If you do not agree with the terms and conditions of this Agreement, you do not have -the right to use the Materials. - -Prior to using the Materials, you expressly acknowledge and agree that to the extent permitted -by applicable laws the Materials are provided “as-is”, the use of the Materials is at your -entire risk with respect to the performance, accuracy and fitness of the Materials -for a particular purpose. You acknowledge and understand that the Materials may not be -error free, free of any security defects or interruption. - -1. Non-Commercial Use. This Agreement is intended for non-commercial use of the Materials. - By “non-commercial use” we mean: - (1) use for the advancement of research and education that does not result in direct or - indirect financial benefit, revenue, monetary compensation or commercial advantage to you; - (2) use by a student, faculty or staff in an educational institution environment, for non-commercial, - educational and academic purposes. - If you intend to use the Materials on a commercial basis, in a commercial environment, or to obtain - any commercial advantage, monetary compensation, financial gain in connection with the Materials, - please contact us in order to arrange a commercial license and/or a collaboration agreement with us. - -2. Incorporation by Reference. This Agreement incorporates by reference the terms and conditions of the following licenses - relevant to open source materials. You may only use the open source materials in compliance with their respective licenses. - Unless required by applicable law or agreed to in writing, open source materials distributed under theses licenses are - distributed on an "as is” basis, without warranties or conditions of any kind, either express or implied. - I. Apache License 2.0 (https://opensource.org/licenses/Apache-2.0) - II. Core parts of the Robot Operating System (ROS) licensed under the BSD license - (https://opensource.org/licenses/BSD-3-Clause) - III. Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License - (https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode) - In the event of any conflict between the terms and conditions of aforementioned licenses and the terms and condition of this - Agreement, the latter shall prevail. We make no warranties with respect to the open source materials incorporated in the Materials. - -3. License. We hereby grant you a worldwide, revocable, non-exclusive, no-charge, non-transferable, perpetual, non-sublicensable - right to download and use the Materials solely in accordance with: - (1) the terms and conditions of this Agreement; - (2) specifications or guidelines relating the Materials and/or the Products; and - (3) solely for the purposes set out in Clause 1 of this Agreement. - -4. Prohibited Uses. - (a) manufacture, research or otherwise use the Materials for commercial, for-profit purposes or - in a commercial environment, including but not limited to sale, rent, lease, license or transfer - of the Materials or derivatives thereof; - (b) disassemble, decompile, reverse engineer, attempt to gain unauthorized access to the Materials; - (c) permit any third party to access the Materials without our prior written consent save when such permission - is part of your application development for research, educational and non-commercial purposes; - (d) assign, relocate, sublicense, or otherwise transfer this Agreement, or the licenses, rights and duties - under it without our prior written consent; - (e) use the Materials other than in compliance with all applicable laws. - -5. Proprietary Rights. We own all proprietary rights, titles and interests in and to the Materials, including but not - limited to know-how, technical specifications, concepts, patents, designs, other technologies and intellectual property - provided by us to you as part of the Materials. This Agreement does not grant you license or permission to use our trademarks, - trade names, service marks, or product names save to the extent required to reasonable and customary description of the Materials. - You may not remove any product identification, copyright, trademark or other notice from the Materials. - -6. Limitation of Liability. To the extent permitted by law we will have no liability for any damage whatsoever, save in the event that - such damage is caused by our gross negligence or willful misconduct. In no event we will be liable for indirect, special, - incidental or consequential damages,including loss of profits, revenue or savings, arising out of or in any way connected with this - Agreement. - -7. Unauthorized Use and Termination. Any use of the Materials in a manner not expressly authorized by this Agreement constitutes an - infringement, entitling us to exercise all rights and remedies available under applicable laws and regulations in addition to - terminating this Agreement. You will be responsible for any damages resulting from any such infringement, including any claims - by a third party. Upon termination, you must immediately stop using the Materials and destroy or, upon our request, return to us - the Materials. - -8. Governing Law. This Agreement shall be governed by and construed under the laws of Japan. + 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.en.md b/README.en.md index 87ec126a..e9caa284 100644 --- a/README.en.md +++ b/README.en.md @@ -149,8 +149,12 @@ To simulate CRANE-X7 on the table: --- -### Proprietary Rights +## License -CRANE-X7 is an arm robot developed by RT Corporation for research purposes. Please read the license information contained in this repository to find out more about licensing. Companies are permitted to use CRANE-X7 and the materials made available here for internal, research and development purposes only. If you are interested in building your own robot for your personal use by utilizing the information made available here, take your time to visit our website and purchase relevant components and parts – that will certainly help us keep going! Otherwise, if you are interested in manufacturing and commercializing products based on the information herein, please contact us to arrange a license and collaboration agreement with us. +(C) 2018 RT Corporation \ -We have obtained permission from ROBOTIS Co., Ltd. to use CAD models relating to servo motors XM540 and XM430. The proprietary rights relating to any components or parts manufactured by ROBOTIS and used in this product, including but not limited to copyrights, trademarks, and other intellectual property rights, shall remain vested in ROBOTIS. +This repository is licensed under the Apache License, Version 2.0, see [LICENSE](./LICENSE). +Unless attributed otherwise, everything in this repository is under the Apache License, Version 2.0. + +The crane_x7_ros depends on [crane_x7_description](https://github.com/rt-net/crane_x7_description) package. +The RT Corporation's [NON-COMMERCIAL LICENSE](https://github.com/rt-net/crane_x7_description/blob/master/LICENSE) applies to the package. diff --git a/README.md b/README.md index 9a60ce2e..8ad0ab12 100644 --- a/README.md +++ b/README.md @@ -146,19 +146,22 @@ GazeboでCRANE-X7のシミュレーションを行うパッケージです。 --- -### 知的財産権について +## ライセンス -CRANE-X7は、アールティが開発した研究用アームロボットです。 -このリポジトリのデータ等に関するライセンスについては、LICENSEファイルをご参照ください。 -企業による使用については、自社内において研究開発をする目的に限り、本データの使用を許諾します。 -本データを使って自作されたい方は、義務ではありませんが弊社ロボットショップで部品をお買い求めいただければ、励みになります。 -商業目的をもって本データを使用する場合は、商業用使用許諾の条件等について弊社までお問合せください。 +(C) 2018 RT Corporation \ -サーボモータのXM540やXM430に関するCADモデルの使用については、ROBOTIS社より使用許諾を受けています。 -CRANE-X7に使用されているROBOTIS社の部品類にかかる著作権、商標権、その他の知的財産権は、ROBOTIS社に帰属します。 +各ファイルはライセンスがファイル中に明記されている場合、そのライセンスに従います。 +特に明記されていない場合は、Apache License, Version 2.0に基づき公開されています。 +ライセンスの全文は[LICENSE](./LICENSE)または[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)から確認できます。 -### Proprietary Rights +本パッケージが依存する[crane_x7_description](https://github.com/rt-net/crane_x7_description)には株式会社アールティの非商用ライセンスが適用されています。 +詳細は[crane_x7_description/LICENSE](https://github.com/rt-net/crane_x7_description/blob/master/LICENSE)を参照してください。 -CRANE-X7 is an arm robot developed by RT Corporation for research purposes. Please read the license information contained in this repository to find out more about licensing. Companies are permitted to use CRANE-X7 and the materials made available here for internal, research and development purposes only. If you are interested in building your own robot for your personal use by utilizing the information made available here, take your time to visit our website and purchase relevant components and parts – that will certainly help us keep going! Otherwise, if you are interested in manufacturing and commercializing products based on the information herein, please contact us to arrange a license and collaboration agreement with us. +## 開発について -We have obtained permission from ROBOTIS Co., Ltd. to use CAD models relating to servo motors XM540 and XM430. The proprietary rights relating to any components or parts manufactured by ROBOTIS and used in this product, including but not limited to copyrights, trademarks, and other intellectual property rights, shall remain vested in ROBOTIS. +- 本ソフトウェアはオープンソースですが、開発はオープンではありません。 +- 本ソフトウェアは基本的にオープンソースソフトウェアとして「AS IS」（現状有姿のまま）で提供しています。 +- 本ソフトウェアに関する無償サポートはありません。 +- バグの修正や誤字脱字の修正に関するリクエストは常に受け付けていますが、 +それ以外の機能追加等のリクエストについては社内のガイドラインを優先します。 +詳しくは[コントリビューションガイドライン](./CONTRIBUTING.md)に従ってください。 diff --git a/crane_x7/package.xml b/crane_x7/package.xml index 49537573..451e265f 100644 --- a/crane_x7/package.xml +++ b/crane_x7/package.xml @@ -1,6 +1,6 @@ crane_x7 - 1.0.0 + 2.0.0 ROS package suite of CRANE-X7 @@ -10,7 +10,7 @@ Daisuke Sato Shota Aoki - NON-COMMERCIAL LICENSE AGREEMENT + Apache License 2.0 http://wiki.ros.org/crane_x7 https://github.com/rt-net/crane_x7_ros/issues diff --git a/crane_x7_bringup/package.xml b/crane_x7_bringup/package.xml index 36a2021d..76b45b42 100644 --- a/crane_x7_bringup/package.xml +++ b/crane_x7_bringup/package.xml @@ -1,13 +1,13 @@ crane_x7_bringup - 1.0.0 + 2.0.0 The CRANE-X7 bringup package RT Corporation Daisuke Sato - NON-COMMERCIAL LICENSE AGREEMENT + Apache License 2.0 catkin crane_x7_moveit_config diff --git a/crane_x7_control/package.xml b/crane_x7_control/package.xml index 2d09e6ac..be51906c 100644 --- a/crane_x7_control/package.xml +++ b/crane_x7_control/package.xml @@ -1,14 +1,14 @@ crane_x7_control - 1.0.0 + 2.0.0 The CRANE-X7 control package RT Corporation Hiroyuki Nomura Geoffrey Biggs - NON-COMMERCIAL LICENSE AGREEMENT + Apache License 2.0 catkin controller_manager diff --git a/crane_x7_control/scripts/preset_reconfigure.py b/crane_x7_control/scripts/preset_reconfigure.py index f5f65e0d..ef52455f 100755 --- a/crane_x7_control/scripts/preset_reconfigure.py +++ b/crane_x7_control/scripts/preset_reconfigure.py @@ -1,6 +1,20 @@ #!/usr/bin/env python # coding: utf-8 +# Copyright 2019 RT Corporation +# +# 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. + import roslib import rospy import dynamic_reconfigure.client diff --git a/crane_x7_examples/package.xml b/crane_x7_examples/package.xml index 1d9bf9a9..8574d7f6 100644 --- a/crane_x7_examples/package.xml +++ b/crane_x7_examples/package.xml @@ -1,14 +1,14 @@ crane_x7_examples - 1.0.0 + 2.0.0 examples of CRANE-X7 ROS package RT Corporation Daisuke Sato Hiroyuki Nomura - NON-COMMERCIAL LICENSE AGREEMENT + Apache License 2.0 catkin crane_x7_moveit_config diff --git a/crane_x7_examples/scripts/cartesian_path_example.py b/crane_x7_examples/scripts/cartesian_path_example.py index 011960f2..5388766d 100755 --- a/crane_x7_examples/scripts/cartesian_path_example.py +++ b/crane_x7_examples/scripts/cartesian_path_example.py @@ -3,9 +3,17 @@ # Copyright 2020 RT Corporation # -# Licensed under the RT Corporation NON-COMMERCIAL LICENSE. -# Please see https://github.com/rt-net/crane_x7_ros/blob/master/LICENSE -# for detail. +# 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. import rospy import moveit_commander diff --git a/crane_x7_examples/scripts/crane_x7_pick_and_place_demo.py b/crane_x7_examples/scripts/crane_x7_pick_and_place_demo.py index 06345677..85371af3 100755 --- a/crane_x7_examples/scripts/crane_x7_pick_and_place_demo.py +++ b/crane_x7_examples/scripts/crane_x7_pick_and_place_demo.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2018 RT Corporation +# +# 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. + import rospy import moveit_commander import geometry_msgs.msg diff --git a/crane_x7_examples/scripts/gripper_action_example.py b/crane_x7_examples/scripts/gripper_action_example.py index 5553d93a..f6cf9d31 100755 --- a/crane_x7_examples/scripts/gripper_action_example.py +++ b/crane_x7_examples/scripts/gripper_action_example.py @@ -1,6 +1,20 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2018 RT Corporation +# +# 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. + # このサンプルは実機動作のみに対応しています # fake_execution:=trueにすると、GripperCommandActionのサーバが立ち上がりません diff --git a/crane_x7_examples/scripts/joint_values_example.py b/crane_x7_examples/scripts/joint_values_example.py index 75b64ea2..b8162a64 100755 --- a/crane_x7_examples/scripts/joint_values_example.py +++ b/crane_x7_examples/scripts/joint_values_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import math import moveit_commander diff --git a/crane_x7_examples/scripts/joystick_example.py b/crane_x7_examples/scripts/joystick_example.py index 4038963c..8a403c50 100755 --- a/crane_x7_examples/scripts/joystick_example.py +++ b/crane_x7_examples/scripts/joystick_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import moveit_commander from geometry_msgs.msg import Vector3, Quaternion diff --git a/crane_x7_examples/scripts/obstacle_avoidance_example.py b/crane_x7_examples/scripts/obstacle_avoidance_example.py index 92c0d6d7..324125ea 100755 --- a/crane_x7_examples/scripts/obstacle_avoidance_example.py +++ b/crane_x7_examples/scripts/obstacle_avoidance_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import moveit_commander from geometry_msgs.msg import Pose, PoseStamped diff --git a/crane_x7_examples/scripts/obstacle_client.py b/crane_x7_examples/scripts/obstacle_client.py index 5d8dfaee..567687f8 100755 --- a/crane_x7_examples/scripts/obstacle_client.py +++ b/crane_x7_examples/scripts/obstacle_client.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import copy import math diff --git a/crane_x7_examples/scripts/pick_and_place_in_gazebo_example.py b/crane_x7_examples/scripts/pick_and_place_in_gazebo_example.py index eb48966a..e682b7a7 100755 --- a/crane_x7_examples/scripts/pick_and_place_in_gazebo_example.py +++ b/crane_x7_examples/scripts/pick_and_place_in_gazebo_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import moveit_commander import actionlib diff --git a/crane_x7_examples/scripts/pose_groupstate_example.py b/crane_x7_examples/scripts/pose_groupstate_example.py index aed42214..9a689de5 100755 --- a/crane_x7_examples/scripts/pose_groupstate_example.py +++ b/crane_x7_examples/scripts/pose_groupstate_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2018 RT Corporation +# +# 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. + import rospy import moveit_commander import geometry_msgs.msg diff --git a/crane_x7_examples/scripts/preset_pid_gain_example.py b/crane_x7_examples/scripts/preset_pid_gain_example.py index 21be6fcb..d1dfc735 100755 --- a/crane_x7_examples/scripts/preset_pid_gain_example.py +++ b/crane_x7_examples/scripts/preset_pid_gain_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import moveit_commander import geometry_msgs.msg diff --git a/crane_x7_examples/scripts/servo_info_example.py b/crane_x7_examples/scripts/servo_info_example.py index 84a2adc3..eb368fde 100755 --- a/crane_x7_examples/scripts/servo_info_example.py +++ b/crane_x7_examples/scripts/servo_info_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import moveit_commander from std_msgs.msg import Int16, Float64 diff --git a/crane_x7_examples/scripts/teaching_example.py b/crane_x7_examples/scripts/teaching_example.py index 48e68386..a44295b2 100755 --- a/crane_x7_examples/scripts/teaching_example.py +++ b/crane_x7_examples/scripts/teaching_example.py @@ -1,6 +1,20 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Copyright 2019 RT Corporation +# +# 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. + import rospy import moveit_commander from std_msgs.msg import UInt8 diff --git a/crane_x7_gazebo/package.xml b/crane_x7_gazebo/package.xml index 2d1a578f..a8c97e6e 100644 --- a/crane_x7_gazebo/package.xml +++ b/crane_x7_gazebo/package.xml @@ -1,13 +1,14 @@ crane_x7_gazebo - 1.0.0 + 2.0.0 The crane_x7_gazebo package RT Corporation Shota Aoki - NON-COMMERCIAL LICENSE AGREEMENT + Apache License 2.0 + catkin gazebo gazebo_plugins diff --git a/crane_x7_moveit_config/package.xml b/crane_x7_moveit_config/package.xml index 46f8708b..e4f5ae58 100644 --- a/crane_x7_moveit_config/package.xml +++ b/crane_x7_moveit_config/package.xml @@ -1,7 +1,7 @@ crane_x7_moveit_config - 1.0.0 + 2.0.0 An automatically generated package with all the configuration and launch files for using the crane_x7 with the MoveIt! Motion Planning Framework @@ -10,7 +10,7 @@ Hiroyuki Nomura Geoffrey Biggs - NON-COMMERCIAL LICENSE AGREEMENT + Apache License 2.0 catkin diff --git a/crane_x7_msgs/package.xml b/crane_x7_msgs/package.xml index 345f7b46..ee24c956 100644 --- a/crane_x7_msgs/package.xml +++ b/crane_x7_msgs/package.xml @@ -1,13 +1,13 @@ crane_x7_msgs - 1.0.0 + 2.0.0 The crane_x7_msgs package RT Corporation Hiroyuki Nomura - NON-COMMERCIAL LICENSE AGREEMENT + Apache License 2.0 message_generation message_generation