From cbd05effd2f57ddd71dec9e5ffd7b36e7ecfa1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Sun, 24 May 2026 10:18:04 +0300 Subject: [PATCH] feat: update package versions and descriptions for all modules; add web interface package --- LICENSE | 202 ++++++++++++++++++++++++++++++ setup.py | 4 +- src/iiwa_bringup/package.xml | 4 +- src/iiwa_config/package.xml | 4 +- src/iiwa_controller/package.xml | 4 +- src/iiwa_description/package.xml | 4 +- src/iiwa_msgs/package.xml | 4 +- src/iiwa_planning/package.xml | 4 +- src/iiwa_utils/package.xml | 4 +- src/iiwa_utils/setup.py | 4 +- src/iiwa_web/iiwa_web/__init__.py | 0 src/iiwa_web/package.xml | 18 +++ src/iiwa_web/resource/iiwa_web | 0 src/iiwa_web/setup.cfg | 4 + src/iiwa_web/setup.py | 26 ++++ 15 files changed, 268 insertions(+), 18 deletions(-) create mode 100644 LICENSE create mode 100644 src/iiwa_web/iiwa_web/__init__.py create mode 100644 src/iiwa_web/package.xml create mode 100644 src/iiwa_web/resource/iiwa_web create mode 100644 src/iiwa_web/setup.cfg create mode 100644 src/iiwa_web/setup.py diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3c3e6a9 --- /dev/null +++ b/LICENSE @@ -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 [2026] [Daniel Robotics] + + 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/setup.py b/setup.py index f423118..058eaa9 100644 --- a/setup.py +++ b/setup.py @@ -2,8 +2,8 @@ from setuptools import setup, find_packages setup( name="lightweight-cobot", - version="0.1.0", - description="Lightweight Cobot", + version="2026.05.31", + description="CLI tool for installing, configuring and managing the ROS 2 cobot workspace", packages=find_packages(), python_requires=">=3.11", install_requires=[ diff --git a/src/iiwa_bringup/package.xml b/src/iiwa_bringup/package.xml index 22504b2..1fbf92b 100644 --- a/src/iiwa_bringup/package.xml +++ b/src/iiwa_bringup/package.xml @@ -2,8 +2,8 @@ iiwa_bringup - 0.2.0 - Launch-файлы для запуска KUKA iiwa7: симуляция Webots, реальный робот через FRI, MoveIt и RViz + 2026.05.31 + Launch files for cobot: Webots simulation, real robot via FRI, MoveIt motion planning and RViz visualization daniel Apache-2.0 diff --git a/src/iiwa_config/package.xml b/src/iiwa_config/package.xml index e5a0fd8..0d70c4b 100644 --- a/src/iiwa_config/package.xml +++ b/src/iiwa_config/package.xml @@ -2,8 +2,8 @@ iiwa_config - 0.1.0 - Конфигурационные файлы системы KUKA iiwa7: параметры MoveIt, контроллеров, кинематики и общих настроек + 2026.05.31 + Configuration files for cobot: MoveIt, ros2_control controllers, kinematics and general system settings daniel Apache-2.0 diff --git a/src/iiwa_controller/package.xml b/src/iiwa_controller/package.xml index 5599465..fabcdbc 100644 --- a/src/iiwa_controller/package.xml +++ b/src/iiwa_controller/package.xml @@ -2,8 +2,8 @@ iiwa_controller - 0.1.0 - Hardware interface для KUKA iiwa7: управление через FRI (Fast Robot Interface) в экосистеме ros2_control + 2026.05.31 + Hardware interface for cobot: real-time joint control via FRI (Fast Robot Interface) within the ros2_control ecosystem daniel Apache-2.0 diff --git a/src/iiwa_description/package.xml b/src/iiwa_description/package.xml index f0071bf..648ee2e 100644 --- a/src/iiwa_description/package.xml +++ b/src/iiwa_description/package.xml @@ -2,8 +2,8 @@ iiwa_description - 0.0.0 - URDF/XACRO описание робота KUKA iiwa7 и конфигурация мира Webots + 2026.05.31 + URDF/XACRO robot description for cobot and Webots world configuration daniel Apache-2.0 diff --git a/src/iiwa_msgs/package.xml b/src/iiwa_msgs/package.xml index 329a366..2871b85 100644 --- a/src/iiwa_msgs/package.xml +++ b/src/iiwa_msgs/package.xml @@ -2,8 +2,8 @@ iiwa_msgs - 0.0.0 - Custom ROS2 interfaces for KUKA iiwa7 + 2026.05.31 + ROS 2 interfaces for cobot: action messages for joint-space and Cartesian motion, services for transitioning to named poses defined in SRDF daniel Apache-2.0 diff --git a/src/iiwa_planning/package.xml b/src/iiwa_planning/package.xml index bce7868..1a30166 100644 --- a/src/iiwa_planning/package.xml +++ b/src/iiwa_planning/package.xml @@ -2,8 +2,8 @@ iiwa_planning - 0.0.0 - Планирование движения KUKA iiwa7: C++ и Python узлы на основе MoveIt 2 (OMPL, Pilz, moveit_py) + 2026.05.31 + Motion planning for cobot: C++ and Python nodes built on MoveIt 2 with OMPL, Pilz Industrial Motion and moveit_py support daniel Apache-2.0 diff --git a/src/iiwa_utils/package.xml b/src/iiwa_utils/package.xml index 03e4613..3a59482 100644 --- a/src/iiwa_utils/package.xml +++ b/src/iiwa_utils/package.xml @@ -2,8 +2,8 @@ iiwa_utils - 0.1.0 - Утилиты для работы системы iiwa7: загрузка конфигурации, обработка URDF/XACRO, спавн объектов в Webots + 2026.05.31 + Utilities for the cobot system: configuration loading, URDF/XACRO processing, object and camera spawning in Webots, geometric data conversion daniel Apache-2.0 diff --git a/src/iiwa_utils/setup.py b/src/iiwa_utils/setup.py index 658fc61..d13eabd 100644 --- a/src/iiwa_utils/setup.py +++ b/src/iiwa_utils/setup.py @@ -4,7 +4,7 @@ package_name = 'iiwa_utils' setup( name=package_name, - version='0.0.0', + version='2026.05.31', packages=find_packages(exclude=['test']), data_files=[ ('share/ament_index/resource_index/packages', @@ -16,7 +16,7 @@ setup( zip_safe=True, maintainer='daniel', maintainer_email='grabardm@ml-dev.ru', - description='Вспомогательные файлы для работы всей системы', + description='cobot system utilities: configuration loading, object and camera spawning in Webots, geometric data conversion, test motion sequences', license='Apache-2.0', entry_points={ 'console_scripts': [ diff --git a/src/iiwa_web/iiwa_web/__init__.py b/src/iiwa_web/iiwa_web/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/iiwa_web/package.xml b/src/iiwa_web/package.xml new file mode 100644 index 0000000..3548571 --- /dev/null +++ b/src/iiwa_web/package.xml @@ -0,0 +1,18 @@ + + + + iiwa_web + 2026.05.31 + Web interface for monitoring and remote control of the cobot via browser + daniel + Apache-2.0 + + ament_copyright + ament_flake8 + ament_pep257 + python3-pytest + + + ament_python + + diff --git a/src/iiwa_web/resource/iiwa_web b/src/iiwa_web/resource/iiwa_web new file mode 100644 index 0000000..e69de29 diff --git a/src/iiwa_web/setup.cfg b/src/iiwa_web/setup.cfg new file mode 100644 index 0000000..9cc7007 --- /dev/null +++ b/src/iiwa_web/setup.cfg @@ -0,0 +1,4 @@ +[develop] +script_dir=$base/lib/iiwa_web +[install] +install_scripts=$base/lib/iiwa_web diff --git a/src/iiwa_web/setup.py b/src/iiwa_web/setup.py new file mode 100644 index 0000000..7ac7184 --- /dev/null +++ b/src/iiwa_web/setup.py @@ -0,0 +1,26 @@ +from setuptools import find_packages, setup + +package_name = 'iiwa_web' + +setup( + name=package_name, + version='2026.05.31', + packages=find_packages(exclude=['test']), + data_files=[ + ('share/ament_index/resource_index/packages', + ['resource/' + package_name]), + ('share/' + package_name, ['package.xml']), + ], + install_requires=['setuptools'], + zip_safe=True, + maintainer='daniel', + maintainer_email='grabardm@ml-dev.ru', + description='Web interface for monitoring and remote control of the cobot via browser', + license='Apache-2.0', + extras_require={ + }, + entry_points={ + 'console_scripts': [ + ], + }, +)