Skip to content
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e2dc628
Add proximity-warning package
arkadiy-telegin Dec 22, 2023
54755fb
Update .gitmodules
arkadiy-telegin Dec 22, 2023
a018c19
Update submodule
arkadiy-telegin Dec 22, 2023
2355503
Update launch file
arkadiy-telegin Dec 22, 2023
0423f51
Update dockerfile
arkadiy-telegin Dec 22, 2023
fcd2896
Update proximity_monitor
arkadiy-telegin Dec 22, 2023
9cd8a98
Fix bugs
arkadiy-telegin Dec 23, 2023
0a55596
Update proximity_monitor to the latest version
arkadiy-telegin Dec 23, 2023
ba7a99b
Publish at 40Hz
arkadiy-telegin Jan 4, 2024
a6fec5f
Set initial warning to 0
arkadiy-telegin Jan 4, 2024
cceb267
Version 1
arkadiy-telegin Jan 19, 2024
33badbf
Log throttling
missxa Mar 7, 2024
6c59182
Remove unused code +
arkadiy-telegin Mar 28, 2024
eae0a94
Add cyclone DDS to dockerfile
arkadiy-telegin Mar 28, 2024
89f32c9
Merge branch 'arkadiy/proximity_warning' of github.com:arkadiy-telegi…
arkadiy-telegin Mar 28, 2024
0a4c3a5
Cleanup
arkadiy-telegin Mar 28, 2024
854f807
Rename threshold parameter
arkadiy-telegin Mar 28, 2024
7f42fb6
Add .devcontainer config
arkadiy-telegin Mar 28, 2024
c0613c8
Fix .devcontainer build target
arkadiy-telegin Mar 28, 2024
7d92739
Add QoL ROS vscode scripts
arkadiy-telegin Mar 28, 2024
6993c06
.devcontainer dockerfile
arkadiy-telegin Mar 28, 2024
23508b0
Rename docker -> src
arkadiy-telegin Mar 28, 2024
9abbdac
Fix submodule
arkadiy-telegin Mar 28, 2024
621a3a8
Fix realsense submodule
arkadiy-telegin Mar 28, 2024
6f695ed
Update ReadMe.md to include devcontainers
arkadiy-telegin Apr 8, 2024
4cff717
Update ReadMe.md - include proximity_monitor usage
arkadiy-telegin Apr 8, 2024
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
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[submodule "docker/realsense-ros"]
path = docker/realsense-ros
url = https://github.com/juandelos/realsense-ros.git

[submodule "docker/proximity_monitor"]
path = docker/proximity_monitor
url = https://github.com/arkadiy-telegin/proximity_monitor.git
1 change: 1 addition & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ RUN apt-get update -y \
COPY docker/realsense-ros ./src
COPY docker/multi_camera_launch.py /ros2_ws/src/realsense2_camera/launch
COPY docker/depth_handler /ros2_ws/src/depth_handler
COPY docker/proximity_monitor /ros2_ws/src/proximity_monitor
RUN apt-get install -y python3-rosdep \
&& apt-get update \
&& source /opt/ros/${ROS_DISTRO}/setup.bash \
Expand Down
24 changes: 16 additions & 8 deletions docker/multi_camera_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,22 @@ def generate_launch_description():
PythonLaunchDescriptionSource([ThisLaunchFileDir(), '/rs_launch.py']),
launch_arguments={'camera_name': 'camera_back', "serial_no":"_829212071844", "pointcloud.enable":"false"}.items(),
),
# launch_ros.actions.Node(
# package = "depth_handler",
# executable = "depth_subscriber"
# ),
# launch_ros.actions.Node(
# package = "depth_handler",
# executable = "pcd_subscriber",
# name = 'pointcloud_shoulder_left',
# parameters = [{'camera_side': 'left'}]
# ),
launch_ros.actions.Node(
package = "depth_handler",
executable = "depth_subscriber"
),
launch_ros.actions.Node(
package = "depth_handler",
executable = "pcd_subscriber",
name = 'pointcloud_shoulder_left',
parameters = [{'camera_side': 'left'}]
package = "proximity_monitor",
executable = "proximity_monitor",
name = 'proximity_monitor',
parameters = [{'first_camera_name': 'camera_shoulder_left'},
{'second_camera_name': 'camera_back'},
{'threshold': 0.2}]
),
])
1 change: 1 addition & 0 deletions docker/proximity_monitor
Submodule proximity_monitor added at 19e279