Skip to content

Commit

Permalink
Merge branch 'project-chip:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
selissia authored Apr 15, 2022
2 parents d197cb5 + 0680f21 commit e9b685d
Show file tree
Hide file tree
Showing 443 changed files with 22,789 additions and 11,503 deletions.
16 changes: 2 additions & 14 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
21
22
AAAA
aabbccddeeff
aarch
abcdef
abfb
Expand Down Expand Up @@ -510,7 +509,6 @@ ffeebaefa
FFF
fffe
fffff
fHtcwcAAAAAAAAAwQAAAAAAXPMlAAAAAAA
Fi
filepath
fini
Expand Down Expand Up @@ -620,6 +618,8 @@ IlluminanceMeasurement
IM
imager
imagetool
ImageURI
imageUri
img
Impl
ImplClass
Expand Down Expand Up @@ -1392,17 +1392,13 @@ xAAAA
xab
xaver
xb
xBEEF
xbef
xc
xcd
Xcode
xcodeproj
xcworkspace
xd
xDEAD
xDEADBEEF
xdeadbeefcafe
xds
xdsdfu
xEA
Expand All @@ -1420,15 +1416,8 @@ xFF
xFFF
xFFFF
xfffff
xFFFFFFFD
xffffffffe
xfffffffff
xffffffffffff
xffffffffffffXXXX
xtensa
xwayland
XXXX
XXXXXXXX
xyz
xz
xzvf
Expand All @@ -1439,7 +1428,6 @@ YNJV
Yocto
yoctoproject
YourFolder
yWsC
zapt
zaptool
ZCL
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/examples-cc13x2x7_26x2x7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ jobs:
cc13x2_26x2 LP_CC2652R7 pump-controller-app \
out/artifacts/cc13x2x7_26x2x7-pump-controller/chip-LP_CC2652R7-pump-controller-example.out \
/tmp/bloat_reports/
- name: Get All Clusters App size stats
timeout-minutes: 5
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
cc13x2_26x2 LP_CC2652R7 all-clusters-app \
out/artifacts/cc13x2x7_26x2x7-all-clusters/chip-LP_CC2652R7-all-clusters-example.out \
/tmp/bloat_reports/
- name: Uploading Size Reports
uses: actions/upload-artifact@v2
if: ${{ !env.ACT }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build Some samples
timeout-minutes: 20
timeout-minutes: 45
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.5.58
image: connectedhomeip/chip-build-nrf-platform:0.5.64
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-qpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build QPG6105 example apps
timeout-minutes: 5
timeout-minutes: 20
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--enable-flashbundle \
--target-glob 'qpg6105-{lock,light,shell,persistent-storage}' \
--target-glob 'qpg-{lock,light,shell,persistent-storage}' \
build \
--copy-artifacts-to out/artifacts \
"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ jobs:
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target linux-x64-all-clusters-${BUILD_VARIANT} \
--target linux-x64-python-bindings \
build \
--copy-artifacts-to objdir-clone \
"
Expand Down
41 changes: 41 additions & 0 deletions .spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,53 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# To run locally:
# Prerequisits (only once):
#
# apt-get install aspell aspell-en
# pip install pyspelling
#
# Actual run:
#
# pyspelling pyspelling --config .spellcheck.yml

matrix:
- name: markdown
dictionary:
wordlists:
- .github/.wordlist.txt
pipeline:
# See https://facelessuser.github.io/pyspelling/configuration/#pipeline
# and https://facelessuser.github.io/pyspelling/filters/context/

# context-aware logic: we have a LOT of code examples in markdown,
# avoid trying to spellcheck code.
- pyspelling.filters.context:
context_visible_first: true
escapes: \\[\\`~]
delimiters:
# Ignore multiline content between fences (fences can have 3 or more back ticks)
# ```
# content
# ```
#
# Allows language marker (since github allows it) like:
# ```python
# content
# ```
- open: '(?s)^(?P<open> *`{3,})[a-z]*$'
close: '^(?P=open)$'
# Ignore text between inline back ticks
- open: '(?P<open>`+)'
close: '(?P=open)'
# Ignore URL in hyperlinks [title](url)
- open: '\[[^]]*\]\('
close: '\)'
# Ignore code markers
- open: '<code>'
close: '</code>'

# converts markdown to HTML
- pyspelling.filters.markdown:
sources:
- '**/*.md|!third_party/**|!examples/common/**/repo/**'
Expand Down
12 changes: 12 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
# Build the cc13x2x7_26x2x7 lock app example.
enable_cc13x2x7_26x2x7_lock_app_build = enable_ti_simplelink_builds

# Build the cc13x2x7_26x2x7 all-clusters app example.
enable_cc13x2x7_26x2x7_all_clusters_app_build = enable_ti_simplelink_builds

# Build the efr32 lock app example.
enable_efr32_lock_app_build = enable_efr32_builds

Expand Down Expand Up @@ -353,6 +356,12 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
}
}

if (enable_cc13x2x7_26x2x7_all_clusters_app_build) {
group("cc13x2x7_26x2x7_all_clusters_app") {
deps = [ "${chip_root}/examples/all-clusters-app/cc13x2x7_26x2x7(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2x7_26x2x7_all_clusters_app)" ]
}
}

if (enable_standalone_shell_build) {
group("standalone_shell") {
deps =
Expand Down Expand Up @@ -539,6 +548,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
if (enable_cc13x2x7_26x2x7_lock_app_build) {
deps += [ ":cc13x2x7_26x2x7_lock_app" ]
}
if (enable_cc13x2x7_26x2x7_all_clusters_app_build) {
deps += [ ":cc13x2x7_26x2x7_all_clusters_app" ]
}
}

group("check") {
Expand Down
6 changes: 6 additions & 0 deletions config/cc13x2_26x2/toolchain/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@ arm_toolchain("cc13x2x7_26x2x7_lock_app") {
current_os = "freertos"
import("${chip_root}/examples/lock-app/cc13x2x7_26x2x7/args.gni")
}
arm_toolchain("cc13x2x7_26x2x7_all_clusters_app") {
toolchain_args = {
current_os = "freertos"
import("${chip_root}/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni")
}
}
}
4 changes: 4 additions & 0 deletions config/esp32/components/chip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ if (CONFIG_ENABLE_CHIP_SHELL)
chip_gn_arg_append("chip_build_libshell" "true")
endif()

if (CONFIG_IDF_TARGET_ESP32H2)
chip_gn_arg_append("chip_enable_wifi" "false")
endif()

if (CONFIG_OPENTHREAD_ENABLED)
chip_gn_arg_append("chip_enable_openthread" "true")
endif()
Expand Down
2 changes: 1 addition & 1 deletion config/nrfconnect/.nrfconnect-recommended-revision
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.9.1
5ea8f7fa91d7315fcc6cd9eb3aa74f9640d0abac
4 changes: 3 additions & 1 deletion config/qpg/chip-gn/.gn
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import("//build_overrides/chip.gni")
buildconfig = "//build/config/BUILDCONFIG.gn"

# CHIP uses angle bracket includes.
check_system_includes = true
# DISABLED since CI failed on PR 17352
# Build error out for unused/unavailble include file (IPAddress.h : <openthread/ip6.h>)
check_system_includes = false

default_args = {
target_cpu = "arm"
Expand Down
4 changes: 2 additions & 2 deletions docs/api/device_runner.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@ enable reusing tests between different devices.
The TSG is targeting the following platforms/boards for early bringup:

- Nordic nRF52 board <TODO: REF>
- SiLabs XXXX board <TODO:REF>
- Espressif ESP32 XXXX board <TODO:REF>
- SiLabs `XXXX` board <TODO:REF>
- Espressif ESP32 `XXXX` board <TODO:REF>
6 changes: 3 additions & 3 deletions docs/discussion/lwip_ipv6.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ addresses for communication to nodes on the same network (wifi or thread). When
there is more than one netif in the system (ex. loopback, softAP, STA), the link
local address needs more information to determine which link the address is
local to. This is normally added as the link local scope and can be seen on
addresses ex. FE80::xxxx:xxxx:xxxx:xxxx%<scope>, where the <scope> identifies
the netif (something like %wlan0 or %eno1 etc.).
addresses ex. `FE80::xxxx:xxxx:xxxx:xxxx%<scope>`, where the <scope> identifies
the netif (something like `%wlan0` or `%eno1` etc.).

Without this indicator, the link local address can only be resolved if there is
one netif. LwIP will also allow a direct address match to the netif source
Expand Down Expand Up @@ -122,7 +122,7 @@ Instead, it might be better to build this into the ICMP layer itself.
LwIP's DNS handling isn’t great and breaks down when the router supports
IPv4/IPv6. There is a single list of DNS servers, DHCP, SLAAC and DHCPv6 all
update the list without locks. Basically, whatever wrote to the list last gets
to set the list. Although there is handling for IP type (requesting A or AAAA
to set the list. Although there is handling for IP type (requesting A or `AAAA`
records), there isn’t handling to specify an IPv6 or IPv4 server specifically,
which can be challenging since not all servers serve all record types.

Expand Down
44 changes: 22 additions & 22 deletions docs/examples/discussion/PID_allocation_for_example_apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@
Unless specifically overridden by the platform, example apps in this SDK use the
Example credentials implementation in `DeviceAttestationCredsExample.cpp`.

The SDK holds example certificates for VID '0xFFF1' and any PID in
'0x8000-0x801F'. The device VID and PID supplied by the basic information
The SDK holds example certificates for VID `0xFFF1` and any PID in
`0x8000-0x801F`. The device VID and PID supplied by the basic information
cluster must correspond to the VID/PID given in the certificate for the device
to pass verification.

Certificates are selected using the value in
CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID. The vendor ID for every example app is the
same because they are all signed by the same PAI (vendor id '0xFFF1').
same because they are all signed by the same PAI (vendor id `0xFFF1`).

In order to allow some differentiation between the various example apps, each
app is assigned a PID from the list below:

| App | PID |
| ----------------------- | ------ |
| All Clusters | 0x8001 |
| Bridge | 0x8002 |
| Door Lock | 0x8003 |
| Light switch | 0x8004 |
| Lighting | 0x8005 |
| Lock | 0x8006 |
| OTA provider | 0x8007 |
| OTA requestor | 0x8008 |
| Persistent Storage | 0x8009 |
| Pigweed | 0x800B |
| Pump | 0x800A |
| Pump Controller | 0x8011 |
| Shell | 0x8012 |
| Temperature measurement | 0x800D |
| Thermostat | 0x800E |
| TV | 0x800F |
| Window | 0x8010 |
| App | PID |
| ----------------------- | -------- |
| All Clusters | `0x8001` |
| Bridge | `0x8002` |
| Door Lock | `0x8003` |
| Light switch | `0x8004` |
| Lighting | `0x8005` |
| Lock | `0x8006` |
| OTA provider | `0x8007` |
| OTA requestor | `0x8008` |
| Persistent Storage | `0x8009` |
| Pigweed | `0x800B` |
| Pump | `0x800A` |
| Pump Controller | `0x8011` |
| Shell | `0x8012` |
| Temperature measurement | `0x800D` |
| Thermostat | `0x800E` |
| TV | `0x800F` |
| Window | `0x8010` |
2 changes: 1 addition & 1 deletion docs/guides/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ To run all tests, run:
ninja -C out/host check
```

To run only the tests in src/inet/tests, you can run:
To run only the tests in `src/inet/tests`, you can run:

```
ninja -C out/host src/inet/tests:tests_run
Expand Down
4 changes: 1 addition & 3 deletions docs/guides/matter-repl.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@ cloud-hosted playground.
The following icon is present at the top of applicable guides that can be
launched into the playground:
<a href="https://www.w3schools.com">
<img src="https://i.ibb.co/hR3yWsC/launch-playground.png" alt="drawing" width="130"/>
</a>
![Launch playground icon](https://i.ibb.co/hR3yWsC/launch-playground.png")
<br></br>
## Guides
Expand Down
4 changes: 1 addition & 3 deletions docs/guides/mbedos_add_new_target.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<p align="center">
<img src="https://raw.githubusercontent.com/ARMmbed/mbed-os/master/logo.png" alt="ARM Mbed-OS logo"/>
</p>
![ARM Mbed-OS logo](https://raw.githubusercontent.com/ARMmbed/mbed-os/master/logo.png)

<h1> Mbed-OS add new hardware target </h1>

Expand Down
10 changes: 7 additions & 3 deletions docs/guides/mbedos_commissioning.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<p align="center">
<img src="https://raw.githubusercontent.com/ARMmbed/mbed-os/master/logo.png" alt="ARM Mbed-OS logo"/>
</p>
![ARM Mbed-OS logo](https://raw.githubusercontent.com/ARMmbed/mbed-os/master/logo.png)

<h1> Matter Arm Mbed OS provisioning guide </h1>

Expand Down Expand Up @@ -67,7 +65,9 @@ After building, install the application by completing the following steps:
1. Install the Android Debug Bridge (adb) package by running the following
command:

```
$ sudo apt install android-tools-adb
```

2. Enable **USB debugging** on your smartphone. See the
[Configure on-device developer options](https://developer.android.com/studio/debug/dev-options)
Expand All @@ -94,7 +94,9 @@ complete the following steps:
accessory device. You can use **mbed-tools** for this purpose
([mbed-tools](https://github.com/ARMmbed/mbed-tools)):

```
mbed-tools sterm -p /dev/ttyACM0 -b 115200 -e off
```

To start the rendezvous, CHIPTool must get the commissioning information from
the Matter device. The data payload is encoded within a QR code and is printed
Expand All @@ -104,8 +106,10 @@ to the UART console.

- Find a message similar to the following one in the application logs:

```
[INFO][CHIP]: [SVR]Copy/paste the below URL in a browser to see the QR Code:
[INFO][CHIP]: [SVR]https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3AYNJV7VSC00CMVH7SR00
```

- Open URL from the console to display the QR in a web browser.

Expand Down
Loading

0 comments on commit e9b685d

Please sign in to comment.