Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
587ec53
jazzy対応(MoveitConfigsBuilder)
mizonon Jul 19, 2024
1374d50
不要なコメント削除
mizonon Aug 9, 2024
6b10a74
不要ファイルのignore
mizonon Aug 13, 2024
89bdf8b
crane_plus_moveit_config/launchの中の不要ファイル削除
mizonon Aug 13, 2024
96186f6
default_***_scaling_factorを0.1->1.0に変更
mizonon Aug 15, 2024
e3898ed
setup assistantによる書換わりを元の書き方に修正
mizonon Aug 15, 2024
553e522
exampleのdemo.lauch修正
mizonon Aug 15, 2024
384f2b4
run_move_group.rviz削除
mizonon Aug 15, 2024
7147e27
sensors_3d.yaml削除
mizonon Aug 15, 2024
de86b8d
solverを元に戻す
mizonon Aug 15, 2024
0314d62
.gitignore変更
mizonon Aug 15, 2024
185c6bd
setup_assistant関連のファイル追加
mizonon Aug 15, 2024
2e01610
ciのjazzy対応
mizonon Aug 15, 2024
4ba5ed8
run_move_froup.lauch.pyの整理
mizonon Aug 15, 2024
92f9340
不要な権限変更
mizonon Aug 15, 2024
b6e6962
不要な権限変更
mizonon Aug 15, 2024
bde95e1
不要なscript削除
mizonon Aug 16, 2024
9013d35
kinematicの設定修正
mizonon Aug 16, 2024
82a96db
ソルバーをKDLに戻す
mizonon Aug 20, 2024
3199a4d
実装完了
mizonon Sep 9, 2024
d31d5e6
jazzy環境対応
mizonon Sep 18, 2024
a057fce
camera_example.launch.pyの実装追加
mizonon Sep 19, 2024
e7ce02d
add crane_plus_example_py
mizonon Sep 19, 2024
f2b83d7
Merge branch 'support_jazzy' into moveit_py
mizonon Sep 19, 2024
91add60
warehouse_ros_mongoをcrane_plus_moveit_configのpackage.xmlに含めない
mizonon Sep 19, 2024
52e8c9c
Merge branch 'support_jazzy' into moveit_py
mizonon Sep 19, 2024
b8f40d7
1回の通信エラーで終了処理をするのをやめる
mizonon Sep 20, 2024
e33e9da
entrypoint.shのパッケージ名の指定修正
mizonon Sep 20, 2024
3398057
launchファイル修正
mizonon Sep 20, 2024
9a099d3
package.xmlに必要なpythonパッケージ追加
mizonon Sep 20, 2024
44bf384
不要なscriptsディレクトリ削除
mizonon Sep 20, 2024
9277ab5
numpy-quaternion-pipをpackage.xmlに含める
mizonon Sep 20, 2024
70deeb6
package.xmlにpython3-pipの依存関係追加
mizonon Sep 25, 2024
094fa3c
pose_groupstate.pyとgripper_control.pyについて動作確認できた
mizonon Sep 26, 2024
d0c1f67
gripper_control.pyとpose_groupstate.pyにコメント追加
mizonon Sep 27, 2024
ccfb544
joint_values.pyについて動作確認できた
mizonon Sep 30, 2024
1c3b113
レビュー結果反映
mizonon Oct 4, 2024
bb49b1e
radianの計算はpythonのmathを使うことに統一
mizonon Oct 4, 2024
e46d557
utils.pyなどの細かい修正
mizonon Oct 16, 2024
2ea61a0
moveit2をソースからビルドして動いたときのプログラム
mizonon Oct 18, 2024
b227184
README.md(jazzy対応&バイナリインストール方法追加)
mizonon Oct 21, 2024
88f4313
.dockerのREADME.mdのjazzy対応
mizonon Oct 21, 2024
e9a548f
CI対応(copyright追加)
mizonon Oct 21, 2024
bf56ec0
CI対応
mizonon Oct 22, 2024
a74f3b7
CI対応(setup_assistant.launch.py)
mizonon Oct 22, 2024
a671d5e
CI対応(package.xmlの不要な部分削除)
mizonon Oct 22, 2024
86513fb
コメントをjazzyに合わせる
mizonon Oct 22, 2024
2de4b14
ign fuelでgazeboのモデルをダウンロードする記述削除
mizonon Oct 22, 2024
8a157cc
ciのDockerイメージをjazzyに対応
mizonon Oct 22, 2024
f1bfe95
他の製品と設定を共通化
mizonon Oct 22, 2024
e6866a2
crane_plus_description/package.xmlのauthorに溝口を追加
mizonon Oct 23, 2024
f2e153a
ompl_planning.yamlに抜けていた記述追加
mizonon Oct 23, 2024
b895f0b
joint_values.pyにmax_acceleraration_scaling_factorとmax_velocity_scalin…
mizonon Oct 25, 2024
8eaf1e8
color_detection.pyのsubscriptionのcallback関数名修正
mizonon Oct 25, 2024
5c6104d
crane_plus_examples_py用のREADME追加
mizonon Oct 30, 2024
4e0a275
CIのnumpy-quaternionのインストールエラー対応
mizonon Oct 31, 2024
057338c
CI対応
mizonon Oct 31, 2024
8ab3822
CI対応
mizonon Oct 31, 2024
c122fb8
CI対応
mizonon Nov 1, 2024
1e1c7e2
CI対応
mizonon Nov 1, 2024
1a5fd93
CI対応
mizonon Nov 1, 2024
32a0cb8
CI対応
mizonon Nov 1, 2024
b3f6ec1
動作確認のため、support_jazzyをマージ
mizonon Nov 8, 2024
1ff1b3b
カメラサンプル用のlaunchファイル修正
mizonon Nov 11, 2024
c823afa
カメラサンプル動作確認用の修正
mizonon Nov 11, 2024
dc07458
カメラサンプル用のlaunchファイル微修正
mizonon Nov 12, 2024
f4161fd
crane_plush_examples_pyのサンプル起動用のlaunchファイル微修正
mizonon Nov 12, 2024
1850f69
crane_plus_examples_pyのpick_and_place_tf.py微修正
mizonon Nov 12, 2024
225a604
crane_plus_examples_py/utils.pyの余計なコメント削除
mizonon Nov 12, 2024
1f59bd9
crane_plus_examples_pyの各コード微修正
mizonon Nov 12, 2024
78dbc3c
CI対応の微修正
mizonon Nov 12, 2024
9b161aa
CI対応の微修正
mizonon Nov 12, 2024
2361a41
CI対応の微修正
mizonon Nov 12, 2024
5d05398
CI対応の微修正
mizonon Nov 12, 2024
f797d08
CI対応
mizonon Nov 20, 2024
8daa08f
CI対応
mizonon Nov 20, 2024
2611004
Merge branch 'master' into moveit_py
Kuwamai Dec 27, 2024
2b4cdd8
コメント修正
Kuwamai Dec 27, 2024
e342fbb
通信エラー時の処理修正
Kuwamai Dec 27, 2024
20aaa8e
不要な差分を削除
Kuwamai Dec 27, 2024
6614b2a
Revert "コメント修正"
Kuwamai Dec 27, 2024
37778b1
コメント修正
Kuwamai Dec 27, 2024
6c52b25
インデント修正
Kuwamai Dec 27, 2024
5a4277f
パッケージ情報更新
Kuwamai Jan 7, 2025
43c5e39
コーディングスタイルを統一
Kuwamai Jan 17, 2025
f2fc690
コーディングスタイルを統一
Kuwamai Jan 17, 2025
accc732
動作の成否を返り値として出力
Kuwamai Jan 17, 2025
d512a86
capabilitiesの記述を削除
Kuwamai Jan 17, 2025
2f4d5fd
不要な処理を削除
Kuwamai Jan 22, 2025
44dc4a4
コーディングスタイルの統一
Kuwamai Jan 22, 2025
02070cf
回転行列の変換にscipyを使用
Kuwamai Jan 22, 2025
ab329fa
コーディングスタイル修正
Kuwamai Jan 22, 2025
314302e
コーディングスタイル修正
Kuwamai Jan 22, 2025
b90e3a6
Merge branch 'master' into moveit_py
Kuwamai Jan 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions crane_plus_control/src/crane_plus_hardware.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ return_type CranePlusHardware::read(
RCLCPP_ERROR(
rclcpp::get_logger("CranePlusHardware"),
driver_->get_last_error_log().c_str());
return return_type::ERROR;
// readに失敗しても通信は継続させる。
// 不確かなデータをセットしないようにOKを返す。
return return_type::OK;
} else {
for (uint i = 0; i < hw_position_states_.size(); ++i) {
hw_position_states_[i] = joint_positions[i];
Expand Down Expand Up @@ -271,7 +273,9 @@ return_type CranePlusHardware::write(
RCLCPP_ERROR(
rclcpp::get_logger("CranePlusHardware"),
driver_->get_last_error_log().c_str());
return return_type::ERROR;
// writeに失敗しても通信は継続させる。
// 不確かなデータをセットしないようにOKを返す。
return return_type::OK;
}

prev_comm_timestamp_ = steady_clock_.now();
Expand Down
202 changes: 202 additions & 0 deletions crane_plus_examples_py/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

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.
Loading
Loading