-
Notifications
You must be signed in to change notification settings - Fork 553
add MultiIR Smoke Detector MIR-SM200 #2874
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.
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
Merged
cbaumler
merged 2 commits into
SmartThingsCommunity:main
from
thinkaName:multiir_smoke_detector_MIR_SM200
Apr 21, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
drivers/SmartThings/zigbee-smoke-detector/profiles/smoke-battery-tamper-no-fw-update.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| name: smoke-battery-tamper-no-fw-update | ||
| components: | ||
| - id: main | ||
| capabilities: | ||
| - id: smokeDetector | ||
| version: 1 | ||
| - id: tamperAlert | ||
| version: 1 | ||
| - id: battery | ||
| version: 1 | ||
| - id: refresh | ||
| version: 1 | ||
| categories: | ||
| - name: SmokeDetector |
13 changes: 13 additions & 0 deletions
13
drivers/SmartThings/zigbee-smoke-detector/src/MultiIR/can_handle.lua
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| -- Copyright 2026 SmartThings, Inc. | ||
| -- Licensed under the Apache License, Version 2.0 | ||
|
|
||
| return function(opts, driver, device, ...) | ||
| local FINGERPRINTS = require "MultiIR.fingerprints" | ||
| for _, fingerprint in ipairs(FINGERPRINTS) do | ||
| if device:get_manufacturer() == fingerprint.mfr and device:get_model() == fingerprint.model then | ||
| local subdriver = require("MultiIR") | ||
| return true, subdriver | ||
| end | ||
| end | ||
| return false | ||
| end |
6 changes: 6 additions & 0 deletions
6
drivers/SmartThings/zigbee-smoke-detector/src/MultiIR/fingerprints.lua
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| -- Copyright 2026 SmartThings, Inc. | ||
| -- Licensed under the Apache License, Version 2.0 | ||
|
|
||
| return { | ||
| { mfr = "MultIR", model = "MIR-SM200" } | ||
| } |
53 changes: 53 additions & 0 deletions
53
drivers/SmartThings/zigbee-smoke-detector/src/MultiIR/init.lua
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| -- Copyright 2026 SmartThings, Inc. | ||
| -- Licensed under the Apache License, Version 2.0 | ||
|
|
||
| local zcl_clusters = require "st.zigbee.zcl.clusters" | ||
| local capabilities = require "st.capabilities" | ||
|
|
||
| local IASZone = zcl_clusters.IASZone | ||
|
|
||
| local function generate_event_from_zone_status(driver, device, zone_status, zb_rx) | ||
| if zone_status:is_alarm1_set() then | ||
| device:emit_event(capabilities.smokeDetector.smoke.detected()) | ||
| elseif zone_status:is_alarm2_set() then | ||
| device:emit_event(capabilities.smokeDetector.smoke.tested()) | ||
| else | ||
| device:emit_event(capabilities.smokeDetector.smoke.clear()) | ||
| end | ||
| if device:supports_capability(capabilities.tamperAlert) then | ||
| device:emit_event(zone_status:is_tamper_set() and capabilities.tamperAlert.tamper.detected() or capabilities.tamperAlert.tamper.clear()) | ||
| end | ||
| end | ||
|
|
||
| local function ias_zone_status_change_handler(driver, device, zb_rx) | ||
| local zone_status = zb_rx.body.zcl_body.zone_status | ||
| generate_event_from_zone_status(driver, device, zone_status, zb_rx) | ||
| end | ||
|
|
||
| local function added_handler(self, device) | ||
| device:emit_event(capabilities.battery.battery(100)) | ||
| device:emit_event(capabilities.smokeDetector.smoke.clear()) | ||
| device:emit_event(capabilities.tamperAlert.tamper.clear()) | ||
| end | ||
|
|
||
| local MultiIR_smoke_detector_handler = { | ||
| NAME = "MultiIR Smoke Detector Handler", | ||
| lifecycle_handlers = { | ||
| added = added_handler | ||
| }, | ||
| zigbee_handlers = { | ||
| cluster = { | ||
| [IASZone.ID] = { | ||
| [IASZone.client.commands.ZoneStatusChangeNotification.ID] = ias_zone_status_change_handler | ||
| } | ||
| }, | ||
| attr = { | ||
| [IASZone.ID] = { | ||
| [IASZone.attributes.ZoneStatus.ID] = generate_event_from_zone_status | ||
| } | ||
| } | ||
| }, | ||
| can_handle = require("MultiIR.can_handle") | ||
| } | ||
|
|
||
| return MultiIR_smoke_detector_handler | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
195 changes: 195 additions & 0 deletions
195
drivers/SmartThings/zigbee-smoke-detector/src/test/test_multiir_smoke_detector.lua
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| -- Copyright 2026 SmartThings, Inc. | ||
| -- Licensed under the Apache License, Version 2.0 | ||
|
|
||
| local test = require "integration_test" | ||
| local clusters = require "st.zigbee.zcl.clusters" | ||
| local capabilities = require "st.capabilities" | ||
| local t_utils = require "integration_test.utils" | ||
| local zigbee_test_utils = require "integration_test.zigbee_test_utils" | ||
|
|
||
| local IASZone = clusters.IASZone | ||
|
|
||
| local mock_device = test.mock_device.build_test_zigbee_device( | ||
| { profile = t_utils.get_profile_definition("smoke-battery-tamper-no-fw-update.yml"), | ||
| zigbee_endpoints = { | ||
| [0x01] = { | ||
| id = 0x01, | ||
| manufacturer = "MultIR", | ||
| model = "MIR-SM200", | ||
| server_clusters = { 0x0001,0x0020, 0x0500, 0x0502 } | ||
| } | ||
| } | ||
| } | ||
| ) | ||
|
|
||
| zigbee_test_utils.prepare_zigbee_env_info() | ||
|
|
||
| local function test_init() | ||
| test.mock_device.add_test_device(mock_device) | ||
| end | ||
|
|
||
| test.set_test_init_function(test_init) | ||
|
|
||
| test.register_coroutine_test( | ||
| "Handle added lifecycle", | ||
| function() | ||
| test.socket.zigbee:__set_channel_ordering("relaxed") | ||
| test.socket.capability:__set_channel_ordering("relaxed") | ||
| test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" }) | ||
| test.socket.capability:__expect_send(mock_device:generate_test_message("main", | ||
| capabilities.battery.battery(100))) | ||
| 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.tamperAlert.tamper.clear())) | ||
| end, | ||
| { | ||
| min_api_version = 19 | ||
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "Reported ZoneStatus should be handled: smoke/clear tamper/clear", | ||
| { | ||
| { | ||
| channel = "zigbee", | ||
| direction = "receive", | ||
| message = { mock_device.id, IASZone.attributes.ZoneStatus:build_test_attr_report(mock_device, 0x0000) } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.smokeDetector.smoke.clear()) | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.tamperAlert.tamper.clear()) | ||
| } | ||
| }, | ||
| { | ||
| min_api_version = 19 | ||
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "Reported ZoneStatus should be handled: smoke/detected tamper/detected", | ||
| { | ||
| { | ||
| channel = "zigbee", | ||
| direction = "receive", | ||
| message = { mock_device.id, IASZone.attributes.ZoneStatus:build_test_attr_report(mock_device, 0x0005) } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.smokeDetector.smoke.detected()) | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.tamperAlert.tamper.detected()) | ||
| } | ||
| }, | ||
| { | ||
| min_api_version = 19 | ||
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "Reported ZoneStatus should be handled: smoke/tested tamper/detected", | ||
| { | ||
| { | ||
| channel = "zigbee", | ||
| direction = "receive", | ||
| message = { mock_device.id, IASZone.attributes.ZoneStatus:build_test_attr_report(mock_device, 0x0006) } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.smokeDetector.smoke.tested()) | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.tamperAlert.tamper.detected()) | ||
| } | ||
| }, | ||
| { | ||
| min_api_version = 19 | ||
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "ZoneStatusChangeNotification should be handled: smoke/detected tamper/detected", | ||
| { | ||
| { | ||
| channel = "zigbee", | ||
| direction = "receive", | ||
| message = { mock_device.id, IASZone.client.commands.ZoneStatusChangeNotification.build_test_rx(mock_device, 0x0005, 0x00) } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.smokeDetector.smoke.detected()) | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.tamperAlert.tamper.detected()) | ||
| } | ||
| }, | ||
| { | ||
| min_api_version = 19 | ||
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "ZoneStatusChangeNotification should be handled: smoke/tested tamper/detected", | ||
| { | ||
| { | ||
| channel = "zigbee", | ||
| direction = "receive", | ||
| message = { mock_device.id, IASZone.client.commands.ZoneStatusChangeNotification.build_test_rx(mock_device, 0x0006, 0x00) } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.smokeDetector.smoke.tested()) | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.tamperAlert.tamper.detected()) | ||
| } | ||
| }, | ||
| { | ||
| min_api_version = 19 | ||
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "ZoneStatusChangeNotification should be handled: smoke/clear tamper/clear", | ||
| { | ||
| { | ||
| channel = "zigbee", | ||
| direction = "receive", | ||
| message = { mock_device.id, IASZone.client.commands.ZoneStatusChangeNotification.build_test_rx(mock_device, 0x0000, 0x00) } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.smokeDetector.smoke.clear()) | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.tamperAlert.tamper.clear()) | ||
| } | ||
| }, | ||
| { | ||
| min_api_version = 19 | ||
| } | ||
| ) | ||
|
|
||
| test.run_registered_tests() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For ZoneStatus attribute bitmap, I see the following in the spec for bits that can be set:
Is the alarm2 bit corresponding to the test functionality just the way the device works? Do we need to also be considering the test mode bit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is included in the capability definition of the smoke detector. It is also required in the Test Suite test items. If this is not added, the test will fail.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand that the "tested" variation is a part of the smokeDetector capability, I guess my question is if it is hooked up correctly, since the spec shows a different bit that could be used to indicate it is being tested. Did you validate the test functionality with a real device?Its fine if this is how it works, I just wanted to confirm, since its not how I would expect after reading the spec.Edit: Sorry, I am a bit new to reviewing WWST PRs. I was able to find the test results you are referencing, and since it passes, LGTM.