From afab73f4f4abd63c076a58d443d3bf590a87e7d3 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sat, 25 Feb 2017 16:20:56 +0100
Subject: [PATCH] updated to latest mcmode.inc

---
 contrib/html/items/mc.4.json | 7 ++++---
 contrib/html/items/mc.json   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/contrib/html/items/mc.4.json b/contrib/html/items/mc.4.json
index 065c40e1..3fddb19c 100644
--- a/contrib/html/items/mc.4.json
+++ b/contrib/html/items/mc.4.json
@@ -11,11 +11,12 @@
 			"update": {"type": ["cold", "off"], "condition": ["mc", "HcPumpPort", "on"]}}
 	],
 	"items": [
-		{"name": "Status", "format": "$2", "top": 0.04, "left": 0.04},
+		{"name": "Status", "format": "$flowtemp", "top": 0.04, "left": 0.04},
 		{"circuit": "uih", "name": "HcName4", "top": 0.25, "leftc": 0.5},
-		{"name": "Mode", "format": "$1 $0", "topc": 0.4, "leftc": 0.5},
+		{"name": "Mode", "format": "$mode $tempdesired $daynight", "topc": 0.4, "leftc": 0.5},
 		{"name": "HcPumpPort", "topc": 0.56, "leftc": 0.22},
 		{"name": "MixerDutyCycle", "topc": 0.73, "leftc": 0.24},
-		{"name": "Status", "format": "$1 $0", "topc": 0.9, "leftc": 0.4}
+		{"name": "Status0a", "format": "$mixer", "topc": 0.73, "leftc": 0.6},
+		{"name": "Status", "format": "$onoff $flowtempdesired", "topc": 0.9, "leftc": 0.4}
 	]
 }
diff --git a/contrib/html/items/mc.json b/contrib/html/items/mc.json
index 7fd68707..f62176ed 100644
--- a/contrib/html/items/mc.json
+++ b/contrib/html/items/mc.json
@@ -11,11 +11,12 @@
 			"update": {"type": ["cold", "off"], "condition": ["ehp", "Hc2Pump", "on"]}}
 	],
 	"items": [
-		{"name": "Status", "format": "$2", "top": 0.04, "left": 0.04},
+		{"name": "Status", "format": "$flowtemp", "top": 0.04, "left": 0.04},
 		{"circuit": "uih", "name": "HcName2", "top": 0.25, "leftc": 0.5},
-		{"name": "Mode", "format": "$1 $0", "topc": 0.4, "leftc": 0.5},
+		{"name": "Mode", "format": "$mode $tempdesired $daynight", "topc": 0.4, "leftc": 0.5},
 		{"circuit": "ehp", "name": "Hc2Pump", "topc": 0.56, "leftc": 0.22},
 		{"circuit": "ehp", "name": "Mixer1DutyCycle", "topc": 0.73, "leftc": 0.24},
-		{"name": "Status", "format": "$1 $0", "topc": 0.9, "leftc": 0.4}
+		{"name": "Status0a", "format": "$mixer", "topc": 0.73, "leftc": 0.4},
+		{"name": "Status", "format": "$onoff $flowtempdesired", "topc": 0.9, "leftc": 0.4}
 	]
 }