Skip to content

Commit

Permalink
Merge pull request #6 from Yolnan/devel
Browse files Browse the repository at this point in the history
demo hardware compatibility and QoL updates
  • Loading branch information
marip8 authored Mar 13, 2024
2 parents 1d2e175 + ec31d4b commit a8e5c56
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [foxy, humble, rolling]
distro: [foxy]
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [foxy, humble, rolling]
distro: [foxy]
container:
image: ghcr.io/ros-industrial-consortium/scan_n_plan_workshop:${{ matrix.distro }}-master
env:
Expand Down
3 changes: 3 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ RUN --mount=type=bind,target=${WORKSPACE_DIR}/src/snp_automate_2022 \
&& cd ${WORKSPACE_DIR} \
&& colcon build --cmake-args \
&& rm -rf build log

COPY --chmod=755 docker/launch_snp_automate_2022.sh /opt/launch_snp_automate_2022.sh
ENTRYPOINT ["/opt/launch_snp_automate_2022.sh"]
4 changes: 4 additions & 0 deletions docker/launch_snp_automate_2022.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

source /opt/snp_automate_2022/install/setup.bash
ros2 launch snp_automate_2022 start.launch.xml sim_robot:=false sim_vision:=false
4 changes: 1 addition & 3 deletions launch/start.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@
<include file="$(find-pkg-share realsense2_camera)/launch/rs_launch.py">
<arg name="align_depth" value="true"/>
<arg name="enable_pointcloud" value="true"/>
<arg name="color_width" value="640"/>
<arg name="color_height" value="360"/>
<arg name="color_fps" value="90.0"/>
<arg name="rgb_camera.profile" value="640x360x30"/>
</include>
</group>
<!-- Launch Open3d Interface Node (Sim) -->
Expand Down
1 change: 1 addition & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<exec_depend>joint_state_broadcaster</exec_depend>
<exec_depend>joint_trajectory_controller</exec_depend>
<exec_depend>hardware_interface</exec_depend>
<exec_depend>realsense2_camera</exec_depend>

<export>
<build_type>ament_cmake</build_type>
Expand Down

0 comments on commit a8e5c56

Please sign in to comment.