nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated to new conditions, started dynamic switching of pipes

Browse Source
This commit is contained in:
john30
2016-03-20 20:04:59 +01:00
parent 5b54666f39
commit 513a89b0e6
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/html/items/ehp.json
+14 -14
View File
@@ -9,10 +9,10 @@
"bounds": [-130,108,80,100], "bounds": [-130,108,80,100],
"endpoints": [ "endpoints": [
{"name": "Flow", "anchor": [0.25, 0, 0, -1], "label": "Source", {"name": "Flow", "anchor": [0.25, 0, 0, -1], "label": "Source",
"connectWith": ["ehp", "SourceInput", "ehp", "SourceTempInput", "0"] "connectWith": ["ehp", "SourceInput", "ehp", "SourceTempInput", "$temp"]
}, },
{"name": "Return", "anchor": [0.75, 0, 0, -1], "target": true, "label": "Source", {"name": "Return", "anchor": [0.75, 0, 0, -1], "target": true, "label": "Source",
"connectWith": ["ehp", "SourceOutput", "ehp", "SourceTempOutput", "0"] "connectWith": ["ehp", "SourceOutput", "ehp", "SourceTempOutput", "$temp"]
} }
] ]
}, },
@@ -24,15 +24,15 @@
"image": "valve.svg", "image": "valve.svg",
"endpoints": [ "endpoints": [
{"name": "Flow", "anchor": "Top", "target": true, {"name": "Flow", "anchor": "Top", "target": true,
"connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "0"] "connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "$temp"]
}, },
{"name": "HwcFlow", "anchor": "Right", {"name": "HwcFlow", "anchor": "Right",
"connectWith": ["storage", "HwcInput"], "connectWith": ["storage", "HwcInput"],
"update": {"type": ["hot", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "on"]]} "update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "on"]}
}, },
{"name": "HcFlow", "anchor": "Left", {"name": "HcFlow", "anchor": "Left",
"connectWith": ["storage", "HcInput", "ehp", "HcFlowTemp", "0"], "connectWith": ["storage", "HcInput", "ehp", "HcFlowTemp", "$temp"],
"update": {"type": ["cold", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "off"]]} "update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "off"]}
} }
], ],
"items": [ "items": [
@@ -86,7 +86,7 @@
"endpoints": [ "endpoints": [
{"name": "HcFlow", "anchor": [1, 0.15, 1, 0]}, {"name": "HcFlow", "anchor": [1, 0.15, 1, 0]},
{"name": "HcInput", "anchor": [0, 0.15, -1, 0], "target": true, {"name": "HcInput", "anchor": [0, 0.15, -1, 0], "target": true,
"connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "0"] "connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "$temp"]
}, },
{"name": "HcReturn", "anchor": [1, 0.85, 1, 0], "target": true, "distance": [0,0,0.7]}, {"name": "HcReturn", "anchor": [1, 0.85, 1, 0], "target": true, "distance": [0,0,0.7]},
{"name": "HcOutput", "anchor": [0, 0.85, -1, 0]} {"name": "HcOutput", "anchor": [0, 0.85, -1, 0]}
@@ -98,19 +98,19 @@
} }
], ],
"endpoints": [ "endpoints": [
{"name": "SourceOutput", "anchor": [0.12, 0, 0, -1], "label": "Source", "update": {"name": "SourceOutput", "anchor": [0.12, 0, 0, -1], "label": "Source",
{"type": ["cold", "off"], "condition": ["ehp", "Source", "on"]} "update": {"type": ["cold", "off"], "condition": ["ehp", "Source", "on"]}
}, },
{"name": "SourceInput", "anchor": [0.22, 0, 0, -1], "target": true, "label": "Source", "distance": [0,60], "update": {"name": "SourceInput", "anchor": [0.22, 0, 0, -1], "target": true, "label": "Source", "distance": [0,60],
{"type": ["hot", "off"], "condition": ["ehp", "Source", "on"]} "update": {"type": ["hot", "off"], "condition": ["ehp", "Source", "on"]}
}, },
{"name": "HwcReturn", "anchor": [0.53, 0, 0, -1], "target": true, "distance": [0,80,0.3], {"name": "HwcReturn", "anchor": [0.53, 0, 0, -1], "target": true, "distance": [0,80,0.3],
"connectWith": ["storage", "HwcOutput"], "connectWith": ["storage", "HwcOutput"],
"update": {"type": ["hot", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "on"]]} "update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "on"]}
}, },
{"name": "HcReturn", "anchor": [0.78, 0, 0, -1], "target": true, "distance": [0,60,0.42], {"name": "HcReturn", "anchor": [0.78, 0, 0, -1], "target": true, "distance": [0,60,0.42],
"connectWith": ["storage", "HcOutput", "ehp", "HcReturnTemp", "0"], "connectWith": ["storage", "HcOutput", "ehp", "HcReturnTemp", "$temp"],
"update": {"type": ["cold", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "off"]]} "update": {"type": ["cold", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "off"]}
}, },
{"name": "HcFlow", "anchor": [0.88, 0, 0, -1], "priority": 1, {"name": "HcFlow", "anchor": [0.88, 0, 0, -1], "priority": 1,
"update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on"]} "update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on"]}
contrib/html/items/mc.4.json
+4 -2
View File
@@ -5,8 +5,10 @@
"endpoints": [ "endpoints": [
{"name":"Flow", "anchor": [0, 0.82, -1, 0], "target": true, "distance": [0,0,0.7], "connectWith": [null, "HcFlow"]}, {"name":"Flow", "anchor": [0, 0.82, -1, 0], "target": true, "distance": [0,0,0.7], "connectWith": [null, "HcFlow"]},
{"name":"Return", "anchor": [0, 0.96, -1, 0], "connectWith": [null, "HcReturn"]}, {"name":"Return", "anchor": [0, 0.96, -1, 0], "connectWith": [null, "HcReturn"]},
{"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true}, {"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true,
{"name":"HcReturn", "anchor": [1, 0.96, 1, 0]} "update": {"type": ["hot", "off"], "condition": ["mc", "HcPumpPort", "on"]}},
{"name":"HcReturn", "anchor": [1, 0.96, 1, 0],
"update": {"type": ["cold", "off"], "condition": ["mc", "HcPumpPort", "on"]}}
], ],
"items": [ "items": [
{"name": "Status", "format": "$2", "top": 0.04, "left": 0.04}, {"name": "Status", "format": "$2", "top": 0.04, "left": 0.04},
contrib/html/items/mc.json
+4 -2
View File
@@ -5,8 +5,10 @@
"endpoints": [ "endpoints": [
{"name":"Flow", "anchor": [0, 0.82, -1, 0], "target": true, "distance": [0,0,0.7], "connectWith": [null, "HcFlow"]}, {"name":"Flow", "anchor": [0, 0.82, -1, 0], "target": true, "distance": [0,0,0.7], "connectWith": [null, "HcFlow"]},
{"name":"Return", "anchor": [0, 0.96, -1, 0], "connectWith": [null, "HcReturn"]}, {"name":"Return", "anchor": [0, 0.96, -1, 0], "connectWith": [null, "HcReturn"]},
{"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true}, {"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true,
{"name":"HcReturn", "anchor": [1, 0.96, 1, 0]} "update": {"type": ["hot", "off"], "condition": ["ehp", "Hc2Pump", "on"]}},
{"name":"HcReturn", "anchor": [1, 0.96, 1, 0],
"update": {"type": ["cold", "off"], "condition": ["ehp", "Hc2Pump", "on"]}}
], ],
"items": [ "items": [
{"name": "Status", "format": "$2", "top": 0.04, "left": 0.04}, {"name": "Status", "format": "$2", "top": 0.04, "left": 0.04},