Add support for the color mode attribute #1772
+179
−6
There are no files selected for viewing
This file contains 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
This file contains 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 |
|---|---|---|
|
|
@@ -85,6 +85,7 @@ local function test_init() | |
| clusters.ColorControl.attributes.CurrentSaturation, | ||
| clusters.ColorControl.attributes.CurrentX, | ||
| clusters.ColorControl.attributes.CurrentY, | ||
| clusters.ColorControl.attributes.ColorMode, | ||
| clusters.ColorControl.attributes.ColorTemperatureMireds, | ||
| clusters.ColorControl.attributes.ColorTempPhysicalMaxMireds, | ||
| clusters.ColorControl.attributes.ColorTempPhysicalMinMireds, | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -86,6 +86,7 @@ local cluster_subscribe_list = { | |
| clusters.ColorControl.attributes.CurrentSaturation, | ||
| clusters.ColorControl.attributes.CurrentX, | ||
| clusters.ColorControl.attributes.CurrentY, | ||
| clusters.ColorControl.attributes.ColorMode, | ||
| clusters.ColorControl.attributes.ColorTemperatureMireds, | ||
| clusters.ColorControl.attributes.ColorTempPhysicalMaxMireds, | ||
| clusters.ColorControl.attributes.ColorTempPhysicalMinMireds, | ||
|
|
@@ -792,4 +793,116 @@ test.register_message_test( | |
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "colorControl capability sent based on CurrentHue and CurrentSaturation but not CurrentX and CurrentY due to ColorMode", | ||
| { | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.ColorMode:build_test_report_data(mock_device, 1, 0) | ||
| } | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentHue:build_test_report_data(mock_device, 1, 0xFE) | ||
| } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.colorControl.hue(100)) | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentSaturation:build_test_report_data(mock_device, 1, 0xFE) | ||
| } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.colorControl.saturation(100)) | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentX:build_test_report_data(mock_device, 1, 15091) | ||
| } | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentY:build_test_report_data(mock_device, 1, 21547) | ||
| } | ||
| }, | ||
| } | ||
| ) | ||
|
|
||
| test.register_message_test( | ||
| "colorControl capability sent based on CurrentX and CurrentY but not CurrentHue and CurrentSaturation due to ColorMode", | ||
| { | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.ColorMode:build_test_report_data(mock_device, 1, 1) | ||
| } | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentHue:build_test_report_data(mock_device, 1, 0xFE) | ||
| } | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentSaturation:build_test_report_data(mock_device, 1, 0xFE) | ||
| } | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentX:build_test_report_data(mock_device, 1, 15091) | ||
| } | ||
| }, | ||
| { | ||
| channel = "matter", | ||
| direction = "receive", | ||
| message = { | ||
| mock_device.id, | ||
| clusters.ColorControl.attributes.CurrentY:build_test_report_data(mock_device, 1, 21547) | ||
| } | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.colorControl.hue(50)) | ||
| }, | ||
| { | ||
| channel = "capability", | ||
| direction = "send", | ||
| message = mock_device:generate_test_message("main", capabilities.colorControl.saturation(72)) | ||
| }, | ||
| } | ||
| ) | ||
|
|
||
| test.run_registered_tests() | ||
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.
This might be more clear just changing this to
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 did it this way in case a device doesn't implement the ColorMode attribute. In that case,
COLOR_MODEwill be nil in the driver, so doing the logic this way maintains the same behavior (we only want to prevent capabilities from being emitted if ColorMode is actually implemented)