GoControl Integrations (SmartThingsCommunity#2927)

* GoControl Integrations

Author: greens

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -41,6 +41,7 @@ metadata {
 		fingerprint mfr: "001A", prod: "4449", model: "0101", deviceJoinName: "Eaton RF Master Dimmer"
 		fingerprint mfr: "001A", prod: "4449", model: "0003", deviceJoinName: "Eaton RF Dimming Plug-In Module"
 		fingerprint mfr: "0086", prod: "0103", model: "0063", deviceJoinName: "Aeotec Smart Dimmer 6"
+		fingerprint mfr: "014F", prod: "5744", model: "3530", deviceJoinName: "GoControl In-Wall Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy

@@ -33,6 +33,7 @@ metadata {
 		fingerprint inClusters: "0x26,0x32"
 		fingerprint mfr:"0086", prod:"0003", model:"001B", deviceJoinName: "Aeotec Micro Smart Dimmer 2E"
 		fingerprint mfr:"0086", prod:"0103", model:"0063", deviceJoinName: "Aeotec Smart Dimmer 6"
+		fingerprint mfr:"014F", prod "5044", model:"3533", deviceJoinName: "GoControl Plug-in Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy

@@ -29,6 +29,8 @@ metadata {
 		fingerprint mfr: "0086", prod: "0003", model: "0012", deviceJoinName: "Aeotec Micro Smart Switch"
 		fingerprint mfr: "021F", prod: "0003", model: "0087", deviceJoinName: "Dome On/Off Plug-in Switch"
 		fingerprint mfr: "0086", prod: "0103", model: "0060", deviceJoinName: "Aeotec Smart Switch 6"
+		fingerprint mfr: "014F", prod: "574F", model: "3535", deviceJoinName: "GoControl Wall-Mounted Outlet"
+		fingerprint mfr: "014F", prod: "5053", model: "3531", deviceJoinName: "GoControl Plug-in Switch"
 	}
 
 	// simulator metadata

devicetypes/smartthings/zwave-plus-motion-temp-sensor.src/zwave-plus-motion-temp-sensor.groovy

@@ -74,7 +74,7 @@ def configure() {
 	log.debug "configure()"
 	def cmds = []
 
-	if (state.sec != 1) {
+	if (!isSecured()) {
 		// secure inclusion may not be complete yet
 		cmds << "delay 1000"
 	}
@@ -317,7 +317,7 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 private secure(physicalgraph.zwave.Command cmd) {
-	if (state.sec == 0) {  // default to secure
+	if (!isSecured()) {  // default to secure
 		cmd.format()
 	} else {
 		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
@@ -327,3 +327,11 @@ private secure(physicalgraph.zwave.Command cmd) {
 private secureSequence(commands, delay=200) {
 	delayBetween(commands.collect{ secure(it) }, delay)
 }
+
+private isSecured() {
+	if (zwaveInfo && zwaveInfo.zw) {
+		return zwaveInfo.zw.endsWith("s")
+	} else {
+		return state.sec == 1
+	}
+}

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -42,6 +42,8 @@ metadata {
 		fingerprint mfr: "001A", prod: "534C", model: "0000", deviceJoinName: "Eaton RF Master Switch"
 		fingerprint mfr: "001A", prod: "5354", model: "0003", deviceJoinName: "Eaton RF Appliance Plug-In Module"
 		fingerprint mfr: "001A", prod: "5352", model: "0000", deviceJoinName: "Eaton RF Accessory Switch"
+		fingerprint mfr: "014F", prod: "5753", model: "3535", deviceJoinName: "GoControl Smart In-Wall Switch"
+		fingerprint mfr: "014F", prod: "5257", model: "3033", deviceJoinName: "GoControl Wall Relay Switch"
 	}
 
 	// simulator metadata