Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
JastAdd
ros2rag
Commits
6956ebd2
Commit
6956ebd2
authored
Jul 06, 2020
by
René Schöne
Browse files
Moving common files to common directory.
parent
c2fc88cd
Pipeline
#7205
passed with stages
in 5 minutes and 30 seconds
Changes
10
Pipelines
1
Show whitespace changes
Inline
Side-by-side
ros2rag.starter/src/main/resources
/config.yaml
→
common
/config.yaml
View file @
6956ebd2
File moved
ros2rag.starter/src/mai
n/proto/dataconfig.proto
→
commo
n/proto/dataconfig.proto
View file @
6956ebd2
File moved
ros2rag.starter/src/mai
n/proto/linkstate.proto
→
commo
n/proto/linkstate.proto
View file @
6956ebd2
File moved
ros2rag.starter/src/mai
n/proto/robotconfig.proto
→
commo
n/proto/robotconfig.proto
View file @
6956ebd2
File moved
ros2rag.starter/src/main/java/de/tudresden/inf/st/ros2rag/starter/StarterMain.java
View file @
6956ebd2
...
...
@@ -28,7 +28,7 @@ public class StarterMain {
private
Model
model
;
public
void
run
(
String
[]
args
)
throws
IOException
,
InterruptedException
{
File
configFile
=
new
File
(
args
.
length
==
0
?
"
./src/main/resources
/config.yaml"
:
args
[
0
]);
File
configFile
=
new
File
(
args
.
length
==
0
?
"
common
/config.yaml"
:
args
[
0
]);
// --- No configuration below this line ---
...
...
ros2rag.starter/src/main/proto
0 → 120000
View file @
6956ebd2
../../../common/proto/
\ No newline at end of file
ros2rag.starter/src/main/resources/config.json
deleted
100644 → 0
View file @
c2fc88cd
{
"joints"
:
[
{
"name"
:
"Joint0"
,
"topic"
:
"panda::panda_link0"
},
{
"name"
:
"Joint1"
,
"topic"
:
"panda::panda_link1"
},
{
"name"
:
"Joint2"
,
"topic"
:
"panda::panda_link2"
},
{
"name"
:
"Joint3"
,
"topic"
:
"panda::panda_link3"
},
{
"name"
:
"Joint4"
,
"topic"
:
"panda::panda_link4"
},
{
"name"
:
"Joint5"
,
"topic"
:
"panda::panda_link5"
},
{
"name"
:
"Joint6"
,
"topic"
:
"panda::panda_link6"
},
{
"name"
:
"EndEffector"
,
"topic"
:
"panda::panda_link7"
,
"isEndEffector"
:
true
},
{
"name"
:
"LeftFinger"
,
"topic"
:
"panda::panda_leftfinger"
},
{
"name"
:
"RightFinger"
,
"topic"
:
"panda::panda_rightfinger"
}
],
"robotConfigTopic"
:
"robotconfig"
,
"dataConfigTopic"
:
"dataconfig"
}
ros2rag.tests/src/test/proto
0 → 120000
View file @
6956ebd2
../../../common/proto/
\ No newline at end of file
ros2rag.tests/src/test/proto/linkstate.proto
deleted
100644 → 0
View file @
c2fc88cd
syntax
=
"proto3"
;
package
panda
;
message
PandaLinkState
{
string
name
=
1
;
message
Position
{
float
positionX
=
1
;
float
positionY
=
2
;
float
positionZ
=
3
;
}
message
Orientation
{
float
orientationX
=
1
;
float
orientationY
=
2
;
float
orientationZ
=
3
;
float
orientationW
=
4
;
}
message
TwistLinear
{
float
twistLinearX
=
1
;
float
twistLinearY
=
2
;
float
twistLinearZ
=
3
;
}
message
TwistAngular
{
float
twistAngularX
=
1
;
float
twistAngularY
=
2
;
float
twistAngularZ
=
3
;
}
Position
pos
=
2
;
Orientation
orient
=
3
;
TwistLinear
tl
=
4
;
TwistAngular
ta
=
5
;
}
ros2rag.tests/src/test/proto/robotconfig.proto
deleted
100644 → 0
View file @
c2fc88cd
syntax
=
"proto3"
;
package
config
;
message
RobotConfig
{
double
speed
=
1
;
bool
loopTrajectory
=
2
;
enum
PlanningMode
{
FLUID
=
0
;
CARTESIAN
=
1
;
}
PlanningMode
planningMode
=
3
;
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment