From f4b5d1a57f1beb39c583ab77248c8a246c892882 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 20 Mar 2016 20:00:09 +0100 Subject: [PATCH] separate hwc+cc --- contrib/html/img/cc.svg | 33 ++++++++ contrib/html/img/hwc.svg | 155 +++++++++++++++++++----------------- contrib/html/items/cc.json | 13 +++ contrib/html/items/hwc.json | 8 +- 4 files changed, 130 insertions(+), 79 deletions(-) create mode 100644 contrib/html/img/cc.svg create mode 100644 contrib/html/items/cc.json diff --git a/contrib/html/img/cc.svg b/contrib/html/img/cc.svg new file mode 100644 index 00000000..21d2c73c --- /dev/null +++ b/contrib/html/img/cc.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/contrib/html/img/hwc.svg b/contrib/html/img/hwc.svg index f48cf4bd..fa6bb04d 100644 --- a/contrib/html/img/hwc.svg +++ b/contrib/html/img/hwc.svg @@ -1,179 +1,186 @@ - - + - + + - + + - + + - + - - - - - - - - - - - + + + + + + + + + + + + + + - + + - + - + - + + - + - + + - + - + + - + + - + + - + - + + - + - + + - + - + - + + - + + - + - + + - + + - + + - + - + + - + - + + - + - + + - + + - + + - + + - + + - + - + - - - - - - - - - - - - - - - - - - - - - + + - - + + + \ No newline at end of file diff --git a/contrib/html/items/cc.json b/contrib/html/items/cc.json new file mode 100644 index 00000000..b99d549a --- /dev/null +++ b/contrib/html/items/cc.json @@ -0,0 +1,13 @@ +{ + "title": "Zirkulation", + "bounds": [610,80,54,18], + "image": "cc.svg", + "endpoints": [ + {"name": "Flow", "anchor": [0, 0.5, -1, 0], "target": true, "distance": [0,0,0.5], "connectWith": ["hwc", "Return"]}, + {"name": "Return", "anchor": [1, 0.5, 1, 0], "connectWith": [null, "HwcReturn"]} + ], + "items": [ + {"circuit": "ehp", "name": "CirPump", "topc": 0.5, "leftc": 0.5}, + {"circuit": "cc", "name": "Mode", "format": "$1 $0", "top": 1, "leftc": 0.5} + ] +} diff --git a/contrib/html/items/hwc.json b/contrib/html/items/hwc.json index 2a20fb93..d629084e 100644 --- a/contrib/html/items/hwc.json +++ b/contrib/html/items/hwc.json @@ -1,14 +1,12 @@ { "title": "Warmwasser", - "bounds": [510,40,174,52], + "bounds": [516,0,161,52], "image": "hwc.svg", "endpoints": [ {"name": "Flow", "anchor": [0, 0.82, -1, 0], "target": true, "distance": [40,0,0.5], "connectWith": [null, "HwcFlow"]}, - {"name": "Return", "anchor": [1, 0.82, 1, 0], "connectWith": [null, "HwcReturn"]} + {"name": "Return", "anchor": [1, 0.82, 1, 0]} ], "items": [ - {"name": "OperatingMode", "topc": 0.2, "left": 0.6}, - {"circuit": "ehp", "name": "CirPump", "topc": 0.8, "leftc": 0.85}, - {"circuit": "cc", "name": "Mode", "format": "$1 $0", "top": 1, "left": 0.6} + {"name": "OperatingMode", "topc": 0.2, "left": 0} ] }