diff --git a/.github/workflows/reusable-workspace.yml b/.github/workflows/reusable-workspace.yml index 4f1ecf3c..b6c18dfa 100644 --- a/.github/workflows/reusable-workspace.yml +++ b/.github/workflows/reusable-workspace.yml @@ -60,7 +60,7 @@ jobs: --entrypoint /bin/bash "${{ inputs.container-image }}" -i -c " source /home/rcdt/.bashrc && source install/setup.bash && - uv run pytest -s -rsxf src/ + uv run xvfb-run pytest -s -rsxf src/ " - name: Show disk usage after job diff --git a/dockerfiles/install_scripts/dev_packages.sh b/dockerfiles/install_scripts/dev_packages.sh index 7d203a35..51c3ca48 100755 --- a/dockerfiles/install_scripts/dev_packages.sh +++ b/dockerfiles/install_scripts/dev_packages.sh @@ -11,4 +11,7 @@ apt update apt install -y \ clang \ doxygen \ - ros-$ROS_DISTRO-nmea-navsat-driver + xvfb \ + ros-$ROS_DISTRO-nmea-navsat-driver \ + ros-$ROS_DISTRO-moveit-ros-perception \ + ros-$ROS_DISTRO-topic-tools diff --git a/pyproject.toml b/pyproject.toml index c993b55c..7249a306 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ dependencies = [ "lark>=1.2.2", "mashumaro>=3.16", "myst-parser>=4.0.1", + "nicegui>=3.1.0", "numpy<2.0", "opencv-python>=4.11.0.86", "pillow>=11.3.0", diff --git a/ros2_ws/src/rcdt_franka_moveit_config/config/fr3.srdf b/ros2_ws/src/rcdt_franka_moveit_config/config/fr3.srdf index aa9d15ee..03c599ce 100644 --- a/ros2_ws/src/rcdt_franka_moveit_config/config/fr3.srdf +++ b/ros2_ws/src/rcdt_franka_moveit_config/config/fr3.srdf @@ -28,7 +28,7 @@ are defined group--> - + @@ -37,10 +37,20 @@ are defined + + + + + + + + + + - + @@ -49,7 +59,7 @@ are defined - + @@ -61,6 +71,7 @@ are defined +