Skip to content

Revert "[CHAD-4106] Set Association Group 1 at initialized() and once… #15345

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 1 commit into from
Dec 16, 2019
Merged

Revert "[CHAD-4106] Set Association Group 1 at initialized() and once… #15345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 0 additions & 21 deletions devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,6 @@ def parse(String description) {
if (cmd) {
result = zwaveEvent(cmd)
}

if (!state.setAssociation)
{
// This change is to fix the issue introduced in 28.11 where association was not getting set at inclusion
// time.
//
// This change will set the association to group id 1 only once, even for the devices that were added
// prior to the 28.11 hub firmware release. The association is set here because not all the device will
// support wake up command class, so we are going to set the association once we hear something from the
// device which is our clue that the device is awake to receive the message.
def hubCmds = [new physicalgraph.device.HubAction(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format())]
sendHubCommand(hubCmds)
state.setAssociation = true
}
}
log.debug "parsed '$description' to $result"
return result
Expand Down Expand Up @@ -319,13 +305,6 @@ def initialPoll() {
request << zwave.batteryV1.batteryGet()
request << zwave.sensorBinaryV2.sensorBinaryGet(sensorType: zwave.sensorBinaryV2.SENSOR_TYPE_DOOR_WINDOW)
request << zwave.manufacturerSpecificV2.manufacturerSpecificGet()

// NOTE: 28.11 hub firmware only associates groupID 1 if the device is Z-Wave Plus. As a workaround, we are going to
// associate with group 1 at installed() to circumvent the issue introduced by 28.11
// Once the issue in 28.11 is resolved, this change will then need to be removed, but associating twice is not
// harmful
request << zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId])
state.setAssociation = true
commands(request, 500) + ["delay 6000", command(zwave.wakeUpV1.wakeUpNoMoreInformation())]
}

Expand Down
22 changes: 0 additions & 22 deletions devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ def installed() {
def cmds = []
createSmokeOrCOEvents("allClear", cmds) // allClear to set inital states for smoke and CO
cmds.each { cmd -> sendEvent(cmd) }

// NOTE: 28.11 hub firmware only associates groupID 1 if the device is Z-Wave Plus. As a workaround, we are going to
// associate with group 1 at installed() to circumvent the issue introduced by 28.11
// Once the issue in 28.11 is resolved, this change will then need to be removed, but associating twice is not
// harmful
def hubCmds = [new physicalgraph.device.HubAction(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format())]
sendHubCommand(hubCmds)
state.setAssociation = true
}

def updated() {
Expand All @@ -84,20 +76,6 @@ def parse(String description) {
if (cmd) {
zwaveEvent(cmd, results)
}

if (!state.setAssociation)
{
// This change is to fix the issue introduced in 28.11 where association was not getting set at inclusion
// time.
//
// This change will set the association to group id 1 only once, even for the devices that were added
// prior to the 28.11 hub firmware release. The association is set here because not all the device will
// support wake up command class, so we are going to set the association once we hear something from the
// device which is our clue that the device is awake to receive the message.
results << response(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]))
state.setAssociation = true
}

}
log.debug "'$description' parsed to ${results.inspect()}"
return results
Expand Down