Skip to content

Commit da28ce6

Browse files
authored
Merge branch 'master' into telink_tl3218x_retention
2 parents ab1dda3 + b9a94b5 commit da28ce6

23 files changed

+102
-65
lines changed

examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1429,7 +1429,7 @@ cluster GroupKeyManagement = 63 {
14291429

14301430
/** Attributes for reporting air quality classification */
14311431
cluster AirQuality = 91 {
1432-
revision 1; // NOTE: Default/not specifically set
1432+
revision 1;
14331433

14341434
enum AirQualityEnum : enum8 {
14351435
kUnknown = 0;

examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,7 @@ cluster GroupKeyManagement = 63 {
17041704

17051705
/** Attributes for reporting air quality classification */
17061706
cluster AirQuality = 91 {
1707-
revision 1; // NOTE: Default/not specifically set
1707+
revision 1;
17081708

17091709
enum AirQualityEnum : enum8 {
17101710
kUnknown = 0;

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -3388,7 +3388,7 @@ cluster RvcCleanMode = 85 {
33883388

33893389
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
33903390
cluster TemperatureControl = 86 {
3391-
revision 1; // NOTE: Default/not specifically set
3391+
revision 1;
33923392

33933393
bitmap Feature : bitmap32 {
33943394
kTemperatureNumber = 0x1;
@@ -3414,7 +3414,7 @@ cluster TemperatureControl = 86 {
34143414
optional int8u targetTemperatureLevel = 1;
34153415
}
34163416

3417-
/** Set Temperature */
3417+
/** The SetTemperature command SHALL have the following data fields: */
34183418
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
34193419
}
34203420

@@ -3506,7 +3506,7 @@ cluster DishwasherMode = 89 {
35063506

35073507
/** Attributes for reporting air quality classification */
35083508
cluster AirQuality = 91 {
3509-
revision 1; // NOTE: Default/not specifically set
3509+
revision 1;
35103510

35113511
enum AirQualityEnum : enum8 {
35123512
kUnknown = 0;

examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -2719,7 +2719,7 @@ cluster ModeSelect = 80 {
27192719

27202720
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
27212721
cluster TemperatureControl = 86 {
2722-
revision 1; // NOTE: Default/not specifically set
2722+
revision 1;
27232723

27242724
bitmap Feature : bitmap32 {
27252725
kTemperatureNumber = 0x1;
@@ -2745,7 +2745,7 @@ cluster TemperatureControl = 86 {
27452745
optional int8u targetTemperatureLevel = 1;
27462746
}
27472747

2748-
/** Set Temperature */
2748+
/** The SetTemperature command SHALL have the following data fields: */
27492749
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
27502750
}
27512751

examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,7 @@ cluster GroupKeyManagement = 63 {
13521352

13531353
/** Attributes for reporting air quality classification */
13541354
cluster AirQuality = 91 {
1355-
revision 1; // NOTE: Default/not specifically set
1355+
revision 1;
13561356

13571357
enum AirQualityEnum : enum8 {
13581358
kUnknown = 0;

examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,7 @@ cluster FixedLabel = 64 {
17441744

17451745
/** Attributes for reporting air quality classification */
17461746
cluster AirQuality = 91 {
1747-
revision 1; // NOTE: Default/not specifically set
1747+
revision 1;
17481748

17491749
enum AirQualityEnum : enum8 {
17501750
kUnknown = 0;

examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,7 @@ cluster BooleanState = 69 {
16451645

16461646
/** Attributes for reporting air quality classification */
16471647
cluster AirQuality = 91 {
1648-
revision 1; // NOTE: Default/not specifically set
1648+
revision 1;
16491649

16501650
enum AirQualityEnum : enum8 {
16511651
kUnknown = 0;

examples/chef/devices/rootnode_dishwasher_cc105034fe.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ cluster GroupKeyManagement = 63 {
14201420

14211421
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
14221422
cluster TemperatureControl = 86 {
1423-
revision 1; // NOTE: Default/not specifically set
1423+
revision 1;
14241424

14251425
bitmap Feature : bitmap32 {
14261426
kTemperatureNumber = 0x1;
@@ -1446,7 +1446,7 @@ cluster TemperatureControl = 86 {
14461446
optional int8u targetTemperatureLevel = 1;
14471447
}
14481448

1449-
/** Set Temperature */
1449+
/** The SetTemperature command SHALL have the following data fields: */
14501450
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
14511451
}
14521452

examples/chef/devices/rootnode_laundrydryer_01796fe396.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ cluster GroupKeyManagement = 63 {
14201420

14211421
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
14221422
cluster TemperatureControl = 86 {
1423-
revision 1; // NOTE: Default/not specifically set
1423+
revision 1;
14241424

14251425
bitmap Feature : bitmap32 {
14261426
kTemperatureNumber = 0x1;
@@ -1446,7 +1446,7 @@ cluster TemperatureControl = 86 {
14461446
optional int8u targetTemperatureLevel = 1;
14471447
}
14481448

1449-
/** Set Temperature */
1449+
/** The SetTemperature command SHALL have the following data fields: */
14501450
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
14511451
}
14521452

examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,7 @@ cluster LaundryWasherControls = 83 {
14421442

14431443
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
14441444
cluster TemperatureControl = 86 {
1445-
revision 1; // NOTE: Default/not specifically set
1445+
revision 1;
14461446

14471447
bitmap Feature : bitmap32 {
14481448
kTemperatureNumber = 0x1;
@@ -1468,7 +1468,7 @@ cluster TemperatureControl = 86 {
14681468
optional int8u targetTemperatureLevel = 1;
14691469
}
14701470

1471-
/** Set Temperature */
1471+
/** The SetTemperature command SHALL have the following data fields: */
14721472
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
14731473
}
14741474

examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
13401340

13411341
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
13421342
cluster TemperatureControl = 86 {
1343-
revision 1; // NOTE: Default/not specifically set
1343+
revision 1;
13441344

13451345
bitmap Feature : bitmap32 {
13461346
kTemperatureNumber = 0x1;
@@ -1366,7 +1366,7 @@ cluster TemperatureControl = 86 {
13661366
optional int8u targetTemperatureLevel = 1;
13671367
}
13681368

1369-
/** Set Temperature */
1369+
/** The SetTemperature command SHALL have the following data fields: */
13701370
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
13711371
}
13721372

examples/darwin-framework-tool/commands/dcl/HTTPSRequest.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ CHIP_ERROR Init(std::string & hostname, uint16_t port, HttpsSecurityMode securit
9292
break;
9393
}
9494
case HttpsSecurityMode::kDisableValidation: {
95-
tls_options = ^(nw_protocol_options_t tls_options) {
96-
sec_protocol_options_t sec_options = nw_tls_copy_sec_protocol_options(tls_options);
95+
tls_options = ^(nw_protocol_options_t options) {
96+
sec_protocol_options_t sec_options = nw_tls_copy_sec_protocol_options(options);
9797
sec_protocol_options_set_verify_block(sec_options, NULL_VERIFIER, queue);
9898
};
9999
break;

examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,7 @@ cluster LaundryWasherControls = 83 {
18821882

18831883
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
18841884
cluster TemperatureControl = 86 {
1885-
revision 1; // NOTE: Default/not specifically set
1885+
revision 1;
18861886

18871887
bitmap Feature : bitmap32 {
18881888
kTemperatureNumber = 0x1;
@@ -1908,7 +1908,7 @@ cluster TemperatureControl = 86 {
19081908
optional int8u targetTemperatureLevel = 1;
19091909
}
19101910

1911-
/** Set Temperature */
1911+
/** The SetTemperature command SHALL have the following data fields: */
19121912
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
19131913
}
19141914

examples/refrigerator-app/refrigerator-common/refrigerator-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ cluster GroupKeyManagement = 63 {
12811281

12821282
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
12831283
cluster TemperatureControl = 86 {
1284-
revision 1; // NOTE: Default/not specifically set
1284+
revision 1;
12851285

12861286
bitmap Feature : bitmap32 {
12871287
kTemperatureNumber = 0x1;
@@ -1307,7 +1307,7 @@ cluster TemperatureControl = 86 {
13071307
optional int8u targetTemperatureLevel = 1;
13081308
}
13091309

1310-
/** Set Temperature */
1310+
/** The SetTemperature command SHALL have the following data fields: */
13111311
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
13121312
}
13131313

examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,7 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
16791679

16801680
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
16811681
cluster TemperatureControl = 86 {
1682-
revision 1; // NOTE: Default/not specifically set
1682+
revision 1;
16831683

16841684
bitmap Feature : bitmap32 {
16851685
kTemperatureNumber = 0x1;
@@ -1705,7 +1705,7 @@ cluster TemperatureControl = 86 {
17051705
optional int8u targetTemperatureLevel = 1;
17061706
}
17071707

1708-
/** Set Temperature */
1708+
/** The SetTemperature command SHALL have the following data fields: */
17091709
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
17101710
}
17111711

examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,7 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
15901590

15911591
/** Attributes and commands for configuring the temperature control, and reporting temperature. */
15921592
cluster TemperatureControl = 86 {
1593-
revision 1; // NOTE: Default/not specifically set
1593+
revision 1;
15941594

15951595
bitmap Feature : bitmap32 {
15961596
kTemperatureNumber = 0x1;
@@ -1616,7 +1616,7 @@ cluster TemperatureControl = 86 {
16161616
optional int8u targetTemperatureLevel = 1;
16171617
}
16181618

1619-
/** Set Temperature */
1619+
/** The SetTemperature command SHALL have the following data fields: */
16201620
command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
16211621
}
16221622

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2023 Project CHIP Authors
3+
Copyright (c) 2023-2025 Project CHIP Authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -14,7 +14,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<configurator>
17+
<!--
18+
XML generated by Alchemy; DO NOT EDIT.
19+
Source: src/app_clusters/AirQuality.adoc
20+
Parameters: in-progress
21+
Git: 0.7-summer-2025-150-g878a2125f
22+
-->
23+
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
1824
<domain name="CHIP"/>
1925
<cluster>
2026
<name>Air Quality</name>
@@ -24,7 +30,7 @@ limitations under the License.
2430
<define>AIR_QUALITY_CLUSTER</define>
2531
<client tick="false" init="false">true</client>
2632
<server tick="false" init="false">true</server>
27-
33+
<globalAttribute code="0xFFFD" side="either" value="1"/>
2834
<features>
2935
<feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">
3036
<optionalConform/>
@@ -39,22 +45,19 @@ limitations under the License.
3945
<optionalConform/>
4046
</feature>
4147
</features>
42-
4348
<!-- Attributes -->
44-
<attribute side="server" code="0x0000" name="AirQuality" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" default="0">
45-
<mandatoryConform/>
46-
</attribute>
49+
<attribute side="server" code="0x0000" name="AirQuality" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" default="0">AirQuality</attribute>
4750
</cluster>
4851

4952
<!-- Cluster Data Types -->
5053
<enum name="AirQualityEnum" type="enum8">
51-
<cluster code="0x005B" />
52-
<item value="0" name="Unknown" />
53-
<item value="1" name="Good" />
54-
<item value="2" name="Fair" />
55-
<item value="3" name="Moderate" />
56-
<item value="4" name="Poor" />
57-
<item value="5" name="Very poor" />
58-
<item value="6" name="Extremely poor" />
54+
<cluster code="0x005B"/>
55+
<item value="0" name="Unknown"/>
56+
<item value="1" name="Good"/>
57+
<item value="2" name="Fair"/>
58+
<item value="3" name="Moderate"/>
59+
<item value="4" name="Poor"/>
60+
<item value="5" name="VeryPoor"/>
61+
<item value="6" name="ExtremelyPoor"/>
5962
</enum>
6063
</configurator>
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2023 Project CHIP Authors
3+
Copyright (c) 2023-2025 Project CHIP Authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -14,9 +14,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<configurator>
17+
<!--
18+
XML generated by Alchemy; DO NOT EDIT.
19+
Source: src/app_clusters/TemperatureControl.adoc
20+
Parameters: in-progress
21+
Git: 0.7-summer-2025-253-gd51479a48
22+
-->
23+
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
1824
<domain name="CHIP"/>
19-
2025
<cluster>
2126
<name>Temperature Control</name>
2227
<domain>Appliances</domain>
@@ -25,7 +30,7 @@ limitations under the License.
2530
<define>TEMPERATURE_CONTROL_CLUSTER</define>
2631
<client tick="false" init="false">true</client>
2732
<server tick="false" init="false">true</server>
28-
33+
<globalAttribute code="0xFFFD" side="either" value="1"/>
2934
<features>
3035
<feature bit="0" code="TN" name="TemperatureNumber" summary="Use actual temperature numbers">
3136
<optionalConform choice="a"/>
@@ -39,44 +44,47 @@ limitations under the License.
3944
</optionalConform>
4045
</feature>
4146
</features>
42-
4347
<attribute side="server" code="0x0000" name="TemperatureSetpoint" define="TEMP_SETPOINT" type="temperature" optional="true">
48+
<description>TemperatureSetpoint</description>
4449
<mandatoryConform>
4550
<feature name="TN"/>
4651
</mandatoryConform>
4752
</attribute>
4853
<attribute side="server" code="0x0001" name="MinTemperature" define="MIN_TEMP" type="temperature" optional="true">
54+
<description>MinTemperature</description>
4955
<mandatoryConform>
5056
<feature name="TN"/>
5157
</mandatoryConform>
5258
</attribute>
5359
<attribute side="server" code="0x0002" name="MaxTemperature" define="MAX_TEMP" type="temperature" optional="true">
60+
<description>MaxTemperature</description>
5461
<mandatoryConform>
5562
<feature name="TN"/>
5663
</mandatoryConform>
5764
</attribute>
5865
<attribute side="server" code="0x0003" name="Step" define="STEP" type="temperature" optional="true">
66+
<description>Step</description>
5967
<mandatoryConform>
6068
<feature name="STEP"/>
6169
</mandatoryConform>
6270
</attribute>
63-
<attribute side="server" code="0x0004" name="SelectedTemperatureLevel" define="SELECTED_TEMP_LEVEL" type="int8u" optional="true">
71+
<attribute side="server" code="0x0004" name="SelectedTemperatureLevel" define="SELECTED_TEMP_LEVEL" type="int8u" optional="true" max="31">
72+
<description>SelectedTemperatureLevel</description>
6473
<mandatoryConform>
6574
<feature name="TL"/>
6675
</mandatoryConform>
6776
</attribute>
68-
<attribute side="server" code="0x0005" name="SupportedTemperatureLevels" define="SUPPORTED_TEMP_LEVELS" type="array" entryType="char_string" optional="true">
77+
<attribute side="server" code="0x0005" name="SupportedTemperatureLevels" define="SUPPORTED_TEMP_LEVELS" type="array" entryType="char_string" optional="true" length="32">
78+
<description>SupportedTemperatureLevels</description>
6979
<mandatoryConform>
7080
<feature name="TL"/>
7181
</mandatoryConform>
7282
</attribute>
73-
7483
<command source="client" code="0x00" name="SetTemperature" optional="false">
75-
<description>Set Temperature</description>
76-
<arg name="TargetTemperature" type="temperature" min="MIN_TEMP" max="MAX_TEMP" optional="true"/>
77-
<arg name="TargetTemperatureLevel" type="int8u" optional="true"/>
78-
<mandatoryConform/>
84+
<description>The SetTemperature command SHALL have the following data fields: </description>
85+
<arg id="0" name="TargetTemperature" type="temperature" optional="true"/>
86+
<arg id="1" name="TargetTemperatureLevel" type="int8u" optional="true"/>
7987
</command>
80-
</cluster>
8188

89+
</cluster>
8290
</configurator>

0 commit comments

Comments
 (0)