From e7a1d29c8430995181ac53a83d4a84887f1f32d1 Mon Sep 17 00:00:00 2001 From: Benjamin Braatz Date: Mon, 15 Feb 2021 14:32:59 +0100 Subject: [PATCH] Tweak --- conf.json | 20 ++------------------ schaltschrank/config.py | 12 ++++++------ 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/conf.json b/conf.json index a71dfb2..f2168ec 100644 --- a/conf.json +++ b/conf.json @@ -158,11 +158,7 @@ "value": true, "state": "aus" }, { "name": "motoran", - "state": "motoran" }, - { "name": "pinstate", - "pin": "Prozesskraftüberwachung aus", - "value": true, - "state": "aus" } ] }, + "state": "motoran" } ] }, "motoran": { "commands": [ { "name": "setpin", @@ -177,11 +173,7 @@ "value": true, "state": "notaus" }, { "name": "motoraus", - "state": "an" }, - { "name": "pinstate", - "pin": "Prozesskraftüberwachung aus", - "value": true, - "state": "aus" } ] } }, + "state": "an" } ] } }, "init": "aus" }, { "name": "Motor", "states": @@ -345,13 +337,5 @@ { "name": "pinstate", "pin": "Stop", "value": true, - "state": "dauerokay" }, - { "name": "pinstate", - "pin": "Prozesskraftüberwachung aus", - "value": true, - "state": "dauerokay" }, - { "name": "pinstate", - "pin": "Prozesskraftüberwachung stop", - "value": true, "state": "dauerokay" } ] } }, "init": "nichtokay" } ] } diff --git a/schaltschrank/config.py b/schaltschrank/config.py index 86b5b5a..ab1aa16 100644 --- a/schaltschrank/config.py +++ b/schaltschrank/config.py @@ -79,25 +79,25 @@ async def fu_handler(queues, fu): elif event['name'] == 'tippenvor': for out_queue in queues: await out_queue.put({'name': 'motoran'}) - await fu.set_frequency(25) + await fu.set_frequency(30) await fu.start_inverter() - await asyncio.sleep(0.15) + await asyncio.sleep(0.2) await fu.stop_inverter() for out_queue in queues: await out_queue.put({'name': 'motoraus'}) - await asyncio.sleep(1) + await asyncio.sleep(0.5) for out_queue in queues: await out_queue.put({'name': 'tippenfertig'}) elif event['name'] == 'tippenrück': for out_queue in queues: await out_queue.put({'name': 'motoran'}) - await fu.set_frequency(-25) + await fu.set_frequency(-30) await fu.start_inverter() - await asyncio.sleep(0.15) + await asyncio.sleep(0.2) await fu.stop_inverter() for out_queue in queues: await out_queue.put({'name': 'motoraus'}) - await asyncio.sleep(1) + await asyncio.sleep(0.5) for out_queue in queues: await out_queue.put({'name': 'tippenfertig'}) in_queue.task_done() -- 2.34.1