From 0f3656cd124b9233ef336e708840182958af37ea Mon Sep 17 00:00:00 2001 From: Lyman Epp Date: Wed, 7 Jun 2017 12:22:33 -0500 Subject: [PATCH 1/4] Fix debug message --- .../simulated-presence-sensor.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy b/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy index b7ef6ca..b63414b 100644 --- a/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy +++ b/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy @@ -49,6 +49,6 @@ def arrived() { def departed() { - log.trace "Executing 'arrived'" + log.trace "Executing 'departed'" sendEvent(name: "presence", value: "not present") } From fb8e4a241637da01e802a72dd93e5211e23eae5c Mon Sep 17 00:00:00 2001 From: Donald Kirker Date: Wed, 7 Jun 2017 23:47:13 -0700 Subject: [PATCH 2/4] ICP-1110 Read valve state during pairing --- .../fortrezz-water-valve.groovy | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy index 998787a..b50c7df 100644 --- a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy +++ b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy @@ -56,6 +56,8 @@ metadata { 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 } From e53d9c910cbfc0522b8f8850f43e2d9044ed01f1 Mon Sep 17 00:00:00 2001 From: Donald Kirker Date: Wed, 14 Jun 2017 17:35:11 -0700 Subject: [PATCH 3/4] DVCSMP-2698 Temporary bandage to properly show valve states in the device tile of local running devices --- .../fortrezz-water-valve.src/fortrezz-water-valve.groovy | 8 ++++---- .../smartthings/zigbee-valve.src/zigbee-valve.groovy | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy index b50c7df..418b9f6 100644 --- 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,8 +48,8 @@ metadata { state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh" } - main "valve" - details(["valve","refresh"]) + main "contact" + details(["contact","refresh"]) } } diff --git a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy b/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy index 2dab99f..ff9c7eb 100644 --- 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"]) } } From fe0f555f10a5da42ad203a150685ba80d776ef95 Mon Sep 17 00:00:00 2001 From: Lars Finander Date: Tue, 20 Jun 2017 10:06:23 -0600 Subject: [PATCH 4/4] DVCSMP-2703 OpenT2T: Update to 6/20 submission --- .../opent2t-smartapp-test.src/opent2t-smartapp-test.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy b/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy index c1e6bff..f7f9ad6 100644 --- 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}" }