Skip to content

Commit 5ec4196

Browse files
Merge branch 'silabs' into RC_2.3.0-1.3
2 parents 5e3bba9 + 9b79757 commit 5ec4196

File tree

89 files changed

+1084
-412
lines changed

Some content is hidden

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

89 files changed

+1084
-412
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ body:
6565
- release_2.1.0-1.1
6666
- release_2.2.0-1.2-alpha.1
6767
- release_2.2.0-1.2
68+
- release_2.3.0-1.3-alpha.1
6869
validations:
6970
required: true
7071

.github/ISSUE_TEMPLATE/feature_request.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ body:
5858
- release_2.1.0-1.1
5959
- release_2.2.0-1.2-alpha.1
6060
- release_2.2.0-1.2
61+
- release_2.3.0-1.3-alpha.1
6162
validations:
6263
required: true
6364

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Device: SiWx917 SoC
2727
This repo contains documentation, demos, examples and all the code needed for Matter Accessory Device development on both Thread and Wi-Fi. The Thread development use cases differs from Wi-Fi because the Thread protocol requires the use of an Open Thread Border Router (OTBR).
2828

2929
- To get started with the Thread demo and development see
30-
[Matter Thread](https://siliconlabs.github.io/matter/2.2.0-1.2-alpha.1/thread/DEMO_OVERVIEW.html)
30+
[Matter Thread](https://siliconlabs.github.io/matter/2.3.0-1.3-alpha.1/thread/DEMO_OVERVIEW.html)
3131
- To get started with the Wi-Fi demo and development see
32-
[Matter Wi-Fi](https://siliconlabs.github.io/matter/2.2.0-1.2-alpha.1/wifi/DEMO_OVERVIEW.html)
32+
[Matter Wi-Fi](https://siliconlabs.github.io/matter/2.3.0-1.3-alpha.1/wifi/DEMO_OVERVIEW.html)
3333

3434
The full documentation set starts here:
35-
[Silicon Labs Matter GitHub Documentation](https://siliconlabs.github.io/matter/2.2.0-1.2-alpha.1)
35+
[Silicon Labs Matter GitHub Documentation](https://siliconlabs.github.io/matter/2.3.0-1.3-alpha.1)
3636

3737
---
3838

docs/silabs/NEW_FEATURES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ With 1.1, devices will remain in Active Mode until the commissioning is complete
9191
The timer starts after the last communication.
9292
For this feature to take affect, there needs to be at least one message coming in or going out. If the device just polls its thread router and nothing else happens, this doesn't come into play.
9393

94-
For more details see the [Openthread Sleepy End Device](./general/OT_SLEEPY_END_DEVICE.md) section.
94+
For more details see the [Openthread Sleepy End Device](./thread/OT_SLEEPY_END_DEVICE.md) section.
9595

9696
### Matter Sleepy End Devices over Wi-Fi
9797

docs/silabs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
2. [Security Overview](general/SECURITY.md)
5151
3. [Matter Attestation Credentials for EFR32](../../silabs_examples/credentials/README.md)
5252
4. [Matter Intermittently Connected Devices](general/MATTER_ICD.md)
53-
5. [Matter Sleepy End Devices over Openthread](general/OT_SLEEPY_END_DEVICE.md)
53+
5. [Matter Sleepy End Devices over Openthread](thread/OT_SLEEPY_END_DEVICE.md)
5454
6. [Matter OTA Software Update](general/OTA_SOFTWARE_UPDATE.md)
5555

5656
9. Reference Guides

docs/silabs/general/ARTIFACTS.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Matter Software Artifacts
22

33
This page provides links to pre-built software image artifacts that can be
4-
used to set up the Matter Demo for the Thread and Wi-Fi use cases. The majority of these artifacts can be found under the "Assets" section on the release page here:
4+
used to set up the Matter Demo for the Thread and Wi-Fi use cases.
5+
6+
Images for the items listed below are available under the "Assets" section at the bottom of this page:
57

68
https://github.com/SiliconLabs/matter/releases/tag/2.3.0-1.3-alpha.1
79

@@ -48,44 +50,42 @@ https://github.com/SiliconLabs/matter/releases/download/v2.3.0-1.3-alpha.1/bootl
4850

4951
## RS9116 Firmware
5052

51-
The RS9116 firmware (rs9116_firmware_files_with_rev.zip) is used to update the RS9116 which can be found here:
53+
The RS9116 firmware (rs9116_firmware_files_with_rev_2.3.0-1.3-alpha.1.zip) is used to update the RS9116 which can be found in the Assets section of this page:
5254

5355
https://github.com/SiliconLabs/matter/releases/download/v2.3.0-1.3-alpha.1/rs9116_firmware_files_with_rev_2.3.0-1.3-alpha.1.zip
5456

5557
**Note**:
5658
RS9116 chip/module needs to be flashed with proper firmware as mentioned below:
59+
5760
- `RS916.x.x.x.x.x.rps - This firmware image is valid for RS9116 1.5 revision chip/module`
5861
- `RS9116.x.x.x.x.x.rps - This firmware image is valid for RS9116 1.4/1.3 revision chip/module`
5962

6063
## SiWx917 Firmware for SiWx917 NCP
6164

62-
The SiWx917 firmware(SiWx917NCP_firmware_files.zip) is used to update the SiWx917 NCP which can be found here:
65+
The SiWx917 firmware(SiWx917NCP_firmware_files_2.3.0-1.3-alpha.1.zip) is used to update the SiWx917 NCP which can be found in the Assets section of this page:
6366

6467
https://github.com/SiliconLabs/matter/releases/download/v2.3.0-1.3-alpha.1/SiWx917NCP_firmware_files_2.3.0-1.3-alpha.1.zip
6568

6669
**Note**:
6770
SiWx917 NCP board need to be flashed with proper firmware as mentioned below:
68-
- `SiWG917-A.2.9.X.X.X.rps - This firmware image is valid for BRD8036A (A0 Expansion v1.1) board`
6971

72+
- `SiWG917-B.2.X.X.X.X.rps - This firmware image is valid for BRD4346A board`
7073

7174
## SiWx917 Firmware for SiWx917 SoC
7275

73-
The SiWx917 firmware (SiWx917SOC_firmware_files.zip) along with WiSeConnect 3 SDK is used to update the SiWx917 SoC which can be found here:
76+
The SiWx917 firmware (SiWx917SOC_firmware_files_2.3.0-1.3-alpha.1.zip) along with WiSeConnect 3 SDK is used to update the SiWx917 SoC which can be found in the Assets section of this page:
7477

7578
https://github.com/SiliconLabs/matter/releases/download/v2.3.0-1.3-alpha.1/SiWx917SOC_firmware_files_2.3.0-1.3-alpha.1.zip
7679

7780
**Note**:
7881
SiWx917 SoC boards need to be flashed with proper firmware as mentioned below:
79-
- `SiWG917-A.2.9.X.X.X.rps - This firmware image is valid for BRD4325B(A0 dual flash 1.1) and BRD4325B(A0 dual flash 1.2) boards`
80-
- `SiWG917-B.2.9.X.X.X.rps - This firmware image is valid for BRD4325C(B0 common flash v1.2), BRD4325G(B0 Stacked Flash + External PSRAM v1.2) and BRD4338A(B0 common flash v2.0) boards`
8182

82-
## SiWx917 SoC Configuration Files for Flashing the Matter Application
83+
- `SiWG917-B.2.X.X.X.X.rps - This firmware image is valid for BRD4338A(B0 common flash v2.0) board`
84+
85+
## SiWx917 SoC Configuration Files For JLink RTT Logging
8386

84-
In order to flash the Matter Application on the SiWx917 SoC, the Ozone Debugger must
85-
be configured for the SiWx917 SoC device by following the instructions on the [Ozone Environment Setup for SiWx917 SoC page](../wifi/SiWx917_Enablement_For_Ozone.md).
87+
In order to check device logs for the Matter Application on the SiWx917 SoC, the **JLink RTT** must be configured for the SiWx917 SoC device by following the instructions on the [JLink RTT SOC Support](../wifi/JLINK_GUIDE_917.md).
8688

87-
The **JLinkDevices.xml** and **ELF** files referenced in the instructions may be found
88-
here:
89+
The [JLinkDevices.xml](https://github.com/SiliconLabs/matter/releases/download/v2.3.0-1.3-alpha.1/JLinkDevices.xml) and **.elf** files referenced in the instructions may be found in the Assets section of this page.
8990

90-
https://github.com/SiliconLabs/matter/releases/download/v2.3.0-1.3-alpha.1/JLinkDevices.xml
91-
https://github.com/SiliconLabs/matter/releases/download/v2.3.0-1.3-alpha.1/RS9117_SF_4MB_42bsp.elf
91+
**Note**:- For EFR32MG2x devices, JLink RTT Logging support is already available.
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Code Savings Guide for Matter Applications
1+
# Code Savings Guide for Building Matter Applications
22

3-
* Remove unnecessary clusters from the zap configuration. Example applications have clusters enabled to support both Thread and WiFi transport layers such as the Diagnostics clusters.
3+
* Remove unnecessary clusters from the zap configuration. Example applications have clusters enabled to support both Thread and WiFi transport layers such as the Diagnostics clusters.
44

5-
* Remove optional features in Matter that may not be needed for a certain application. In the EFR32 build [script](https://github.com/SiliconLabs/matter/blob/latest/scripts/examples/gn_build_example.sh), there are additional build arguments that are added to either add or remove optional Matter features. For example, added a build argument disable_lcd=true will save flash by disabling the lcd screen.
5+
* Remove optional features in Matter that may not be needed for a certain application. In the EFR32 build script, there are additional build arguments that are added to either add or remove optional Matter features. For example, added a build argument disable_lcd=true will save flash by disabling the lcd screen.

docs/silabs/general/COMMISSIONING.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Matter Commissioning
1+
# Commissioning
22

33
## Overview
44

@@ -7,10 +7,10 @@ The commissioning process supports two potential starting points:
77
1. The device is already on the network
88
2. The device needs network credentials for Wi-Fi or Thread (requires Bluetooth LE (BLE) support)
99

10-
The current Matter revision supports Ethernet, Wi-Fi, and Thread devices.
10+
The current Matter revision supports Ethernet, Wi-Fi, and Thread devices.
1111

1212
- Ethernet devices get into the operational network when their Ethernet cable is connected. Therefore the devices are normally already on the network before commissioning.
13-
- Wi-Fi and Thread devices must have credentials configured before the devices can be joined into the operational network. This is normally done over BLE.
13+
- Wi-Fi and Thread devices must have credentials configured before the devices join into the operational network. This is normally done over BLE.
1414

1515
This page focuses on Wi-Fi and Thread. The first step for these devices is to enter commissioning mode, following one of two scenarios:
1616

@@ -19,35 +19,34 @@ This page focuses on Wi-Fi and Thread. The first step for these devices is to en
1919
| Standard | Device automatically goes into the commissioning mode on power-up. Beneficial for limited UI devices (such as light bulbs) |
2020
| User-Directed | Device only enters commissioning mode when initiated by the user. Helpful for devices that have user interfaces or for which commissioning should not be initiated without a user present. |
2121

22-
The following figure provides an overview of the commissioning process and the actions each role performs.
22+
The following figure provides an overview of the commissioning process and the actions each role performs.
2323

2424
![Commissioning Overview](./images/CommissioningOverview.png)
2525

2626
## Example Commissioning Flow
2727

2828
![Steps 1-4](./images/CommissioningSteps1-4.png)
2929

30-
In step 1, the Matter device must enter commissioning mode in one of the two scenarios
31-
described above.
30+
In step 1, the Matter device must enter commissioning mode in one of the two scenarios described above.
3231

3332
Usually, a mobile phone serves as the administrator. Step 2 is to use the mobile phone to scan the QR code of the Matter device. The QR code is used as a passcode to set up a secured BLE connection.
3433

35-
Step 3 is to set up the BLE beaconing and connection between the mobile phone and the Matter device, so that the commissioning information can be exchanged through the BLE connection channel.
34+
Step 3 is to set up the BLE beaconing and connection between the mobile phone and the Matter device, so that the commissioning information can be exchanged through the BLE connection channel.
3635

37-
As the connection should be secure, step 4 is to secure the connection in a process known as password-authenticated session establishment (**PACE**). The passcode derived from the QR code is used as an input for this process. The output is the security key used by the connection.
36+
As the connection should be secure, step 4 is to secure the connection in a process known as password-authenticated session establishment (**PASE**). The passcode derived from the QR code is used as an input for this process. The output is the security key used by the connection.
3837

3938
![Steps 5-7](./images/CommissioningSteps5-7.png)
4039

4140
After the secured connection is established, step 5 is to verify the Matter device's manufacturer certificate and compliance status. Each Matter device must have a device certificate programmed before it is shipped. The mobile phone, acting as administrator, reads the device certificate through the commissioning channel, then communicates with a remote database to validate the certificate and the compliance status of the device. The remote database is called the Distributed Compliance Ledger (**DCL**).
4241

4342
Step 6 is to install the operational certificate for the device. The administrator either obtains the certificate from the remote server or generates the certificate locally and then transfers the certificate to the device. The administrator also configures the Access Control List (**ACL**) with the list of administrators.
4443

45-
After operational security is configured, step 7 is to configure the operational network for the device. For Wi-Fi devices, the SSID and the password are configured. For Thread devices, the PAN ID, network key, and other parameters are configured.
44+
After operational security is configured, step 7 is to configure the operational network for the device. For Wi-Fi devices, the SSID and the password are configured. For Thread devices, the PAN ID, network key, and other parameters are configured.
4645

4746
![Steps 8-10](./images/CommissioningSteps8-10.png)
4847

49-
In step 8, the device starts to join the operational network with the configured parameters.
48+
In step 8, the device starts to join the operational network with the configured parameters.
5049

51-
Once the device is attached to the network (step 9), it can be discovered through Service Registration Protocol (**SRP**). To control that device, you must establish a secured connection through the Certification Authorized Session Establishment (**CASE**) process.
50+
Once the device is attached to the network (step 9), it can be discovered through Service Registration Protocol (**SRP**). To control that device, you must establish a secured connection through the Certification Authorized Session Establishment (**CASE**) process.
5251

53-
After the CASE session is established, the Matter device is commissioned successfully and can communicate with other devices in the Matter network (step 10).
52+
After the CASE session is established, the Matter device is commissioned successfully and can communicate with other devices in the Matter network (step 10).

docs/silabs/general/COMMIT_HASHES.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ in this release of the Silicon Labs Matter Out of Box Experience
77

88
| Repo | Branch | Commit Hash |
99
| ------------------------------------------ | ------ | ---------------------------------------- |
10-
| https://github.com/SiliconLabs/ot-br-posix | main | bb565ca0164981f58a2659222c30917399703a9b |
10+
| https://github.com/SiliconLabs/ot-br-posix | main | 42f98b27bc7f54951c860cd98ce5ff7c7fedc68c |
1111

1212
## Radio Co-Processor (RCP)
1313

1414
| Repo | Branch | Commit Hash |
1515
| --------------------------------------- | ---------- | ---------------------------------------- |
16-
| https://github.com/SiliconLabs/ot-efr32 | matter_sve | 038475dcc21c51448d35309496a2f7401eb2ccfe |
16+
| https://github.com/SiliconLabs/ot-efr32 | main | e75c767374a6a6fccd62f024c7217762ae652891 |
17+
18+
## Openthread
19+
20+
| Repo | Branch | Commit Hash |
21+
| --------------------------------------- | ---------- | ---------------------------------------- |
22+
| https://github.com/openthread/openthread | main | 7074a43e4577d32d5535d52e7940ed2ea7e3a528 |
1723

1824
## Connectivity Standards Alliance (CSA) connectedhomeip (Matter)
1925

@@ -25,10 +31,10 @@ in this release of the Silicon Labs Matter Out of Box Experience
2531

2632
| Repo | Branch | Commit Hash |
2733
| ----------------------------------------------- | ------------------------ | ----------------- |
28-
| https://github.com/SiliconLabs/matter | release_2.3.0-1.3-alpha.1 | \<latest commit\> |
34+
| https://github.com/SiliconLabs/matter | release_2.3.0-1.3-alpha.1 | c36f4a7745ac0092982933987c694a6b605de35d |
2935

3036
## Matter Accessory Device (MAD)
3137

3238
| Repo | Branch | Commit Hash |
3339
| ----------------------------------------------- | ------------------------ | ----------------------|
34-
| https://github.com/SiliconLabs/matter | release_2.3.0-1.3-alpha.1 | \<latest commit\> |
40+
| https://github.com/SiliconLabs/matter | release_2.3.0-1.3-alpha.1 | c36f4a7745ac0092982933987c694a6b605de35d|

docs/silabs/general/CUSTOM_MATTER_DEVICE.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ application example.
3131
```shell
3232
$ ./scripts/tools/zap/run_zaptool.sh examples/lighting-app/lighting-common/lighting-app.zap
3333
```
34-
3534
On the left side of the application, there is a tab for Endpoint 0 and
3635
Endpoint 1. Endpoint 0 is known as the root node. This endpoint is akin to a
3736
"read me first" endpoint that describes itself and the other endpoints that make
@@ -53,7 +52,7 @@ your application to the full power of the Matter SDK.
5352
For example, if a lighting application only includes
5453
single color LEDs instead of RGB LEDs, it might make sense to disable the Color
5554
Control cluster in the ZAP configuration. Similarly, if a
56-
lighting application doesn't take advantage of the Level Control cluster,
55+
lighting application does not take advantage of the Level Control cluster,
5756
which allows you to customize current flow to an LED, it might make sense to
5857
disable the Level Control cluster.
5958

@@ -64,11 +63,10 @@ generate ZAP code.
6463
```shell
6564
$ ./scripts/tools/zap/generate.py examples/lighting-app/lighting-common/lighting-app.zap -o zzz_generated/lighting-app/zap-generated/
6665
```
67-
6866
## Receiving Matter Commands
6967

7068
All Matter commands reach the application through the intermediate function
71-
MatterPostAttributeChangeCallback(). When a request is made by a Matter client,
69+
`MatterPostAttributeChangeCallback()`. When a request is made by a Matter client,
7270
the information contained in the request is forwarded to a Matter application
7371
through this function. The command can then be dissected using conditional logic
7472
to call the proper application functions based on the most recent command
@@ -113,6 +111,7 @@ MoveToLevel action.
113111
LightMgr().InitiateActionLight(AppEvent::kEventType_Light, action_type, endpoint, *value);
114112
}
115113
```
114+
116115
## Send a MoveToLevel Command and Read the CurrentLevel Attribute
117116
118117
Rebuild the application and load the new executable on your EFR32 device. Send
@@ -133,4 +132,4 @@ $ mattertool levelcontrol read current-level 1 1 // Returns 10
133132
```
134133

135134
For more information on running a Silicon Labs lighting example on a Thunderboard Sense 2 see
136-
[sl-newlight/efr32](https://github.com/SiliconLabs/matter/blob/latest/silabs_examples/sl-newLight/efr32/README.md).
135+
[sl-newlight/efr32](https://github.com/SiliconLabs/matter/blob/latest/silabs_examples/sl-newLight/efr32/README.md).

docs/silabs/general/EP.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ developing an energy-friendly device.
77
Using Energy Profiler with Matter is the same as any other protocol except that
88
you need to start the usage from within Energy Profiler inside Simplicity
99
Studio, rather than using an existing Simplicity Studio project, since your
10-
Matter project will not have been created inside Simplicity Studio.
10+
Matter project will not have been created inside Simplicity Studio.
1111

1212
Complete documentation on using the Simplicity Studio Energy Profiler is
1313
provided in the

0 commit comments

Comments
 (0)