Skip to content

Commit

Permalink
Apache-2.0ライセンスを適用。バージョンを2.0.0に更新。 (#136)
Browse files Browse the repository at this point in the history
* ライセンスをApache-2.0へ変更

* package.xmlのライセンスとバージョン表記を更新

* サンプルスクリプトにライセンスを明記

* README内のライセンスに関する表記を更新

* コントリビューションガイドラインの追加
  • Loading branch information
Kuwamai authored Sep 15, 2023
1 parent c8ae98d commit 0487d39
Show file tree
Hide file tree
Showing 27 changed files with 464 additions and 183 deletions.
26 changes: 26 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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`されます
- [コミットをスカッシュしてマージする | GitHub Docs](https://docs.github.com/ja/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits)
- 1つのPRでリクエストする変更はできるだけシンプルにしてください
- 異なる内容の変更を含む場合はPRを分割してください
- 例えば、複数の機能追加したり、機能追加とリファクタリングを同時にする場合はそれぞれ別々のPRとしてください
- squashマージしても履歴を辿りやすくするためです
350 changes: 201 additions & 149 deletions LICENSE

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,12 @@ roslaunch sciurus17_gazebo sciurus17_with_table.launch
This package includes example codes for Sciurus17.
Please refer to [./sciurus17_examples/README.en.md](./sciurus17_examples/README.en.md).

### Proprietary Rights
## License

Sciurus17 is an upper body 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 Sciurus17 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 \<[email protected]\>

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 sciurus17_ros depends on [sciurus17_description](https://github.com/rt-net/sciurus17_description) package.
The RT Corporation's [NON-COMMERCIAL LICENSE](https://github.com/rt-net/sciurus17_description/blob/main/LICENSE) applies to the package.
26 changes: 14 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,20 +172,22 @@ roslaunch sciurus17_gazebo sciurus17_with_table.launch
Sciurus17を動作させるためのサンプルコードをまとめたパッケージです。
`sciurus17_examples` の使い方については[./sciurus17_examples/README.md](./sciurus17_examples/README.md)を参照してください。

### 知的財産権について
## ライセンス

Sciurus17は、アールティが開発した研究用上半身ロボットです。
このリポジトリのデータ等に関するライセンスについては、LICENSEファイルをご参照ください。
企業による使用については、自社内において研究開発をする目的に限り、本データの使用を許諾します。
本データを使って自作されたい方は、義務ではありませんが弊社ロボットショップで部品をお買い求めいただければ、励みになります。
商業目的をもって本データを使用する場合は、商業用使用許諾の条件等について弊社までお問合せください。
(C) 2018 RT Corporation \<[email protected]\>

サーボモータのXM540やXM430に関するCADモデルの使用については、ROBOTIS社より使用許諾を受けています。
Sciurus17に使用されている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
本パッケージが依存する[sciurus17_description](https://github.com/rt-net/sciurus17_description)には株式会社アールティの非商用ライセンスが適用されています。
詳細は[sciurus17_description/LICENSE](https://github.com/rt-net/sciurus17_description/blob/main/LICENSE)を参照してください。

Sciurus17 is an upper body 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 Sciurus17 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)に従ってください。
4 changes: 2 additions & 2 deletions sciurus17/package.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<package>
<name>sciurus17</name>
<version>1.0.0</version>
<version>2.0.0</version>
<description>
ROS package suite of Sciurus17
</description>
<maintainer email="[email protected]">RT Corporation</maintainer>
<author email="[email protected]">Hiroyuki Nomura</author>
<author email="[email protected]">Shota Hirama</author>

<license>NON-COMMERCIAL LICENSE AGREEMENT</license>
<license>Apache License 2.0</license>

<url type="website">http://wiki.ros.org/sciurus17_ros</url>
<url type="bugtracker">https://github.com/rt-net/sciurus17_ros/issues</url>
Expand Down
4 changes: 2 additions & 2 deletions sciurus17_bringup/package.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<package format="2">
<name>sciurus17_bringup</name>
<version>1.0.0</version>
<version>2.0.0</version>
<description>The sciurus17_bringup package</description>

<maintainer email="[email protected]">RT Corporation</maintainer>
<author email="[email protected]">Hiroyuki Nomura</author>
<author email="[email protected]">Shota Hirama</author>
<license>NON-COMMERCIAL LICENSE AGREEMENT</license>
<license>Apache License 2.0</license>

<buildtool_depend>catkin</buildtool_depend>

Expand Down
4 changes: 2 additions & 2 deletions sciurus17_control/package.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<package>
<name>sciurus17_control</name>
<version>1.0.0</version>
<version>2.0.0</version>
<description>The Sciurus17 control package</description>

<maintainer email="[email protected]">RT Corporation</maintainer>
<author email="[email protected]">Hiroyuki Nomura</author>

<license>NON-COMMERCIAL LICENSE AGREEMENT</license>
<license>Apache License 2.0</license>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>controller_manager</build_depend>
Expand Down
4 changes: 2 additions & 2 deletions sciurus17_examples/package.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<package>
<name>sciurus17_examples</name>
<version>1.0.0</version>
<version>2.0.0</version>
<description>examples of Sciurus17 ROS package</description>

<maintainer email="[email protected]">RT Corporation</maintainer>
<author email="[email protected]">Daisuke Sato</author>
<author email="[email protected]">Hiroyuki Nomura</author>

<license>NON-COMMERCIAL LICENSE AGREEMENT</license>
<license>Apache License 2.0</license>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>sciurus17_moveit_config</build_depend>
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/box_stacking_example.py
Original file line number Diff line number Diff line change
@@ -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 sys
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/chest_camera_tracking.py
Original file line number Diff line number Diff line change
@@ -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 sys
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/control_effort_wrist.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
#! /usr/bin/env python
# coding: utf-8

# Copyright 2020 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 math
import rospy
from sensor_msgs.msg import JointState
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/depth_camera_tracking.py
Original file line number Diff line number Diff line change
@@ -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 sys
Expand Down
15 changes: 15 additions & 0 deletions sciurus17_examples/scripts/gripper_action_example.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
#!/usr/bin/env python

# 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 sys
import argparse

Expand Down
17 changes: 16 additions & 1 deletion sciurus17_examples/scripts/hand_position_publisher_example.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
#!/usr/bin/env python
#!/usr/bin/env python

# 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 roslib
import rospy
import math
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/head_camera_tracking.py
Original file line number Diff line number Diff line change
@@ -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 sys
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/neck_joint_trajectory_example.py
Original file line number Diff line number Diff line change
@@ -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 actionlib
from control_msgs.msg import (
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/pick_and_place_left_arm_demo.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/pick_and_place_right_arm_demo.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/pick_and_place_two_arm_demo.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 14 additions & 0 deletions sciurus17_examples/scripts/preset_pid_gain_example.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading

0 comments on commit 0487d39

Please sign in to comment.