Skip to content

CHAD-5172 Send follow-ups to verify that window shade level changes o… #36279

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 7 commits into from
Jul 21, 2020
Merged

CHAD-5172 Send follow-ups to verify that window shade level changes o… #36279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1b6fef
CHAD-5172 Send follow-ups to verify that window shade level changes o…
greens Jul 7, 2020
ea58dcd
fixup
greens Jul 7, 2020
0cb73e1
logic changes
greens Jul 9, 2020
640e01a
guarantee overwrite
greens Jul 17, 2020
e7a2312
state variables do not work with += operator
greens Jul 20, 2020
2fa1a4a
add a +/- 2 range for the level
greens Jul 20, 2020
7c2bee0
spacing fix and re-arrange logic
greens Jul 20, 2020
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
38 changes: 29 additions & 9 deletions ...etypes/smartthings/springs-window-fashions-shade.src/springs-window-fashions-shade.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ private handleLevelReport(physicalgraph.zwave.Command cmd) {
shadeValue = "partially open"
descriptionText = "${device.displayName} shade is ${level}% open"
}
checkLevelReport(level)
def levelEvent = createEvent(name: "level", value: level, unit: "%", displayed: false)
def stateEvent = createEvent(name: "windowShade", value: shadeValue, descriptionText: descriptionText, isStateChange: levelEvent.isStateChange)

Expand All @@ -181,15 +182,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelS
response(zwave.switchMultilevelV1.switchMultilevelGet().format()) ]
}

def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
updateDataValue("MSR", msr)
if (cmd.manufacturerName) {
updateDataValue("manufacturer", cmd.manufacturerName)
}
createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
}

def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
def map = [ name: "battery", unit: "%" ]
if (cmd.batteryLevel == 0xFF || cmd.batteryLevel == 0) {
Expand Down Expand Up @@ -222,13 +214,15 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
def open() {
log.debug "open()"
def level = switchDirection ? 0 : 99
levelChangeFollowUp(level)
zwave.basicV1.basicSet(value: level).format()
// zwave.basicV1.basicSet(value: 0xFF).format()
}

def close() {
log.debug "close()"
def level = switchDirection ? 99 : 0
levelChangeFollowUp(level)
zwave.basicV1.basicSet(value: level).format()
//zwave.basicV1.basicSet(value: 0).format()
}
Expand All @@ -239,6 +233,7 @@ def setLevel(value, duration = null) {
level = switchDirection ? 99-level : level
if (level < 0) level = 0
if (level > 99) level = 99
levelChangeFollowUp(level)
zwave.basicV1.basicSet(value: level).format()
}

Expand Down Expand Up @@ -266,4 +261,29 @@ def refresh() {
zwave.switchMultilevelV1.switchMultilevelGet().format(),
zwave.batteryV1.batteryGet().format()
], 1500)
}

def levelChangeFollowUp(expectedLevel) {
state.expectedValue = expectedLevel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is more of a nit-picking, but state.expectedLevel would be more clear than state.expectedValue.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still think state.expectedValue should be state.expectedLevel.

state.levelChecks = 0
runIn(5, "checkLevel", [overwrite: true])
}

def checkLevelReport(value) {
if (state.expectedValue != null) {
if ((state.expectedValue == 99 && value >= 99) ||
(value >= state.expectedValue - 2 && value <= state.expectedValue + 2)) {
unschedule("checkLevel")
}
}
}

def checkLevel() {
if (state.levelChecks != null && state.levelChecks < 5) {
state.levelChecks = state.levelChecks + 1
runIn(5, "checkLevel", [overwrite: true])
sendHubCommand(zwave.switchMultilevelV1.switchMultilevelGet())
} else {
unschedule("checkLevel")
}
}
43 changes: 30 additions & 13 deletions devicetypes/smartthings/zwave-window-shade.src/zwave-window-shade.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ private handleLevelReport(physicalgraph.zwave.Command cmd) {
shadeValue = "partially open"
descriptionText = "${device.displayName} shade is ${level}% open"
}
checkLevelReport(level)
def levelEvent = createEvent(name: "level", value: level, unit: "%", displayed: false)
def stateEvent = createEvent(name: "windowShade", value: shadeValue, descriptionText: descriptionText, isStateChange: levelEvent.isStateChange)

Expand All @@ -166,15 +167,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelS
response(zwave.switchMultilevelV1.switchMultilevelGet().format()) ]
}

def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
updateDataValue("MSR", msr)
if (cmd.manufacturerName) {
updateDataValue("manufacturer", cmd.manufacturerName)
}
createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
}

def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
def map = [ name: "battery", unit: "%" ]
if (cmd.batteryLevel == 0xFF) {
Expand All @@ -194,6 +186,7 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
}

def open() {
levelChangeFollowUp(99)
log.debug "open()"
/*delayBetween([
zwave.basicV1.basicSet(value: 0xFF).format(),
Expand All @@ -203,6 +196,7 @@ def open() {
}

def close() {
levelChangeFollowUp(0)
log.debug "close()"
/*delayBetween([
zwave.basicV1.basicSet(value: 0x00).format(),
Expand All @@ -216,10 +210,8 @@ def setLevel(value, duration = null) {
Integer level = value as Integer
if (level < 0) level = 0
if (level > 99) level = 99
delayBetween([
zwave.basicV1.basicSet(value: level).format(),
zwave.switchMultilevelV1.switchMultilevelGet().format()
])
levelChangeFollowUp(level)
zwave.basicV1.basicSet(value: level).format()
}

def presetPosition() {
Expand Down Expand Up @@ -247,3 +239,28 @@ def refresh() {
zwave.batteryV1.batteryGet().format()
], 1500)
}

def levelChangeFollowUp(expectedLevel) {
state.expectedValue = expectedLevel
state.levelChecks = 0
runIn(5, "checkLevel", [overwrite: true])
}

def checkLevelReport(value) {
if (state.expectedValue != null) {
if ((state.expectedValue == 99 && value >= 99) ||
(value >= state.expectedValue - 2 && value <= state.expectedValue + 2)) {
unschedule("checkLevel")
}
}
}

def checkLevel() {
if (state.levelChecks != null && state.levelChecks < 5) {
state.levelChecks = state.levelChecks + 1
runIn(5, "checkLevel", [overwrite: true])
sendHubCommand(zwave.switchMultilevelV1.switchMultilevelGet())
} else {
unschedule("checkLevel")
}
}