Cable refactoring

diff --git a/conf.json b/conf.json
index d587bdbba33e3e05a56be9da1245331ea8bb7b96..a71dfb2cec209da08bb18c5df77fe6f9c5522fb9 100644 (file)
--- a/conf.json
+++ b/conf.json
@@ -5,8 +5,8 @@
       "pins":
       [ [ "A1-1", "T1-1", "Motorschütz" ], [ "A1-2", "T1-2" ],
         [ "A1-3", "T1-3", "Zentralschmierung" ], [ "A1-4", "T1-4", "Ölpumpe" ],
-        [ "A1-5", "T1-5" ], [ "A1-6", "T1-6" ],
-        [ "A1-7", "T1-7" ], [ "A1-8", "T1-8" ] ] },
+        [ "A1-5", "T1-5" ], [ "A1-6", "T1-6", "Notaus Schaltschrank Lampe" ],
+        [ "A1-7", "T1-7" ], [ "A1-8", "T1-8", "Notaus Maschine Lampe" ] ] },
     { "name": "A2",
       "type": "output",
       "address": 57,
@@ -14,7 +14,7 @@
       [ [ "A2-1", "T1-9" ], [ "A2-2", "T1-10" ],
         [ "A2-3", "T1-11" ], [ "A2-4", "T1-12" ],
         [ "A2-5", "T1-13" ], [ "A2-6", "T1-14", "Öllampe" ],
-        [ "A2-7", "T1-15" ], [ "A2-8", "T1-16" ] ] },
+        [ "A2-7", "T1-15", "Vorwärmgerät" ], [ "A2-8", "T1-16" ] ] },
     { "name": "E1",
       "type": "input",
       "address": 32,
@@ -22,15 +22,15 @@
       "pins":
       [ [ "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" ],
-        [ "E1-7", "T1-24" ], [ "E1-8", "T1-25", "Schwungrad" ] ] },
+        [ "E1-5", "T1-22" ], [ "E1-6", "T1-23", "Notaus Schaltschrank" ],
+        [ "E1-7", "T1-24" ], [ "E1-8", "T1-25" ] ] },
     { "name": "E2",
       "type": "input",
       "address": 33,
       "interrupt pin": 17,
       "pins":
-      [ [ "E2-1", "T1-26" ], [ "E2-2", "T1-27" ],
-        [ "E2-3", "T1-28" ], [ "E2-4", "T1-29" ],
+      [ [ "E2-1", "T1-26", "Notaus" ], [ "E2-2", "T1-27", "Prozesskraftüberwachung aus" ],
+        [ "E2-3", "T1-28", "Prozesskraftüberwachung stop" ], [ "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" ], [ "E3-2", "T2-2", "Notaus" ],
+      [ [ "E3-1", "T2-1", "Schwungrad" ], [ "E3-2", "T2-2", "Notaus Maschine" ],
         [ "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" ] ] },
@@ -60,7 +60,53 @@
   { "serial device": "/dev/serial0",
     "slave id": 1 },
   "statemachines":
-  [ { "name": "Schmierung",
+  [ { "name": "Notaus Schaltschrank",
+      "states":
+      { "aus":
+        { "commands":
+          [ { "name": "setpin",
+              "pin": "Notaus Schaltschrank Lampe",
+              "value": false } ],
+          "events":
+          [ { "name": "pinstate",
+              "pin": "Notaus Schaltschrank",
+              "value": true,
+              "state": "an" } ] },
+        "an":
+        { "commands":
+          [ { "name": "setpin",
+              "pin": "Notaus Schaltschrank Lampe",
+              "value": true } ],
+          "events":
+          [ { "name": "pinstate",
+              "pin": "Notaus Schaltschrank",
+              "value": false,
+              "state": "aus" } ] } },
+      "init": "aus" },
+    { "name": "Notaus Maschine",
+      "states":
+      { "aus":
+        { "commands":
+          [ { "name": "setpin",
+              "pin": "Notaus Maschine Lampe",
+              "value": false } ],
+          "events":
+          [ { "name": "pinstate",
+              "pin": "Notaus Maschine",
+              "value": true,
+              "state": "an" } ] },
+        "an":
+        { "commands":
+          [ { "name": "setpin",
+              "pin": "Notaus Maschine Lampe",
+              "value": true } ],
+          "events":
+          [ { "name": "pinstate",
+              "pin": "Notaus Maschine",
+              "value": false,
+              "state": "aus" } ] } },
+      "init": "aus" },
+    { "name": "Schmierung",
       "states":
       { "notaus":
         { "commands":
@@ -112,7 +158,11 @@
               "value": true,
               "state": "aus" },
             { "name": "motoran",
-              "state": "motoran" } ] },
+              "state": "motoran" },
+            { "name": "pinstate",
+              "pin": "Prozesskraftüberwachung aus",
+              "value": true,
+              "state": "aus" } ] },
         "motoran":
         { "commands":
           [ { "name": "setpin",
@@ -127,7 +177,11 @@
               "value": true,
               "state": "notaus" },
             { "name": "motoraus",
-              "state": "an" } ] } },
+              "state": "an" },
+            { "name": "pinstate",
+              "pin": "Prozesskraftüberwachung aus",
+              "value": true,
+              "state": "aus" } ] } },
       "init": "aus" },
     { "name": "Motor",
       "states":
@@ -139,6 +193,9 @@
               "value": false },
             { "name": "setpin",
               "pin": "Öllampe",
+              "value": false },
+            { "name": "setpin",
+              "pin": "Vorwärmgerät",
               "value": false } ],
           "events":
           [ { "name": "pinstate",
@@ -155,7 +212,10 @@
               "pin": "Öllampe",
               "value": false },
             { "name": "getpin",
-              "pin": "Öldruck" } ],
+              "pin": "Öldruck" },
+            { "name": "setpin",
+              "pin": "Vorwärmgerät",
+              "value": false } ],
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
@@ -175,7 +235,10 @@
               "pin": "Öllampe",
               "value": true },
             { "name": "getpin",
-              "pin": "Tippen" } ],
+              "pin": "Tippen" },
+            { "name": "setpin",
+              "pin": "Vorwärmgerät",
+              "value": false } ],
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
@@ -243,7 +306,10 @@
               "pin": "Öllampe",
               "value": true },
             { "name": "getpin",
-              "pin": "Tippen" } ],
+              "pin": "Tippen" },
+            { "name": "setpin",
+              "pin": "Vorwärmgerät",
+              "value": false } ],
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
@@ -263,7 +329,10 @@
               "state": "dauervor" } ] },
         "dauervor":
         { "commands":
-          [ { "name": "dauervor" } ],
+          [ { "name": "dauervor" },
+            { "name": "setpin",
+              "pin": "Vorwärmgerät",
+              "value": true } ],
           "events":
           [ { "name": "pinstate",
               "pin": "Notaus",
@@ -276,5 +345,13 @@
             { "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/web/index.html b/web/index.html
index 837110bcf95c5a1390252d8538503867e14dd3e4..acb8f7a5a1c490cd86ef0f5b84c9d9275fe7f438 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -34,53 +34,57 @@
                        }
             })
             ws.addEventListener('open', function (event) {
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Notaus'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Stop'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Tippen'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Schmierung'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Vorlauf'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Rücklauf'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Öllampe'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Motorschütz'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Zentralschmierung'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Zentralschmierung Rückmeldung'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Ölpumpe'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Öllampe'}))
+                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: 'Schwungrad'}))
+                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'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Öldruck'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Bruchplatte'}))
                 ws.send(JSON.stringify({name: 'getpin', pin: 'Bruchplatte Einzug'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Motorschütz'}))
-                ws.send(JSON.stringify({name: 'getpin', pin: 'Motorschütz Rückmeldung'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Schwungrad'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Notaus Maschine'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Stop'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Tippen'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Schmierung'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Vorlauf'}))
+                ws.send(JSON.stringify({name: 'getpin', pin: 'Rücklauf'}))
             })
         </script>
         <h1>ControlPi</h1>
         <section>
             <h2>Kontrollfeld</h2>
-            <div id="Notaus">Notaus</div>
+            <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>
-            <div id="Öllampe">Öllampe</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>
-            <div id="Motorschütz">Motorschütz</div>
-            <div id="Motorschütz Rückmeldung">Motorschütz Rückmeldung</div>
         </section>
         <section>
             <h2>Sensoren</h2>
-            <div id="Schwungrad">Schwungrad</div>
+            <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="Okay">Okay</div>
         </section>
     </body>