Tweak

diff --git a/conf.json b/conf.json
index a71dfb2cec209da08bb18c5df77fe6f9c5522fb9..f2168ecb668306fa145a038bd6c4218eccee32c4 100644 (file)
--- 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 86b5b5a6d9f4c0faa434d0929f2469fec727301e..ab1aa16ef207c5e8c0042ed76177a64db744f779 100644 (file)
--- 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()