Fix merge issues in CHIPDeviceCommissioner. #14579
Merged
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
A combination of changes to the state machine, changes to require timed interactions for opening commissioning windows and PR 13371 landed, and the merge does not compile. Specific fixes: 1. Pass a timed invoke timeout when opening commissioning windows. 2. Restore the endpoint and command timeout bits for those commands that used to have them. This is a different timeout, not a timed invoke timeout.
pullapprove
bot
requested review from
anush-apple,
balducci-apple,
Byungjoo-Lee,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis,
franck-apple,
gjc13,
hawk248,
holbrookt,
isiu-apple,
jelderton,
jepenven-silabs,
jmartinez-silabs,
kghost,
LuDuda,
lzgrablic02,
mlepage-google,
msandstedt,
sagar-apple and
saurabhst
pullapprove
bot
requested review from
selissia,
tcarmelveilleux,
tecimovic,
turon,
vijs,
wbschiller,
woody-apple,
xylophone21,
yufengwangca and
yunhanw-google
yunhanw-google
approved these changes
Jan 29, 2022
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.
A combination of changes to the state machine, changes to require timed interactions for opening commissioning windows and PR #13371 landed, and the merge does not compile.
Specific fixes:
Pass a timed invoke timeout when opening commissioning windows.
Restore the endpoint and command timeout bits for those commands
that used to have them. This is a different timeout, not a timed
invoke timeout.
Problem
See above.
Change overview
See above.
Testing
Compiled and it at least compiled....
Going to land as a hotfix, but @cecille @vivien-apple please review this carefully?