Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
simulators
basic-simulator
Commits
8bed4bb0
Commit
8bed4bb0
authored
Sep 23, 2019
by
Robert Meyer
Browse files
new bus setup
parent
8b9ffe6f
Pipeline
#186497
failed with stage
in 1 minute and 13 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/de/rwth/monticore/EmbeddedMontiArc/simulators/basic_simulator/controller/VehicleBuilder.java
View file @
8bed4bb0
...
@@ -14,12 +14,14 @@ import sensors.StaticPlannedTrajectoryYSensor;
...
@@ -14,12 +14,14 @@ import sensors.StaticPlannedTrajectoryYSensor;
import
simulation.EESimulator.DirectModelAsEEComponent
;
import
simulation.EESimulator.DirectModelAsEEComponent
;
import
simulation.EESimulator.EEComponent
;
import
simulation.EESimulator.EEComponent
;
import
simulation.EESimulator.EESimulator
;
import
simulation.EESimulator.EESimulator
;
import
simulation.bus.FlexRay
;
import
simulation.bus.InstantBus
;
import
simulation.bus.InstantBus
;
import
simulation.simulator.Simulator
;
import
simulation.simulator.Simulator
;
import
de.rwth.monticore.EmbeddedMontiArc.simulators.hardware_emulator.HardwareEmulatorInterface
;
import
de.rwth.monticore.EmbeddedMontiArc.simulators.hardware_emulator.HardwareEmulatorInterface
;
import
simulation.vehicle.*
;
import
simulation.vehicle.*
;
import
sensors.*
;
import
sensors.*
;
import
java.time.Duration
;
import
java.time.Instant
;
import
java.time.Instant
;
import
java.util.*
;
import
java.util.*
;
...
@@ -59,10 +61,15 @@ public class VehicleBuilder {
...
@@ -59,10 +61,15 @@ public class VehicleBuilder {
public
void
createVehicle
(
VehicleConfig
config
,
MapData
map
)
throws
Exception
{
public
void
createVehicle
(
VehicleConfig
config
,
MapData
map
)
throws
Exception
{
EESimulator
eeSim
=
new
EESimulator
(
Instant
.
EPOCH
);
EESimulator
eeSim
=
new
EESimulator
(
Instant
.
EPOCH
);
EEVehicleBuilder
eeVehicleBuilder
=
new
EEVehicleBuilder
(
eeSim
);
EEVehicleBuilder
eeVehicleBuilder
=
new
EEVehicleBuilder
(
eeSim
);
InstantBus
bus
=
new
InstantBus
(
eeSim
);
InstantBus
sensorBus
=
new
InstantBus
(
eeSim
);
eeVehicleBuilder
.
createControllerSensors
(
bus
);
InstantBus
actuatorBus
=
new
InstantBus
(
eeSim
);
eeVehicleBuilder
.
createMassPointActuators
(
bus
);
FlexRay
controllerBus
=
new
FlexRay
(
eeSim
);
eeVehicleBuilder
.
createController
(
model_server
,
config
.
autopilot_config
,
bus
);
eeVehicleBuilder
.
connectBuses
(
sensorBus
,
controllerBus
,
Duration
.
ofMillis
(
1
));
eeVehicleBuilder
.
connectBuses
(
actuatorBus
,
controllerBus
,
Duration
.
ofMillis
(
1
));
eeVehicleBuilder
.
createControllerSensors
(
sensorBus
);
eeVehicleBuilder
.
createMassPointActuators
(
actuatorBus
);
DirectModelAsEEComponent
controller
=
eeVehicleBuilder
.
createController
(
model_server
,
config
.
autopilot_config
,
controllerBus
);
//controller.setCycleTime(bus.getCycleTime());
PhysicalVehicleBuilder
physicalVehicleBuilder
=
getVehicleBuilder
(
config
.
physics_model
);
PhysicalVehicleBuilder
physicalVehicleBuilder
=
getVehicleBuilder
(
config
.
physics_model
);
Vehicle
simVehicle
=
new
Vehicle
(
physicalVehicleBuilder
,
eeVehicleBuilder
);
Vehicle
simVehicle
=
new
Vehicle
(
physicalVehicleBuilder
,
eeVehicleBuilder
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment