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

fix: add SR-ZG9002KR12-Pro expose and add ZG9380A zigbeeModel for SR-ZG9042MP #8388

Merged
merged 2 commits into from
Nov 28, 2024
Merged

fix: add SR-ZG9002KR12-Pro expose and add ZG9380A zigbeeModel for SR-ZG9042MP #8388

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b95fc84
fix: add SR-ZG9002KR12-Pro expose and add ZG9380A zigbeeModel for SR-…
niracler Nov 27, 2024
7d11cb2
refactor: convert variable naming from snake_case to camelCase
niracler Nov 28, 2024
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
14 changes: 8 additions & 6 deletions src/devices/sunricher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,7 @@ const fzLocal = {
convert: (model, msg, publish, options, meta) => {
const bytes = [...msg.data];
const messageType = bytes[3];
const buttons: string[] = [];
let action = 'unknown';
let speed = 0;

if (messageType === 0x01) {
const pressTypeMask: number = bytes[6];
Expand All @@ -226,15 +224,17 @@ const fzLocal = {
16: 'k12',
};

const action_buttons: string[] = [];
for (let i = 0; i < 16; i++) {
if ((buttonMask >> i) & 1) {
const button = i + 1;
buttons.push(specialButtonMap[button] ?? `k${button}`);
action_buttons.push(specialButtonMap[button] ?? `k${button}`);
}
}
return {action, action_buttons};
} else if (messageType === 0x03) {
const directionMask = bytes[4];
speed = bytes[6];
const action_speed = bytes[6];

const directionMap: {[key: number]: string} = {
0x01: 'clockwise',
Expand All @@ -243,9 +243,10 @@ const fzLocal = {
const direction = directionMap[directionMask] || 'unknown';

action = `${direction}_rotation`;
return {action, action_speed};
}

return {action, buttons, speed};
return {action};
},
} satisfies Fz.Converter,
};
Expand All @@ -268,9 +269,10 @@ const definitions: DefinitionWithExtend[] = [
description: 'Zigbee smart wall panel remote',
extend: [battery()],
fromZigbee: [fzLocal.sunricher_SRZG9002KR12Pro],
exposes: [e.action(['short_press', 'double_press', 'hold', 'hold_released', 'clockwise_rotation', 'anti_clockwise_rotation'])],
},
{
zigbeeModel: ['ZV9380A'],
zigbeeModel: ['ZV9380A', 'ZG9380A'],
model: 'SR-ZG9042MP',
vendor: 'Sunricher',
description: 'Zigbee three phase power meter',
Expand Down