updates

sgupta999 · sgupta999 · commit 3b7fb1bd1e70 · 2019-11-18T13:29:11.000-06:00
diff --git a/devicetypes/gupta/tasmota.src/TasmotaContactSensor.groovy b/devicetypes/gupta/tasmota.src/TasmotaContactSensor.groovy
@@ -43,14 +43,14 @@ metadata {
     }
 
     tiles {		
-		multiAttributeTile(name:"main", type: "generic"){
+		multiAttributeTile(name:"main", type: "generic", canChangeIcon: 'true', canChangeBackground : 'true' ){
 			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
 				attributeState "open", label:'${name}', action: "close", icon:"st.contact.contact.open", backgroundColor:"#e86d13"
 				attributeState "closed", label:'${name}', action: "open", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc"
             }
 			
 			tileAttribute("device.device_details", key: "SECONDARY_CONTROL") {
-				attributeState("default", action: "refresh", label: '${currentValue}', icon:"st.secondary.refresh-icon")				
+				attributeState("default", action: "refresh", label: '${currentValue}', icon:"https://github.com/sgupta999/GuptaSmartthingsRepository/raw/master/icons/refresh.png")				
                 attributeState("refresh", label: 'Updating data from server...')
 			}
         }
@@ -189,6 +189,7 @@ def updateTiles(Object val ){
 		//log.debug "Are updates ready ${state.update1}, ${state.update2}, ${state.update3}, ${state.update4}"
 		//log.debug "Time is  ${state.currentTimestamp}"	
 		if (state.update1 && state.update2 && state.update3 && state.update4){
+			state.update1 = state.update2 = state.update3 = state.update4 = false;	
 			runIn(3,fireEvents)
 		}	
 }
diff --git a/devicetypes/gupta/tasmota.src/TasmotaSensorSwitch.groovy b/devicetypes/gupta/tasmota.src/TasmotaSensorSwitch.groovy
@@ -48,14 +48,14 @@ metadata {
     }
 
     tiles {		
-		multiAttributeTile(name:"main", type: "generic"){
+		multiAttributeTile(name:"main", type: "generic", canChangeIcon: 'true', canChangeBackground : 'true' ){
 			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
 				attributeState "open", label:'${name}', action: "close", icon:"st.contact.contact.open", backgroundColor:"#e86d13"
 				attributeState "closed", label:'${name}', action: "open", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc"
             }
 			
 			tileAttribute("device.device_details", key: "SECONDARY_CONTROL") {
-				attributeState("default", action: "refresh", label: '${currentValue}', icon:"st.secondary.refresh-icon")				
+				attributeState("default", action: "refresh", label: '${currentValue}', icon:"https://github.com/sgupta999/GuptaSmartthingsRepository/raw/master/icons/refresh.png")				
                 attributeState("refresh", label: 'Updating data from server...')
 			}
         }	
@@ -209,6 +209,7 @@ def updateTiles(Object val ){
 		//log.debug "Are updates ready ${state.update1}, ${state.update2}, ${state.update3}, ${state.update4}"
 		//log.debug "Time is  ${state.currentTimestamp}"	
 		if (state.update1 && state.update2 && state.update3 && state.update4){
+			state.update1 = state.update2 = state.update3 = state.update4 = false;	
 			runIn(3,fireEvents)
 		}	
 }
diff --git a/devicetypes/gupta/tasmota.src/TasmotaSwitch.groovy b/devicetypes/gupta/tasmota.src/TasmotaSwitch.groovy
@@ -41,14 +41,14 @@ metadata {
     }
 
     tiles {	
-		multiAttributeTile(name:"main", type: "device.switch", width: 6, height: 4){
+		multiAttributeTile(name:"main", type: "device.switch", width: 6, height: 4, canChangeIcon: 'true', canChangeBackground : 'true' ){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
 				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 			}		
 				
 			tileAttribute("device.device_details", key: "SECONDARY_CONTROL") {
-				attributeState("default", action: "refresh", label: '${currentValue}', icon:"st.secondary.refresh-icon")				
+				attributeState("default", action: "refresh", label: '${currentValue}', icon:"https://github.com/sgupta999/GuptaSmartthingsRepository/raw/master/icons/refresh.png")				
                 attributeState("refresh", label: 'Updating data from server...')
 			}
 		}
@@ -190,6 +190,7 @@ def updateTiles(Object val ){
 		//log.debug "Are updates ready ${state.update1}, ${state.update2}, ${state.update3}, ${state.update4}"
 		//log.debug "Time is  ${state.currentTimestamp}"	
 		if (state.update1 && state.update2 && state.update3 && state.update4){
+			state.update1 = state.update2 = state.update3 = state.update4 = false;	
 			runIn(3,fireEvents)
 		}	
 }
diff --git a/devicetypes/gupta/tasmota.src/TasmotaSwitchSensor.groovy b/devicetypes/gupta/tasmota.src/TasmotaSwitchSensor.groovy
@@ -48,14 +48,14 @@ metadata {
     }
 
     tiles {	
-		multiAttributeTile(name:"main", type: "device.switch", width: 6, height: 4){
+		multiAttributeTile(name:"main", type: "device.switch", width: 6, height: 4, canChangeIcon: 'true', canChangeBackground : 'true' ){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
 				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 			}		
 				
 			tileAttribute("device.device_details", key: "SECONDARY_CONTROL") {
-				attributeState("default", action: "refresh", label: '${currentValue}', icon:"st.secondary.refresh-icon")				
+				attributeState("default", action: "refresh", label: '${currentValue}', icon: "https://github.com/sgupta999/GuptaSmartthingsRepository/raw/master/icons/refresh.png")				
                 attributeState("refresh", label: 'Updating data from server...')
 			}
 		}
@@ -207,6 +207,7 @@ def updateTiles(Object val ){
 		//log.debug "Are updates ready ${state.update1}, ${state.update2}, ${state.update3}, ${state.update4}"
 		//log.debug "Time is  ${state.currentTimestamp}"	
 		if (state.update1 && state.update2 && state.update3 && state.update4){
+			state.update1 = state.update2 = state.update3 = state.update4 = false;	
 			runIn(3,fireEvents)
 		}	
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mqtt-bridge-smartthings",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "MQTT Bridge to SmartThings [MBS]",
   "main": "mbs-server.js",
   "bin": {
diff --git a/test/mbs-server-v2.js b/test/mbs-server-v2.js

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ metadata {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`tiles {`
`46`		`- multiAttributeTile(name:"main", type: "generic"){`
	`46`	`+ multiAttributeTile(name:"main", type: "generic", canChangeIcon: 'true', canChangeBackground : 'true' ){`
`47`	`47`	`tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {`
`48`	`48`	`attributeState "open", label:'${name}', action: "close", icon:"st.contact.contact.open", backgroundColor:"#e86d13"`
`49`	`49`	`attributeState "closed", label:'${name}', action: "open", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc"`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`tileAttribute("device.device_details", key: "SECONDARY_CONTROL") {`
`53`		`- attributeState("default", action: "refresh", label: '${currentValue}', icon:"st.secondary.refresh-icon")`
	`53`	`+ attributeState("default", action: "refresh", label: '${currentValue}', icon:"https://github.com/sgupta999/GuptaSmartthingsRepository/raw/master/icons/refresh.png")`
`54`	`54`	`attributeState("refresh", label: 'Updating data from server...')`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -189,6 +189,7 @@ def updateTiles(Object val ){`
`189`	`189`	`//log.debug "Are updates ready ${state.update1}, ${state.update2}, ${state.update3}, ${state.update4}"`
`190`	`190`	`//log.debug "Time is ${state.currentTimestamp}"`
`191`	`191`	`if (state.update1 && state.update2 && state.update3 && state.update4){`
	`192`	`+ state.update1 = state.update2 = state.update3 = state.update4 = false;`
`192`	`193`	`runIn(3,fireEvents)`
`193`	`194`	`}`
`194`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,14 @@ metadata {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`tiles {`
`51`		`- multiAttributeTile(name:"main", type: "generic"){`
	`51`	`+ multiAttributeTile(name:"main", type: "generic", canChangeIcon: 'true', canChangeBackground : 'true' ){`
`52`	`52`	`tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {`
`53`	`53`	`attributeState "open", label:'${name}', action: "close", icon:"st.contact.contact.open", backgroundColor:"#e86d13"`
`54`	`54`	`attributeState "closed", label:'${name}', action: "open", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc"`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`tileAttribute("device.device_details", key: "SECONDARY_CONTROL") {`
`58`		`- attributeState("default", action: "refresh", label: '${currentValue}', icon:"st.secondary.refresh-icon")`
	`58`	`+ attributeState("default", action: "refresh", label: '${currentValue}', icon:"https://github.com/sgupta999/GuptaSmartthingsRepository/raw/master/icons/refresh.png")`
`59`	`59`	`attributeState("refresh", label: 'Updating data from server...')`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -209,6 +209,7 @@ def updateTiles(Object val ){`
`209`	`209`	`//log.debug "Are updates ready ${state.update1}, ${state.update2}, ${state.update3}, ${state.update4}"`
`210`	`210`	`//log.debug "Time is ${state.currentTimestamp}"`
`211`	`211`	`if (state.update1 && state.update2 && state.update3 && state.update4){`
	`212`	`+ state.update1 = state.update2 = state.update3 = state.update4 = false;`
`212`	`213`	`runIn(3,fireEvents)`
`213`	`214`	`}`
`214`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,14 @@ metadata {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`tiles {`
`44`		`- multiAttributeTile(name:"main", type: "device.switch", width: 6, height: 4){`
	`44`	`+ multiAttributeTile(name:"main", type: "device.switch", width: 6, height: 4, canChangeIcon: 'true', canChangeBackground : 'true' ){`
`45`	`45`	`tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {`
`46`	`46`	`attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"`
`47`	`47`	`attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`tileAttribute("device.device_details", key: "SECONDARY_CONTROL") {`
`51`		`- attributeState("default", action: "refresh", label: '${currentValue}', icon:"st.secondary.refresh-icon")`
	`51`	`+ attributeState("default", action: "refresh", label: '${currentValue}', icon:"https://github.com/sgupta999/GuptaSmartthingsRepository/raw/master/icons/refresh.png")`
`52`	`52`	`attributeState("refresh", label: 'Updating data from server...')`
`53`	`53`	`}`
`54`	`54`	`}`
`@@ -190,6 +190,7 @@ def updateTiles(Object val ){`
`190`	`190`	`//log.debug "Are updates ready ${state.update1}, ${state.update2}, ${state.update3}, ${state.update4}"`
`191`	`191`	`//log.debug "Time is ${state.currentTimestamp}"`
`192`	`192`	`if (state.update1 && state.update2 && state.update3 && state.update4){`
	`193`	`+ state.update1 = state.update2 = state.update3 = state.update4 = false;`
`193`	`194`	`runIn(3,fireEvents)`
`194`	`195`	`}`
`195`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mqtt-bridge-smartthings",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"description": "MQTT Bridge to SmartThings [MBS]",`
`5`	`5`	`"main": "mbs-server.js",`
`6`	`6`	`"bin": {`