Skip to content

Commit 3eee95e

Browse files
Merge branch 'master' into tc-idm-4.3-(python)
2 parents 759dd8c + 32a84b4 commit 3eee95e

21 files changed

+1011
-87
lines changed

.vscode/settings.json

+14-10
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,29 @@
77
"${workspaceFolder}/build/default/src/lib/**",
88
"${workspaceFolder}/config/standalone/",
99
"${workspaceFolder}/config/standalone/**",
10+
"${workspaceFolder}/darwin/Framework/CHIP/**",
1011
"${workspaceFolder}/examples/**",
1112
"${workspaceFolder}/src/**",
13+
"${workspaceFolder}/src/app/**",
14+
"${workspaceFolder}/src/ble/**",
15+
"${workspaceFolder}/src/controller/**",
16+
"${workspaceFolder}/src/credentials/**",
17+
"${workspaceFolder}/src/crypto/**",
18+
"${workspaceFolder}/src/darwin/**",
1219
"${workspaceFolder}/src/include/",
1320
"${workspaceFolder}/src/include/**",
21+
"${workspaceFolder}/src/inet/**",
1422
"${workspaceFolder}/src/lib/**",
15-
"${workspaceFolder}/src/system/**",
16-
"${workspaceFolder}/third_party/nlassert/repo/include/**",
17-
"${workspaceFolder}/third_party/nlio/repo/include/**",
18-
"${workspaceFolder}/darwin/Framework/CHIP/**",
23+
"${workspaceFolder}/src/lwip/**",
1924
"${workspaceFolder}/src/messaging/**",
25+
"${workspaceFolder}/src/platform/**",
2026
"${workspaceFolder}/src/protocols/**",
27+
"${workspaceFolder}/src/setup_payload/**",
28+
"${workspaceFolder}/src/system/**",
2129
"${workspaceFolder}/src/tracing/**",
2230
"${workspaceFolder}/src/transport/**",
23-
"${workspaceFolder}/src/inet/**",
24-
"${workspaceFolder}/src/credentials/**",
25-
"${workspaceFolder}/src/data_model/**",
26-
"${workspaceFolder}/src/app/**",
27-
"${workspaceFolder}/src/crytpo/**",
28-
"${workspaceFolder}/src/platform/**"
31+
"${workspaceFolder}/third_party/nlassert/repo/include/**",
32+
"${workspaceFolder}/third_party/nlio/repo/include/**"
2933
],
3034
"[cpp]": {
3135
"editor.defaultFormatter": "xaver.clang-format"

src/app/tests/suites/TestAccessControlConstraints.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: User Label Cluster Tests
15+
name: Test Access Control Constraints
1616

1717
config:
1818
nodeId: 0x12344321

src/controller/AutoCommissioner.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam
125125

126126
mParams = params;
127127

128+
mNeedIcdRegistration = false;
129+
128130
if (haveMaybeDanglingBufferPointers)
129131
{
130132
mParams.ClearExternalBufferDependentValues();

0 commit comments

Comments
 (0)