Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ros3rag
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
ros3rag
Commits
a6e56056
Commit
a6e56056
authored
4 years ago
by
René Schöne
Browse files
Options
Downloads
Patches
Plain Diff
use reachability connection instead of dummies
parent
81596ea8
No related branches found
No related tags found
1 merge request
!1
Multiple scenes, multiple robots and more
Pipeline
#9748
passed
4 years ago
Stage: build
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ros3rag.placeB/src/main/java/de/tudresden/inf/st/placeB/MainB.java
+9
-3
9 additions, 3 deletions
...laceB/src/main/java/de/tudresden/inf/st/placeB/MainB.java
ros3rag.placeB/src/main/resources/config-b.yaml
+1
-1
1 addition, 1 deletion
ros3rag.placeB/src/main/resources/config-b.yaml
with
10 additions
and
4 deletions
ros3rag.placeB/src/main/java/de/tudresden/inf/st/placeB/MainB.java
+
9
−
3
View file @
a6e56056
...
@@ -29,8 +29,9 @@ public class MainB {
...
@@ -29,8 +29,9 @@ public class MainB {
private
final
static
String
TOPIC_EXIT
=
"place-b/exit"
;
private
final
static
String
TOPIC_EXIT
=
"place-b/exit"
;
private
final
static
String
TOPIC_MY_SCENE_INIT
=
"place-b/init"
;
private
final
static
String
TOPIC_MY_SCENE_INIT
=
"place-b/init"
;
private
final
static
String
TOPIC_ROBOT_REACHABILITY
=
"place-b/reachability/%s"
;
private
final
static
String
TOPIC_MY_SCENE_UPDATE_FROM_ROS
=
"place-b/scene/update"
;
private
final
static
String
TOPIC_MY_SCENE_UPDATE_FROM_ROS
=
"place-b/scene/update"
;
private
final
static
String
TOPIC_COMMAND
S
=
"place-b/command
s
"
;
private
final
static
String
TOPIC_COMMAND
=
"place-b/command"
;
private
final
static
String
TOPIC_OTHER_SCENE_UPDATE_FROM_PLACE_A
=
"place-a/logical/update"
;
private
final
static
String
TOPIC_OTHER_SCENE_UPDATE_FROM_PLACE_A
=
"place-a/logical/update"
;
...
@@ -69,7 +70,12 @@ public class MainB {
...
@@ -69,7 +70,12 @@ public class MainB {
);
);
Scene
myScene
=
UtilB
.
convert
(
scene
);
Scene
myScene
=
UtilB
.
convert
(
scene
);
model
.
setMyScene
(
myScene
);
model
.
setMyScene
(
myScene
);
Util
.
extractRobotNames
(
scene
).
forEach
(
name
->
model
.
addRobot
(
UtilB
.
createRobot
(
name
)));
for
(
String
name
:
Util
.
extractRobotNames
(
scene
))
{
Robot
robot
=
UtilB
.
createRobot
(
name
);
model
.
addRobot
(
robot
);
// assumption: robots do not change during runtime, so we have stable connections
robot
.
connectCanReachObjectOfInterestWrapper
(
mqttUri
(
String
.
format
(
TOPIC_ROBOT_REACHABILITY
,
name
),
config
));
}
/// Set (dummy) reachability, if configured
/// Set (dummy) reachability, if configured
if
(
config
.
useReachability
)
{
if
(
config
.
useReachability
)
{
...
@@ -91,7 +97,7 @@ public class MainB {
...
@@ -91,7 +97,7 @@ public class MainB {
/// Connect endpoints
/// Connect endpoints
model
.
connectMyScene
(
mqttUri
(
TOPIC_MY_SCENE_UPDATE_FROM_ROS
,
config
));
model
.
connectMyScene
(
mqttUri
(
TOPIC_MY_SCENE_UPDATE_FROM_ROS
,
config
));
model
.
connectOtherScene
(
mqttUri
(
TOPIC_OTHER_SCENE_UPDATE_FROM_PLACE_A
,
config
));
model
.
connectOtherScene
(
mqttUri
(
TOPIC_OTHER_SCENE_UPDATE_FROM_PLACE_A
,
config
));
model
.
connectNextOperation
(
mqttUri
(
TOPIC_COMMAND
S
,
config
),
false
);
model
.
connectNextOperation
(
mqttUri
(
TOPIC_COMMAND
,
config
),
false
);
logStatus
(
"Start"
);
logStatus
(
"Start"
);
...
...
This diff is collapsed.
Click to expand it.
ros3rag.placeB/src/main/resources/config-b.yaml
+
1
−
1
View file @
a6e56056
mqttHost
:
"
localhost"
mqttHost
:
"
localhost"
filenameInitialScene
:
"
src/main/resources/config-scene-b.json"
filenameInitialScene
:
"
src/main/resources/config-scene-b.json"
useReachability
:
tru
e
useReachability
:
fals
e
reachability
:
reachability
:
-
idRobot
:
"
arm1"
-
idRobot
:
"
arm1"
filename
:
"
src/main/resources/dummy-reachability-b-arm1.json"
filename
:
"
src/main/resources/dummy-reachability-b-arm1.json"
...
...
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