Skip to content

Commit a66a5b8

Browse files
tleacmcsatleacmcsa
authored
Merge branch 'master' into test_plan_issue_4685
2 parents 2bc8123 + e103352 commit a66a5b8

File tree

206 files changed

+3545
-61130
lines changed

Some content is hidden

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

206 files changed

+3545
-61130
lines changed

‎.github/workflows/tests.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,6 @@ jobs:
202202
src/app/zap-templates/zcl/data-model/chip/window-covering.xml \
203203
src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml \
204204
src/app/zap-templates/zcl/data-model/chip/matter-devices.xml \
205-
src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml \
206-
src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml \
207-
src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml \
208-
src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
209205
src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml \
210206
src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml \
211207
src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml \

‎BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
8181
"//examples/common/pigweed/rpc_console/py:chip_rpc",
8282
"//integrations/mobly:chip_mobly",
8383
"//scripts/py_matter_yamltests:matter_yamltests",
84-
"//src/python_testing/matter_testing_infrastructure:metadata_parser",
84+
"//src/python_testing/matter_testing_infrastructure:chip-testing",
8585
]
8686

8787
pw_python_venv("matter_build_venv") {
@@ -122,7 +122,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
122122
deps = [
123123
"${chip_root}/scripts:matter_yamltests_distribution.wheel",
124124
"${chip_root}/src/controller/python:chip-repl",
125-
"${chip_root}/src/python_testing/matter_testing_infrastructure:metadata_parser.wheel",
125+
"${chip_root}/src/python_testing/matter_testing_infrastructure:chip-testing.wheel",
126126
]
127127
}
128128
}
@@ -249,7 +249,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
249249
"//scripts/py_matter_idl:matter_idl.tests",
250250
"//scripts/py_matter_yamltests:matter_yamltests.tests",
251251
"//src:tests_run",
252-
"//src/python_testing/matter_testing_infrastructure:metadata_parser.tests",
252+
"//src/python_testing/matter_testing_infrastructure:chip-testing.tests",
253253
]
254254

255255
if (current_os == "linux" || current_os == "mac") {

‎config/nrfconnect/chip-module/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
155155
matter_add_gn_arg_bool ("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
156156
matter_add_gn_arg_bool ("chip_enable_icd_checkin" CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
157157
matter_add_gn_arg_bool ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
158+
matter_add_gn_arg_bool ("chip_enable_icd_dsls" CONFIG_CHIP_ICD_DSLS_SUPPORT)
158159
matter_add_gn_arg_bool ("icd_enforce_sit_slow_poll_limit" TRUE)
159160
endif()
160161

‎config/zephyr/Kconfig

+10-3
Original file line numberDiff line numberDiff line change
@@ -398,25 +398,32 @@ config CHIP_ICD_ACTIVE_MODE_THRESHOLD
398398
For LIT devices it cannot be set to a value smaller than 5000 ms.
399399

400400
config CHIP_ICD_LIT_SUPPORT
401-
bool "Intermittenly Connected Device Long Idle Time support"
401+
bool "Intermittently Connected Device Long Idle Time support"
402402
imply CHIP_ICD_CHECK_IN_SUPPORT
403403
imply CHIP_ICD_UAT_SUPPORT
404404
help
405405
Enables the Intermittently Connected Device Long Idle Time support in Matter.
406406
It also implies the ICD Check-In and UAT features support that are mandatory for LIT device.
407407

408408
config CHIP_ICD_CHECK_IN_SUPPORT
409-
bool "Intermittenly Connected Device Check-In protocol support"
409+
bool "Intermittently Connected Device Check-In protocol support"
410410
help
411411
Enables the Check-In protocol support in Matter. It allows an ICD device to notify the registered
412412
ICD clients that it is available for communication.
413413

414414
config CHIP_ICD_UAT_SUPPORT
415-
bool "Intermittenly Connected Device User Active Mode Trigger support"
415+
bool "Intermittently Connected Device User Active Mode Trigger support"
416416
help
417417
Enables the User Active Mode Trigger (UAT) support in Matter. It allows the User to use application specific
418418
means (e.g. button press) to trigger an ICD device to enter the active mode and become responsive.
419419

420+
config CHIP_ICD_DSLS_SUPPORT
421+
bool "Intermittenttly Connected Device Dynamic SIT LIT support"
422+
depends on CHIP_ICD_LIT_SUPPORT
423+
help
424+
Enables the Dynamic SIT LIT support in Matter. It allows the application to dynamically switch between
425+
SIT and LIT modes, as long as the requirements for these modes are met (e.g. device has at least one active ICD client).
426+
420427
config CHIP_ICD_CLIENTS_PER_FABRIC
421428
int "Intermittently Connected Device number of clients per fabric"
422429
default 2

‎docs/guides/fabric_synchronization_guide.md

+9
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ Run the Fabric Synchronization script:
9696

9797
### Fabric Sync Setup
9898

99+
Fabric Sync Setup is the process of enabling two ecosystems that support the
100+
Fabric Synchronization feature to commission each other's Fabric Bridge nodes
101+
into their respective private fabrics.
102+
99103
In Ecosystem 1 Fabric-Admin console:
100104

101105
Pair the local bridge of Ecosystem 1 with node ID 1:
@@ -118,6 +122,11 @@ of Ecosystem 1 has successfully paired with Ecosystem 2 on Endpoint 2:
118122
>>> A new device is added on Endpoint 2.
119123
```
120124

125+
Note: We only need to add the local bridge to the ecosystem to trigger the
126+
Fabric Sync Setup process. In the example above, the Fabric Sync Setup process
127+
is initiated by the command 'add-bridge' from Ecosystem 1. Adding the local
128+
bridge on the other side is optional.
129+
121130
### Pair Light Example to Ecosystem 2
122131

123132
Since Fabric-Bridge also functions as a Matter server, running it alongside the

‎docs/zap_clusters.md

-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ Generally regenerate using one of:
1515
| 3 | 0x03 | Identify |
1616
| 4 | 0x04 | Groups |
1717
| 6 | 0x06 | OnOff |
18-
| 7 | 0x07 | OnOffSwitchConfiguration |
1918
| 8 | 0x08 | LevelControl |
20-
| 15 | 0x0F | BinaryInputBasic |
2119
| 28 | 0x1C | PulseWidthModulation |
2220
| 29 | 0x1D | Descriptor |
2321
| 30 | 0x1E | Binding |
@@ -91,7 +89,6 @@ Generally regenerate using one of:
9189
| 159 | 0x9F | DeviceEnergyManagementMode |
9290
| 257 | 0x101 | DoorLock |
9391
| 258 | 0x102 | WindowCovering |
94-
| 259 | 0x103 | BarrierControl |
9592
| 336 | 0x150 | ServiceArea |
9693
| 512 | 0x200 | PumpConfigurationAndControl |
9794
| 513 | 0x201 | Thermostat |
@@ -134,7 +131,6 @@ Generally regenerate using one of:
134131
| 1296 | 0x510 | ContentAppObserver |
135132
| 1872 | 0x750 | EcosystemInformation |
136133
| 1873 | 0x751 | CommissionerControl |
137-
| 2820 | 0xB04 | ElectricalMeasurement |
138134
| 4294048773 | 0xFFF1FC05 | UnitTesting |
139135
| 4294048774 | 0xFFF1FC06 | FaultInjection |
140136
| 4294048800 | 0xFFF1FC20 | SampleMei |

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

-18
Original file line numberDiff line numberDiff line change
@@ -770,24 +770,6 @@
770770
"isIncoming": 0,
771771
"isEnabled": 1
772772
}
773-
],
774-
"attributes": [
775-
{
776-
"name": "ClusterRevision",
777-
"code": 65533,
778-
"mfgCode": null,
779-
"side": "client",
780-
"type": "int16u",
781-
"included": 1,
782-
"storageOption": "RAM",
783-
"singleton": 0,
784-
"bounded": 0,
785-
"defaultValue": "0x0001",
786-
"reportable": 1,
787-
"minInterval": 0,
788-
"maxInterval": 65344,
789-
"reportableChange": 0
790-
}
791773
]
792774
},
793775
{

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap

-18
Original file line numberDiff line numberDiff line change
@@ -770,24 +770,6 @@
770770
"isIncoming": 0,
771771
"isEnabled": 1
772772
}
773-
],
774-
"attributes": [
775-
{
776-
"name": "ClusterRevision",
777-
"code": 65533,
778-
"mfgCode": null,
779-
"side": "client",
780-
"type": "int16u",
781-
"included": 1,
782-
"storageOption": "RAM",
783-
"singleton": 0,
784-
"bounded": 0,
785-
"defaultValue": "1",
786-
"reportable": 1,
787-
"minInterval": 0,
788-
"maxInterval": 65344,
789-
"reportableChange": 0
790-
}
791773
]
792774
},
793775
{

0 commit comments

Comments
 (0)