Merge pull request #2108 from SmartThingsCommunity/staging

Rolling up staging to production for deploy
Merge pull request #2107 from larsfinander/DVCSMP-2703_OpenT2T_Update_6_20_submission_2_staging
2026-03-10 05:11:51 +00:00 · 2017-06-20 11:29:13 -07:00 · 2017-06-20 09:19:50 -07:00 · 2017-06-20 10:17:49 -06:00 · 2017-06-19 18:31:41 -07:00 · 2017-06-19 16:25:32 -07:00
17 changed files with 74 additions and 32 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'

 buildscript {
    dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.11"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.12"
    }
    repositories {
        mavenLocal()
@@ -19,7 +19,7 @@ buildscript {
                username smartThingsArtifactoryUserName
                password smartThingsArtifactoryPassword
            }
-            url "https://artifactory.smartthings.com/libs-release-local"
+            url "https://smartthings.jfrog.io/smartthings/libs-release-local"
        }
    }
 }
@@ -32,7 +32,7 @@ repositories {
            username smartThingsArtifactoryUserName
            password smartThingsArtifactoryPassword
        }
-        url "https://artifactory.smartthings.com/libs-release-local"
+        url "https://smartthings.jfrog.io/smartthings/libs-release-local"
    }
 }

@@ -51,10 +51,10 @@ sourceSets {

 dependencies {
    devicetypesCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    devicetypesCompile 'smartthings:appengine-z-wave:0.1.2'
-    devicetypesCompile 'smartthings:appengine-zigbee:0.1.11'
+    devicetypesCompile 'smartthings:appengine-z-wave:0.1.3'
+    devicetypesCompile 'smartthings:appengine-zigbee:0.1.12'
    smartappsCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    smartappsCompile 'smartthings:appengine-common:0.1.8'
+    smartappsCompile 'smartthings:appengine-common:0.1.9'
    smartappsCompile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
    smartappsCompile 'org.grails:grails-web:2.3.11'
    smartappsCompile 'org.json:json:20140107'
@@ -74,19 +74,19 @@ slackSendMessage {
    String username
    switch (branch) {
        case 'master':
-            username = 'Hickory'
+            username = 'DEV'
            iconUrl = wolverine
            color = '#35D0F2'
            messageText = 'Began deployment of _SmartThingsPublic[master]_ branch to the _Dev_ environments.'
            break
        case 'staging':
-            username = 'Dickory'
+            username = 'STG'
            iconUrl = beach
            color = '#FFDE20'
            messageText = 'Began deployment of _SmartThingsPublic[staging]_ branch to the _Staging_ environments.'
            break
        case 'production':
-            username = 'Dock'
+            username = 'PRD'
            iconUrl = drinks
            color = '#FF1D23'
            messageText = 'Began deployment of _SmartThingsPublic[production]_ branch to the _Prod_ environments.'
--- a/devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy
+++ b/devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Bose SoundTouch
 *
--- a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy
+++ b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy
@@ -35,8 +35,8 @@ metadata {

 	// tile definitions
 	tiles(scale: 2) {
-		multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
+		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
 				attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
 				attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
 				attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
@@ -48,14 +48,16 @@ metadata {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

-		main "valve"
-		details(["valve","refresh"])
+		main "contact"
+		details(["contact","refresh"])
 	}
 }

 def installed(){
 // Device-Watch simply pings if no device events received for 32min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+
+	response(refresh())
 }

 def updated(){
@@ -85,11 +87,17 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }

 def open() {
-	zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format()
+	delayBetween([
+		zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	], 500)
 }

 def close() {
-	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
+	delayBetween([
+		zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	], 500)
 }

 /**
@@ -105,6 +113,6 @@ def refresh() {

 def createEventWithDebug(eventMap) {
 	def event = createEvent(eventMap)
-	log.debug "Event created with ${event?.descriptionText}"
+	log.debug "Event created with ${event?.name}:${event?.value} - ${event?.descriptionText}"
 	return event
 }
--- a/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
+++ b/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Hue Bloom
 *
--- a/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy
+++ b/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Hue Bridge
 *
--- a/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
+++ b/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Hue Bulb
 *
--- a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
+++ b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Hue Lux Bulb
 *
--- a/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy
+++ b/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Hue White Ambiance Bulb
 *
--- a/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
+++ b/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Copyright 2015 SmartThings
 *
--- a/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
+++ b/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Copyright 2015 SmartThings
 *
--- a/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
+++ b/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Copyright 2015 SmartThings
 *
--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -66,22 +66,29 @@ def parse(String description) {
        else {
            sendEvent(event)
        }
-    }
-    else {
-        def cluster = zigbee.parse(description)
-
-        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-            if (cluster.data[0] == 0x00) {
+    } else {
+        def descMap = zigbee.parseDescriptionAsMap(description)
+        if (descMap && descMap.clusterInt == 0x0006 && descMap.commandInt == 0x07) {
+            if (descMap.data[0] == "00") {
                log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-            }
-            else {
+            } else {
                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
            }
-        }
-        else {
+        } else if (device.getDataValue("manufacturer") == "sengled" && descMap && descMap.clusterInt == 0x0008 && descMap.attrInt == 0x0000) {
+            // This is being done because the sengled element touch/classic incorrectly uses the value 0xFF for the max level.
+            // Per the ZCL spec for the UINT8 data type 0xFF is an invalid value, and 0xFE should be the max.  Here we
+            // manually handle the invalid attribute value since it will be ignored by getEvent as an invalid value.
+            // We also set the level of the bulb to 0xFE so future level reports will be 0xFE until it is changed by
+            // something else.
+            if (descMap.value.toUpperCase() == "FF") {
+                descMap.value = "FE"
+            }
+            sendHubCommand(zigbee.command(zigbee.LEVEL_CONTROL_CLUSTER, 0x00, "FE0000").collect { new physicalgraph.device.HubAction(it) }, 0)
+            sendEvent(zigbee.getEventFromAttrData(descMap.clusterInt, descMap.attrInt, descMap.encoding, descMap.value))
+        } else {
            log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug "${cluster}"
+            log.debug "${descMap}"
        }
    }
 }
--- a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy
+++ b/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy
@@ -38,8 +38,8 @@ metadata {
    }

    tiles(scale: 2) {
-        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-            tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
+        multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
                attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
                attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
                attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
@@ -58,8 +58,8 @@ metadata {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }

-        main(["valve"])
-        details(["valve", "battery", "refresh"])
+        main(["contact"])
+        details(["contact", "battery", "refresh"])
    }
 }

--- a/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy
+++ b/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy
@@ -195,7 +195,10 @@ def registerDeviceChange() {
 				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			} else if (!state.deviceSubscriptionMap[deviceId].contains(subscriptionEndpt)) {
-				state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
+				// state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
+				// For now, we will only have one subscription endpoint per device
+				state.deviceSubscriptionMap.remove(deviceId)
+				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			}

--- a/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
+++ b/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Bose SoundTouch (Connect)
 *
--- a/smartapps/smartthings/hue-connect.src/hue-connect.groovy
+++ b/smartapps/smartthings/hue-connect.src/hue-connect.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Hue Service Manager
 *
--- a/smartapps/smartthings/wemo-connect.src/wemo-connect.groovy
+++ b/smartapps/smartthings/wemo-connect.src/wemo-connect.groovy
@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
 *  Copyright 2015 SmartThings
 *
Author	SHA1	Message	Date
Vinay Rao	f752a01906	Merge pull request #2108 from SmartThingsCommunity/staging Rolling up staging to production for deploy	2017-06-20 11:29:13 -07:00
Vinay Rao	505ec4ff0f	Merge pull request #2107 from larsfinander/DVCSMP-2703_OpenT2T_Update_6_20_submission_2_staging DVCSMP-2703 OpenT2T: Update to 6/20 submission	2017-06-20 09:19:50 -07:00
Lars Finander	fe0f555f10	DVCSMP-2703 OpenT2T: Update to 6/20 submission	2017-06-20 10:17:49 -06:00
Vinay Rao	42353044e6	Merge pull request #2104 from SmartThingsCommunity/production Rolling down production to staging	2017-06-19 18:31:41 -07:00
Vinay Rao	78f06a0b9d	Merge pull request #2103 from workingmonk/bug/appengine_version Fix circle ci issues with new artifactory server	2017-06-19 16:25:32 -07:00
Vinay Rao	7f13dd356d	Fix circle ci issues with new artifactory server	2017-06-19 16:24:58 -07:00
Vinay Rao	4042bbbf98	Merge pull request #2102 from SmartThingsCommunity/bug/deploy_script2 DVCSMP-2701 Update Deployment Jobs to new Artifactory.	2017-06-19 14:24:34 -07:00
Vinay Rao	20407441d9	DVCSMP-2701 Update Deployment Jobs to new Artifactory. set build gradle to new artifactory server	2017-06-19 14:23:44 -07:00
Vinay Rao	52925d6d99	Merge pull request #2093 from dkirker/DVCSMP-2698 DVCSMP-2698 Temporary bandage to properly show valve states in the device tile of local running devices	2017-06-19 12:15:01 -07:00
Vinay Rao	e6c17131af	Merge pull request #2101 from SmartThingsCommunity/bug/deploy_script DVCSMP-2701 Update Deployment Jobs to new Artifactory	2017-06-19 11:27:21 -07:00
Vinay Rao	cc70865fbf	DVCSMP-2701 Update Deployment Jobs to new Artifactory	2017-06-19 11:21:05 -07:00
Donald Kirker	e53d9c910c	DVCSMP-2698 Temporary bandage to properly show valve states in the device tile of local running devices	2017-06-14 17:35:11 -07:00
Vinay Rao	c13014936b	Merge pull request #2090 from SmartThingsCommunity/master Rolling up master to staging	2017-06-13 15:25:30 -07:00
Vinay Rao	d6b0f6a8ed	Merge pull request #2089 from SmartThingsCommunity/staging Rolling down staging to master	2017-06-13 15:24:44 -07:00
Vinay Rao	62c810ba90	Merge pull request #2078 from dkirker/ICP-1110 ICP-1110 Read valve state during pairing	2017-06-13 15:23:07 -07:00
Vinay Rao	ea3abb26c0	Merge pull request #2088 from SmartThingsCommunity/staging Rolling up staging to production	2017-06-13 14:10:07 -07:00
Vinay Rao	0b81793b0f	Merge pull request #2081 from SmartThingsCommunity/staging Rolling down staging to master	2017-06-09 13:03:54 -07:00
Vinay Rao	16f41bddae	Merge pull request #2080 from workingmonk/bug/mark_files_deprecated SLC-82 Marking old connect apps and device types as deprecated	2017-06-09 13:01:45 -07:00
Vinay Rao	117adea586	SLC-82 Marking old connect apps and device types as deprecated	2017-06-09 11:44:06 -07:00
Vinay Rao	783538e36d	Merge pull request #2070 from dkirker/ICP-1097 ICP-1097 Fix Sengled Classic default level on pairing	2017-06-08 16:28:50 -07:00
Donald Kirker	fb8e4a2416	ICP-1110 Read valve state during pairing	2017-06-07 23:47:13 -07:00
Vinay Rao	6110aaa0fa	Merge pull request #2074 from SmartThingsCommunity/master Rolling up master to staging	2017-06-06 12:01:26 -07:00
Vinay Rao	c4c2a3ffd7	Merge pull request #2072 from SmartThingsCommunity/staging Rolling up staging to production	2017-06-06 11:35:06 -07:00
Donald Kirker	6325101f52	ICP-1097 Fix Sengled Classic default level on pairing Code brought oever from @varzac commit `8bcbe7b924` Original commit message: > Fix sengled use of FF for max level > This works around the fact that sengled element touches can get back > into a state of reporting an invalid value (of FF) if the physical > button on the bulb is used to cycle back to the 100% state. Here we > interpret FF as FE for sengled and then issue a move to level command to > put it in a state where it will report FE until the level is changed > again. > > This resolves: https://smartthings.atlassian.net/browse/DVCSMP-2597 While the Classic does not have a physical button, since it does represent 100% as FF we want to always catch this.	2017-06-06 03:29:41 -07:00