Skip to content

Commit f9fec6e

Browse files
committed
Update profile parsing from ipairs to pairs
1 parent d4647ea commit f9fec6e

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,16 +247,13 @@ local function profile_changed(latest_profile, previous_profile)
247247
if prev_component == nil then
248248
return true
249249
end
250-
if #synced_component.capabilities ~= #prev_component.capabilities then
251-
return true
252-
end
253250
-- Build a table of capability IDs from the previous component. Then, use this map to check
254251
-- that all capabilities in the synced component existed in the previous component.
255252
local prev_cap_ids = {}
256-
for _, capability in ipairs(prev_component.capabilities or {}) do
253+
for _, capability in pairs(prev_component.capabilities or {}) do
257254
prev_cap_ids[capability.id] = true
258255
end
259-
for _, capability in ipairs(synced_component.capabilities or {}) do
256+
for _, capability in pairs(synced_component.capabilities or {}) do
260257
if not prev_cap_ids[capability.id] then
261258
return true
262259
end

drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_utils/utils.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,13 @@ function AirQualitySensorUtils.profile_changed(latest_profile, previous_profile)
8686
if prev_component == nil then
8787
return true
8888
end
89-
if #synced_component.capabilities ~= #prev_component.capabilities then
90-
return true
91-
end
9289
-- Build a table of capability IDs from the previous component. Then, use this map to check
9390
-- that all capabilities in the synced component existed in the previous component.
9491
local prev_cap_ids = {}
95-
for _, capability in ipairs(prev_component.capabilities or {}) do
92+
for _, capability in pairs(prev_component.capabilities or {}) do
9693
prev_cap_ids[capability.id] = true
9794
end
98-
for _, capability in ipairs(synced_component.capabilities or {}) do
95+
for _, capability in pairs(synced_component.capabilities or {}) do
9996
if not prev_cap_ids[capability.id] then
10097
return true
10198
end

drivers/SmartThings/matter-switch/src/switch_utils/utils.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,16 +334,13 @@ function utils.profile_changed(latest_profile, previous_profile)
334334
if prev_component == nil then
335335
return true
336336
end
337-
if #synced_component.capabilities ~= #prev_component.capabilities then
338-
return true
339-
end
340337
-- Build a table of capability IDs from the previous component. Then, use this map to check
341338
-- that all capabilities in the synced component existed in the previous component.
342339
local prev_cap_ids = {}
343-
for _, capability in ipairs(prev_component.capabilities or {}) do
340+
for _, capability in pairs(prev_component.capabilities or {}) do
344341
prev_cap_ids[capability.id] = true
345342
end
346-
for _, capability in ipairs(synced_component.capabilities or {}) do
343+
for _, capability in pairs(synced_component.capabilities or {}) do
347344
if not prev_cap_ids[capability.id] then
348345
return true
349346
end

drivers/SmartThings/matter-switch/src/test/test_matter_light_fan.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ test.register_coroutine_test(
161161
if i > 1 then subscribe_request:merge(clus:subscribe(mock_device_capabilities_disabled)) end
162162
end
163163
test.socket.device_lifecycle:__queue_receive(mock_device_capabilities_disabled:generate_info_changed(
164-
{profile = {id = "00000000-1111-2222-3333-000000000004", components = { main = {capabilities={{id="fanSpeedPercent", version=1}, {id="fanMode", version=1}, {id="firmwareUpdate", version=1}, {id="refresh", version=1}}}}}})
164+
{profile = {id = "00000000-1111-2222-3333-000000000004", components = { main = {capabilities={["fanSpeedPercent"] = {id="fanSpeedPercent", version=1}, ["fanMode"] = {id="fanMode", version=1}, ["firmwareUpdate"] = {id="firmwareUpdate", version=1}, ["refresh"] = {id="refresh", version=1}}}}}})
165165
)
166166
test.socket.matter:__expect_send({mock_device_capabilities_disabled.id, subscribe_request})
167167
end,
@@ -180,7 +180,7 @@ test.register_coroutine_test(
180180
if i > 1 then subscribe_request:merge(clus:subscribe(mock_device_capabilities_disabled)) end
181181
end
182182
test.socket.device_lifecycle:__queue_receive(mock_device_capabilities_disabled:generate_info_changed(
183-
{profile = {id = "00000000-1111-2222-3333-000000000004", components = { main = {capabilities={{id="firmwareUpdate", version=1}, {id="refresh", version=1}}}}}})
183+
{profile = {id = "00000000-1111-2222-3333-000000000004", components = { main = {capabilities={["firmwareUpdate"] = {id="firmwareUpdate", version=1}, ["refresh"] = {id="refresh", version=1}}}}}})
184184
)
185185
end,
186186
{ test_init = function() test.mock_device.add_test_device(mock_device_capabilities_disabled) end }

0 commit comments

Comments
 (0)