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

Cherry pick/cherypick for release24q2 #6

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Cherry pick/cherypick for release24q2 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2326b8d
doorlock and colorcontrol xml changes
Thirsrin Jun 5, 2024
5a564ca
[Linux]DGSW_2_3 fails CurrentHeapUsed is greater than CurrentHeapHigh…
Thirsrin May 2, 2024
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
25 changes: 22 additions & 3 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5438,6 +5438,21 @@ cluster ColorControl = 768 {
kColorTemperature = 2;
}

enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherUnknown = 1;
kTemperaturemonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
Expand Down Expand Up @@ -5490,16 +5505,20 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -5531,7 +5550,7 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
Expand Down
27 changes: 23 additions & 4 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,7 +2972,7 @@ cluster DoorLock = 257 {
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
attribute access(write: manage) optional char_string<3> language = 33;
attribute access(write: manage) optional int8u LEDSettings = 34;
attribute access(write: manage) int32u autoRelockTime = 35;
attribute access(write: manage) optional int32u autoRelockTime = 35;
attribute access(write: manage) optional int8u soundVolume = 36;
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
Expand Down Expand Up @@ -3997,6 +3997,21 @@ cluster ColorControl = 768 {
kColorTemperature = 2;
}

enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherUnknown = 1;
kTemperaturemonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
Expand Down Expand Up @@ -4049,16 +4064,20 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -4090,7 +4109,7 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
Expand Down
25 changes: 22 additions & 3 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,6 +1423,21 @@ cluster ColorControl = 768 {
kColorTemperature = 2;
}

enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherUnknown = 1;
kTemperaturemonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
Expand Down Expand Up @@ -1475,16 +1490,20 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -1516,7 +1535,7 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ cluster DoorLock = 257 {
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
attribute access(write: manage) optional char_string<3> language = 33;
attribute access(write: manage) optional int8u LEDSettings = 34;
attribute access(write: manage) int32u autoRelockTime = 35;
attribute access(write: manage) optional int32u autoRelockTime = 35;
attribute access(write: manage) optional int8u soundVolume = 36;
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
Expand Down
25 changes: 22 additions & 3 deletions examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,21 @@ cluster ColorControl = 768 {
kColorTemperature = 2;
}

enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherUnknown = 1;
kTemperaturemonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
Expand Down Expand Up @@ -1576,16 +1591,20 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -1617,7 +1636,7 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
Expand Down
25 changes: 22 additions & 3 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,6 +2193,21 @@ cluster ColorControl = 768 {
kColorTemperature = 2;
}

enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherUnknown = 1;
kTemperaturemonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
Expand Down Expand Up @@ -2245,16 +2260,20 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -2286,7 +2305,7 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
Expand Down
25 changes: 22 additions & 3 deletions examples/light-switch-app/qpg/zap/switch.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1990,6 +1990,21 @@ cluster ColorControl = 768 {
kColorTemperature = 2;
}

enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherUnknown = 1;
kTemperaturemonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
Expand Down Expand Up @@ -2042,16 +2057,20 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -2083,7 +2102,7 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
Expand Down
25 changes: 22 additions & 3 deletions examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,21 @@ cluster ColorControl = 768 {
kColorTemperature = 2;
}

enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherUnknown = 1;
kTemperaturemonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
Expand Down Expand Up @@ -1615,16 +1630,20 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -1656,7 +1675,7 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
Expand Down
Loading
Loading