Skip to content
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

Jump to bottom

Update ISM300Z3 device #7549

Merged
merged 2 commits into from
May 23, 2024
Merged

Update ISM300Z3 device #7549

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b27c76
Update ISM300Z3 device
shinasys May 23, 2024
81ab351
Update switch_3way_mode, rf_pairing description
shinasys May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
102 changes: 29 additions & 73 deletions src/devices/shinasystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,6 @@ const fzLocal = {
};
},
} satisfies Fz.Converter,
ISM300Z3_on_off: {
cluster: 'genOnOff',
type: ['attributeReport', 'readResponse'],
convert: (model, msg, publish, options, meta) => {
if (msg.data.hasOwnProperty('onOff')) {
const property = utils.postfixWithEndpointName('state', msg, model, meta);
return {[property]: msg.data['onOff'] === 1 ? 'ON' : 'OFF'};
} else if (msg.data.hasOwnProperty(0x9000)) {
const value = msg.data[0x9000];
const lookup = {0: 'auto', 1: 'push', 2: 'latch'};
return {operation_mode: utils.getFromLookup(value, lookup)};
}
},
} satisfies Fz.Converter,
GCM300Z_valve_status: {
cluster: 'genOnOff',
type: ['attributeReport', 'readResponse'],
Expand Down Expand Up @@ -170,45 +156,6 @@ const tzLocal = {
await endpoint.write('genAnalogInput', payload);
},
} satisfies Tz.Converter,
ISM300Z3_on_off: {
key: ['state', 'operation_mode'],
convertSet: async (entity, key, value, meta) => {
const endpoint = meta.device.getEndpoint(1);
if (key === 'state') {
// @ts-expect-error
const state = meta.message.hasOwnProperty('state') ? meta.message.state.toLowerCase() : null;
utils.validateValue(state, ['toggle', 'off', 'on']);
await entity.command('genOnOff', state, {}, utils.getOptions(meta.mapped, entity));
if (state === 'toggle') {
const currentState = meta.state[`state${meta.endpoint_name ? `_${meta.endpoint_name}` : ''}`];
return currentState ? {state: {state: currentState === 'OFF' ? 'ON' : 'OFF'}} : {};
} else {
return {state: {state: state.toUpperCase()}};
}
} else if (key === 'operation_mode') {
const lookup = {'auto': 0, 'push': 1, 'latch': 2};
const payload = {0x9000: {value: utils.getFromLookup(value, lookup), type: 0x20}}; // INT8U
await entity.write('genOnOff', payload);
await endpoint.read('genOnOff', [0x9000]);
}
},
convertGet: async (entity, key, meta) => {
if (key === 'operation_mode') {
const endpoint = meta.device.getEndpoint(1);
await endpoint.read('genOnOff', [0x9000]);
} else {
await entity.read('genOnOff', ['onOff']);
}
},
} satisfies Tz.Converter,
ISM300Z3_rf_pairing: {
key: ['rf_pairing'],
convertSet: async (entity, key, value, meta) => {
const lookup = {'l1': 1, 'l2': 2, 'l3': 3};
const payload = {0x9001: {value: utils.getFromLookup(value, lookup), type: 0x20}}; // INT8U
await entity.write('genOnOff', payload);
},
} satisfies Tz.Converter,
GCM300Z_valve_status: {
key: ['gas_valve_state'],
convertSet: async (entity, key, value, meta) => {
Expand Down Expand Up @@ -716,26 +663,35 @@ const definitions: Definition[] = [
model: 'ISM300Z3',
vendor: 'ShinaSystem',
description: 'SiHAS IOT smart inner switch 3 gang',
fromZigbee: [fzLocal.ISM300Z3_on_off],
toZigbee: [tzLocal.ISM300Z3_on_off, tzLocal.ISM300Z3_rf_pairing],
exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.switch().withEndpoint('l3'),
e.enum('operation_mode', ea.ALL, ['auto', 'push', 'latch'])
.withDescription('Operation mode: "auto" - toggle by S/W, "push" - for momentary S/W, "latch" - sync S/W'),
e.enum('rf_pairing', ea.SET, ['l1', 'l2', 'l3'])
.withDescription('Enable RF pairing mode each button l1, l2, l3')],
endpoint: (device) => {
return {l1: 1, l2: 2, l3: 3};
},
meta: {multiEndpoint: true},
configure: async (device, coordinatorEndpoint) => {
await device.getEndpoint(1).read('genOnOff', [0x9000]);
await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
await reporting.onOff(device.getEndpoint(1));
await reporting.onOff(device.getEndpoint(2));
await reporting.onOff(device.getEndpoint(3));
},
extend: [
onOff({endpointNames: ['l1', 'l2', 'l3'], powerOnBehavior: false}),
deviceEndpoints({endpoints: {'l1': 1, 'l2': 2, 'l3': 3}}),
enumLookup({
name: 'operation_mode',
lookup: {'auto': 0, 'push': 1, 'latch': 2},
cluster: 'genOnOff',
attribute: {ID: 0x9000, type: 0x20},
description: 'switch type: "auto" - toggle by S/W, "push" - for momentary S/W, "latch" - sync S/W.',
endpointName: 'l1',
}),
enumLookup({
name: 'rf_pairing',
lookup: {'none': 0, 'l1': 1, 'l2': 2, 'l3': 3},
cluster: 'genOnOff',
attribute: {ID: 0x9001, type: 0x20},
description: 'Enable RF pairing mode each button l1, l2, l3. It is supported only in repeat mode.',
endpointName: 'l1',
}),
enumLookup({
name: 'switch_3way_mode',
lookup: {'disable': 0, 'enable': 1},
cluster: 'genOnOff',
attribute: {ID: 0x900f, type: 0x20},
description: 'If the 3-way switch setting is enabled, the 1st and 3rd switches are used. ' +
'At this time, connect the remote switch to SW3.',
endpointName: 'l1',
}),
],
},
{
zigbeeModel: ['GCM-300Z'],
Expand Down