Skip to content
Snippets Groups Projects
Commit 972f9aea authored by René Schöne's avatar René Schöne
Browse files

Merge branch 'master' into 19-poc-use-mustache-as-template-engine

parents 916cc80d 2e3c1b05
No related branches found
No related tags found
No related merge requests found
Pipeline #7202 passed
...@@ -22,7 +22,7 @@ SerializeRobotConfig maps config.Robotconfig.RobotConfig rc to byte[] {: ...@@ -22,7 +22,7 @@ SerializeRobotConfig maps config.Robotconfig.RobotConfig rc to byte[] {:
LinkStateToIntPosition maps panda.Linkstate.PandaLinkState pls to IntPosition {: LinkStateToIntPosition maps panda.Linkstate.PandaLinkState pls to IntPosition {:
// System.out.println("LinkStateToIntPosition"); // 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 {:
...@@ -30,6 +30,6 @@ CreateSpeedMessage maps double speed to config.Robotconfig.RobotConfig {: ...@@ -30,6 +30,6 @@ CreateSpeedMessage maps double speed to config.Robotconfig.RobotConfig {:
return config.Robotconfig.RobotConfig.newBuilder() return config.Robotconfig.RobotConfig.newBuilder()
.setSpeed(speed) .setSpeed(speed)
.setLoopTrajectory(true) .setLoopTrajectory(true)
.setPlanningMode(config.Robotconfig.RobotConfig.PlanningMode.CARTESIAN) .setPlanningMode(config.Robotconfig.RobotConfig.PlanningMode.FLUID)
.build(); .build();
:} :}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment