Skip to content

Commit 866ac35

Browse files
silabs-vmSarthak-Shahaselissiasilabs-akosjsilabs-danielV
authored
Merge main into doccurator 2.8.0 20260310 (#54)
* enable CLA * use pull_request * use pull_request_target * Add info on the 2.2.2 release * update cluster.md to correct Cluster header file link * Matter App Cluster Logic Addition * Apps feedback * More edits * Addressing Apps feedback * Apply suggestions from code review Co-authored-by: silabs-vm <vimorrow@silabs.com> * Link the Code Savings Guide * Mention the doccurator branches * Mention the doccurator branches in the PR template * Update CONTRIBUTING.md Fixed typo * Update CONTRIBUTING.md fixed typo * Rename ZclCallbacks.cpp to DataModelCallbacks.cpp * Adding the note for the 917SoC matter cli * Update sld248-matter-overview-guides/serial-port-communications.md Co-authored-by: silabs-vm <vimorrow@silabs.com> * RS9116 deprecation documentation * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert "use pull_request_target" This reverts commit c660e1e. * Revert "use pull_request" This reverts commit 5286c81. * Revert "enable CLA" This reverts commit 74cd27f. * Apply copilot suggestions * MATTER AWS Documentation * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: silabs-vm <vimorrow@silabs.com> * Add the new features for the 2.7.0 Release * Update version strings to 2.7.0 * Updates to New Features * Updating the MatterHub link to use the 2.6.0 version * Add missing image in Matter AWS documentation * use shared cla action (#42) --------- Co-authored-by: Sarthak Shaha <sarthak.shaha@silabs.com> Co-authored-by: Sergei Lissianoi <selissia@silabs.com> Co-authored-by: silabs-akosj <146345861+silabs-akosj@users.noreply.github.com> Co-authored-by: davargas <daniel.vargas@silabs.com> Co-authored-by: silabs-danielV <108473947+silabs-danielV@users.noreply.github.com> Co-authored-by: chirag-silabs <chirag.bansal@silabs.com> Co-authored-by: chirag-silabs <100861685+chirag-silabs@users.noreply.github.com> Co-authored-by: Satya Naag Bollimpalli <sabollim@silabs.com> Co-authored-by: arun-silabs <141724790+arun-silabs@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Arun Padakanti <arunkumar.padakanti@silabs.com> Co-authored-by: Michael Duggan <miduggan@silabs.com> Co-authored-by: Nga Nguyen <nga.nguyen@silabs.com>
1 parent 7fc00b5 commit 866ac35

12 files changed

Lines changed: 269 additions & 27 deletions

.github/workflows/01-CLA-Assistant.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,7 @@ permissions:
1616

1717
jobs:
1818
CLAAssistant:
19-
runs-on: ubuntu-24.04
20-
steps:
21-
- name: Create CLA Assistant Lite bot token
22-
uses: actions/create-github-app-token@v2
23-
id: app-token
24-
with:
25-
app-id: ${{ secrets.GH_APP_ID }}
26-
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
27-
owner: SiliconLabsInternal
28-
repositories: contributor-license-agreements
29-
30-
- name: "CLA Assistant"
31-
if: ${{ contains(github.event.comment.body, 'I have read the CLA Document and I hereby sign the CLA') }} || github.event_name == 'pull_request_target'
32-
uses: SiliconLabsSoftware/action-cla-assistant@silabs_flavour_v2
33-
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35-
PERSONAL_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
36-
with:
37-
path-to-signatures: "cla_signatures_db.json"
38-
path-to-document: "https://github.com/SiliconLabsSoftware/agreements-and-guidelines/blob/main/contributor_license_agreement.md"
39-
branch: 'cla-database'
40-
allowlist: silabs-*,bot*
41-
# the following are the optional inputs - If the optional inputs are not given, then default values will be taken
42-
remote-organization-name: "SiliconLabsInternal"
43-
remote-repository-name: "contributor-license-agreements"
44-
create-file-commit-message: "Created the CLA database file. CLA Assistant Lite bot created this file."
45-
signed-commit-message: "$contributorName has signed the CLA in $owner/$repo#$pullRequestNo"
19+
uses: SiliconLabsSoftware/matter_build_action/.github/workflows/cla.yml@main
20+
secrets:
21+
CLA_APP_ID: ${{ secrets.SILABSIN_CLA_BOT_APP_ID }}
22+
CLA_APP_PRIVATE_KEY: ${{ secrets.SILABSIN_CLA_BOT_APP_PRIVATE_KEY }}

sld291-matter-wifi-run-demo/flashing-using-commander.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Before flashing the application for EFR32 Boards, flash **bootloader images** as
1010
- **BRD4187C Board**
1111
- For MG24 + WF200: External Bootloader (bootloader-storage-spiflash-single-1024k-BRD4187C-gsdk4.1)
1212

13+
**Note**: RS9116 is deprecated and no longer supported on Matter.
14+
1315
Bootloader binaries are available in the respective path of codebase **third_party/silabs/matter_support/matter/efr32/bootloader_binaries** folder. Silicon Labs recommends always flashing the latest bootloader binaries from the codebase.
1416

1517
**Note**: Bootloader binaries are flashed using Simplicity Commander only. It supports EFR32 Boards only.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Amazon Web Services (AWS)
2+
3+
Amazon Web Services offers reliable, scalable, and inexpensive cloud computing services. Refer to [AWS Documentation](https://aws.amazon.com/what-is-aws/) for more details.
4+
5+
## AWS CA Certificate Registration
6+
7+
1. Open [AWS](https://aws.amazon.com/).
8+
2. Log in using your AWS credentials.
9+
10+
3. Go to **Security > Policies** and select **Create Policy**. Enter the policy name (e.g., `MATTER_AWS_POLICY_`). In the policy statements, select **JSON** and replace the contents with the JSON provided below:
11+
12+
```shell
13+
{
14+
"Version": "2012-10-17",
15+
"Statement": [
16+
{
17+
"Effect": "Allow",
18+
"Action": "*",
19+
"Resource": "*"
20+
}
21+
]
22+
}
23+
```
24+
25+
4. Once done, select **Create**.
26+
27+
5. Create a client CSR certificate and a client key by following the steps in the [OpenSSL Certificate Creation](./openssl-certificate-creation.md) documentation.
28+
29+
6. Complete the following steps to create a thing and generate certificates for your Matter application to use in the `MatterAwsNvmCert.cpp` source file:
30+
31+
- Go to **All Devices > Things** and select **Create Things**.
32+
- Select **Create Single Thing** and click **Next**.
33+
- Under **Info > Give the thing a name**, specify the thing name (this will be the client ID), then click **Next**.
34+
- (Optional) Configure the device certificate under **Info > Upload CSR**.
35+
- In **Certificate > Choose file** (Choose Client CSR generated in Openssl Certificate Creation ex: `device.csr`). Click **Next**.
36+
- Use the policy (e.g., `MATTER_AWS_POLICY_`) created in AWS Certificate creation.
37+
- Once the thing is successfully created, activate and download the certificate.
38+
39+
8. Copy the contents of [AWS_CA CERT](https://www.amazontrust.com/repository/AmazonRootCA3.pem) and add it as CA certificate in `MatterAwsNvmCert.cpp`.
40+
41+
9. Repeat Step 5 to create a new thing for use in MQTT Explorer, using the certificate generated for MQTT Explorer during OpenSLL certificate creation (e.g., `explorer.csr`). Create a `.pem` file from the CA certificate in step 8 and use it as the server certificate in MQTT Explorer.
42+
43+
**Note**: The thing name must be unique as it will be used as the client ID.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Build Procedure For Matter + AWS
2+
3+
The following components are common for all apps and should be modified in the corresponding application-specific `.slcp` file.
4+
5+
## How to Add the Matter + AWS Component
6+
7+
To add the Matter + AWS component, modify the corresponding application-specific `.slcp` file.
8+
9+
```shell
10+
- id: matter_aws
11+
from: matter
12+
```
13+
To enable the component in Simplicity Studio, add the following components.
14+
15+
- Go to **Software** components, search for `Matter_Wifi`. Click on **Settings** symbol beside Matter Wi-fi component in the left panel and enable IPV4 configuration.
16+
![IPV4 Component](images/matter_aws_ipv4_enable_1.png)
17+
![IPV4 Settings Enable](images/matter_aws_ipv4_enable_2.png)
18+
19+
- In **Software Components**, search for `aws` and install the Matter AWS component.
20+
21+
- Next, select the dependencies for the Matter AWS component.
22+
![Default Entropy Source for Matter + AWS](images/matter_aws_dependency_1.png)
23+
![Public-Key Abstaction Layer for Matter + AWS](images/matter_aws_dependency_2.png)
24+
25+
## How to Add the Matter + AWS Server, Client, Cluster Details.
26+
27+
- Update the definitions for the server ID, client ID and cluster in `MatterAwsConfig.h`:
28+
    - Update the AWS server name at `#define MATTER_AWS_SERVER_HOST ""`.
29+
    - Update the client ID at `#define MATTER_AWS_CLIENT_ID ""`.
30+
    - Update the cluster information at `#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER`.
31+
32+
33+
## Building Matter + AWS Application
34+
35+
- After you finish modifying the **.slcp** project file as described above, refresh the `matter-extension` in Simplicity Studio.
36+
37+
- On the **Launcher** tab, select **Preferences**.
38+
39+
![Select Preferences](images/select-preferences.png)
40+
41+
- Expand the **Simplicity Studio** section, and click the **SDKs** tab.
42+
43+
![Select SDK](images/select-studio-sdk-option.png)
44+
45+
- Expand **Simplicity SDK**, and click **Refresh** in the side menu.
46+
47+
![Select Refresh](images/select-refresh-option.png)
48+
49+
- Build the Matter + AWS application using Simplicity Studio as described in
50+
- [Build SOC Application Using Studio](/matter/{build-docspace-version}/matter-wifi-run-demo/build-soc-application-using-studio).
51+
52+
## Compile using new/different certificates
53+
54+
- Two devices should not use the same client ID. Use a different client ID for
55+
your second connection.
56+
- While using AWS, update the following information:
57+
- Add your AWS certificates in file
58+
`examples/platform/silabs/matter_aws/matter_aws_interface/include/MatterAwsNvmCert.h`
59+
- Provide the AWS Root CA key
60+
(https://www.amazontrust.com/repository/AmazonRootCA3.pem)
61+
- Provide `device_certificate` and `device_key` with your device certificate and
62+
device key. For more details, refer to
63+
[OpenSSL Device Certificate Creation] (./openssl-certificate-creation.md)
64+
- Add your AWS server and client ID information to the
65+
`examples/platform/silabs/matter_aws/matter_aws_interface/include/MatterAwsConfig.h` file.
66+
- Provide `MATTER_AWS_SERVER_HOST` with your AWS Server name.
67+
- Provide `MATTER_AWS_CLIENT_ID` with your device/thing ID.
68+
- Provide `ZCL_USING_THERMOSTAT_CLUSTER_SERVER` with the cluster details.
69+
- The preferred certificate type to use in the application is ECDSA.
70+
- AWS RootCA used in this PoC is
71+
https://www.amazontrust.com/repository/AmazonRootCA3.pem
72+
246 KB
Loading
141 KB
Loading
148 KB
Loading
116 KB
Loading
189 KB
Loading
67.7 KB
Loading

0 commit comments

Comments
 (0)