From d184efeb8a9fc22323ab1e942077af66a42aba55 Mon Sep 17 00:00:00 2001
From: Beate Jost <beate.jost@iais.fraunhofer.de>
Date: Mon, 1 May 2023 21:38:43 +0200
Subject: [PATCH] Issue #1127: swap calliope motors in sim, fix visitor

---
 .../js/app/simulation/simulationLogic/robot.calliope.js       | 4 ++--
 .../src/app/simulation/simulationLogic/robot.calliope.ts      | 4 ++--
 .../worker/codegen/CalliopeStackMachineGeneratorWorker.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenRobertaServer/staticResources/js/app/simulation/simulationLogic/robot.calliope.js b/OpenRobertaServer/staticResources/js/app/simulation/simulationLogic/robot.calliope.js
index 6dac0792f2..4bcdd51ec1 100644
--- a/OpenRobertaServer/staticResources/js/app/simulation/simulationLogic/robot.calliope.js
+++ b/OpenRobertaServer/staticResources/js/app/simulation/simulationLogic/robot.calliope.js
@@ -46,7 +46,7 @@ define(["require", "exports", "robot.sensors", "./robot.actuators", "robot.base.
             var myActuatorPins = [];
             var myDrawableMotors = [
                 {
-                    cx: 362,
+                    cx: 562,
                     cy: 720,
                     theta: 0,
                     color: 'grey',
@@ -56,7 +56,7 @@ define(["require", "exports", "robot.sensors", "./robot.actuators", "robot.base.
                     timeout: 0,
                 },
                 {
-                    cx: 562,
+                    cx: 362,
                     cy: 720,
                     theta: 0,
                     color: 'grey',
diff --git a/OpenRobertaWeb/src/app/simulation/simulationLogic/robot.calliope.ts b/OpenRobertaWeb/src/app/simulation/simulationLogic/robot.calliope.ts
index 896d3cb3d2..b7e4353f52 100644
--- a/OpenRobertaWeb/src/app/simulation/simulationLogic/robot.calliope.ts
+++ b/OpenRobertaWeb/src/app/simulation/simulationLogic/robot.calliope.ts
@@ -47,7 +47,7 @@ export default class RobotCalliope extends RobotBaseStationary {
         let myActuatorPins: DrawableTouchKey[] = [];
         let myDrawableMotors: DrawableMotor[] = [
             {
-                cx: 362,
+                cx: 562,
                 cy: 720,
                 theta: 0,
                 color: 'grey',
@@ -57,7 +57,7 @@ export default class RobotCalliope extends RobotBaseStationary {
                 timeout: 0,
             },
             {
-                cx: 562, //-45, // center x
+                cx: 362, //-45, // center x
                 cy: 720, // center y
                 theta: 0,
                 color: 'grey',
diff --git a/RobotMbed/src/main/java/de/fhg/iais/roberta/worker/codegen/CalliopeStackMachineGeneratorWorker.java b/RobotMbed/src/main/java/de/fhg/iais/roberta/worker/codegen/CalliopeStackMachineGeneratorWorker.java
index 7f969df466..f0cd103393 100644
--- a/RobotMbed/src/main/java/de/fhg/iais/roberta/worker/codegen/CalliopeStackMachineGeneratorWorker.java
+++ b/RobotMbed/src/main/java/de/fhg/iais/roberta/worker/codegen/CalliopeStackMachineGeneratorWorker.java
@@ -2,13 +2,13 @@
 
 import de.fhg.iais.roberta.bean.UsedHardwareBean;
 import de.fhg.iais.roberta.components.Project;
-import de.fhg.iais.roberta.visitor.codegen.MbedStackMachineVisitor;
+import de.fhg.iais.roberta.visitor.codegen.CalliopeStackMachineVisitor;
 import de.fhg.iais.roberta.visitor.lang.codegen.AbstractStackMachineVisitor;
 import de.fhg.iais.roberta.worker.AbstractStackMachineGeneratorWorker;
 
 public class CalliopeStackMachineGeneratorWorker extends AbstractStackMachineGeneratorWorker {
     @Override
     protected AbstractStackMachineVisitor getVisitor(Project project, UsedHardwareBean usedHardwareBean) {
-        return new MbedStackMachineVisitor(project.getConfigurationAst(), project.getProgramAst().getTree());
+        return new CalliopeStackMachineVisitor(project.getConfigurationAst(), project.getProgramAst().getTree());
     }
 }