From fb31e58e303bf5b5ea2ace8354ac4187d9c8c01f Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 15 Jul 2022 17:02:59 +0200
Subject: [PATCH] updating
---
README.md | 2 +-
config/ros3rag.coordinator | 4 ----
docker-compose.yml | 1 +
robotic-controller/src/ccf | 2 +-
robotic-controller/src/ccf_immersive_sorting | 2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index e3a8473..a24ad21 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,6 @@ instructions further below in this document. Please note that the setup uses vnc
- Prepare/Build all docker images: `docker-compose build`
- (Optional) Use the Web UI to observe MQTT message and view the runtime model of place B
- `docker-compose up -d web_rag`
- - Open your browser at <http://127.0.0.1:8050/>
+ - Open your browser at <http://0.0.0.0:8050/>
- Start the case study
- `docker-compose up [-d] coordinator` (the `-d` flag is optional to run the coordinator in the background)
diff --git a/config/ros3rag.coordinator b/config/ros3rag.coordinator
index 8daa543..024a8bb 100644
--- a/config/ros3rag.coordinator
+++ b/config/ros3rag.coordinator
@@ -7,12 +7,8 @@ components {
component ragB, start using script "./place.sh b" in "ros3rag", report using mqtt "coordinating/rag-b"
//component ragB, report using mqtt "coordinating/rag-b"
- component rosCore, start using docker compose "ros_core", status "ready" after 2 sec
component mosquitto, start using docker compose "mosquitto", status "ready" after 1 sec
- // ros core needed for all other ros nodes
- rosCore < robotCtrlA, robotCtrlB
-
// mqtt broker needed for all robot ctrl and rag nodes
mosquitto < robotCtrlA, robotCtrlB, ragA, ragB
diff --git a/docker-compose.yml b/docker-compose.yml
index f656f09..386ae59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
user: "ros"
coordinator:
+ privileged: true
build: coordinator
volumes:
# - "./coordinator/examples/ros3rag.coordinator:/config.coordinator"
diff --git a/robotic-controller/src/ccf b/robotic-controller/src/ccf
index d79d1c4..872b968 160000
--- a/robotic-controller/src/ccf
+++ b/robotic-controller/src/ccf
@@ -1 +1 @@
-Subproject commit d79d1c40b974d0d5a88104913f679bcb980ad973
+Subproject commit 872b968eafb37070e020ca047f14a474a75a99e8
diff --git a/robotic-controller/src/ccf_immersive_sorting b/robotic-controller/src/ccf_immersive_sorting
index 3464e27..5afd0e4 160000
--- a/robotic-controller/src/ccf_immersive_sorting
+++ b/robotic-controller/src/ccf_immersive_sorting
@@ -1 +1 @@
-Subproject commit 3464e27642725c6c143a2850399f42563c35b42a
+Subproject commit 5afd0e429aa0902bc4a9556cf050bada890f848e
--
GitLab