Skip to content

Commit

Permalink
Bugfix: Mismatch in value type of light-sensor-type attribute of illu…
Browse files Browse the repository at this point in the history
…minace measurment cluster (#26290)
  • Loading branch information
riwaghe authored and pull[bot] committed Oct 19, 2023
1 parent f0375b1 commit 1118007
Showing 23 changed files with 103 additions and 94 deletions.
Original file line number Diff line number Diff line change
@@ -3710,7 +3710,7 @@ server cluster BallastConfiguration = 769 {

/** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
server cluster IlluminanceMeasurement = 1024 {
enum LightSensorType : ENUM8 {
enum LightSensorTypeEnum : ENUM8 {
kPhotodiode = 0;
kCmos = 1;
}
@@ -3719,7 +3719,7 @@ server cluster IlluminanceMeasurement = 1024 {
readonly attribute nullable int16u minMeasuredValue = 1;
readonly attribute nullable int16u maxMeasuredValue = 2;
readonly attribute int16u tolerance = 3;
readonly attribute nullable enum8 lightSensorType = 4;
readonly attribute nullable LightSensorTypeEnum lightSensorType = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Original file line number Diff line number Diff line change
@@ -2948,7 +2948,7 @@ server cluster BallastConfiguration = 769 {

/** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
server cluster IlluminanceMeasurement = 1024 {
enum LightSensorType : ENUM8 {
enum LightSensorTypeEnum : ENUM8 {
kPhotodiode = 0;
kCmos = 1;
}
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
Original file line number Diff line number Diff line change
@@ -1275,15 +1275,15 @@ server cluster FixedLabel = 64 {

/** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
server cluster IlluminanceMeasurement = 1024 {
enum LightSensorType : ENUM8 {
enum LightSensorTypeEnum : ENUM8 {
kPhotodiode = 0;
kCmos = 1;
}

readonly attribute nullable int16u measuredValue = 0;
readonly attribute nullable int16u minMeasuredValue = 1;
readonly attribute nullable int16u maxMeasuredValue = 2;
readonly attribute nullable enum8 lightSensorType = 4;
readonly attribute nullable LightSensorTypeEnum lightSensorType = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
@@ -4953,7 +4953,7 @@ server cluster ColorControl = 768 {

/** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
server cluster IlluminanceMeasurement = 1024 {
enum LightSensorType : ENUM8 {
enum LightSensorTypeEnum : ENUM8 {
kPhotodiode = 0;
kCmos = 1;
}
@@ -4962,7 +4962,7 @@ server cluster IlluminanceMeasurement = 1024 {
readonly attribute nullable int16u minMeasuredValue = 1;
readonly attribute nullable int16u maxMeasuredValue = 2;
readonly attribute int16u tolerance = 3;
readonly attribute nullable enum8 lightSensorType = 4;
readonly attribute nullable LightSensorTypeEnum lightSensorType = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app2/config.matter
Original file line number Diff line number Diff line change
@@ -4912,7 +4912,7 @@ server cluster ColorControl = 768 {

/** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
server cluster IlluminanceMeasurement = 1024 {
enum LightSensorType : ENUM8 {
enum LightSensorTypeEnum : ENUM8 {
kPhotodiode = 0;
kCmos = 1;
}
@@ -4921,7 +4921,7 @@ server cluster IlluminanceMeasurement = 1024 {
readonly attribute nullable int16u minMeasuredValue = 1;
readonly attribute nullable int16u maxMeasuredValue = 2;
readonly attribute int16u tolerance = 3;
readonly attribute nullable enum8 lightSensorType = 4;
readonly attribute nullable LightSensorTypeEnum lightSensorType = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Original file line number Diff line number Diff line change
@@ -30,10 +30,10 @@ limitations under the License.
<attribute side="server" code="0x0001" define="ILLUM_MIN_MEASURED_VALUE" type="INT16U" min="0x0001" max="0xFFFD" writable="false" isNullable="true" optional="false">MinMeasuredValue</attribute>
<attribute side="server" code="0x0002" define="ILLUM_MAX_MEASURED_VALUE" type="INT16U" min="0x0002" max="0xFFFE" writable="false" isNullable="true" optional="false">MaxMeasuredValue</attribute>
<attribute side="server" code="0x0003" define="ILLUM_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" optional="true" >Tolerance</attribute>
<attribute side="server" code="0x0004" define="ILLUM_LIGHT_SENSOR_TYPE" type="ENUM8" min="0x00" max="0xFF" writable="false" isNullable="true" default="0xFF" optional="true" >LightSensorType</attribute>
<attribute side="server" code="0x0004" define="ILLUM_LIGHT_SENSOR_TYPE" type="LightSensorTypeEnum" min="0x00" max="0xFF" writable="false" isNullable="true" default="0xFF" optional="true" >LightSensorType</attribute>
</cluster>

<enum name="LightSensorType" type="ENUM8">
<enum name="LightSensorTypeEnum" type="ENUM8">
<cluster code="0x0400"/>
<item name="Photodiode" value="0x00"/>
<item name="CMOS" value="0x01"/>
4 changes: 2 additions & 2 deletions src/controller/data_model/controller-clusters.matter
Original file line number Diff line number Diff line change
@@ -4959,7 +4959,7 @@ client cluster BallastConfiguration = 769 {

/** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
client cluster IlluminanceMeasurement = 1024 {
enum LightSensorType : ENUM8 {
enum LightSensorTypeEnum : ENUM8 {
kPhotodiode = 0;
kCmos = 1;
}
@@ -4968,7 +4968,7 @@ client cluster IlluminanceMeasurement = 1024 {
readonly attribute nullable int16u minMeasuredValue = 1;
readonly attribute nullable int16u maxMeasuredValue = 2;
readonly attribute optional int16u tolerance = 3;
readonly attribute optional nullable enum8 lightSensorType = 4;
readonly attribute optional nullable LightSensorTypeEnum lightSensorType = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/controller/java/zap-generated/CHIPReadCallbacks.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/controller/python/chip/clusters/Objects.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1118007

Please sign in to comment.