Skip to content

Rolling up staging to acceptance #11352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 1, 2019
Merged

Rolling up staging to acceptance #11352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
81c0743
[WWST-5510] Add ilumi Tunable White Bulb to aeon-multiwhite-bulb (#11…
MGoralczykS Sep 25, 2019
a4b3576
Child devices of hub connected devices not being added to room on join
tpmanley Sep 26, 2019
98490ef
WWST-5295 Added FP for Inovelli Red Series (#11339)
ZWozniakS Sep 27, 2019
f6f0b3f
Merge pull request #11330 from tpmanley/bugfix/hub-device-child
tpmanley Sep 27, 2019
83c35be
[ICP-11165] Zigbee ewelink motion sensor & ewelink contact sensor, fi…
ZouLianghuiS Sep 28, 2019
2ee6144
DVCSMP-3664 Fix NPE in zigbee metering plug (#11345)
greens Sep 30, 2019
fbaf63a
[WWST-5165] Everspring Radiator Thermostat integration (#11285)
PKacprowiczS Oct 1, 2019
daaad21
Merge pull request #11350 from SmartThingsCommunity/staging
greens Oct 1, 2019
d794064
Merge pull request #11351 from SmartThingsCommunity/master
greens Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions devicetypes/erocm123/inovelli-2-channel-smart-plug.src/inovelli-2-channel-smart-plug.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,14 @@ private channelNumber(String dni) {
private void createChildDevices() {
state.oldLabel = device.label
for (i in 1..2) {
addChildDevice("Switch Child Device", "${device.deviceNetworkId}-ep${i}", null, [completedSetup: true, label: "${device.displayName} (CH${i})",
isComponent: true, componentName: "ep$i", componentLabel: "Channel $i"
addChildDevice("Switch Child Device",
"${device.deviceNetworkId}-ep${i}",
device.hubId,
[completedSetup: true,
label: "${device.displayName} (CH${i})",
isComponent: true,
componentName: "ep$i",
componentLabel: "Channel $i"
])
}
}
Expand Down
6 changes: 4 additions & 2 deletions devicetypes/fibargroup/fibaro-double-switch-2-zw5.src/fibaro-double-switch-2-zw5.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,10 @@ private createChildDevices() {
addChildDevice(
"Fibaro Double Switch 2 - USB",
"${device.deviceNetworkId}-2",
null,
[completedSetup: true, label: "${device.displayName} (CH2)", isComponent: false]
device.hubId,
[completedSetup: true,
label: "${device.displayName} (CH2)",
isComponent: false]
)
} catch (Exception e) {
logging("${device.displayName} - error attempting to create child device: "+e, "debug")
Expand Down
6 changes: 4 additions & 2 deletions devicetypes/fibargroup/fibaro-wall-plug-us-zw5.src/fibaro-wall-plug-us-zw5.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,10 @@ private createChildDevices() {
addChildDevice(
"Fibaro Wall Plug USB",
"${device.deviceNetworkId}-2",
null,
[completedSetup: true, label: "${device.displayName} (CH2)", isComponent: false]
device.hubId,
[completedSetup: true,
label: "${device.displayName} (CH2)",
isComponent: false]
)
}

Expand Down
12 changes: 9 additions & 3 deletions devicetypes/smartthings/Orvibo-Contact-Sensor.src/Orvibo-Contact-Sensor.groovy
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,15 @@ def refresh() {
}

def configure() {
sendEvent(name: "checkInterval", value:20 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
def cmds = []
def manufacturer = getDataValue("manufacturer")

if (manufacturer == "eWeLink") {
sendEvent(name: "checkInterval", value:2 * 60 * 60 + 5 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
} else {
sendEvent(name: "checkInterval", value:20 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
}
def cmds = []

log.debug "Configuring Reporting, IAS CIE, and Bindings."
//The electricity attribute is reported without bind and reporting CFG. The TI plan reports the power once in about 10 minutes; the NXP plan reports the electricity once in 20 minutes
if (manufacturer == "Aurora") {
Expand Down Expand Up @@ -185,4 +191,4 @@ def getContactResult(value) {
value : value,
descriptionText: descriptionText
]
}
}
11 changes: 8 additions & 3 deletions devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,14 @@ private void createChildDevices() {
Integer buttons = (device.currentState("numberOfButtons").value).toBigInteger()

for (i in 1..buttons) {
def child = addChildDevice("Child Button", "${device.deviceNetworkId}/${i}", null,
[completedSetup: true, label: "${device.displayName} button ${i}",
isComponent: true, componentName: "button$i", componentLabel: "Button $i"])
def child = addChildDevice("Child Button",
"${device.deviceNetworkId}/${i}",
device.hubId,
[completedSetup: true,
label: "${device.displayName} button ${i}",
isComponent: true,
componentName: "button$i",
componentLabel: "Button $i"])

child.sendEvent(name: "supportedButtonValues", value: JsonOutput.toJson(["pushed", "held"]), displayed: false)
child.sendEvent(name: "button", value: "pushed", data: [buttonNumber: 1], displayed: false)
Expand Down
1 change: 1 addition & 0 deletions devicetypes/smartthings/aeon-multiwhite-bulb.src/aeon-multiwhite-bulb.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ metadata {

fingerprint mfr: "0371", prod: "0103", model: "0001", deviceJoinName: "Aeon LED Bulb 6 Multi-White" //US
fingerprint mfr: "0371", prod: "0003", model: "0001", deviceJoinName: "Aeon LED Bulb 6 Multi-White" //EU
fingerprint mfr: "0300", prod: "0003", model: "0004", deviceJoinName: "ilumin Tunable White"
}

simulator {
Expand Down
16 changes: 9 additions & 7 deletions devicetypes/smartthings/eaton-5-scene-keypad.src/eaton-5-scene-keypad.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,13 +320,15 @@ private updateLocalSwitchState(childId, state) {
private addChildSwitches() {
for (i in 2..5) {
String childDni = "${device.deviceNetworkId}/$i"
def child = addChildDevice("Child Switch", childDni, null, [
completedSetup: true,
label : "$device.displayName Switch $i",
isComponent : true,
componentName : "switch$i",
componentLabel: "Switch $i"
])
def child = addChildDevice("Child Switch",
childDni,
device.hubId,
[completedSetup: true,
label : "$device.displayName Switch $i",
isComponent : true,
componentName : "switch$i",
componentLabel: "Switch $i"
])
child.sendEvent(name: "switch", value: "off")
}
}
4 changes: 2 additions & 2 deletions devicetypes/smartthings/zigbee-metering-plug.src/zigbee-metering-plug.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ def parse(String description) {

attrData.each {
def map = [:]
if (it.clusterInt == zigbee.SIMPLE_METERING_CLUSTER && it.attrInt == ATTRIBUTE_HISTORICAL_CONSUMPTION) {
if (it.value && it.clusterInt == zigbee.SIMPLE_METERING_CLUSTER && it.attrInt == ATTRIBUTE_HISTORICAL_CONSUMPTION) {
log.debug "power"
map.name = "power"
map.value = zigbee.convertHexToInt(it.value)/powerDiv
map.unit = "W"
}
else if (it.clusterInt == zigbee.SIMPLE_METERING_CLUSTER && it.attrInt == ATTRIBUTE_READING_INFO_SET) {
else if (it.value && it.clusterInt == zigbee.SIMPLE_METERING_CLUSTER && it.attrInt == ATTRIBUTE_READING_INFO_SET) {
log.debug "energy"
map.name = "energy"
map.value = zigbee.convertHexToInt(it.value)/energyDiv
Expand Down
9 changes: 7 additions & 2 deletions devicetypes/smartthings/zigbee-motion-detector.src/zigbee-motion-detector.groovy
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ def refresh() {

def configure() {
log.debug "configure"
sendEvent(name: "checkInterval", value:20 * 60 + 2*60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
def manufacturer = getDataValue("manufacturer")
if (manufacturer == "eWeLink") {
sendEvent(name: "checkInterval", value:2 * 60 * 60 + 5 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
} else {
sendEvent(name: "checkInterval", value:20 * 60 + 2*60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
}
return zigbee.configureReporting(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0021, DataType.UINT8, 30, 1200, 0x10) + refresh()
}
}
11 changes: 8 additions & 3 deletions devicetypes/smartthings/zooz-power-strip.src/zooz-power-strip.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,14 @@ private void onOffCmd(value, endpoint = null) {
private void createChildDevices() {
state.oldLabel = device.label
for (i in 1..5) {
addChildDevice("Zooz Power Strip Outlet", "${device.deviceNetworkId}-ep${i}", null,
[completedSetup: true, label: "${device.displayName} (CH${i})",
isComponent: true, componentName: "ch$i", componentLabel: "Channel $i"])
addChildDevice("Zooz Power Strip Outlet",
"${device.deviceNetworkId}-ep${i}",
device.hubId,
[completedSetup: true,
label: "${device.displayName} (CH${i})",
isComponent: true,
componentName: "ch$i",
componentLabel: "Channel $i"])
}
}

Expand Down
1 change: 1 addition & 0 deletions devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ metadata {
fingerprint mfr: "0371", prod: "0003", model: "00AF", deviceJoinName: "Aeotec Smart Switch 7", ocfDeviceType: "oic.d.smartplug" //EU
fingerprint mfr: "0371", prod: "0103", model: "00AF", deviceJoinName: "Aeotec Smart Switch 7", ocfDeviceType: "oic.d.smartplug" //US
fingerprint mfr: "0060", prod: "0004", model: "000B", deviceJoinName: "Everspring Smart Plug", ocfDeviceType: "oic.d.smartplug" //US
fingerprint mfr: "031E", prod: "0002", model: "0001", deviceJoinName: "Inovelli Switch Red Series" //US
}

// simulator metadata
Expand Down
Loading