From adfe2d79427851af852f537b93b4ba14d9497f06 Mon Sep 17 00:00:00 2001 From: SebastianEbert <sebastian.ebert@tu-dresden.de> Date: Wed, 5 Oct 2022 12:47:05 +0200 Subject: [PATCH] serveral object pos/color fixes --- docker/Dockerfile | 2 ++ docker/launch.sh | 2 +- src/ccf_immersive_sorting | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index fcb296b..896df18 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -72,6 +72,8 @@ WORKDIR ${HOME}/work_dir RUN echo "Cloning modules!" +RUN ls -l + RUN git clone --recurse-submodules -b ga-demo https://git-st.inf.tu-dresden.de/ceti/ros/ccf/ccf_workspace.git RUN echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc diff --git a/docker/launch.sh b/docker/launch.sh index fb55743..164155c 100755 --- a/docker/launch.sh +++ b/docker/launch.sh @@ -7,5 +7,5 @@ if [ $1 -eq 1 ] then roslaunch ccf_immersive_sorting main_controller_virtual_preview_ceti-table-$1_real_robot.launch mqtt_server:=tcp://$2 connection_address:=tcp://$3 robot_ip:=$4 else -roslaunch robot-cell_ceti-table-$1.launch mqtt_server:=tcp://$2 robot_ip:=$4 +roslaunch ccf_immersive_sorting robot-cell_ceti-table-$1.launch mqtt_server:=tcp://$2 robot_ip:=$4 fi diff --git a/src/ccf_immersive_sorting b/src/ccf_immersive_sorting index 00a1a47..8b9b710 160000 --- a/src/ccf_immersive_sorting +++ b/src/ccf_immersive_sorting @@ -1 +1 @@ -Subproject commit 00a1a4785fc2f2b5f0e101886fcc5a466346e746 +Subproject commit 8b9b710f67e2f5a0b67154380ce978d0afe45bda -- GitLab