Skip to content

Commit

Permalink
Merge branch 'tc-idm-4.3-(python)' of github.com:raul-marquez-csa/con…
Browse files Browse the repository at this point in the history
…nectedhomeip into tc-idm-4.3-(python)
  • Loading branch information
raul-marquez-csa committed May 24, 2024
2 parents 56742f8 + 3eee95e commit 7674e43
Show file tree
Hide file tree
Showing 21 changed files with 1,043 additions and 141 deletions.
24 changes: 14 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,29 @@
"${workspaceFolder}/build/default/src/lib/**",
"${workspaceFolder}/config/standalone/",
"${workspaceFolder}/config/standalone/**",
"${workspaceFolder}/darwin/Framework/CHIP/**",
"${workspaceFolder}/examples/**",
"${workspaceFolder}/src/**",
"${workspaceFolder}/src/app/**",
"${workspaceFolder}/src/ble/**",
"${workspaceFolder}/src/controller/**",
"${workspaceFolder}/src/credentials/**",
"${workspaceFolder}/src/crypto/**",
"${workspaceFolder}/src/darwin/**",
"${workspaceFolder}/src/include/",
"${workspaceFolder}/src/include/**",
"${workspaceFolder}/src/inet/**",
"${workspaceFolder}/src/lib/**",
"${workspaceFolder}/src/system/**",
"${workspaceFolder}/third_party/nlassert/repo/include/**",
"${workspaceFolder}/third_party/nlio/repo/include/**",
"${workspaceFolder}/darwin/Framework/CHIP/**",
"${workspaceFolder}/src/lwip/**",
"${workspaceFolder}/src/messaging/**",
"${workspaceFolder}/src/platform/**",
"${workspaceFolder}/src/protocols/**",
"${workspaceFolder}/src/setup_payload/**",
"${workspaceFolder}/src/system/**",
"${workspaceFolder}/src/tracing/**",
"${workspaceFolder}/src/transport/**",
"${workspaceFolder}/src/inet/**",
"${workspaceFolder}/src/credentials/**",
"${workspaceFolder}/src/data_model/**",
"${workspaceFolder}/src/app/**",
"${workspaceFolder}/src/crytpo/**",
"${workspaceFolder}/src/platform/**"
"${workspaceFolder}/third_party/nlassert/repo/include/**",
"${workspaceFolder}/third_party/nlio/repo/include/**"
],
"[cpp]": {
"editor.defaultFormatter": "xaver.clang-format"
Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/TestAccessControlConstraints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

name: User Label Cluster Tests
name: Test Access Control Constraints

config:
nodeId: 0x12344321
Expand Down
2 changes: 2 additions & 0 deletions src/controller/AutoCommissioner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam

mParams = params;

mNeedIcdRegistration = false;

if (haveMaybeDanglingBufferPointers)
{
mParams.ClearExternalBufferDependentValues();
Expand Down
Loading

0 comments on commit 7674e43

Please sign in to comment.