Skip to content

Commit

Permalink
Merge pull request SmartThingsCommunity#3701 from SmartThingsCommunit…
Browse files Browse the repository at this point in the history 
…y/master

Rolling up master to staging
  • Loading branch information
@workingmonk
workingmonk authored Nov 21, 2018
2 parents 0ccdcda + f270c6d commit 89714cf
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 5 deletions.
2 changes: 2 additions & 0 deletions devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ metadata {
fingerprint inClusters: "0x33"
fingerprint mfr: "0086", prod: "0103", model: "0079", deviceJoinName: "Aeotec LED Strip" //US
fingerprint mfr: "0086", prod: "0003", model: "0079", deviceJoinName: "Aeotec LED Strip" //EU
fingerprint mfr: "0086", prod: "0003", model: "0062", deviceJoinName: "Aeotec LED Bulb" //EU
fingerprint mfr: "0086", prod: "0103", model: "0062", deviceJoinName: "Aeotec LED Bulb" //US
}

simulator {
Expand Down
10 changes: 5 additions & 5 deletions devicetypes/smartthings/zigbee-accessory-dimmer.src/zigbee-accessory-dimmer.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ def parse(String description) {
}
} else if (descMap && descMap.clusterInt == 0x0005) {
if (descMap.commandInt == 0x05) {
sendEvent(name: "button", value: "pushed", isStateChange: true)
sendEvent(name: "button", value: "pushed", data: [buttonNumber: 1], isStateChange: true)
} else if (descMap.commandInt == 0x04) {
sendEvent(name: "button", value: "held", isStateChange: true)
sendEvent(name: "button", value: "held", data: [buttonNumber: 1], isStateChange: true)
}
} else {
log.warn "DID NOT PARSE MESSAGE for description : $description"
Expand All @@ -120,9 +120,9 @@ def setLevel(value) {
}

def installed() {
sendEvent(name: "switch", value: "on", isStateChange: false, displayed: false)
sendEvent(name: "level", value: 100, isStateChange: false, displayed: false)
sendEvent(name: "button", value: "pushed", isStateChange: false, displayed: false)
sendEvent(name: "switch", value: "on", displayed: false)
sendEvent(name: "level", value: 100, displayed: false)
sendEvent(name: "button", value: "pushed", data: [buttonNumber: 1], displayed: false)
sendEvent(name: "numberOfButtons", value: 1, displayed: false)
}

Expand Down
1 change: 1 addition & 0 deletions devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ metadata {
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B05, FC01", outClusters: "0019", manufacturer: "LEDVANCE", model: "Flex RGBW Pro", deviceJoinName: "SYLVANIA Smart Flex 11 RGBW"
fingerprint profileId: "0104", inClusters: "0000, 0004, 0003, 0006, 0008, 0005, 0300, FFFF, 1000", outClusters: "0019", manufacturer: "Aurora", model: "RGBBulb51AU", deviceJoinName: "Aurora RGBW GLS Lamp"
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000, FFFF", outClusters: "0019", manufacturer: "Aurora", model: "RGBBulb51AU", deviceJoinName: "AOne Smart RGBW GLS Lamp"
fingerprint profileId: "0104", inClusters: "0000, 0004, 0003, 0006, 0008, 0005, 0300", outClusters: "0019", manufacturer: "LEEDARSON LIGHTING", model: "5ZB-A806ST-Q1G", deviceJoinName: "Ozom Multicolor Smart Light"
}

// UI tile definitions
Expand Down
1 change: 1 addition & 0 deletions devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ metadata {
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "0003, 000A, 0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702", outClusters: "0000", manufacturer: "ClimaxTechnology", model: "PSM_00.00.00.35TC", deviceJoinName: "Ozom Smart Plug"
}

tiles(scale: 2) {
Expand Down
9 changes: 9 additions & 0 deletions devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ metadata {
capability "Battery"
capability "Configuration"
capability "Power Source"
capability "Health Check"
capability "Refresh"
capability "Valve"

Expand Down Expand Up @@ -140,3 +141,11 @@ def configure() {
log.debug "Configuring Reporting and Bindings."
refresh()
}

def installed() {
sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
}

def ping() {
zigbee.onOffRefresh()
}
2 changes: 2 additions & 0 deletions devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ metadata {
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0019", manufacturer: "innr", model: "RB 175 W", deviceJoinName: "innr Smart Bulb (Warm Dimming)"
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "E14-U43", deviceJoinName: "Sengled E14-U43"
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0019", manufacturer: "innr", model: "RB 145", deviceJoinName: "innr Smart Candle"
//IKEA TRADFRI bulb E14 W op/ch 400lm: 01 C05E 0100 02 08 0000 0003 0004 0005 0006 0008 0B05 1000 04 0005 0019 0020 1000
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05, 1000", outClusters: "0005, 0019, 0020, 1000", manufacturer: "IKEA of Sweden", model: "TRADFRI bulb E14 W op/ch 400lm", deviceJoinName: "IKEA TRADFRI LED Bulb"

}

Expand Down
1 change: 1 addition & 0 deletions devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ metadata {
fingerprint mfr: "0086", prod: "0002", model: "0059", deviceJoinName: "Aeon Recessed Door Sensor"
//zw:S type:0701 mfr:0214 prod:0002 model:0001 ver:6.38 zwv:4.38 lib:06 cc:5E,30,84,80,86,72,71,70,85,59,73,5A role:06 ff:8C06 ui:8C06
fingerprint mfr: "0214", prod: "0002", model: "0001", deviceJoinName: "BeSense Door/Window Detector"
fingerprint mfr: "0086", prod: "0002", model: "0078", deviceJoinName: "Aeotec Door/Window Sensor Gen5" //EU
}

// simulator metadata
Expand Down
2 changes: 2 additions & 0 deletions devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ metadata {
fingerprint mfr:"003B", prod:"6341", model:"0544", deviceJoinName: "Schlage Touchscreen Deadbolt Door Lock"
fingerprint mfr:"003B", prod:"6341", model:"5044", deviceJoinName: "Schlage Touchscreen Deadbolt Door Lock"
fingerprint mfr:"003B", prod:"634B", model:"504C", deviceJoinName: "Schlage Connected Keypad Lever Door Lock"
fingerprint mfr:"003B", prod:"0001", model:"0468", deviceJoinName: "Schlage Connect Smart Deadbolt Door Lock" //BE468ZP
fingerprint mfr:"003B", prod:"0001", model:"0469", deviceJoinName: "Schlage Connect Smart Deadbolt Door Lock" //BE469ZP
// Yale
fingerprint mfr:"0129", prod:"0002", model:"0800", deviceJoinName: "Yale Touchscreen Deadbolt Door Lock" // YRD120
fingerprint mfr:"0129", prod:"0002", model:"0000", deviceJoinName: "Yale Touchscreen Deadbolt Door Lock" // YRD220, YRD240
Expand Down
1 change: 1 addition & 0 deletions ...ypes/smartthings/zwave-motion-temp-light-sensor.src/zwave-motion-temp-light-sensor.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def updated() {

def configure() {
sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
response(secure(zwave.configurationV1.configurationSet(parameterNumber: 2, size: 2, scaledConfigurationValue: 30)))
}

def parse(String description) {
Expand Down

0 comments on commit 89714cf

Please sign in to comment.