Skip to content

Commit 35c5570

Browse files
authored
Merge pull request #2140 from pInksenberg/fix-an-issue-of-tuya-switch-duplicate-event-sending
fix an issue of Tuya button send duplicate event
2 parents 57514c8 + d8099ee commit 35c5570

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

drivers/Unofficial/tuya-zigbee/src/button/init.lua

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ local function added_handler(self, device)
3939
device:emit_event(capabilities.button.button.pushed({state_change = false}))
4040
end
4141

42-
local function button_handler(event)
43-
return function(driver, device, value, zb_rx)
44-
device:emit_event(event)
45-
end
46-
end
47-
4842
local tuya_private_cluster_button_handler = function(driver, device, zb_rx)
4943
local event
5044
local additional_fields = {
@@ -79,9 +73,6 @@ local tuya_button_driver = {
7973
zigbee_handlers = {
8074
cluster = {
8175
[OnOff.ID] = {
82-
[OnOff.server.commands.On.ID] = button_handler(capabilities.button.button.double({ state_change = true })),
83-
[OnOff.server.commands.Off.ID] = button_handler(capabilities.button.button.held({ state_change = true })),
84-
[OnOff.server.commands.Toggle.ID] = button_handler(capabilities.button.button.pushed({ state_change = true })),
8576
[PRESENT_ATTRIBUTE_ID] = tuya_private_cluster_button_handler
8677
}
8778
}

drivers/Unofficial/tuya-zigbee/src/test/test_tuya_button.lua

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -90,32 +90,6 @@ test.register_coroutine_test(
9090
end
9191
)
9292

93-
test.register_coroutine_test(
94-
"OnOff cluster any command (except On or Off) should result with sending pushed event",
95-
function()
96-
test.socket.zigbee:__queue_receive({
97-
mock_device.id,
98-
OnOff.server.commands.Toggle.build_test_rx(mock_device)
99-
})
100-
test.socket.capability:__expect_send(
101-
mock_device:generate_test_message("main", button.button.pushed({ state_change = true }))
102-
)
103-
end
104-
)
105-
106-
test.register_coroutine_test(
107-
"OnOff cluster On command should result with sending double event",
108-
function()
109-
test.socket.zigbee:__queue_receive({
110-
mock_device.id,
111-
OnOff.server.commands.On.build_test_rx(mock_device)
112-
})
113-
test.socket.capability:__expect_send(
114-
mock_device:generate_test_message("main", button.button.double({ state_change = true }))
115-
)
116-
end
117-
)
118-
11993
test.register_coroutine_test(
12094
"OnOff cluster private command 0x01 should result with sending double event",
12195
function()
@@ -126,19 +100,6 @@ test.register_coroutine_test(
126100
end
127101
)
128102

129-
test.register_coroutine_test(
130-
"OnOff cluster Off command should result with sending held event",
131-
function()
132-
test.socket.zigbee:__queue_receive({
133-
mock_device.id,
134-
OnOff.server.commands.Off.build_test_rx(mock_device)
135-
})
136-
test.socket.capability:__expect_send(
137-
mock_device:generate_test_message("main", button.button.held({ state_change = true }))
138-
)
139-
end
140-
)
141-
142103
test.register_coroutine_test(
143104
"OnOff cluster private command 0x02 should result with sending held event",
144105
function()

0 commit comments

Comments
 (0)