Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ros2rag
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
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
JastAdd
ros2rag
Commits
fa38ca9e
Commit
fa38ca9e
authored
4 years ago
by
René Schöne
Browse files
Options
Downloads
Patches
Plain Diff
More debugging messages in starter.
parent
d921e51f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ros2rag.starter/src/main/jastadd/Computation.jrag
+2
-0
2 additions, 0 deletions
ros2rag.starter/src/main/jastadd/Computation.jrag
ros2rag.starter/src/main/jastadd/Definitions.ros2rag
+4
-0
4 additions, 0 deletions
ros2rag.starter/src/main/jastadd/Definitions.ros2rag
with
6 additions
and
0 deletions
ros2rag.starter/src/main/jastadd/Computation.jrag
+
2
−
0
View file @
fa38ca9e
aspect Computation {
aspect Computation {
syn boolean RobotArm.isInSafetyZone() {
syn boolean RobotArm.isInSafetyZone() {
System.out.println("isInSafetyZone()");
for (Joint joint : getJointList()) {
for (Joint joint : getJointList()) {
if (model().getZoneModel().isInSafetyZone(joint.getCurrentPosition())) {
if (model().getZoneModel().isInSafetyZone(joint.getCurrentPosition())) {
return true;
return true;
...
@@ -10,6 +11,7 @@ aspect Computation {
...
@@ -10,6 +11,7 @@ aspect Computation {
cache ZoneModel.isInSafetyZone(IntPosition pos);
cache ZoneModel.isInSafetyZone(IntPosition pos);
syn boolean ZoneModel.isInSafetyZone(IntPosition pos) {
syn boolean ZoneModel.isInSafetyZone(IntPosition pos) {
System.out.println("isInSafetyZone(" + pos + ")");
for (Zone sz : getSafetyZoneList()) {
for (Zone sz : getSafetyZoneList()) {
for (Coordinate coordinate : sz.getCoordinateList()) {
for (Coordinate coordinate : sz.getCoordinateList()) {
IntPosition inside = coordinate.getPosition();
IntPosition inside = coordinate.getPosition();
...
...
This diff is collapsed.
Click to expand it.
ros2rag.starter/src/main/jastadd/Definitions.ros2rag
+
4
−
0
View file @
fa38ca9e
...
@@ -10,19 +10,23 @@ RobotArm.AppropriateSpeed canDependOn Joint.CurrentPosition as dependency1 ;
...
@@ -10,19 +10,23 @@ RobotArm.AppropriateSpeed canDependOn Joint.CurrentPosition as dependency1 ;
// --- mapping definitions ---
// --- mapping definitions ---
ParseLinkState maps byte[] bytes to panda.Linkstate.PandaLinkState {:
ParseLinkState maps byte[] bytes to panda.Linkstate.PandaLinkState {:
System.out.println("ParseLinkState");
return panda.Linkstate.PandaLinkState.parseFrom(bytes);
return panda.Linkstate.PandaLinkState.parseFrom(bytes);
:}
:}
SerializeRobotConfig maps config.Robotconfig.RobotConfig rc to byte[] {:
SerializeRobotConfig maps config.Robotconfig.RobotConfig rc to byte[] {:
System.out.println("SerializeRobotConfig");
return rc.toByteArray();
return rc.toByteArray();
:}
:}
LinkStateToIntPosition maps panda.Linkstate.PandaLinkState pls to IntPosition {:
LinkStateToIntPosition maps panda.Linkstate.PandaLinkState pls to IntPosition {:
System.out.println("LinkStateToIntPosition");
panda.Linkstate.PandaLinkState.Position p = pls.getPos();
panda.Linkstate.PandaLinkState.Position p = pls.getPos();
return IntPosition.of((int) (Math.round(p.getPositionX() * 2)), (int) (Math.round(p.getPositionY() * 2)), (int) (Math.round(p.getPositionZ() * 2 + 0.5)));
return IntPosition.of((int) (Math.round(p.getPositionX() * 2)), (int) (Math.round(p.getPositionY() * 2)), (int) (Math.round(p.getPositionZ() * 2 + 0.5)));
:}
:}
CreateSpeedMessage maps double speed to config.Robotconfig.RobotConfig {:
CreateSpeedMessage maps double speed to config.Robotconfig.RobotConfig {:
System.out.println("CreateSpeedMessage");
return config.Robotconfig.RobotConfig.newBuilder()
return config.Robotconfig.RobotConfig.newBuilder()
.setSpeed(speed)
.setSpeed(speed)
.setLoopTrajectory(true)
.setLoopTrajectory(true)
...
...
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