Skip to content

Commit

Permalink
t # This is a combination of 44 commits.
Browse files Browse the repository at this point in the history
Added the ability to transmit and display device name in the Matter SDK

Re-run zap_convert_all.py (project-chip#28459)

Add an API to get the list of running controllers from a controller factory. (project-chip#28461)

Add utilities for converting CATValues to/from NSSet. (project-chip#28453)

* Add utilities for converting CATValues to/from NSSet.

* Address review comments.

* Address more review comments.

[esp32 m5-stack light] move freertos functions to flash instead of iram (project-chip#28455)

* Move freertos functions out if iram.

This is because linkage fails with out of IRAM.

Following https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/performance/ram-usage.html#optimizing-iram-usage

* Add newline at the end of the file

---------

Co-authored-by: Andrei Litvin <[email protected]>

virtual-device-app: Add LoadingFragment for commissioning establish started event (project-chip#28428)

Signed-off-by: Jaehoon You <[email protected]>

Add openiot clean steps (project-chip#28473)

Co-authored-by: Andrei Litvin <[email protected]>

[cloudbuild] switch to v2 of our build images. (project-chip#28476)

Co-authored-by: Andrei Litvin <[email protected]>

Update ZAP to pick up UI for multiple device types on an endpoint. (project-chip#28423)

tv-casting-app: Implementing PASE related callbacks (project-chip#28342)

* Linux tv-casting-app: Implementing AppDelegate

* Android tv-casting-app: Implementing AppDelegate

* iOS tv-casting-app: Implementing AppDelegate

[TC-RVC-2.1] Fix PIXIT codes to match the test plan (project-chip#28481)

* fix PIXIT codes to match tp

* fix PIXIT

Stop using controllerID for internal XPC bookkeeping. (project-chip#28480)

We want to use controllerID for client-assigned controller IDs.

Add functions to set Parent Endpoint and Composition Type for an Endpoint (project-chip#28410)

* Added endpointCompositionType to the EmberAfDefinedEndpoint structure to be used to hold whether an endpoint is flat or tree composed - defaults to Flat to assume previous behaviour as default

* Added functions to support setting and getting composition type and also to set an endpoints parent endpoint

* updated Read handler for parts list to make its else branch for Flat composition and then added a further branch to handle Tree composition

* Restyled by clang-format

* Fixed mistake in return type of emberAfEndpointCompositionTypeForEndpoint

* Removing debug logs

* Restyled by clang-format

* Moved new API funciotns to chip::app namespace and removed ember naming. Made endpoint struct use a proper bitmask as it was basically using an enum in a weird way

* Moved Read for Parts List to use new function naming

* Restyled by clang-format

* Replaced EmberAfStatus with CHIP_ERROR

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>

Add macro to set alignment of sha256 context (project-chip#28426)

Fix uninitialised values in KeySet and AttributePathExpandIterator (project-chip#28356)

* Fix uninitialised value in KeySet

* Fix uninitilised mGlobalAttributeEndIndex

* Restyled by clang-format

* Review proposed change initilize mGlobalAttributeEndIndex

* Change initialize values in KeySet to initilize only start_time in EpochKey

* Restyled by clang-format

* Review proposed change initilize IPK keyset start_time

---------

Co-authored-by: Restyled.io <[email protected]>

Add a controller argument to the storage checker function. (project-chip#28488)

Most of the changes are just reindenting.

CASE: Send busy status report if we receive a sigma1 and we are in the middle of handshake (project-chip#28153)

* CASE: Send busy status report if we receive a sigma1 and we are in the
middle of handshake

* Apply suggestions from code review

Co-authored-by: Boris Zbarsky <[email protected]>

* Addressing review comments

* few more review comments

* Addressed reviews and added the unit tests

* Restyled by clang-format

* Few more review comments

* Apply suggestions from code review

Co-authored-by: Tennessee Carmel-Veilleux <[email protected]>

* Moved todo to better place

---------

Co-authored-by: Boris Zbarsky <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
Co-authored-by: Tennessee Carmel-Veilleux <[email protected]>

doc: chip_tool_guide: fix the order of arguments in (project-chip#28494)

`pairing code` command

chip-tool expects the node-id to be passed before payload.

Signed-off-by: Marcin Kajor <[email protected]>

add event For messages acks, Request ICD active mode when waiting on a ack (project-chip#28380)

[ReadHandler] Removal of test flags (project-chip#28421)

* Removed reportScheduler test flags and made TestReadInteractin.cpp wait for min/max instead of setting flags. Modified subscription times in the test to minimise the impact of waiting.

* Restyled by clang-format

* Added a driveAndServiceIO after waiting for max in test where we should wait for max to expire to ensure the run gets scheduled reliably

* Moved ctx.GetIOContext().DriveIO(); after each tests to garantee this will run after maxInterval is expired

* Implemented a mock clock in TestReadInteraction to reduce wait loops

* Removed more loops and added comment on loop left in the code

---------

Co-authored-by: Restyled.io <[email protected]>

[Silabs] Add SIT ICD configurations to silabs lock example (project-chip#28474)

* rename SED for ICD

* Delete ICD subscription callback since default behavior is merged

* Enable ICD default configuration for DL
Update configs to support ICDs

* Add ICDM attributes for SIT ICD config

* generated files

* update wordlist

* update readme

* update default config comments

* add define block for ICD configs

* fix esp

* try to fix esp again

* try to fix esp again

Add an example room air conditioner configuration to chef devices (project-chip#28485)

* Add an example room air conditioner configuration to chef devices

* Remove unuseful cluster in ep 0

* fix ci bug

* Revert "fix ci bug"

This reverts commit e31432e.

[docker] Use gcc 10 in chip build (project-chip#28478)

* Switch to gcc10 instead of gcc9 for chip build base

* Bump up version file

* Add -Dtests=false

---------

Co-authored-by: Andrei Litvin <[email protected]>

Reduce type character size of SceneTableImpl types (project-chip#28448)

virtual-device-app: Add control module for virtual device's detail view (project-chip#28486)

Signed-off-by: Jaehoon You <[email protected]>
Signed-off-by: Charles Kim <[email protected]>

Add `__test__ = False` to hooks (project-chip#28477)

Improve Silabs Matter shell functionality/stability (project-chip#28475)

* Re-worked matter shell to allow for copy/paste, fix varying platform functionality, and increase stability

* Update src/lib/shell/MainLoopSilabs.cpp

Co-authored-by: mkardous-silabs <[email protected]>

* Added further clarification in comments

---------

Co-authored-by: mkardous-silabs <[email protected]>

fix define (project-chip#28502)

Update python logic for executing work in chip main loop (project-chip#28449)

* Add python main loop work method

* Fix typo and restyle

* Fix typo

* Code review updates

* Comment update

* Restyle

---------

Co-authored-by: Andrei Litvin <[email protected]>

Fix crash when an error happens during a BLE scan on darwin. (project-chip#28505)

If we happened to do a BLE scan after doing a BLE connect, and then during the
BLE scan one of two things happens:

1. Bluetooth is shut down (e.g. by just turning it off via the menubar).
2. The scan is a delegate-less scan and times out.

then we would try to use the error handler that expects a SetUpCodePairer but
without an actual non-null SetUpCodePairer to pass it.  And then that would
crash.

The fix is to not call an error handler that we're not supposed to be calling;
scans do not call the _connection_ error handler.

Fix RESOURCE_EXHAUSTED in KeySetWrite (project-chip#28456)

* Fix RESOURCE_EXHAUSTED in KeySetWrite

* Restyled by prettier-yaml

---------

Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
Co-authored-by: Andrei Litvin <[email protected]>

Power source: Implementation of dynamic endpoint list setter (project-chip#28110)

* Implementation of dynamic endpoint list setter

Test: tested by adding a call to set endpoint list in all clusters
      with chip-tool. Also see TestPowerSourceCluster.cpp

* Restyled by whitespace

* Restyled by gn

* Remove the define

Some platforms run these tests, but don't have that define defined.
Instead, just change the function name to test only.

* Address review comments

* free is being called, man, where's the leak?

* Restyled by clang-format

* Address some review comments.

* Fix leak.

* Deal with zero-length arrays.

* shutdown -> clear

* Use EncodeList for list

* test fix.

* types need to match

---------

Co-authored-by: Restyled.io <[email protected]>

* Refine the laundry-washer-control server implementation and add laundry-washer-controls-delegate-impl (project-chip#28264)

* * Refine the laundry-washer-control server implementation
* Add laundry-washer-controls-delegate-impl

Signed-off-by: Chin-Ran Lo <[email protected]>

* Restyled by whitespace

* Restyled by clang-format

* Restyled by gn

* Update src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-delegate.h

Co-authored-by: Boris Zbarsky <[email protected]>

* Update examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h

Co-authored-by: Boris Zbarsky <[email protected]>

* * Remove the unused code and refine the comment

Signed-off-by: Chin-Ran Lo <[email protected]>

* Update examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h

Co-authored-by: Arkadiusz Bokowy <[email protected]>

* Restyled by clang-format

---------

Signed-off-by: Chin-Ran Lo <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
Co-authored-by: Boris Zbarsky <[email protected]>
Co-authored-by: Arkadiusz Bokowy <[email protected]>

Fix selector for status update on CHIPToolDeviceControllerDelegate. (project-chip#28506)

This did not get correctly updated in
project-chip#23665, so it was not
getting the status update callbacks.

[app] Add option to disable read client (project-chip#28149)

* app : Add option to disable Read Client

* Restyled by gn

* Format changes

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>

enable android platform configuration (project-chip#28451)

Skip building python modules as part of Matter.framework build. (project-chip#28514)

We don't need them there, but also they unconditionally pull in perfetto bits,
which is also undesirable.

[mode-base-cluster]fix: build error while not enable On/Off cluster server (project-chip#28388)

* fix build error while not enable onOff cluster server

* fix include file bug

[Ameba] Update docker image (project-chip#28441)

* Update Dockerfile

* Update version

[K32W0] Use west tool to get SDK (project-chip#28431)

Signed-off-by: Marius Tache <[email protected]>

[Ameba] Upgrade cpp17 (project-chip#28438)

* fix cmake workaround for ameba
- upgrade pigweed app to c++17

* Update Dockerfile

* Update version

* Move to chip-build-ameba version 4 instead of 1, to suppor c++17

---------

Co-authored-by: Andrei Litvin <[email protected]>
Co-authored-by: Andrei Litvin <[email protected]>

Remove ICDM cluster for lighting app (project-chip#28522)

[Silabs] Rename SED build target to ICD for python scripts (project-chip#28504)

* rename sed to icd in build targets

* update txt tagets

* rename targets

[chef] disable Groups and Switch from example devices (project-chip#28501)

* A set of manual edits

* zap regen

* Script-disable groups and switch from EP0

* Zap regen
  • Loading branch information
Joletta Cheung authored and Joletta Cheung committed Aug 4, 2023
1 parent b2b89d0 commit 432618c
Show file tree
Hide file tree
Showing 263 changed files with 17,591 additions and 6,690 deletions.
3 changes: 2 additions & 1 deletion .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ hci
hciattach
hciconfig
hdlc
HEPA
HKDF
HMAC
hoc
Expand All @@ -641,7 +642,6 @@ HomePods
hostapd
hostname
href
HEPA
HTTPS
HW
hwadr
Expand All @@ -652,6 +652,7 @@ IasWd
iaszone
ibb
ICA
ICD
iCloud
ICMP
IDF
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ameba:1
image: ghcr.io/project-chip/chip-build-ameba:4
options: --user root

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
"./scripts/build/build_examples.py \
--enable-flashbundle \
--target efr32-brd4187c-thermostat-openthread_mtd \
--target efr32-brd4187c-switch-sed-shell-use_ot_coap_lib \
--target efr32-brd4187c-switch-shell-use_ot_coap_lib \
--target efr32-brd4187c-unit-test \
build \
--copy-artifacts-to out/artifacts \
Expand All @@ -81,7 +81,7 @@ jobs:
--enable-flashbundle \
--target efr32-brd4187c-light-use_ot_lib \
--target efr32-brd4187c-pump \
--target efr32-brd4187c-lock-rpc-shell-enable_heap_monitoring \
--target efr32-brd4187c-lock-shell-enable_heap_monitoring \
build \
--copy-artifacts-to out/artifacts \
"
Expand Down
67 changes: 38 additions & 29 deletions .github/workflows/examples-openiotsdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ jobs:
examples/shell/openiotsdk/build/chip-openiotsdk-shell-example.elf \
/tmp/bloat_reports/
- name: "Test: shell example"
if: steps.build_shell.outcome == 'success'
run: |
scripts/run_in_python_env.sh out/venv \
'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
- name: Clean shell output
run: rm -rf examples/shell/openiotsdk/build

- name: Build lock-app example (mbedtls)
# Disabled being tracked here: https://github.com/project-chip/connectedhomeip/issues/28026
if: false
Expand All @@ -93,6 +102,18 @@ jobs:
examples/tv-app/openiotsdk/build/chip-openiotsdk-tv-app-example.elf \
/tmp/bloat_reports/
- name: "Test: tv-app example"
if: steps.build_tv_app.outcome == 'success'
timeout-minutes: 10
run: |
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
scripts/run_in_python_env.sh out/venv \
'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
- name: Clean tv-app output
run: rm -rf examples/tv-app/openiotsdk/build

- name: Build all-clusters-app example
id: build_all_clusters_app
timeout-minutes: 10
Expand All @@ -103,6 +124,18 @@ jobs:
examples/all-clusters-app/openiotsdk/build/chip-openiotsdk-all-clusters-app-example.elf \
/tmp/bloat_reports/
- name: "Test: all-clusters-app example"
if: steps.build_all_clusters_app.outcome == 'success'
timeout-minutes: 5
run: |
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
scripts/run_in_python_env.sh out/venv \
'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
- name: Clean all-clusters-app output
run: rm -rf examples/all-clusters-app/openiotsdk/build

- name: Build ota-requestor-app example
id: build_ota_requestor_app
timeout-minutes: 10
Expand All @@ -127,12 +160,6 @@ jobs:
run: |
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out/ota-provider chip_config_network_layer_ble=false
- name: "Test: shell example"
if: steps.build_shell.outcome == 'success'
run: |
scripts/run_in_python_env.sh out/venv \
'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
- name: "Test: lock-app example (mbedtls)"
if: steps.build_lock_app_mbedtls.outcome == 'success'
run: |
Expand All @@ -141,24 +168,6 @@ jobs:
'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
- name: "Test: tv-app example"
if: steps.build_tv_app.outcome == 'success'
timeout-minutes: 10
run: |
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
scripts/run_in_python_env.sh out/venv \
'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
- name: "Test: all-clusters-app example"
if: steps.build_all_clusters_app.outcome == 'success'
timeout-minutes: 5
run: |
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
scripts/run_in_python_env.sh out/venv \
'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
- name: "Test: ota-requestor-app example"
if: steps.build_ota_requestor_app.outcome == 'success' && steps.build_ota_provider_app.outcome == 'success'
timeout-minutes: 30
Expand Down Expand Up @@ -189,11 +198,6 @@ jobs:
examples/lock-app/openiotsdk/build/chip-openiotsdk-lock-app-example.elf \
/tmp/bloat_reports/
- name: Build unit tests (psa)
id: build_unit_tests_psa
run: |
scripts/examples/openiotsdk_example.sh -b psa unit-tests
- name: "Test: lock-app example (psa)"
if: steps.build_lock_app_psa.outcome == 'success'
run: |
Expand All @@ -202,6 +206,11 @@ jobs:
'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
- name: Build unit tests (psa)
id: build_unit_tests_psa
run: |
scripts/examples/openiotsdk_example.sh -b psa unit-tests
- name: "Test: unit-tests (psa)"
if: steps.build_unit_tests_psa.outcome == 'success'
run: |
Expand Down
4 changes: 4 additions & 0 deletions config/esp32/components/chip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ if(CONFIG_DISABLE_IPV4)
chip_gn_arg_append("chip_inet_config_enable_ipv4" "false")
endif()

if(CONFIG_DISABLE_READ_CLIENT)
chip_gn_arg_append("chip_enable_read_client" "false")
endif()

if(CHIP_CODEGEN_PREGEN_DIR)
chip_gn_arg_append("chip_code_pre_generated_directory" "\"${CHIP_CODEGEN_PREGEN_DIR}\"")
endif()
Expand Down
6 changes: 6 additions & 0 deletions config/esp32/components/chip/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ menu "CHIP Core"
help
Matter spec is based on IPv6 communication only. Enabling this option may save some flash/ram.

config DISABLE_READ_CLIENT
bool "Disable read client in Interaction Model"
default n
help
Some device types don't require the read client. Enabling this option may save some flash/ram.

config BUILD_CHIP_TESTS
bool "Build CHIP tests"
default n
Expand Down
8 changes: 4 additions & 4 deletions docs/guides/chip_tool_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -980,23 +980,23 @@ Complete the following steps:
fabric by using the following command pattern:
```
$ ./chip-tool pairing code <payload> <node_id> --commissioner-name <commissioner_name>
$ ./chip-tool pairing code <node_id> <payload> --commissioner-name <commissioner_name>
```
In this command:
- _<payload\>_ is the the QR code payload or a manual pairing code generated
by the first commissioner instance when opened commissioning window
- _<node_id\>_ is the user-defined ID of the node being commissioned. It
doesn't need to be the same ID, as for the first fabric.
- _<payload\>_ is the the QR code payload or a manual pairing code generated
by the first commissioner instance when opened commissioning window
- _<commissioner_name\>_ is the name of the second fabric. Valid values are
"alpha", "beta", "gamma", and integers greater than or equal to 4. The
default if not specified is "alpha".
**Example of command:**
```
$ ./chip-tool pairing code 36281602573 1 --commissioner-name beta
$ ./chip-tool pairing code 1 36281602573 --commissioner-name beta
```
#### Step 5: Test reception of commands
Expand Down
Loading

0 comments on commit 432618c

Please sign in to comment.