[Darwin] Fix Matter framework delegates to pass the delegating object as the first arg to their methods #23665
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pullapprove
bot
requested review from
andy31415,
anush-apple,
arkq,
Byungjoo-Lee,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis,
franck-apple,
gjc13,
harsha-rajendran,
hawk248,
isiu-apple,
jelderton,
jepenven-silabs,
jmartinez-silabs,
jtung-apple,
lazarkov,
LuDuda,
mlepage-google,
msandstedt,
mspang,
rgoliver,
robszewczyk,
saurabhst and
selissia
pullapprove
bot
requested review from
vivien-apple,
wbschiller,
woody-apple,
xylophone21 and
yunhanw-google
jtung-apple
reviewed
Nov 17, 2022
jtung-apple
approved these changes
Nov 17, 2022
yunhanw-google
approved these changes
Nov 17, 2022
|
PR #23665: Size comparison from c6272c6 to 8c3b9bc Increases (4 builds for cc13x2_26x2, k32w, psoc6, telink)
Decreases (4 builds for cc13x2_26x2, esp32, telink)
Full report (47 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
bzbarsky-apple
force-pushed
the
darwin-reland-PR-22682-22690
branch
from
8c3b9bc
to
cacaac6
Compare
|
PR #23665: Size comparison from c62b6b5 to cacaac6 Increases (3 builds for cc13x2_26x2, k32w)
Decreases (8 builds for bl602, bl702, cc13x2_26x2, k32w, telink)
Full report (26 builds for bl602, bl702, cc13x2_26x2, k32w, linux, mbed, nrfconnect, qpg, telink)
|
|
PR #23665: Size comparison from c62b6b5 to aace596 Increases (39 builds for bl602, bl702, cc13x2_26x2, cyw30739, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Decreases (6 builds for cc13x2_26x2)
Full report (46 builds for bl602, bl702, cc13x2_26x2, cyw30739, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
… as the first arg to their methods This is a re-landing of PR project-chip#22682 and PR project-chip#22690 but with backwards compat shims in place. The changes to MTRDeviceControllerDelegate are OK because this protocol is newly introduced and has not shipped yet.
bzbarsky-apple
force-pushed
the
darwin-reland-PR-22682-22690
branch
from
aace596
to
d3f8221
Compare
|
PR #23665: Size comparison from 6978de7 to d3f8221 Increases (2 builds for esp32, telink)
Decreases (5 builds for bl602, bl702, esp32, telink)
Full report (51 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
adbridge
pushed a commit
to ARM-software/connectedhomeip
that referenced
this pull request
Nov 18, 2022
… as the first arg to their methods (project-chip#23665) * [Darwin] Fix Matter framework delegates to pass the delegating object as the first arg to their methods This is a re-landing of PR project-chip#22682 and PR project-chip#22690 but with backwards compat shims in place. The changes to MTRDeviceControllerDelegate are OK because this protocol is newly introduced and has not shipped yet. * Address review comment. Co-authored-by: Jeff Tung <100387939+jtung-apple@users.noreply.github.com>
bzbarsky-apple
added a commit
to bzbarsky-apple/connectedhomeip
that referenced
this pull request
Aug 3, 2023
This did not get correctly updated in project-chip#23665, so it was not getting the status update callbacks.
ajoletta-amzn
pushed a commit
to ajoletta-amzn/connectedhomeip
that referenced
this pull request
Aug 4, 2023
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 <andreilitvin@google.com> virtual-device-app: Add LoadingFragment for commissioning establish started event (project-chip#28428) Signed-off-by: Jaehoon You <jaehoon.you@samsung.com> Add openiot clean steps (project-chip#28473) Co-authored-by: Andrei Litvin <andreilitvin@google.com> [cloudbuild] switch to v2 of our build images. (project-chip#28476) Co-authored-by: Andrei Litvin <andreilitvin@google.com> 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 <commits@restyled.io> 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 <commits@restyled.io> 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 <bzbarsky@apple.com> * 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 <tennessee.carmelveilleux@gmail.com> * Moved todo to better place --------- Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Tennessee Carmel-Veilleux <tennessee.carmelveilleux@gmail.com> 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 <marcin.kajor@nordicsemi.no> 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 <commits@restyled.io> [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 <andreilitvin@google.com> 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 <jaehoon.you@samsung.com> Signed-off-by: Charles Kim <chulspro.kim@samsung.com> 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 <84793247+mkardous-silabs@users.noreply.github.com> * Added further clarification in comments --------- Co-authored-by: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com> 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 <andreilitvin@google.com> 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: tennessee.carmelveilleux@gmail.com <tennessee@google.com> Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Andrei Litvin <andy314@gmail.com> 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 <commits@restyled.io> * 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 <chin-ran.lo@nxp.com> * 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 <bzbarsky@apple.com> * Update examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * * Remove the unused code and refine the comment Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com> * Update examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h Co-authored-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> * Restyled by clang-format --------- Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com> Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> Co-authored-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> 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 <commits@restyled.io> 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 <marius.tache@nxp.com> [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 <andy314@gmail.com> Co-authored-by: Andrei Litvin <andreilitvin@google.com> 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a re-landing of PR #22682 and PR #22690 but with backwards compat shims in place.
The changes to MTRDeviceControllerDelegate are OK because this protocol is newly introduced and has not shipped yet.