Skip to content

Commit be53bc5

Browse files
PR discussion fixes
1 parent c248678 commit be53bc5

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

drivers/SmartThings/zigbee-lock/src/init.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,9 @@ local migrate = function(driver, device, command)
310310
end
311311

312312
local code_length = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.codeLength.NAME)
313-
local max_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.maxCodeLength.NAME)
314-
local min_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.minCodeLength.NAME)
313+
local max_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.maxCodeLength.NAME, 4)
314+
local min_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.minCodeLength.NAME, 8)
315315
local max_codes = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.maxCodes.NAME)
316-
317316
if (code_length ~= nil) then
318317
max_code_len = code_length
319318
min_code_len = code_length

drivers/SmartThings/zwave-lock/src/init.lua

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -160,27 +160,20 @@ local function migrate(driver, device, cmd)
160160
end
161161

162162
for code in pairs(lock_codes) do
163-
table.insert(ordered_codes, code)
163+
table.insert(ordered_codes, code)
164164
end
165165

166166
table.sort(ordered_codes)
167167
for index = 1, #ordered_codes do
168-
local code_slot, code_name = ordered_codes[index], lock_codes[ ordered_codes[index] ]
169-
table.insert(lock_users, {userIndex = index, userType = "guest", userName = code_name})
170-
table.insert(lock_credentials, {userIndex = index, credentialIndex = tonumber(code_slot), credentialType = "pin"})
168+
local code_slot, code_name = ordered_codes[index], lock_codes[ ordered_codes[index] ]
169+
table.insert(lock_users, {userIndex = index, userType = "guest", userName = code_name})
170+
table.insert(lock_credentials, {userIndex = index, credentialIndex = tonumber(code_slot), credentialType = "pin"})
171171
end
172172

173173
local code_length = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.codeLength.NAME)
174-
local min_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.minCodeLength.NAME)
175-
local max_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.maxCodeLength.NAME)
174+
local min_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.minCodeLength.NAME, 4)
175+
local max_code_len = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.maxCodeLength.NAME, 10)
176176
local max_codes = device:get_latest_state("main", capabilities.lockCodes.ID, capabilities.lockCodes.maxCodes.NAME)
177-
178-
if (min_code_len == nil) then
179-
min_code_len = 4 -- per ZWave spec
180-
end
181-
if (max_code_len == nil) then
182-
max_code_len = 10 -- per ZWave spec
183-
end
184177
if (code_length ~= nil) then
185178
max_code_len = code_length
186179
min_code_len = code_length

0 commit comments

Comments
 (0)