Remove specific confs and change to generic debug conf.

diff --git a/home/pi/conf-industriepi.json b/home/pi/conf-industriepi.json
deleted file mode 100644 (file)
index dac7db3..0000000
--- a/home/pi/conf-industriepi.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "ControlPi-Master": {
-        "plugin": "WSClient",
-        "url": "ws://graph-hsv-hsrobotics-com.castle:8080",
-        "interface": "eth0",
-        "up filter": [ ],
-        "down filter": [ { "target": { "const": "" } } ]
-    }
-}

diff --git a/home/pi/conf-lightpi.json b/home/pi/conf-lightpi.json
deleted file mode 100644 (file)
index f289c65..0000000
--- a/home/pi/conf-lightpi.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "ControlPi-Master": {
-        "plugin": "WSClient",
-        "url": "ws://graph-castle-screwerk-com.castle:8080",
-        "interface": "eth0",
-        "up filter": [ ],
-        "down filter": [ { "target": { "const": "" } } ]
-    }
-}

diff --git a/home/pi/conf-test.json b/home/pi/conf-test.json
deleted file mode 100644 (file)
index 0eeae26..0000000
--- a/home/pi/conf-test.json
+++ /dev/null
@@ -1,489 +0,0 @@
-{
-    "Debug": {
-        "plugin": "WSServer",
-        "web": {
-            "/": {
-                "module": "controlpi_plugins.wsserver",
-                "location": "Debug"
-            }
-        }
-    },
-    "Log": {
-        "plugin": "Log",
-        "filter": [{}]
-    },
-    "Output Card 1": {
-        "plugin": "OutputCard",
-        "address": 56,
-        "pins": {
-            "A1-1": 0, "A1-2": 1, "A1-3": 2, "A1-4": 3,
-            "A1-5": 4, "A1-6": 5, "A1-7": 6, "A1-8": 7
-        }
-    },
-    "Output Card 2": {
-        "plugin": "OutputCard",
-        "address": 57,
-        "pins": {
-            "A2-1": 0, "A2-2": 1, "A2-3": 2, "A2-4": 3,
-            "A2-5": 4, "A2-6": 5, "A2-7": 6, "A2-8": 7
-        }
-    },
-    "Input Card 1": {
-        "plugin": "InputCard",
-        "address": 32,
-        "interrupt pin": 4,
-        "pins": {
-            "E1-1": 0, "E1-2": 1, "E1-3": 2, "E1-4": 3,
-            "E1-5": 4, "E1-6": 5, "E1-7": 6, "E1-8": 7
-        }
-    },
-    "Input Card 2": {
-        "plugin": "InputCard",
-        "address": 33,
-        "interrupt pin": 17,
-        "pins": {
-            "E2-1": 0, "E2-2": 1, "E2-3": 2, "E2-4": 3,
-            "E2-5": 4, "E2-6": 5, "E2-7": 6, "E2-8": 7
-        }
-    },
-    "Input Card 3": {
-        "plugin": "InputCard",
-        "address": 34,
-        "interrupt pin": 27,
-        "pins": {
-            "E3-1": 0, "E3-2": 1, "E3-3": 2, "E3-4": 3,
-            "E3-5": 4, "E3-6": 5, "E3-7": 6, "E3-8": 7
-        }
-    },
-    "Input Card 4": {
-        "plugin": "InputCard",
-        "address": 35,
-        "interrupt pin": 22,
-        "pins": {
-            "E4-1": 0, "E4-2": 1, "E4-3": 2, "E4-4": 3,
-            "E4-5": 4, "E4-6": 5, "E4-7": 6, "E4-8": 7
-        }
-    },
-    "Test Init": {
-        "plugin": "Init",
-        "messages": [{ "target": "Test On", "command": "start" }]
-    },
-    "Test Wait": {
-        "plugin": "GenericWait"
-    },
-    "Test A1-1 On": {
-        "plugin": "Alias",
-        "from": {
-            "target": { "const": "Test On" },
-            "command": { "const": "start" }
-        },
-        "to": [
-            { "target": "A1-1", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-1 On" }
-        ]
-    },
-    "Test A1-1 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-1 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-1", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-1 Off" }
-        ]
-    },
-    "Test A1-2 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-1 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-2", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-2 On" }
-        ]
-    },
-    "Test A1-2 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-2 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-2", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-2 Off" }
-        ]
-    },
-    "Test A1-3 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-2 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-3", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-3 On" }
-        ]
-    },
-    "Test A1-3 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-3 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-3", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-3 Off" }
-        ]
-    },
-    "Test A1-4 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-3 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-4", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-4 On" }
-        ]
-    },
-    "Test A1-4 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-4 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-4", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-4 Off" }
-        ]
-    },
-    "Test A1-5 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-4 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-5", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-5 On" }
-        ]
-    },
-    "Test A1-5 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-5 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-5", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-5 Off" }
-        ]
-    },
-    "Test A1-6 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-5 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-6", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-6 On" }
-        ]
-    },
-    "Test A1-6 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-6 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-6", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-6 Off" }
-        ]
-    },
-    "Test A1-7 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-6 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-7", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-7 On" }
-        ]
-    },
-    "Test A1-7 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-7 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-7", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-7 Off" }
-        ]
-    },
-    "Test A1-8 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-7 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-8", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-8 On" }
-        ]
-    },
-    "Test A1-8 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-8 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A1-8", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A1-8 Off" }
-        ]
-    },
-    "Test A2-1 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A1-8 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-1", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-1 On" }
-        ]
-    },
-    "Test A2-1 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-1 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-1", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-1 Off" }
-        ]
-    },
-    "Test A2-2 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-1 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-2", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-2 On" }
-        ]
-    },
-    "Test A2-2 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-2 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-2", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-2 Off" }
-        ]
-    },
-    "Test A2-3 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-2 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-3", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-3 On" }
-        ]
-    },
-    "Test A2-3 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-3 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-3", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-3 Off" }
-        ]
-    },
-    "Test A2-4 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-3 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-4", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-4 On" }
-        ]
-    },
-    "Test A2-4 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-4 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-4", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-4 Off" }
-        ]
-    },
-    "Test A2-5 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-4 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-5", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-5 On" }
-        ]
-    },
-    "Test A2-5 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-5 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-5", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-5 Off" }
-        ]
-    },
-    "Test A2-6 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-5 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-6", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-6 On" }
-        ]
-    },
-    "Test A2-6 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-6 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-6", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-6 Off" }
-        ]
-    },
-    "Test A2-7 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-6 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-7", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-7 On" }
-        ]
-    },
-    "Test A2-7 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-7 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-7", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-7 Off" }
-        ]
-    },
-    "Test A2-8 On": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-7 Off" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-8", "command": "set state", "new state": true },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-8 On" }
-        ]
-    },
-    "Test A2-8 Off": {
-        "plugin": "Alias",
-        "from": {
-            "sender": { "const": "Test Wait" },
-            "id": { "const": "A2-8 On" },
-            "event": { "const": "finished" }
-        },
-        "to": [
-            { "target": "A2-8", "command": "set state", "new state": false },
-            { "target": "Test Wait", "command": "wait",
-              "seconds": 0.1, "id": "A2-8 Off" }
-        ]
-    }
-}

diff --git a/home/pi/conf.json b/home/pi/conf.json
index dac7db3e02405f5f2ad55760c6c40d011cfd26bd..86a20ffe9829e9305ce3afb189ea5bb2b51df283 100644 (file)
--- a/home/pi/conf.json
+++ b/home/pi/conf.json
@@ -1,9 +1,15 @@
 {
-    "ControlPi-Master": {
-        "plugin": "WSClient",
-        "url": "ws://graph-hsv-hsrobotics-com.castle:8080",
-        "interface": "eth0",
-        "up filter": [ ],
-        "down filter": [ { "target": { "const": "" } } ]
+    "Debug": {
+        "plugin": "WSServer",
+        "web": {
+            "/": {
+                "module": "controlpi_plugins.wsserver",
+                "location": "Debug"
+            }
+        }
+    },
+    "Log": {
+        "plugin": "Log",
+        "filter": [{}]
     }
 }