Fix implementation of OnChipScanComplete and OnScanComplete - second PR #24873
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
Create a separate error handler for scan errors
Create a separate function to handle scan errors.
pullapprove
bot
requested review from
amitnj,
anush-apple,
arkq,
Byungjoo-Lee,
bzbarsky-apple,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
CodeChronos928,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis,
franck-apple,
gjc13,
harimau-qirex,
harsha-rajendran,
hawk248,
jelderton and
jepenven-silabs
pullapprove
bot
requested review from
kcoppock,
ksperling-apple,
lazarkov,
lpbeliveau-silabs,
LuDuda,
mlepage-google,
mrjerryjohns,
pjzander-signify,
robszewczyk,
selissia,
tcarmelveilleux,
tecimovic,
turon,
vijs,
vivien-apple,
woody-apple,
xylophone21,
yufengwangca and
kkasperczyk-no
andy31415
approved these changes
Feb 28, 2023
shchen-Lab
added a commit
to bouffalolab/connectedhomeip-1
that referenced
this pull request
Mar 1, 2023
…p-1 into bl702l_matter * 'bl702l_matter' of github.com:bouffalolab/connectedhomeip-1: (446 commits) [Python] Add Python commissioning flow (project-chip#25119) Add to flake8 in workflow and fix python files (project-chip#25280) Align Time Format Localization cluster XML to spec changes. (project-chip#25289) Use the PathsFinder module in scripts/tests/run_test_suite.py instead of having duplicated code (project-chip#25368) Add a continuous browse for Matter operational advertisements on Darwin. (project-chip#25317) Chef doorlock sample update (project-chip#24118) Fix implementation of OnChipScanComplete and OnScanComplete - second PR (project-chip#24873) Add to flake8 in workflow and fix python files (project-chip#25279) Make PASE setup a bit more robust if multiple clients race. (project-chip#25352) Add dependent lib kotlin-stdlib for kotlin version of java-matter-controller (project-chip#25358) [python tests] Add to flake8 in workflow and fix python files (part project-chip#25193) (project-chip#25312) Add to flake8 in workflow and fix python files (project-chip#25283) Add a way to read a concrete attribute path from AttributePathIB::Parser. (project-chip#25293) Make sure various tests in TestReadInteraction are not no-ops. (project-chip#25298) [Android] Add isUrgent option in Android (project-chip#25301) [NXP] Add to flake8 in workflow and fix python files (part project-chip#25193) (project-chip#25305) [placeholder] Allow applications can specify which additional sources to build (project-chip#25346) Set thread sleep and yield backends for rpc (project-chip#25350) [config-data] Remove some enums that just don't generate anything (project-chip#25370) [Tizen] CI workflow for running QEMU-based tests (project-chip#24871) ...
shchen-Lab
added a commit
to bouffalolab/connectedhomeip-1
that referenced
this pull request
Mar 1, 2023
* official/master: (449 commits) tv-casting-app: Updating the context we pass to FindOrEstablishSession Changing caching logic to match video players using hostname before other attributes Enable -Wconversion tree-wide on darwin. (project-chip#25376) [Python] Add Python commissioning flow (project-chip#25119) Add to flake8 in workflow and fix python files (project-chip#25280) Align Time Format Localization cluster XML to spec changes. (project-chip#25289) Use the PathsFinder module in scripts/tests/run_test_suite.py instead of having duplicated code (project-chip#25368) Add a continuous browse for Matter operational advertisements on Darwin. (project-chip#25317) Chef doorlock sample update (project-chip#24118) Fix implementation of OnChipScanComplete and OnScanComplete - second PR (project-chip#24873) Add to flake8 in workflow and fix python files (project-chip#25279) Make PASE setup a bit more robust if multiple clients race. (project-chip#25352) Add dependent lib kotlin-stdlib for kotlin version of java-matter-controller (project-chip#25358) [python tests] Add to flake8 in workflow and fix python files (part project-chip#25193) (project-chip#25312) Add to flake8 in workflow and fix python files (project-chip#25283) Add a way to read a concrete attribute path from AttributePathIB::Parser. (project-chip#25293) Make sure various tests in TestReadInteraction are not no-ops. (project-chip#25298) [Android] Add isUrgent option in Android (project-chip#25301) [NXP] Add to flake8 in workflow and fix python files (part project-chip#25193) (project-chip#25305) [placeholder] Allow applications can specify which additional sources to build (project-chip#25346) ...
lecndav
pushed a commit
to lecndav/connectedhomeip
that referenced
this pull request
Mar 22, 2023
…PR (project-chip#24873) * Remove on connection error from on scan complete Create a separate error handler for scan errors * Fix typo * Remove redundant variable set * Rewrite OnScanComplete to make it more readable. Create a separate function to handle scan errors. * Add missing override * Style fix * Change log level * Call an error in darwin on StopTimeoutReached * Error as int
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.
I recreated PR #23612. In the original one there was a problem with CI "pullapprove — Given usernames could not be requested."
Problem
When the chip-tool is shutting down because of timeout from StartWaiting then mBleLayer->mBleTransport is firstly set to nullptr and OnBleConnectionError is called on this pointer.
Fix
I've changed the implementation of OnScanComplete to do not call
OnConnectionErrorit seems that this isn't the right place to do it. I've createdOnScanError, which is called when the error occurs during scanning. Now it is called from TimerExpiredCallback which is the callback for a timeout for scan task. For kConnectTimeoutOnConnectionErroris called here if an error occurred.Testing
Manually tested on the Linux platform on one device I've run:
and on the other Linux device I've run: