integrated ee vehicle

install/scenarios/straight2.json

@@ -21,7 +21,8 @@
                 "cache_IL1": "262144,4,4",
                 "cache_L2": "2097152,6,6",
                 "cache_L3": "12582912,40,40",
-				"no_time": true
+                "no_time": true,
+                "no_emulation": true
             }
         }
     ]

pom.xml

@@ -18,11 +18,11 @@
 
     <properties>
         <!-- USE THESE TO SET THE VERSIONS OF THE DEPENDENCIES FOR ALL THE SUB-PROJECTS -->
-        <montisim.commons.version>1.0.9-EE-SNAPSHOT</montisim.commons.version>
-        <montisim.controller.version>1.0.3-EE-SNAPSHOT</montisim.controller.version>
-        <montisim.server.version>1.0.7</montisim.server.version>
-        <montisim.hardware_emulator.version>1.0.0-EE-SNAPSHOT</montisim.hardware_emulator.version>
-        <montisim.simulation.version>2.0.2-EE-SNAPSHOT</montisim.simulation.version>
+        <montisim.commons.version>1.0.11</montisim.commons.version>
+        <montisim.controller.version>1.0.4</montisim.controller.version>
+        <montisim.server.version>2.2.0</montisim.server.version>
+        <montisim.hardware_emulator.version>1.0.2</montisim.hardware_emulator.version>
+        <montisim.simulation.version>2.0.4</montisim.simulation.version>
 
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/de/rwth/monticore/EmbeddedMontiArc/simulators/basic_simulator/controller/VehicleBuilder.java

@@ -14,6 +14,8 @@ import sensors.StaticPlannedTrajectoryYSensor;
 import simulation.EESimulator.DirectModelAsEEComponent;
 import simulation.EESimulator.EEComponent;
 import simulation.EESimulator.EESimulator;
+import simulation.bus.CAN;
+import simulation.bus.CANOperationMode;
 import simulation.bus.FlexRay;
 import simulation.bus.InstantBus;
 import simulation.simulator.Simulator;
@@ -64,8 +66,8 @@ public class VehicleBuilder {
     	InstantBus sensorBus = new InstantBus(eeSim);
     	InstantBus actuatorBus = new InstantBus(eeSim);
         FlexRay controllerBus = new FlexRay(eeSim);
-        eeVehicleBuilder.connectBuses(sensorBus, controllerBus, Duration.ofMillis(1));
-        eeVehicleBuilder.connectBuses(actuatorBus, controllerBus, Duration.ofMillis(1));
+        eeVehicleBuilder.connectBuses(sensorBus, controllerBus, Duration.ofMillis(400));
+        eeVehicleBuilder.connectBuses(actuatorBus, controllerBus, Duration.ofMillis(400));
     	eeVehicleBuilder.createControllerSensors(sensorBus);
     	eeVehicleBuilder.createMassPointActuators(actuatorBus);
     	DirectModelAsEEComponent controller = eeVehicleBuilder.createController(model_server, config.autopilot_config, controllerBus);