Skip to content
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

fix aqara smoke detector reonboarding issue #1294

Merged
merged 1 commit into from
Apr 3, 2024
Merged

fix aqara smoke detector reonboarding issue #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions drivers/SmartThings/zigbee-smoke-detector/src/aqara/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,24 @@ local function device_init(driver, device)
end

local function device_added(driver, device)
device:send(cluster_base.write_manufacturer_specific_attribute(device,
PRIVATE_CLUSTER_ID, PRIVATE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0x01))
device:emit_event(capabilities.smokeDetector.smoke.clear())
device:emit_event(capabilities.audioMute.mute.unmuted())
device:emit_event(selfCheck.selfCheckState.idle())
device:emit_event(capabilities.battery.battery(100))
end

local function do_configure(self, device)
device:configure()
device:send(cluster_base.write_manufacturer_specific_attribute(device,
PRIVATE_CLUSTER_ID, PRIVATE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0x01))
end

local aqara_gas_detector_handler = {
NAME = "Aqara Smoke Detector Handler",
lifecycle_handlers = {
init = device_init,
added = device_added
added = device_added,
doConfigure = do_configure
},
zigbee_handlers = {
attr = {
Expand Down
30 changes: 27 additions & 3 deletions drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_smoke_detector.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,40 @@ test.register_coroutine_test(
"Handle added lifecycle",
function()
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
test.socket.zigbee:__expect_send({ mock_device.id,
cluster_base.write_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, PRIVATE_ATTRIBUTE_ID, MFG_CODE,
data_types.Uint8, 0x01) })
test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.smokeDetector.smoke.clear()))
test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.audioMute.mute.unmuted()))
test.socket.capability:__expect_send(mock_device:generate_test_message("main", selfCheck.selfCheckState.idle()))
test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(100)))
end
)

test.register_coroutine_test(
"Handle doConfigure lifecycle",
function()
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, PowerConfiguration.ID)
})
test.socket.zigbee:__expect_send({
mock_device.id,
PowerConfiguration.attributes.BatteryVoltage:configure_reporting(mock_device, 30, 3600, 1)
})
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, PRIVATE_CLUSTER_ID)
})

local config_attr_message = zigbee_test_utils.build_attr_config(mock_device,
PRIVATE_CLUSTER_ID, PRIVATE_SMOKE_ZONE_STATUS_ATTRIBUTE_ID, 0x0001, 0x0E10, data_types.Uint16, 0x0001)
test.socket.zigbee:__expect_send({mock_device.id, config_attr_message})

test.socket.zigbee:__expect_send({ mock_device.id,
cluster_base.write_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, PRIVATE_ATTRIBUTE_ID, MFG_CODE,
data_types.Uint8, 0x01) })
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
end
)


test.register_coroutine_test(
Expand Down
Loading