Skip to content

Sinope WWST DTH update #31140

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
May 29, 2020
Merged

Sinope WWST DTH update #31140

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
556ad8e
Sinope WWST DTH update
May 12, 2020
e5c8095
Modifying 'Sinope WWST DTH update'
May 12, 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
59 changes: 24 additions & 35 deletions devicetypes/sinope-technologies/dm2500zb-sinope-dimmer.src/dm2500zb-sinope-dimmer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**

Copyright Sinopé Technologies 2019
1.1.0
Copyright Sinopé Technologies
1.3.0
SVN-571
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -14,8 +13,8 @@ preferences {

input("LedIntensityParam", "number", title:"Indicator light intensity (1..100) (default: blank)", range:"1..100", description:"optional")
input("trace", "bool", title: "Trace", description: "Set it to true to enable tracing")
input("logFilter", "number", title: "Trace level", range: "1..5",
description: "1= ERROR only, 2= <1+WARNING>, 3= <2+INFO>, 4= <3+DEBUG>, 5= <4+TRACE>")
// input("logFilter", "number", title: "Trace level", range: "1..5",
// description: "1= ERROR only, 2= <1+WARNING>, 3= <2+INFO>, 4= <3+DEBUG>, 5= <4+TRACE>")
}

metadata {
Expand Down Expand Up @@ -71,7 +70,7 @@ def parse(String description)
else {
traceEvent(settings.logFilter, "send event : $event", settings.trace, get_LOG_DEBUG())
sendEvent(event)
sendEvent(name: "checkInterval", value: 30*60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
sendEvent(name: "checkInterval", value: 300, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
}
}
else
Expand Down Expand Up @@ -313,35 +312,25 @@ def traceEvent(logFilter, message, displayEvent = false, traceLevel = 4, sendMes
int LOG_INFO = get_LOG_INFO()
int LOG_DEBUG = get_LOG_DEBUG()
int LOG_TRACE = get_LOG_TRACE()
int filterLevel = (logFilter) ? logFilter.toInteger() : get_LOG_WARN()

if ((displayEvent) || (sendMessage)) {
def results = [
name: "verboseTrace",
value: message,
displayed: ((displayEvent) ?: false)
]

if ((displayEvent) && (filterLevel >= traceLevel)) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
} /* end switch*/
if (sendMessage) sendEvent(results)
} /* end if displayEvent*/
if (displayEvent || traceLevel < 4) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
}
}
}
68 changes: 28 additions & 40 deletions ...e-technologies/rm3250zb-sinope-load-controller.src/rm3250zb-sinope-load-controller.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**

Copyright Sinopé Technologies 2019
1.1.0
Copyright Sinopé Technologies
1.3.0
SVN-571
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -11,8 +10,8 @@ metadata {

preferences {
input("trace", "bool", title: "Trace", description: "Set it to true to enable tracing")
input("logFilter", "number", title: "Trace level", range: "1..5",
description: "1= ERROR only, 2= <1+WARNING>, 3= <2+INFO>, 4= <3+DEBUG>, 5= <4+TRACE>")
// input("logFilter", "number", title: "Trace level", range: "1..5",
// description: "1= ERROR only, 2= <1+WARNING>, 3= <2+INFO>, 4= <3+DEBUG>, 5= <4+TRACE>")
}

definition (name: "RM3250ZB Sinope Load Controller", namespace: "Sinope Technologies", author: "Sinope Technologies", , ocfDeviceType: "oic.d.switch") {
Expand Down Expand Up @@ -92,18 +91,17 @@ def refresh() {
traceEvent(settings.logFilter, "Refresh.", settings.trace, get_LOG_DEBUG())
return zigbee.readAttribute(0x0006, 0x0000) + //read on/off
zigbee.readAttribute(0x0B04, 0x050B) + //read active power
zigbee.configureReporting(0x0006, 0x0000, 0x10, 0, 600, null) + //configure reporting of on/off
zigbee.configureReporting(0x0B04, 0x050B, 0x29, 30, 599, 0x64) // configure reporting of active power
configure()
}

def configure() {
traceEvent(settings.logFilter, "Configuring Reporting and Bindings.", settings.trace, get_LOG_DEBUG())

//allow 30 minutes without receiving on/off state
sendEvent(name: "checkInterval", value: 30*60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
sendEvent(name: "checkInterval", value: 300, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])

return zigbee.configureReporting(0x0006, 0x0000, 0x10, 0, 600, null) + // configure reporting of active power
zigbee.configureReporting(0x0B04, 0x050B, 0x29, 30, 599, 0x64) + //configure reporting of on/off
return zigbee.configureReporting(0x0006, 0x0000, 0x10, 0, 600, null) + //configure reporting of on/off
zigbee.configureReporting(0x0B04, 0x050B, 0x29, 5, 300, 0x05) + // configure reporting of active power
zigbee.readAttribute(0x0006, 0x0000) + //read on/off
zigbee.readAttribute(0x0B04, 0x050B) //read active power
}
Expand All @@ -130,35 +128,25 @@ def traceEvent(logFilter, message, displayEvent = false, traceLevel = 4, sendMes
int LOG_INFO = get_LOG_INFO()
int LOG_DEBUG = get_LOG_DEBUG()
int LOG_TRACE = get_LOG_TRACE()
int filterLevel = (logFilter) ? logFilter.toInteger() : get_LOG_WARN()

if ((displayEvent) || (sendMessage)) {
def results = [
name: "verboseTrace",
value: message,
displayed: ((displayEvent) ?: false)
]

if ((displayEvent) && (filterLevel >= traceLevel)) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
} /* end switch*/
if (sendMessage) sendEvent(results)
} /* end if displayEvent*/
if (displayEvent || traceLevel < 4) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
}
}
}
}
65 changes: 27 additions & 38 deletions devicetypes/sinope-technologies/sw2500zb-sinope-switch.src/sw2500zb-sinope-switch.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**

Copyright Sinopé Technologies 2019
1.1.0
Copyright Sinopé Technologies
1.3.0
SVN-571
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -12,8 +11,8 @@ metadata {
preferences {
input("LedIntensityParam", "number", title:"Indicator light intensity (1..100) (default: blank)", range:"1..100", description:"optional")
input("trace", "bool", title: "Trace", description: "Set it to true to enable tracing")
input("logFilter", "number", title: "Trace level", range: "1..5",
description: "1= ERROR only, 2= <1+WARNING>, 3= <2+INFO>, 4= <3+DEBUG>, 5= <4+TRACE>")
// input("logFilter", "number", title: "Trace level", range: "1..5",
// description: "1= ERROR only, 2= <1+WARNING>, 3= <2+INFO>, 4= <3+DEBUG>, 5= <4+TRACE>")
}

definition (name: "SW2500ZB Sinope Switch", namespace: "Sinope Technologies", author: "Sinope Technologies", ocfDeviceType: "oic.d.switch")
Expand Down Expand Up @@ -58,7 +57,7 @@ def parse(String description)
{
traceEvent(settings.logFilter, "Event: $event", settings.trace, get_LOG_DEBUG())
sendEvent(event)
sendEvent(name: "checkInterval", value: 30*60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
sendEvent(name: "checkInterval", value: 300, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
}
else
{
Expand Down Expand Up @@ -123,8 +122,8 @@ def configure()
{
traceEvent(settings.logFilter, "Configuring Reporting and Bindings", settings.trace, get_LOG_DEBUG())

//allow 30 min without receiving on/off report
sendEvent(name: "checkInterval", value: 30*60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
//allow 5 min without receiving on/off report
sendEvent(name: "checkInterval", value: 300, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])

return zigbee.configureReporting(0x0006, 0x0000, 0x10, 0, 600, null) +
zigbee.readAttribute(0x0006, 0x0000)
Expand Down Expand Up @@ -152,36 +151,26 @@ def traceEvent(logFilter, message, displayEvent = false, traceLevel = 4, sendMes
int LOG_INFO = get_LOG_INFO()
int LOG_DEBUG = get_LOG_DEBUG()
int LOG_TRACE = get_LOG_TRACE()
int filterLevel = (logFilter) ? logFilter.toInteger() : get_LOG_WARN()

if ((displayEvent) || (sendMessage)) {
def results = [
name: "verboseTrace",
value: message,
displayed: ((displayEvent) ?: false)
]

if ((displayEvent) && (filterLevel >= traceLevel)) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
} /* end switch*/
if (sendMessage) sendEvent(results)
} /* end if displayEvent*/

if (displayEvent || traceLevel < 4) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
}
}
}

Expand Down
52 changes: 21 additions & 31 deletions ...logies/th1123zb-th1124zb-sinope-thermostat.src/th1123zb-th1124zb-sinope-thermostat.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
Copyright Sinopé Technologies
1.2.0
1.3.0
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
**/
Expand Down Expand Up @@ -642,35 +642,25 @@ def traceEvent(logFilter, message, displayEvent = false, traceLevel = 4, sendMes
int LOG_INFO = get_LOG_INFO()
int LOG_DEBUG = get_LOG_DEBUG()
int LOG_TRACE = get_LOG_TRACE()
int filterLevel = (logFilter) ? logFilter.substring(0,1).toInteger() : get_LOG_WARN()

if ((displayEvent) || (sendMessage)) {
// def results = [
// name: "verboseTrace",
// value: message,
// displayed: ((displayEvent) ?: false)
// ]

if ((displayEvent) && (filterLevel >= traceLevel)) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
} /* end switch*/
// if (sendMessage) sendEvent(results)
} /* end if displayEvent*/

if (displayEvent || traceLevel < 4) {
switch (traceLevel) {
case LOG_ERROR:
log.error "${message}"
break
case LOG_WARN:
log.warn "${message}"
break
case LOG_INFO:
log.info "${message}"
break
case LOG_TRACE:
log.trace "${message}"
break
case LOG_DEBUG:
default:
log.debug "${message}"
break
}
}
}
Loading