Skip to content

Add debounce delay to coalesce both subscription updates #3209

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

Open
HunsupJung wants to merge 2 commits into
base: main
Choose a base branch
from
+84 −13
Open

Add debounce delay to coalesce both subscription updates #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f4541b
Add debounce delay to coalesce both subscription updates
HunsupJung Sep 1, 2026
2985cc6
Modify test case to add debounce delay
HunsupJung Sep 2, 2026
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: 19 additions & 13 deletions drivers/SmartThings/matter-rvc/src/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ local OPERATING_STATE_MAP = {
[clus_rvc_op_enum.DOCKED] = cap_op_enum.docked
}

local DEBOUNCE_DELAY_S = 1 -- wait for both sources(OperationalState and RvcRunMode) to settle

local subscribed_attributes = {
[capabilities.mode.ID] = {
clusters.RvcRunMode.attributes.SupportedModes,
Expand Down Expand Up @@ -292,12 +294,14 @@ local function run_mode_current_mode_handler(driver, device, ib, response)
device:set_field(CURRENT_RUN_MODE, current_run_mode, { persist = true })

-- Update supported mode
local current_state = device:get_latest_state(
"main",
capabilities.robotCleanerOperatingState.ID,
capabilities.robotCleanerOperatingState.operatingState.NAME
)
update_supported_arguments(device, ib.endpoint_id, current_run_mode, current_state)
device.thread:call_with_delay(DEBOUNCE_DELAY_S, function()
local current_state = device:get_latest_state(
"main",
capabilities.robotCleanerOperatingState.ID,
capabilities.robotCleanerOperatingState.operatingState.NAME
)
update_supported_arguments(device, ib.endpoint_id, current_run_mode, current_state)
end)
end

local function clean_mode_supported_mode_handler(driver, device, ib, response)
Expand Down Expand Up @@ -336,13 +340,15 @@ local function rvc_operational_state_attr_handler(driver, device, ib, response)
device:emit_event_for_endpoint(ib.endpoint_id, OPERATING_STATE_MAP[ib.data.value]())
end

-- Supported Mode update
local current_run_mode = device:get_field(CURRENT_RUN_MODE)
if ib.data.value ~= clus_op_enum.ERROR then
update_supported_arguments(device, ib.endpoint_id, current_run_mode, OPERATING_STATE_MAP[ib.data.value].NAME)
else
update_supported_arguments(device, ib.endpoint_id, current_run_mode, "Error")
end
-- Update supported mode
device.thread:call_with_delay(DEBOUNCE_DELAY_S, function()
local current_run_mode = device:get_field(CURRENT_RUN_MODE)
if ib.data.value ~= clus_op_enum.ERROR then
update_supported_arguments(device, ib.endpoint_id, current_run_mode, OPERATING_STATE_MAP[ib.data.value].NAME)
else
update_supported_arguments(device, ib.endpoint_id, current_run_mode, "Error")
end
end)
end

local function rvc_operational_error_attr_handler(driver, device, ib, response)
Expand Down
65 changes: 65 additions & 0 deletions drivers/SmartThings/matter-rvc/src/test/test_matter_rvc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -291,6 +294,9 @@ test.register_coroutine_test(
CLEANING_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -319,6 +325,9 @@ test.register_coroutine_test(
MAPPING_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -396,6 +405,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -437,6 +449,9 @@ test.register_coroutine_test(
CLEANING_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -475,6 +490,9 @@ test.register_coroutine_test(
CLEANING_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -484,6 +502,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalState:build_test_report_data(
Expand All @@ -498,6 +517,9 @@ test.register_coroutine_test(
capabilities.robotCleanerOperatingState.operatingState.running()
)
)
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -538,6 +560,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -550,6 +575,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalState:build_test_report_data(
Expand All @@ -564,6 +590,9 @@ test.register_coroutine_test(
capabilities.robotCleanerOperatingState.operatingState.running()
)
)
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -592,6 +621,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -604,6 +636,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalState:build_test_report_data(
Expand All @@ -618,6 +651,9 @@ test.register_coroutine_test(
capabilities.robotCleanerOperatingState.operatingState.paused()
)
)
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -649,6 +685,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -661,6 +700,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalState:build_test_report_data(
Expand All @@ -675,6 +715,9 @@ test.register_coroutine_test(
capabilities.robotCleanerOperatingState.operatingState.seekingCharger()
)
)
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -706,6 +749,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -718,6 +764,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalState:build_test_report_data(
Expand All @@ -732,6 +779,9 @@ test.register_coroutine_test(
capabilities.robotCleanerOperatingState.operatingState.charging()
)
)
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -760,6 +810,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -772,6 +825,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalState:build_test_report_data(
Expand All @@ -786,6 +840,9 @@ test.register_coroutine_test(
capabilities.robotCleanerOperatingState.operatingState.docked()
)
)
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand Down Expand Up @@ -814,6 +871,9 @@ test.register_coroutine_test(
IDLE_MODE.mode
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -826,6 +886,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalState:build_test_report_data(
Expand All @@ -834,6 +895,9 @@ test.register_coroutine_test(
clusters.OperationalState.types.OperationalStateEnum.ERROR
)
})
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
test.wait_for_events()
test.mock_time.advance_time(1)
test.socket.capability:__expect_send(
mock_device:generate_test_message(
"main",
Expand All @@ -843,6 +907,7 @@ test.register_coroutine_test(
)
)
)
test.wait_for_events()
test.socket.matter:__queue_receive({
mock_device.id,
clusters.RvcOperationalState.server.attributes.OperationalError:build_test_report_data(
Expand Down
Loading