Skip to content

Commit 36d48e0

Browse files
LyudmilaKostanyanLyudmilaKostanyan
authored
Merge branch 'master' into CommandTesting
2 parents ecc49a4 + cc93907 commit 36d48e0

File tree

87 files changed

+8387
-1467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+8387
-1467
lines changed

‎docs/ids_and_codes/zap_clusters.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Generally regenerate using one of:
7474
| 101 | 0x65 | Groupcast |
7575
| 113 | 0x71 | HepaFilterMonitoring |
7676
| 114 | 0x72 | ActivatedCarbonFilterMonitoring |
77+
| 121 | 0x79 | WaterTankLevelMonitoring |
7778
| 128 | 0x80 | BooleanStateConfiguration |
7879
| 129 | 0x81 | ValveConfigurationAndControl |
7980
| 144 | 0x90 | ElectricalPowerMeasurement |

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,7 +1648,7 @@ cluster AirQuality = 91 {
16481648

16491649
/** Attributes and commands for monitoring HEPA filters in a device */
16501650
cluster HepaFilterMonitoring = 113 {
1651-
revision 1; // NOTE: Default/not specifically set
1651+
revision 1;
16521652

16531653
shared enum ChangeIndicationEnum : enum8 {
16541654
kOK = 0 [spec_name = "OK"];
@@ -1692,13 +1692,13 @@ cluster HepaFilterMonitoring = 113 {
16921692
readonly attribute bitmap32 featureMap = 65532;
16931693
readonly attribute int16u clusterRevision = 65533;
16941694

1695-
/** Reset the condition of the replaceable to the non degraded state */
1695+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
16961696
command ResetCondition(): DefaultSuccess = 0;
16971697
}
16981698

16991699
/** Attributes and commands for monitoring activated carbon filters in a device */
17001700
cluster ActivatedCarbonFilterMonitoring = 114 {
1701-
revision 1; // NOTE: Default/not specifically set
1701+
revision 1;
17021702

17031703
shared enum ChangeIndicationEnum : enum8 {
17041704
kOK = 0 [spec_name = "OK"];
@@ -1742,7 +1742,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
17421742
readonly attribute bitmap32 featureMap = 65532;
17431743
readonly attribute int16u clusterRevision = 65533;
17441744

1745-
/** Reset the condition of the replaceable to the non degraded state */
1745+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
17461746
command ResetCondition(): DefaultSuccess = 0;
17471747
}
17481748

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4102,7 +4102,7 @@ provisional cluster ScenesManagement = 98 {
41024102

41034103
/** Attributes and commands for monitoring HEPA filters in a device */
41044104
cluster HepaFilterMonitoring = 113 {
4105-
revision 1; // NOTE: Default/not specifically set
4105+
revision 1;
41064106

41074107
shared enum ChangeIndicationEnum : enum8 {
41084108
kOK = 0 [spec_name = "OK"];
@@ -4146,13 +4146,13 @@ cluster HepaFilterMonitoring = 113 {
41464146
readonly attribute bitmap32 featureMap = 65532;
41474147
readonly attribute int16u clusterRevision = 65533;
41484148

4149-
/** Reset the condition of the replaceable to the non degraded state */
4149+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
41504150
command ResetCondition(): DefaultSuccess = 0;
41514151
}
41524152

41534153
/** Attributes and commands for monitoring activated carbon filters in a device */
41544154
cluster ActivatedCarbonFilterMonitoring = 114 {
4155-
revision 1; // NOTE: Default/not specifically set
4155+
revision 1;
41564156

41574157
shared enum ChangeIndicationEnum : enum8 {
41584158
kOK = 0 [spec_name = "OK"];
@@ -4196,7 +4196,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
41964196
readonly attribute bitmap32 featureMap = 65532;
41974197
readonly attribute int16u clusterRevision = 65533;
41984198

4199-
/** Reset the condition of the replaceable to the non degraded state */
4199+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
42004200
command ResetCondition(): DefaultSuccess = 0;
42014201
}
42024202

‎examples/all-clusters-app/realtek/data_model/all-clusters-app.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4199,7 +4199,7 @@ provisional cluster ScenesManagement = 98 {
41994199

42004200
/** Attributes and commands for monitoring HEPA filters in a device */
42014201
cluster HepaFilterMonitoring = 113 {
4202-
revision 1; // NOTE: Default/not specifically set
4202+
revision 1;
42034203

42044204
shared enum ChangeIndicationEnum : enum8 {
42054205
kOK = 0 [spec_name = "OK"];
@@ -4243,13 +4243,13 @@ cluster HepaFilterMonitoring = 113 {
42434243
readonly attribute bitmap32 featureMap = 65532;
42444244
readonly attribute int16u clusterRevision = 65533;
42454245

4246-
/** Reset the condition of the replaceable to the non degraded state */
4246+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
42474247
command ResetCondition(): DefaultSuccess = 0;
42484248
}
42494249

42504250
/** Attributes and commands for monitoring activated carbon filters in a device */
42514251
cluster ActivatedCarbonFilterMonitoring = 114 {
4252-
revision 1; // NOTE: Default/not specifically set
4252+
revision 1;
42534253

42544254
shared enum ChangeIndicationEnum : enum8 {
42554255
kOK = 0 [spec_name = "OK"];
@@ -4293,7 +4293,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
42934293
readonly attribute bitmap32 featureMap = 65532;
42944294
readonly attribute int16u clusterRevision = 65533;
42954295

4296-
/** Reset the condition of the replaceable to the non degraded state */
4296+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
42974297
command ResetCondition(): DefaultSuccess = 0;
42984298
}
42994299

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,7 @@ cluster GroupKeyManagement = 63 {
16551655

16561656
/** Attributes and commands for monitoring HEPA filters in a device */
16571657
cluster HepaFilterMonitoring = 113 {
1658-
revision 1; // NOTE: Default/not specifically set
1658+
revision 1;
16591659

16601660
shared enum ChangeIndicationEnum : enum8 {
16611661
kOK = 0 [spec_name = "OK"];
@@ -1699,13 +1699,13 @@ cluster HepaFilterMonitoring = 113 {
16991699
readonly attribute bitmap32 featureMap = 65532;
17001700
readonly attribute int16u clusterRevision = 65533;
17011701

1702-
/** Reset the condition of the replaceable to the non degraded state */
1702+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
17031703
command ResetCondition(): DefaultSuccess = 0;
17041704
}
17051705

17061706
/** Attributes and commands for monitoring activated carbon filters in a device */
17071707
cluster ActivatedCarbonFilterMonitoring = 114 {
1708-
revision 1; // NOTE: Default/not specifically set
1708+
revision 1;
17091709

17101710
shared enum ChangeIndicationEnum : enum8 {
17111711
kOK = 0 [spec_name = "OK"];
@@ -1749,7 +1749,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
17491749
readonly attribute bitmap32 featureMap = 65532;
17501750
readonly attribute int16u clusterRevision = 65533;
17511751

1752-
/** Reset the condition of the replaceable to the non degraded state */
1752+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
17531753
command ResetCondition(): DefaultSuccess = 0;
17541754
}
17551755

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ cluster AirQuality = 91 {
15011501

15021502
/** Attributes and commands for monitoring HEPA filters in a device */
15031503
cluster HepaFilterMonitoring = 113 {
1504-
revision 1; // NOTE: Default/not specifically set
1504+
revision 1;
15051505

15061506
shared enum ChangeIndicationEnum : enum8 {
15071507
kOK = 0 [spec_name = "OK"];
@@ -1545,13 +1545,13 @@ cluster HepaFilterMonitoring = 113 {
15451545
readonly attribute bitmap32 featureMap = 65532;
15461546
readonly attribute int16u clusterRevision = 65533;
15471547

1548-
/** Reset the condition of the replaceable to the non degraded state */
1548+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
15491549
command ResetCondition(): DefaultSuccess = 0;
15501550
}
15511551

15521552
/** Attributes and commands for monitoring activated carbon filters in a device */
15531553
cluster ActivatedCarbonFilterMonitoring = 114 {
1554-
revision 1; // NOTE: Default/not specifically set
1554+
revision 1;
15551555

15561556
shared enum ChangeIndicationEnum : enum8 {
15571557
kOK = 0 [spec_name = "OK"];
@@ -1595,7 +1595,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
15951595
readonly attribute bitmap32 featureMap = 65532;
15961596
readonly attribute int16u clusterRevision = 65533;
15971597

1598-
/** Reset the condition of the replaceable to the non degraded state */
1598+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
15991599
command ResetCondition(): DefaultSuccess = 0;
16001600
}
16011601

‎examples/chef/devices/rootnode_extractorhood_0359bf807d.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,7 @@ cluster IcdManagement = 70 {
16201620

16211621
/** Attributes and commands for monitoring HEPA filters in a device */
16221622
cluster HepaFilterMonitoring = 113 {
1623-
revision 1; // NOTE: Default/not specifically set
1623+
revision 1;
16241624

16251625
shared enum ChangeIndicationEnum : enum8 {
16261626
kOK = 0 [spec_name = "OK"];
@@ -1664,13 +1664,13 @@ cluster HepaFilterMonitoring = 113 {
16641664
readonly attribute bitmap32 featureMap = 65532;
16651665
readonly attribute int16u clusterRevision = 65533;
16661666

1667-
/** Reset the condition of the replaceable to the non degraded state */
1667+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
16681668
command ResetCondition(): DefaultSuccess = 0;
16691669
}
16701670

16711671
/** Attributes and commands for monitoring activated carbon filters in a device */
16721672
cluster ActivatedCarbonFilterMonitoring = 114 {
1673-
revision 1; // NOTE: Default/not specifically set
1673+
revision 1;
16741674

16751675
shared enum ChangeIndicationEnum : enum8 {
16761676
kOK = 0 [spec_name = "OK"];
@@ -1714,7 +1714,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
17141714
readonly attribute bitmap32 featureMap = 65532;
17151715
readonly attribute int16u clusterRevision = 65533;
17161716

1717-
/** Reset the condition of the replaceable to the non degraded state */
1717+
/** Upon receipt, the device SHALL reset the Condition and ChangeIndicator attributes, indicating full resource availability and readiness for use, as initially configured. */
17181718
command ResetCondition(): DefaultSuccess = 0;
17191719
}
17201720

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
#define MATTER_DM_GROUPCAST_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8484
#define MATTER_DM_HEPA_FILTER_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
8585
#define MATTER_DM_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
86+
#define MATTER_DM_WATER_TANK_LEVEL_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8687
#define MATTER_DM_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
8788
#define MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
8889
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -225,6 +226,7 @@
225226
#define MATTER_DM_GROUPCAST_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
226227
#define MATTER_DM_HEPA_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
227228
#define MATTER_DM_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
229+
#define MATTER_DM_WATER_TANK_LEVEL_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
228230
#define MATTER_DM_BOOLEAN_STATE_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
229231
#define MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
230232
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
#define MATTER_DM_GROUPCAST_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8484
#define MATTER_DM_HEPA_FILTER_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8585
#define MATTER_DM_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
86+
#define MATTER_DM_WATER_TANK_LEVEL_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8687
#define MATTER_DM_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8788
#define MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8889
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
@@ -225,6 +226,7 @@
225226
#define MATTER_DM_GROUPCAST_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
226227
#define MATTER_DM_HEPA_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
227228
#define MATTER_DM_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
229+
#define MATTER_DM_WATER_TANK_LEVEL_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
228230
#define MATTER_DM_BOOLEAN_STATE_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
229231
#define MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
230232
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

‎src/app/clusters/network-commissioning/BUILD.gn‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ source_set("network-commissioning") {
5151
sources = [
5252
"NetworkCommissioningCluster.cpp",
5353
"NetworkCommissioningCluster.h",
54-
"NetworkCommissioningLogic.cpp",
55-
"NetworkCommissioningLogic.h",
5654
]
5755

5856
public_deps = [

0 commit comments

Comments
 (0)