Skip to content

Rolling up staging to acceptance #11372

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 2 commits into from
Oct 8, 2019
Merged

Rolling up staging to acceptance #11372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee0a439
Fix window shade commands not being visible on device view
tpmanley Oct 3, 2019
2764b58
Merge pull request #11355 from tpmanley/bugfix/support-shade-commands
tpmanley Oct 7, 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
2 changes: 1 addition & 1 deletion devicetypes/axis/axis-gear-st.src/axis-gear-st.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def configure() {
sendEvent(name: "windowShade", value: "unknown")
log.debug "Configuring Reporting and Bindings."
sendEvent(name: "checkInterval", value: (2 * 60 * 60 + 10 * 60), displayed: true, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
sendEvent(name: "supportedWindowShadeCommands", value: JsonOutput.toJson(["open", "close", "pause"]))
sendEvent(name: "supportedWindowShadeCommands", value: JsonOutput.toJson(["open", "close", "pause"]), displayed: false)

def attrs_refresh = zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_SWBUILDID) +
zigbee.readAttribute(CLUSTER_WINDOWCOVERING, WINDOWCOVERING_ATTR_LIFTPERCENTAGE) +
Expand Down
9 changes: 9 additions & 0 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 @@ -11,6 +11,9 @@
* for the specific language governing permissions and limitations under the License.
*
*/
import groovy.json.JsonOutput


metadata {
definition (name: "Springs Window Fashions Shade", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.blind") {
capability "Window Shade"
Expand Down Expand Up @@ -111,6 +114,7 @@ def getCheckInterval() {

def installed() {
sendEvent(name: "checkInterval", value: checkInterval, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
sendEvent(name: "supportedWindowShadeCommands", value: JsonOutput.toJson(["open", "close", "pause"]), displayed: false)
response(refresh())
}

Expand Down Expand Up @@ -242,6 +246,11 @@ def presetPosition() {
zwave.switchMultilevelV1.switchMultilevelSet(value: 0xFF).format()
}

def pause() {
log.debug "pause()"
stop()
}

def stop() {
log.debug "stop()"
zwave.switchMultilevelV3.switchMultilevelStopLevelChange().format()
Expand Down
6 changes: 6 additions & 0 deletions devicetypes/smartthings/zigbee-window-shade.src/zigbee-window-shade.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
* for the specific language governing permissions and limitations under the License.
*/

import groovy.json.JsonOutput
import physicalgraph.zigbee.zcl.DataType

metadata {
Expand Down Expand Up @@ -201,6 +203,10 @@ def refresh() {
return cmds
}

def installed() {
sendEvent(name: "supportedWindowShadeCommands", value: JsonOutput.toJson(["open", "close", "pause"]), displayed: false)
}

def configure() {
// Device-Watch allows 2 check-in misses from device + ping (plus 2 min lag time)
log.info "configure()"
Expand Down
9 changes: 9 additions & 0 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 @@ -11,6 +11,9 @@
* for the specific language governing permissions and limitations under the License.
*
*/
import groovy.json.JsonOutput


metadata {
definition (name: "Z-Wave Window Shade", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.blind") {
capability "Window Shade"
Expand Down Expand Up @@ -106,6 +109,7 @@ def getCheckInterval() {

def installed() {
sendEvent(name: "checkInterval", value: checkInterval, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
sendEvent(name: "supportedWindowShadeCommands", value: JsonOutput.toJson(["open", "close", "pause"]), displayed: false)
response(refresh())
}

Expand Down Expand Up @@ -222,6 +226,11 @@ def presetPosition() {
setLevel(preset ?: state.preset ?: 50)
}

def pause() {
log.debug "pause()"
stop()
}

def stop() {
log.debug "stop()"
zwave.switchMultilevelV3.switchMultilevelStopLevelChange().format()
Expand Down