Tweaks from Testing

diff --git a/conf.json b/conf.json
index f2168ecb668306fa145a038bd6c4218eccee32c4..631349db816b63b2a48d7d9424c4362bc522be82 100644 (file)
--- a/conf.json
+++ b/conf.json
@@ -23,14 +23,14 @@
       [ [ "E1-1", "T1-18", "Motorschütz Rückmeldung" ], [ "E1-2", "T1-19" ],
         [ "E1-3", "T1-20", "Zentralschmierung Rückmeldung" ], [ "E1-4", "T1-21", "Ölpumpe Rückmeldung" ],
         [ "E1-5", "T1-22" ], [ "E1-6", "T1-23", "Notaus Schaltschrank" ],
-        [ "E1-7", "T1-24" ], [ "E1-8", "T1-25" ] ] },
+        [ "E1-7", "T1-24" ], [ "E1-8", "T1-25", "Notaus Maschine" ] ] },
     { "name": "E2",
       "type": "input",
       "address": 33,
       "interrupt pin": 17,
       "pins":
-      [ [ "E2-1", "T1-26", "Notaus" ], [ "E2-2", "T1-27", "Prozesskraftüberwachung aus" ],
-        [ "E2-3", "T1-28", "Prozesskraftüberwachung stop" ], [ "E2-4", "T1-29" ],
+      [ [ "E2-1", "T1-26" ], [ "E2-2", "T1-27", "Notaus" ],
+        [ "E2-3", "T1-28" ], [ "E2-4", "T1-29" ],
         [ "E2-5", "T1-30", "Takt" ], [ "E2-6", "T1-31", "Öldruck" ],
         [ "E2-7", "T1-32", "Bruchplatte" ], [ "E2-8", "T1-33", "Bruchplatte Einzug" ] ] },
     { "name": "E3",
@@ -38,7 +38,7 @@
       "address": 34,
       "interrupt pin": 27,
       "pins":
-      [ [ "E3-1", "T2-1", "Schwungrad" ], [ "E3-2", "T2-2", "Notaus Maschine" ],
+      [ [ "E3-1", "T2-1", "Schwungrad" ], [ "E3-2", "T2-2" ],
         [ "E3-3", "T2-3", "Stop" ], [ "E3-4", "T2-4", "Tippen" ],
         [ "E3-5", "T2-5", "Schmierung" ], [ "E3-6", "T2-6", "Vorlauf" ],
         [ "E3-7", "T2-7", "Rücklauf" ], [ "E3-8", "T2-8" ] ] },
@@ -48,7 +48,7 @@
       "interrupt pin": 22,
       "pins":
       [ [ "E4-1", "T2-9" ], [ "E4-2", "T2-10" ],
-        [ "E4-3", "T2-11" ], [ "E4-4", "T2-12" ],
+        [ "E4-3", "T2-11", "Prozesskraftüberwachung aus" ], [ "E4-4", "T2-12", "Prozesskraftüberwachung stop" ],
         [ "E4-5", "T2-13" ], [ "E4-6", "T2-14" ],
         [ "E4-7", "T2-15" ], [ "E4-8", "T2-16" ] ] } ],
   "andpins":
@@ -119,7 +119,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": false,
+              "value": true,
               "state": "aus" } ] },
         "aus":
         { "commands":
@@ -132,7 +132,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Schmierung",
@@ -151,14 +151,18 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Schmierung",
               "value": true,
               "state": "aus" },
             { "name": "motoran",
-              "state": "motoran" } ] },
+              "state": "motoran" },
+           { "name": "pinstate",
+             "pin": "Prozesskraftüberwachung aus",
+             "value": false,
+             "state": "aus" } ] },
         "motoran":
         { "commands":
           [ { "name": "setpin",
@@ -170,10 +174,14 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "motoraus",
-              "state": "an" } ] } },
+              "state": "an" },
+           { "name": "pinstate",
+             "pin": "Prozesskraftüberwachung aus",
+             "value": false,
+             "state": "aus" } ] } },
       "init": "aus" },
     { "name": "Motor",
       "states":
@@ -192,7 +200,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": false,
+              "value": true,
               "state": "nichtokay" } ] },
         "nichtokay":
         { "commands":
@@ -211,7 +219,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Okay",
@@ -234,7 +242,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Okay",
@@ -258,7 +266,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Okay",
@@ -276,7 +284,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Okay",
@@ -305,7 +313,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Okay",
@@ -328,7 +336,7 @@
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
-              "value": true,
+              "value": false,
               "state": "notaus" },
             { "name": "pinstate",
               "pin": "Okay",
@@ -337,5 +345,17 @@
             { "name": "pinstate",
               "pin": "Stop",
               "value": true,
-              "state": "dauerokay" } ] } },
+              "state": "dauerokay" },
+           { "name": "pinstate",
+             "pin": "Prozesskraftüberwachung aus",
+             "value": false,
+             "state": "dauerokay" },
+           { "name": "pinstate",
+             "pin": "Prozesskraftüberwachung stop",
+             "value": false,
+             "state": "dauerokay" },
+           { "name": "pinstate",
+             "pin": "Tippen",
+             "value": true,
+             "state": "tippenokay" } ] } },
       "init": "nichtokay" } ] }

diff --git a/schaltschrank/config.py b/schaltschrank/config.py
index 65d75a8873e0753b4df9faa30262ec9e9a1a7ee9..ab1aa16ef207c5e8c0042ed76177a64db744f779 100644 (file)
--- a/schaltschrank/config.py
+++ b/schaltschrank/config.py
@@ -81,7 +81,7 @@ async def fu_handler(queues, fu):
                 await out_queue.put({'name': 'motoran'})
             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'})
@@ -93,7 +93,7 @@ async def fu_handler(queues, fu):
                 await out_queue.put({'name': 'motoran'})
             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'})

diff --git a/web/index.html b/web/index.html
index acb8f7a5a1c490cd86ef0f5b84c9d9275fe7f438..3fe948b9bb36ad4243d03ebff232bf2fc2db5c3d 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -37,10 +37,15 @@
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Motorschütz'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Zentralschmierung'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Ölpumpe'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Notaus Schaltschrank Lampe'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Notaus Maschine Lampe'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Öllampe'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Vorwärmgerät'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Motorschütz Rückmeldung'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Zentralschmierung Rückmeldung'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Ölpumpe Rückmeldung'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Notaus Schaltschrank'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Notaus'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Prozesskraftüberwachung aus'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Prozesskraftüberwachung stop'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Takt'}))
@@ -58,33 +63,31 @@
         </script>
         <h1>ControlPi</h1>
         <section>
-            <h2>Kontrollfeld</h2>
-            <div id="Öllampe">Öllampe</div>
-            <div id="Notaus Maschine">Notaus Maschine</div>
-            <div id="Stop">Stop</div>
-            <div id="Tippen">Tippen</div>
-            <div id="Schmierung">Schmierung</div>
-            <div id="Vorlauf">Vorlauf</div>
-            <div id="Rücklauf">Rücklauf</div>
-        </section>
-        <section>
-            <h2>Schütze</h2>
-            <div id="Motorschütz">Motorschütz</div>
-            <div id="Motorschütz Rückmeldung">Motorschütz Rückmeldung</div>
-            <div id="Zentralschmierung">Zentralschmierung</div>
-            <div id="Zentralschmierung Rückmeldung">Zentralschmierung Rückmeldung</div>
-            <div id="Ölpumpe">Ölpumpe</div>
-            <div id="Ölpumpe Rückmeldung">Ölpumpe Rückmeldung</div>
-        </section>
-        <section>
-            <h2>Sensoren</h2>
-            <div id="Prozesskraftüberwachung aus">Prozesskraftüberwachung aus</div>
-            <div id="Prozesskraftüberwachung stop">Prozesskraftüberwachung stop</div>
-            <div id="Takt">Takt</div>
-            <div id="Öldruck">Öldruck</div>
-            <div id="Bruchplatte">Bruchplatte</div>
-            <div id="Bruchplatte Einzug">Bruchplatte Einzug</div>
-            <div id="Schwungrad">Schwungrad</div>
+            <div id="Motorschütz">Motorschütz (T1-1)</div>
+            <div id="Zentralschmierung">Zentralschmierung (T1-3)</div>
+            <div id="Ölpumpe">Ölpumpe (T1-4)</div>
+            <div id="Notaus Schaltschrank Lampe">Notaus Schaltschrank Lampe (T1-6)</div>
+            <div id="Notaus Maschine Lampe">Notaus Maschine Lampe (T1-8)</div>
+            <div id="Öllampe">Öllampe (T1-14)</div>
+            <div id="Vorwärmgerät">Vorwärmgerät (T1-15)</div>
+            <div id="Motorschütz Rückmeldung">Motorschütz Rückmeldung (T1-18)</div>
+            <div id="Zentralschmierung Rückmeldung">Zentralschmierung Rückmeldung (T1-20)</div>
+            <div id="Ölpumpe Rückmeldung">Ölpumpe Rückmeldung (T1-21)</div>
+            <div id="Notaus Schaltschrank">Notaus Schaltschrank (T1-23)</div>
+            <div id="Notaus Maschine">Notaus Maschine (T1-25)</div>
+            <div id="Notaus">Notaus (T1-27)</div>
+            <div id="Takt">Takt (T1-30)</div>
+            <div id="Öldruck">Öldruck (T1-31)</div>
+            <div id="Bruchplatte">Bruchplatte (T1-32)</div>
+            <div id="Bruchplatte Einzug">Bruchplatte Einzug (T1-33)</div>
+            <div id="Schwungrad">Schwungrad (T2-1)</div>
+            <div id="Stop">Stop (T2-3)</div>
+            <div id="Tippen">Tippen (T2-4)</div>
+            <div id="Schmierung">Schmierung (T2-5)</div>
+            <div id="Vorlauf">Vorlauf (T2-6)</div>
+            <div id="Rücklauf">Rücklauf (T2-7)</div>
+            <div id="Prozesskraftüberwachung aus">Prozesskraftüberwachung aus (T2-11)</div>
+            <div id="Prozesskraftüberwachung stop">Prozesskraftüberwachung stop (T2-12)</div>
             <div id="Okay">Okay</div>
         </section>
     </body>