Commit 7ef91190 authored by Zwifi's avatar Zwifi
Browse files

Merge branch 'shapes-activation' of https://framagit.org/nseydoux/edr into shapes-activation

Conflicts:
	simulator/coopis/distribution_syndream/distribution_0_blueprint.json
	simulator/coopis/distribution_syndream/distribution_1_blueprint.json
	simulator/coopis/distribution_syndream/distribution_2_blueprint.json
	simulator/coopis/distribution_syndream/distribution_3_blueprint.json
parents e92c3c31 bf54aca0
......@@ -2,7 +2,7 @@
"type":"factory",
"floors":[{
"type":"floor",
"sensors":["presence", "luminosity", "particle_level", "temperature"],
"sensors":["particle_level", "temperature","particle_level", "temperature", "luminosity", "presence", "luminosity", "presence", "luminosity", "presence","luminosity", "presence", "luminosity", "presence", "luminosity", "presence"],
"count":1,
"conveyors":[{
"type":"conveyor",
......
......@@ -2,11 +2,11 @@
"type":"factory",
"floors":[{
"type":"floor",
"sensors":["particle_level", "temperature"],
"sensors":["particle_level", "temperature","particle_level", "temperature"],
"count":1,
"conveyors":[{
"type":"conveyor",
"sensors":["luminosity", "presence", "conveyor_state", "conveyor_speed", "supervisor_presence"],
"sensors":[ "luminosity", "presence", "luminosity", "presence", "luminosity", "presence", "conveyor_state", "conveyor_speed", "supervisor_presence"],
"count":2,
"machines":[{
"type":"spark_machine",
......
......@@ -2,19 +2,19 @@
"type":"factory",
"floors":[{
"type":"floor",
"sensors":["particle_level", "temperature"],
"sensors":[],
"count":1,
"conveyors":[{
"type":"conveyor",
"sensors":["luminosity", "presence", "conveyor_state", "conveyor_speed", "supervisor_presence"],
"sensors":["particle_level", "temperature", "luminosity", "presence", "luminosity", "presence", "luminosity", "presence", "conveyor_state", "conveyor_speed", "supervisor_presence"],
"count":2,
"machines":[{
"type":"spark_machine",
"sensors":["luminosity", "presence", "machine_state", "product_quality", "machine_speed"],
"sensors":["machine_state", "product_quality", "machine_speed"],
"count":1
},{
"type":"temperature_machine",
"sensors":["luminosity", "presence", "machine_state", "product_quality", "machine_speed"],
"sensors":["machine_state", "product_quality", "machine_speed"],
"count":1
}]
}
......
......@@ -6,15 +6,15 @@
"count":1,
"conveyors":[{
"type":"conveyor",
"sensors":["particle_level", "temperature", "luminosity", "presence", "conveyor_state", "conveyor_speed", "supervisor_presence"],
"sensors":["luminosity", "presence", "conveyor_state", "conveyor_speed", "supervisor_presence"],
"count":2,
"machines":[{
"type":"spark_machine",
"sensors":["luminosity", "presence", "machine_state", "product_quality", "machine_speed"],
"sensors":["particle_level", "luminosity", "presence", "machine_state", "product_quality", "machine_speed"],
"count":1
},{
"type":"temperature_machine",
"sensors":["luminosity", "presence", "machine_state", "product_quality", "machine_speed"],
"sensors":["temperature", "luminosity", "presence", "machine_state", "product_quality", "machine_speed"],
"count":1
}]
}
......
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