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
68a4ee8e
Commit
68a4ee8e
authored
4 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
update looping and margin of error for lcoation detection
parent
44ee5b0f
No related branches found
No related tags found
No related merge requests found
Pipeline
#7508
passed
4 years ago
Stage: build
Stage: test
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ros2rag.goal/src/main/jastadd/Computation.jrag
+2
-2
2 additions, 2 deletions
ros2rag.goal/src/main/jastadd/Computation.jrag
ros2rag.starter/src/main/jastadd/Computation.jrag
+1
-1
1 addition, 1 deletion
ros2rag.starter/src/main/jastadd/Computation.jrag
with
3 additions
and
3 deletions
ros2rag.goal/src/main/jastadd/Computation.jrag
+
2
−
2
View file @
68a4ee8e
...
...
@@ -90,12 +90,12 @@ aspect Computation {
.setOrientation(getOrientation())
.setMode(plan.TrajectoryOuterClass.Trajectory.PlanningMode.FLUID)
.build())
.setLoop(
tru
e)
.setLoop(
fals
e)
.build();
eq WorkStep.nextTrajectory() = getPredecessor().nextTrajectory();
eq FinishedStep.nextTrajectory() = getPredecessor().nextTrajectory();
private static final double MoveToStep.DELTA = 0.
1
;
private static final double MoveToStep.DELTA = 0.
005
;
private boolean MoveToStep.isNear(plan.TrajectoryOuterClass.Trajectory.Position one, plan.TrajectoryOuterClass.Trajectory.Position other) {
return Math.abs(one.getX() - other.getX()) < DELTA &&
Math.abs(one.getY() - other.getY()) < DELTA &&
...
...
This diff is collapsed.
Click to expand it.
ros2rag.starter/src/main/jastadd/Computation.jrag
+
1
−
1
View file @
68a4ee8e
...
...
@@ -23,6 +23,6 @@ aspect Computation {
}
syn double RobotArm.getAppropriateSpeed() {
return isInSafetyZone() ? 0.
4
d :
1.0
d;
return isInSafetyZone() ? 0.
2
d :
0.9
d;
}
}
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