Commit 56b88f2e authored by Jean Meurice's avatar Jean Meurice
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/basic-simulator into sim_dev
parents 571fbcbd 52a67e9f
Pipeline #495158 passed with stage
in 1 minute and 3 seconds
<!-- (c) https://github.com/MontiCore/monticore -->
# basic-simulator # basic-simulator
## >> [User Documentation for the basic-simulator](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/simulation/-/wikis/user-docs/The-basic_simulator) << ## >> [User Documentation for the basic-simulator](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/simulation/-/wikis/user-docs/The-basic_simulator) <<
......
File mode changed from 100644 to 100755
File mode changed from 100755 to 100644
...@@ -27,7 +27,10 @@ ...@@ -27,7 +27,10 @@
"TrueVelocitySensor", "TrueVelocitySensor",
"TruePositionSensor", "TruePositionSensor",
"TrueCompassSensor", "TrueCompassSensor",
"BatterySensor",
"Navigation", "Navigation",
"Lidar",
"SpeedLimit",
"JavaAutopilot" "JavaAutopilot"
] ]
}, },
...@@ -66,7 +69,14 @@ ...@@ -66,7 +69,14 @@
"name": "TrueCompassSensor", "name": "TrueCompassSensor",
"physical_value_name": "true_compass" "physical_value_name": "true_compass"
}, },
{
"type": "sensor",
"name": "BatterySensor",
"physical_value_name": "battery_level"
},
{ "type": "navigation" }, { "type": "navigation" },
{ "type": "lidar" },
{ "type": "speed_limit" },
{ {
"type": "java_autopilot", "type": "java_autopilot",
"name": "JavaAutopilot", "name": "JavaAutopilot",
...@@ -75,4 +85,4 @@ ...@@ -75,4 +85,4 @@
] ]
} }
] ]
} }
\ No newline at end of file
...@@ -159,4 +159,4 @@ ...@@ -159,4 +159,4 @@
</distributionManagement> </distributionManagement>
</project> </project>
\ No newline at end of file
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