add support for generic zigbee multi-switch #1922
Conversation
|
Invitation URL: |
Test Results 64 files 409 suites 0s ⏱️ For more details on these failures, see this check. Results for commit c7c1799. ♻️ This comment has been updated with latest results. |
|
Minimum allowed coverage is Generated by 🐒 cobertura-action against c7c1799 |
| }) | ||
| end | ||
|
|
||
| local function device_added(driver, device, event) |
There was a problem hiding this comment.
This added function is now going to be run for all devices joined to the zigbee-switch driver, I don't think we should be making a change that affects all those other devices.
There was a problem hiding this comment.
This should be moved to the subdriver as this should only be run for the tuya devices.
EDIT: Oh, I see it was changed to not include the custom stuff so this may be fine to leave in the base driver since it is pretty generic.
There was a problem hiding this comment.
I figured out which devices are affected by this code in wwst certified devices. Most of devices that have multi endpoint has their own added_handler. but there is one device that doesn't have sub-driver.
- id: "ubisys/S2 (5502)"
deviceLabel: ubisys S2
manufacturer: ubisys
model: "S2 (5502)"
deviceProfileName: switch-power-firmware-2
ubisys S2 is multi component device.
name: switch-power-firmware-2
components:
- id: main
capabilities:
- id: powerMeter
version: 1
- id: firmwareUpdate
version: 1
- id: refresh
version: 1
categories:
- name: Switch
- id: switch1
capabilities:
- id: switch
version: 1
categories:
- name: Switch
- id: switch2
capabilities:
- id: switch
version: 1
categories:
- name: Switch
the device will be affected by this code. we need to avoid these code for this device.
There was a problem hiding this comment.
we will add S2 device(MCD) fingerprint in added handler to avoid running our logic.
There was a problem hiding this comment.
| @@ -85,6 +100,133 @@ local device_init = function(self, device) | |||
| end | |||
| end | |||
|
|
|||
|
|
|||
| local function send_discover_command(device) | |||
| local discover_attribute_id = 0x0c | |||
There was a problem hiding this comment.
This looks to be a command ID and not an attribute ID, and this command is not defined in the ZCL spec, which makes it seem like a manufacturer specific function, and we should not be sending a manufacturer specific command to every device that is onboarded.
There was a problem hiding this comment.
I think the intention is to send the global command Discovery Attributes which does have a command ID of 0x0C
There was a problem hiding this comment.
Ah, I had forgotten the default for the frame control was a global command. So that explains the command. I'm still not sure what the reason for sending it is.
| device:send(send_message) | ||
| end | ||
|
|
||
| local function read_attribute_function(device, cluster_id, attr_id) |
There was a problem hiding this comment.
A function like this is already defined in BasicCluster.read_attribute so you don't need to redifine it here.
| return result | ||
| end | ||
|
|
||
| local function all_zigbee_message_handler(self, message_channel) |
There was a problem hiding this comment.
This is going to change how EVERY message processed by ANY Zigbee Switch on the platform is handled. I do not think we should make this change.
pInksenberg
force-pushed
the
add_support_for_zigbee_mutli-switch
branch
from
bc2da4c to
fc3b686
Compare
| end | ||
|
|
||
| local function discover_response_message_handler(driver, device, zb_rx) | ||
| if zb_rx.address_header.cluster.value == clusters.Basic.ID and zb_rx.body.zcl_header.cmd.value == DISCOVER_ATTR_RSP_ID then |
There was a problem hiding this comment.
If this function is called, both of these have already been validated, so you don't need to check again here.
| device:send(send_message) | ||
| end | ||
|
|
||
| local function read_attribute_function(device, cluster_id, attr_id) |
There was a problem hiding this comment.
As mentioned, this code is already defined in the zigbee cluster_base, so you can just require the BasicCluster and then use BasicCluster.read_attribute(device, cluster_id, attr_id) instead of duplicating the code here.
| end | ||
| table.remove(bytes, 1) -- remove first type which means discover attribute command is completed | ||
| local result = {} | ||
| for i = 1, #bytes, 3 do -- remove data type information |
There was a problem hiding this comment.
I think this loop can be simplified by using the buf lib local buf = buf_lib.Reader(data) and then you can use
https://github.ecodesamsung.com/iot-hub/scripting-engine/blob/main/lua_libs/st/zigbee/data_types/AttributeId.lua
and
https://github.ecodesamsung.com/iot-hub/scripting-engine/blob/main/lua_libs/st/zigbee/data_types/ZigbeeDataType.lua
using their deserialize functions.
So something like
local attr_list = {}
while buf:remain() > 0 do
attr_list[#attr_list+1] = AttributeId.deserialize(buf)
local type_info = ZigbeeDataType.deserialize(buf)
end
you could also create a definition for the discover attribute response global command similar to https://developer.smartthings.com/docs/edge-device-drivers/zigbee/zcl/zcl_commands.html#read-attribute-response so that we can support this from any driver instead of custom in this driver.
| local TUYA_MFR_HEADER = "_TZ" | ||
|
|
||
| local function is_tuya_products(opts, driver, device) | ||
| if string.sub(device:get_manufacturer(),1,3) == TUYA_MFR_HEADER then -- if it is a tuya device, then send the magic packet |
There was a problem hiding this comment.
Should we also check that there is more than 1 zigbee endpoint since this handling is only for multi switch devices?
There was a problem hiding this comment.
@pInksenberg can you address @varzac 's comment?
There was a problem hiding this comment.
Sure, we will add this logic in next commit tonight.
| @@ -85,6 +89,40 @@ local device_init = function(self, device) | |||
| end | |||
| end | |||
|
|
|||
| local function device_added(driver, device, event) | |||
| device:set_find_child(find_child) | |||
There was a problem hiding this comment.
I would move setting this function to only be set if at least 1 child device is created.
pInksenberg
force-pushed
the
add_support_for_zigbee_mutli-switch
branch
from
fc3b686 to
09e3de1
Compare
pInksenberg
force-pushed
the
add_support_for_zigbee_mutli-switch
branch
from
09e3de1 to
c7c1799
Compare
Check all that apply
Type of Change
Checklist
Description of Change
add support for generic zigbee multi-switch
Summary of Completed Tests