Skip to content

ICP-3923 GoControl Integrations #2927

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 6 commits into from
Apr 4, 2018
Merged

ICP-3923 GoControl Integrations #2927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9852ac3
GoControl Integrations
greens Mar 19, 2018
eb62e37
GoControl Integrations
greens Mar 19, 2018
8d5bf8b
Add fingerprint for siren/strobe
greens Mar 20, 2018
96e154f
Move GoControl PIR sensor to motion/temp sensor
greens Mar 20, 2018
7f9d6bf
remove PIR and Siren
greens Mar 22, 2018
5126dae
Merge branch 'master' into GoControl
greens Mar 29, 2018
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
1 change: 1 addition & 0 deletions devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ metadata {
fingerprint mfr: "001A", prod: "4449", model: "0101", deviceJoinName: "Eaton RF Master Dimmer"
fingerprint mfr: "001A", prod: "4449", model: "0003", deviceJoinName: "Eaton RF Dimming Plug-In Module"
fingerprint mfr: "0086", prod: "0103", model: "0063", deviceJoinName: "Aeotec Smart Dimmer 6"
fingerprint mfr: "014F", prod: "5744", model: "3530", deviceJoinName: "GoControl In-Wall Dimmer"
}

simulator {
Expand Down
1 change: 1 addition & 0 deletions devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ metadata {
fingerprint inClusters: "0x26,0x32"
fingerprint mfr:"0086", prod:"0003", model:"001B", deviceJoinName: "Aeotec Micro Smart Dimmer 2E"
fingerprint mfr:"0086", prod:"0103", model:"0063", deviceJoinName: "Aeotec Smart Dimmer 6"
fingerprint mfr:"014F", prod "5044", model:"3533", deviceJoinName: "GoControl Plug-in Dimmer"
}

simulator {
Expand Down
2 changes: 2 additions & 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 @@ -29,6 +29,8 @@ metadata {
fingerprint mfr: "0086", prod: "0003", model: "0012", deviceJoinName: "Aeotec Micro Smart Switch"
fingerprint mfr: "021F", prod: "0003", model: "0087", deviceJoinName: "Dome On/Off Plug-in Switch"
fingerprint mfr: "0086", prod: "0103", model: "0060", deviceJoinName: "Aeotec Smart Switch 6"
fingerprint mfr: "014F", prod: "574F", model: "3535", deviceJoinName: "GoControl Wall-Mounted Outlet"
fingerprint mfr: "014F", prod: "5053", model: "3531", deviceJoinName: "GoControl Plug-in Switch"
}

// simulator metadata
Expand Down
12 changes: 10 additions & 2 deletions ...etypes/smartthings/zwave-plus-motion-temp-sensor.src/zwave-plus-motion-temp-sensor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def configure() {
log.debug "configure()"
def cmds = []

if (state.sec != 1) {
if (!isSecured()) {
// secure inclusion may not be complete yet
cmds << "delay 1000"
}
Expand Down Expand Up @@ -317,7 +317,7 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
}

private secure(physicalgraph.zwave.Command cmd) {
if (state.sec == 0) { // default to secure
if (!isSecured()) { // default to secure
cmd.format()
} else {
zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
Expand All @@ -327,3 +327,11 @@ private secure(physicalgraph.zwave.Command cmd) {
private secureSequence(commands, delay=200) {
delayBetween(commands.collect{ secure(it) }, delay)
}

private isSecured() {
if (zwaveInfo && zwaveInfo.zw) {
return zwaveInfo.zw.endsWith("s")
} else {
return state.sec == 1
}
}
2 changes: 2 additions & 0 deletions devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ metadata {
fingerprint mfr: "001A", prod: "534C", model: "0000", deviceJoinName: "Eaton RF Master Switch"
fingerprint mfr: "001A", prod: "5354", model: "0003", deviceJoinName: "Eaton RF Appliance Plug-In Module"
fingerprint mfr: "001A", prod: "5352", model: "0000", deviceJoinName: "Eaton RF Accessory Switch"
fingerprint mfr: "014F", prod: "5753", model: "3535", deviceJoinName: "GoControl Smart In-Wall Switch"
fingerprint mfr: "014F", prod: "5257", model: "3033", deviceJoinName: "GoControl Wall Relay Switch"
}

// simulator metadata
Expand Down