Skip to content

Add energy report to SW2500ZB and other minor fixes #5697

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
Apr 29, 2023
Merged

Add energy report to SW2500ZB and other minor fixes #5697

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f79aae
Add energy report to SW2500ZB and other minor fixes
ericgu08 Apr 29, 2023
0d2b8f1
Fixed lint
ericgu08 Apr 29, 2023
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
32 changes: 20 additions & 12 deletions devices/sinope.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ const tzLocal = {
},
},
connected_load: {
// TH1400ZB specific
// TH1400ZB and SW2500ZB
key: ['connected_load'],
convertSet: async (entity, key, value, meta) => {
await entity.write('manuSpecificSinope', {connectedLoad: value});
Expand Down Expand Up @@ -413,7 +413,7 @@ const tzLocal = {
if (value >= 0 && value <= 100) {
await entity.write('manuSpecificSinope', {ledIntensityOn: value});
}
return {readAfterWriteTime: 250, state: {ledIntensityOn: value}};
return {state: {led_intensity_on: value}};
},
convertGet: async (entity, key, meta) => {
await entity.read('manuSpecificSinope', ['ledIntensityOn']);
Expand All @@ -426,7 +426,7 @@ const tzLocal = {
if (value >= 0 && value <= 100) {
await entity.write('manuSpecificSinope', {ledIntensityOff: value});
}
return {readAfterWriteTime: 250, state: {ledIntensityOff: value}};
return {state: {led_intensity_off: value}};
},
convertGet: async (entity, key, meta) => {
await entity.read('manuSpecificSinope', ['ledIntensityOff']);
Expand Down Expand Up @@ -476,13 +476,13 @@ const tzLocal = {
if (value >= 0 && value <= 10800) {
await entity.write('manuSpecificSinope', {dimmerTimmer: value});
}
return {readAfterWriteTime: 250, state: {dimmerTimmer: value}};
return {state: {timer_seconds: value}};
},
convertGet: async (entity, key, meta) => {
await entity.read('manuSpecificSinope', ['dimmerTimmer']);
},
},
keypad_lock: {
keypad_lockout: {
// SW2500ZB
key: ['keypad_lockout'],
convertSet: async (entity, key, value, meta) => {
Expand Down Expand Up @@ -991,16 +991,16 @@ module.exports = [
model: 'SW2500ZB',
vendor: 'Sinopé',
description: 'Zigbee smart light switch',
fromZigbee: [fz.on_off, fz.electrical_measurement, fzLocal.sinope],
fromZigbee: [fz.on_off, fzLocal.sinope, fz.metering],
toZigbee: [tz.on_off, tzLocal.timer_seconds, tzLocal.led_intensity_on, tzLocal.led_intensity_off,
tzLocal.led_color_on, tzLocal.led_color_off, tzLocal.keypad_lock],
tzLocal.led_color_on, tzLocal.led_color_off, tzLocal.keypad_lockout, tzLocal.connected_load],
exposes: [e.switch(),
e.action(['up_single', 'up_double', 'up_hold', 'down_single', 'down_double', 'down_hold']),
exposes.numeric('timer_seconds', ea.ALL).withValueMin(0).withValueMax(10800)
exposes.numeric('timer_seconds', ea.ALL).withUnit('seconds').withValueMin(0).withValueMax(10800)
.withDescription('Automatically turn off load after x seconds'),
exposes.numeric('led_intensity_on', ea.ALL).withValueMin(0).withValueMax(100)
exposes.numeric('led_intensity_on', ea.ALL).withUnit('%').withValueMin(0).withValueMax(100)
.withDescription('Control status LED intensity when load ON'),
exposes.numeric('led_intensity_off', ea.ALL).withValueMin(0).withValueMax(100)
exposes.numeric('led_intensity_off', ea.ALL).withUnit('%').withValueMin(0).withValueMax(100)
.withDescription('Control status LED intensity when load OFF'),
exposes.composite('led_color_on', 'led_color_on', ea.SET)
.withFeature(exposes.numeric('r', ea.SET))
Expand All @@ -1013,12 +1013,20 @@ module.exports = [
.withFeature(exposes.numeric('b', ea.SET))
.withDescription('Control status LED color when load OFF'),
exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock'])
.withDescription('Enables or disables the device’s buttons')],
.withDescription('Enables or disables the device’s buttons'),
exposes.numeric('connected_load', ea.ALL)
.withUnit('W').withValueMin(1).withValueMax(1800)
.withDescription('Load connected in watt'),
e.energy(),
],
configure: async (device, coordinatorEndpoint, logger) => {
const endpoint = device.getEndpoint(1);
const binds = ['genOnOff'];
const binds = ['genOnOff', 'manuSpecificSinope', 'seMetering'];
await reporting.bind(endpoint, coordinatorEndpoint, binds);
await reporting.onOff(endpoint);
try {
await reporting.currentSummDelivered(endpoint, {min: 10, max: 300, change: [0, 10]});
} catch (error) {/* Do nothing*/}
const payload = [{
attribute: 'actionReport',
minimumReportInterval: 0,
Expand Down