grabardm/lightweight-cobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Refactor code structure for improved readability and maintainability

Browse Source
This commit is contained in:
Даниил Грабарь
2026-04-14 18:06:58 +10:00
parent a913d512b9
commit 1156c768bb
13 changed files with 220 additions and 6765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/iiwa_config/config/cameras/d455_top.yaml
+14 -14
View File
@@ -6,9 +6,9 @@
name: d455_top name: d455_top
# Положение в сцене (x y z) # Положение в сцене (x y z)
translation: "0 0 2.49" translation: "0.25 0 2.49"
# Ориентация (ось_x ось_y ось_z угол_рад) # Ориентация (ось_x ось_y ось_z угол_рад)
rotation: "0 0 1 0" rotation: "0 1 0 1.5708"
# Блок camera # Блок camera
# Если блок отсутствует — Camera-девайс не создаётся # Если блок отсутствует — Camera-девайс не создаётся
@@ -37,16 +37,16 @@ camera:
# Если блок отсутствует - RangeFinder-девайс не создаётся # Если блок отсутствует - RangeFinder-девайс не создаётся
# Поля соответствуют документации Webots: # Поля соответствуют документации Webots:
# https://cyberbotics.com/doc/reference/rangefinder # https://cyberbotics.com/doc/reference/rangefinder
# range_finder: range_finder:
# width: 640 width: 640
# height: 480 height: 480
# fieldOfView: 1.047 fieldOfView: 1.047
# minRange: 0.1 minRange: 0.1
# maxRange: 5.0 maxRange: 5.0
# resolution: -1.0 # -1 = без ограничений по дискретизации resolution: -1.0 # -1 = без ограничений по дискретизации
# noise: 0.0 noise: 0.0
# # Параметры публикации в ROS2 # Параметры публикации в ROS2
# ros: ros:
# topic: /d455_top/depth/image_raw topic: /d455_top/depth/image_raw
# update_rate: 15 update_rate: 15
src/iiwa_config/config/moveit/iiwa7.srdf
+16 -3
View File
@@ -20,8 +20,10 @@
<joint name="joint7"/> <joint name="joint7"/>
<joint name="tools_joint"/> <joint name="tools_joint"/>
<joint name="tool"/> <joint name="tool"/>
<joint name="cameraHolder_patron"/> <joint name="camera_holder_patron"/>
<joint name="cameraHolder_cameraD455"/> <joint name="camera_holder_corner"/>
<joint name="camera_corner_camera"/>
<joint name="camera_hand_to_optical"/>
</group> </group>
<!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'--> <!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'-->
<group_state name="home" group="iiwa_arm"> <group_state name="home" group="iiwa_arm">
@@ -86,7 +88,18 @@
<disable_collisions link1="link1" link2="camera_holder" reason="Never"/> <disable_collisions link1="link1" link2="camera_holder" reason="Never"/>
<disable_collisions link1="base_link" link2="camera_holder" reason="Never"/> <disable_collisions link1="base_link" link2="camera_holder" reason="Never"/>
<disable_collisions link1="camera_holder" link2="patron" reason="Adjacent"/> <disable_collisions link1="camera_holder" link2="patron" reason="Adjacent"/>
<disable_collisions link1="camera_hand" link2="camera_holder" reason="Adjacent"/> <disable_collisions link1="camera_holder" link2="camera_corner" reason="Adjacent"/>
<disable_collisions link1="camera_corner" link2="patron" reason="Never"/>
<disable_collisions link1="camera_corner" link2="link7" reason="Never"/>
<disable_collisions link1="camera_corner" link2="link6" reason="Never"/>
<disable_collisions link1="camera_corner" link2="link5" reason="Never"/>
<disable_collisions link1="camera_corner" link2="link4" reason="Never"/>
<disable_collisions link1="camera_corner" link2="link3" reason="Never"/>
<disable_collisions link1="camera_corner" link2="link2" reason="Never"/>
<disable_collisions link1="camera_corner" link2="link1" reason="Never"/>
<disable_collisions link1="camera_corner" link2="base_link" reason="Never"/>
<disable_collisions link1="camera_corner" link2="camera_hand" reason="Adjacent"/>
<disable_collisions link1="camera_hand" link2="camera_holder" reason="Never"/>
<disable_collisions link1="camera_hand" link2="patron" reason="Never"/> <disable_collisions link1="camera_hand" link2="patron" reason="Never"/>
<disable_collisions link1="camera_hand" link2="link7" reason="Never"/> <disable_collisions link1="camera_hand" link2="link7" reason="Never"/>
<disable_collisions link1="camera_hand" link2="link6" reason="Never"/> <disable_collisions link1="camera_hand" link2="link6" reason="Never"/>
src/iiwa_description/resource/freecad_models/CameraHolder.FCStd
BIN
View File
Binary file not shown.
src/iiwa_description/resource/freecad_models/assymbly_camera_tool.FCStd
BIN
View File
Binary file not shown.
src/iiwa_description/resource/freecad_models/cameraD455.FCStd
BIN
View File
Binary file not shown.
src/iiwa_description/resource/freecad_models/camera_corner.FCStd
BIN
View File
Binary file not shown.
src/iiwa_description/resource/freecad_models/kamera.stp
-6679
View File
File diff suppressed because it is too large Load Diff
src/iiwa_description/resource/freecad_models/patron.FCStd
BIN
View File
Binary file not shown.
src/iiwa_description/resource/meshes/tools/CameraHolder.dae
+3 -3
View File
@@ -1,8 +1,8 @@
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1"> <COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
<asset> <asset>
<contributor/> <contributor/>
<created>2026-04-10T13:27:38.363305</created> <created>2026-04-14T16:59:02.416745</created>
<modified>2026-04-10T13:27:38.363309</modified> <modified>2026-04-14T16:59:02.416750</modified>
<unit name="meter" meter="1.0"/> <unit name="meter" meter="1.0"/>
<up_axis>Z_UP</up_axis> <up_axis>Z_UP</up_axis>
</asset> </asset>
@@ -18,7 +18,7 @@
<color>0.0 0.0 0.0 1.0</color> <color>0.0 0.0 0.0 1.0</color>
</ambient> </ambient>
<diffuse> <diffuse>
<color>0.6941176652908325 0.572549045085907 0.6196078658103943 1.0</color> <color>0.6941176652908325 0.3921568691730499 0.1725490242242813 1.0</color>
</diffuse> </diffuse>
<specular> <specular>
<color>1 1 1 1.0</color> <color>1 1 1 1.0</color>
src/iiwa_description/resource/meshes/tools/camera_corner.dae
+106
View File
File diff suppressed because one or more lines are too long
src/iiwa_description/resource/meshes/tools/patron.dae
+14 -14
View File
File diff suppressed because one or more lines are too long
src/iiwa_description/urdf/iiwa7.urdf.xacro
+1 -10
View File
@@ -16,7 +16,7 @@
<xacro:include filename="$(find iiwa_description)/urdf/links.xacro"/> <xacro:include filename="$(find iiwa_description)/urdf/links.xacro"/>
<xacro:include filename="$(find iiwa_description)/urdf/joints.xacro"/> <xacro:include filename="$(find iiwa_description)/urdf/joints.xacro"/>
<xacro:include filename="$(find iiwa_description)/urdf/tools/patron.xacro"/> <xacro:include filename="$(find iiwa_description)/urdf/tools/patronv2.xacro"/>
<xacro:if value="$(arg simulate)"> <xacro:if value="$(arg simulate)">
@@ -32,15 +32,6 @@
</ros> </ros>
</device> </device>
<device reference="example_camera" type="Camera">
<ros>
<topicName>/camera_example/color</topicName>
<updateRate>30</updateRate>
<alwaysOn>True</alwaysOn>
<frameName>example_camera</frameName>
</ros>
</device>
<device reference="camera_depth" type="RangeFinder"> <device reference="camera_depth" type="RangeFinder">
<ros> <ros>
<topicName>/camera/depth</topicName> <topicName>/camera/depth</topicName>
src/iiwa_description/urdf/tools/patron.xacro
+65 -41
View File
@@ -4,15 +4,14 @@
<link name="camera_holder"> <link name="camera_holder">
<inertial> <inertial>
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/> <origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<mass value="0.09"/> <mass value="0.15"/>
<inertia ixx="0.0" ixy="0.0" ixz="0.0" <inertia ixx="0.000073" ixy="0.0" ixz="0.0"
iyy="0.0" iyz="0.0" izz="0.0"/> iyy="0.000136" iyz="0.0" izz="0.000186"/>
</inertial> </inertial>
<visual name=""> <visual name="">
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/> <origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<geometry> <geometry>
<!-- <mesh filename="/home/daniel/dev/kuka_iiwa7_ros2/src/iiwa_description/resource/meshes/tools/CameraHolder.dae" /> --> <mesh filename="package://iiwa_description/resource/meshes/tools/CameraHolder.dae" />
<mesh filename="package://iiwa_description/resource/meshes/tools/CameraHolder.dae"/>
</geometry> </geometry>
</visual> </visual>
<collision> <collision>
@@ -29,39 +28,17 @@
</collision> </collision>
</link> </link>
<link name="camera_hand">
<inertial>
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<mass value="0.0"/>
<inertia ixx="0.0" ixy="0.0" ixz="0.0" iyy="0.0" iyz="0.0" izz="0.0"/>
</inertial>
<visual>
<origin xyz="-0.06 0.0 0.0" rpy="0.0 0.0 0.0"/>
<geometry>
<!-- <mesh filename="/home/daniel/dev/kuka_iiwa7_ros2/src/iiwa_description/resource/meshes/tools/cameraD455.dae" /> -->
<mesh filename="package://iiwa_description/resource/meshes/tools/cameraD455.dae"/>
</geometry>
</visual>
<collision>
<origin xyz="0.0 0.014 0.0125" rpy="0.0 0.0 0.0"/>
<geometry>
<box size="0.12 0.025 0.025"/>
</geometry>
</collision>
</link>
<link name="patron"> <link name="patron">
<inertial> <inertial>
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/> <origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<mass value="0.03"/> <mass value="0.35"/>
<inertia ixx="0.0" ixy="0.0" ixz="0.0" <inertia ixx="0.000127" ixy="0.0" ixz="0.0"
iyy="0.0" iyz="0.0" izz="0.0"/> iyy="0.000127" iyz="0.0" izz="0.000077"/>
</inertial> </inertial>
<visual name=""> <visual name="">
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/> <origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<geometry> <geometry>
<!-- <mesh filename="/home/daniel/dev/kuka_iiwa7_ros2/src/iiwa_description/resource/meshes/tools/patron.dae" /> --> <mesh filename="package://iiwa_description/resource/meshes/tools/patron.dae" />
<mesh filename="package://iiwa_description/resource/meshes/tools/patron.dae"/>
</geometry> </geometry>
</visual> </visual>
<collision> <collision>
@@ -72,36 +49,84 @@
</collision> </collision>
</link> </link>
<link name="camera_corner">
<inertial>
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<mass value="0.1"/>
<inertia ixx="0.0000094" ixy="0.0" ixz="0.0"
iyy="0.000131" iyz="0.0" izz="0.000135"/>
</inertial>
<visual name="">
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<geometry>
<mesh filename="package://iiwa_description/resource/meshes/tools/camera_corner.dae" />
</geometry>
</visual>
<collision>
<origin xyz="0 0.116 0.022" rpy="0.0 0.0 0.0"/>
<geometry>
<box size="0.124 0.029 0.017"/>
</geometry>
</collision>
</link>
<link name="camera_hand">
<inertial>
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<mass value="0.2"/>
<inertia ixx="0.000021" ixy="0.0" ixz="0.0"
iyy="0.000250" iyz="0.0" izz="0.000250"/>
</inertial>
<visual>
<origin xyz="-0.06 0.0 0.0" rpy="0.0 0.0 0.0"/>
<geometry>
<mesh filename="package://iiwa_description/resource/meshes/tools/cameraD455.dae" />
</geometry>
</visual>
<collision>
<origin xyz="0.0 0.014 0.0125" rpy="0.0 0.0 0.0"/>
<geometry>
<box size="0.12 0.025 0.025"/>
</geometry>
</collision>
</link>
<link name="camera_optical_frame"/>
<joint name="tool" type="fixed"> <joint name="tool" type="fixed">
<parent link="link_ee"/> <parent link="link_ee"/>
<child link="camera_holder"/> <child link="camera_holder"/>
<origin xyz="0 0 0" rpy="0 0 1.5708"/> <origin xyz="0 0 0" rpy="0 0 1.5708"/>
</joint> </joint>
<joint name="cameraHolder_patron" type="fixed"> <joint name="camera_holder_patron" type="fixed">
<origin xyz="0.0 0.0 0.03" rpy="0.0 0.0 0.0"/> <origin xyz="0.0 0.0 0.032" rpy="0.0 0.0 0.0"/>
<parent link="camera_holder"/> <parent link="camera_holder"/>
<child link="patron"/> <child link="patron"/>
</joint> </joint>
<joint name="cameraHolder_cameraD455" type="fixed"> <joint name="camera_holder_corner" type="fixed">
<origin xyz="0.0 0.1 0.014" rpy="0.0 0.0 0.0"/> <origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<parent link="camera_holder"/> <parent link="camera_holder"/>
<child link="camera_corner"/>
</joint>
<joint name="camera_corner_camera" type="fixed">
<origin xyz="0.0 0.1 0.014" rpy="0.61 0.0 0.0"/>
<parent link="camera_corner"/>
<child link="camera_hand"/> <child link="camera_hand"/>
</joint> </joint>
<link name="camera_optical_frame"/>
<joint name="camera_hand_to_optical" type="fixed"> <joint name="camera_hand_to_optical" type="fixed">
<origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 3.14159"/> <origin xyz="0.0 0.0 0.0" rpy="0.0 0.0 0.0"/>
<parent link="camera_hand"/> <parent link="camera_hand"/>
<child link="camera_optical_frame"/> <child link="camera_optical_frame"/>
</joint> </joint>
<gazebo reference="camera_optical_frame"> <gazebo reference="camera_optical_frame">
<sensor type="camera" name="camera_rgb"> <sensor type="camera" name="camera_rgb">
<camera> <camera>
<horizontal_fov>1.5708</horizontal_fov> <horizontal_fov>1.3089969</horizontal_fov>
<image> <image>
<width>640</width> <width>640</width>
<height>480</height> <height>480</height>
@@ -120,7 +145,7 @@
<sensor type="depth" name="camera_depth"> <sensor type="depth" name="camera_depth">
<camera> <camera>
<horizontal_fov>1.5184</horizontal_fov> <horizontal_fov>1.3089969</horizontal_fov>
<image> <image>
<width>640</width> <width>640</width>
<height>480</height> <height>480</height>
@@ -140,7 +165,6 @@
<stddev>0.02</stddev> <stddev>0.02</stddev>
</noise> </noise>
</sensor> </sensor>
</gazebo> </gazebo>
</robot> </robot>