Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
CCF Workspace
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CeTI
ROS
CeTI Cobotic Framework
CCF Workspace
Commits
adfe2d79
Commit
adfe2d79
authored
2 years ago
by
Sebastian Ebert
Browse files
Options
Downloads
Patches
Plain Diff
serveral object pos/color fixes
parent
8921d806
Branches
ga-demo
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker/Dockerfile
+2
-0
2 additions, 0 deletions
docker/Dockerfile
docker/launch.sh
+1
-1
1 addition, 1 deletion
docker/launch.sh
src/ccf_immersive_sorting
+1
-1
1 addition, 1 deletion
src/ccf_immersive_sorting
with
4 additions
and
2 deletions
docker/Dockerfile
+
2
−
0
View file @
adfe2d79
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
docker/launch.sh
+
1
−
1
View file @
adfe2d79
...
...
@@ -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
This diff is collapsed.
Click to expand it.
ccf_immersive_sorting
@
8b9b710f
Compare
00a1a478
...
8b9b710f
Subproject commit
00a1a4785fc2f2b5f0e101886fcc5a466346e746
Subproject commit
8b9b710f67e2f5a0b67154380ce978d0afe45bda
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment