Commit ca0cfe7e authored by Andreas Wahlen's avatar Andreas Wahlen
Browse files

Merge remote-tracking branch 'origin/master' into dev_ema

parents 89768b60 1a4ec3fa
......@@ -9,7 +9,8 @@
/target
*.pyc
*.DS_Store
install/*
install/hardware_emulator_lib.dll
install/basic-simulator.jar
dependency-reduced-pom.xml
.vscode/
.factorypath
\ No newline at end of file
{
"name": "ema_network_test",
"map_name": "aachen",
"modules": [
{
"type": "simple_network",
"transmission_time": [0, 100000000],
"car_transmission_range": 100000
}
],
"cars": [
{
"name": "VCGTestVehicle1",
"start_pos": [ 0, 0 ],
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"SimpleCommunicationGateway",
"Computer"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{ "type": "simple_communication_gateway" },
{
"type": "computer",
"name": "Computer",
"backend": {
"type": "tcp",
"host": "::1",
"port": 4567,
"ref_id": 16384
},
"time_model": {
"type": "measured"
},
"cycle_duration": [0,10000000]
}
]
},
{
"name": "VCGTestVehicle2",
"start_pos": [ 0, 10 ],
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"SimpleCommunicationGateway",
"Computer"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor"}
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{ "type": "simple_communication_gateway" },
{
"type": "computer",
"name": "Computer",
"backend": {
"type": "tcp",
"host": "::1",
"port": 4568,
"ref_id": 16384
},
"time_model": {
"type": "measured"
},
"cycle_duration": [0,10000000]
}
]
},
{
"name": "VCGTestVehicle3",
"start_pos": [ 0, 20 ],
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"SimpleCommunicationGateway",
"Computer"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor"}
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{ "type": "simple_communication_gateway" },
{
"type": "computer",
"name": "Computer",
"backend": {
"type": "tcp",
"host": "::1",
"port": 4569,
"ref_id": 16384
},
"time_model": {
"type": "measured"
},
"cycle_duration": [0,10000000]
}
]
}
]
}
\ No newline at end of file
......@@ -9,15 +9,15 @@
<groupId>montisim</groupId>
<artifactId>basic-simulator</artifactId>
<version>2.1.4</version>
<version>2.1.5</version>
<name>basic-simulator</name>
<properties>
<!-- USE THESE TO SET THE VERSIONS OF THE DEPENDENCIES FOR ALL THE SUB-PROJECTS -->
<montisim.commons.version>2.0.13</montisim.commons.version>
<montisim.simulation.version>3.1.4</montisim.simulation.version>
<montisim.hardware_emulator.version>2.0.6</montisim.hardware_emulator.version>
<montisim.commons.version>2.0.14</montisim.commons.version>
<montisim.simulation.version>3.1.5</montisim.simulation.version>
<montisim.hardware_emulator.version>2.0.7</montisim.hardware_emulator.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment