Skip to content

Commit 191cc0f

Browse files
authored
Merge branch 'master' into feature/fix-cluster-revisions
2 parents f5b8f73 + 45f4090 commit 191cc0f

File tree

9 files changed

+21
-7
lines changed

9 files changed

+21
-7
lines changed

.github/workflows/issue-labeler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
triage:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: github/issue-labeler@v3.3 #May not be the latest version
14+
- uses: github/issue-labeler@v3.4 #May not be the latest version
1515
with:
1616
configuration-path: .github/issue-labeler.yml
1717
not-before: 2020-01-15T02:54:32Z

.github/workflows/kotlin-style.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: "detekt"
25-
uses: natiginfo/action-detekt-all@1.23.4
25+
uses: natiginfo/action-detekt-all@1.23.5
2626
# Detekt seems not to like circular symlinks, so we set up
2727
# explicit paths below
2828
with:

scripts/py_matter_yamltests/matter_yamltests/websocket_runner.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ async def execute(self, request):
7070
return await instance.recv()
7171
return None
7272

73-
async def _start_client(self, url, max_retries=4, interval_between_retries=1):
73+
async def _start_client(self, url, max_retries=5, interval_between_retries=1):
7474
if max_retries:
7575
start = time.time()
7676
try:

src/app/clusters/door-lock-server/door-lock-server.h

+12
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,18 @@ struct EmberAfDoorLockEndpointContext
8787
int wrongCodeEntryAttempts;
8888
};
8989

90+
namespace chip {
91+
namespace app {
92+
namespace Clusters {
93+
namespace DoorLock {
94+
95+
void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate);
96+
97+
} // namespace DoorLock
98+
} // namespace Clusters
99+
} // namespace app
100+
} // namespace chip
101+
90102
/**
91103
* @brief Door Lock Server Plugin class.
92104
*/

src/protocols/bdx/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ static_library("bdx") {
2525
"BdxTransferProxyDiagnosticLog.h",
2626
"BdxTransferServer.cpp",
2727
"BdxTransferServer.h",
28+
"BdxTransferServerDelegate.h",
2829
"BdxTransferSession.cpp",
2930
"BdxTransferSession.h",
3031
"BdxUri.cpp",
3132
"BdxUri.h",
33+
"DiagnosticLogs.h",
3234
"StatusCode.cpp",
3335
"StatusCode.h",
3436
"TransferFacilitator.cpp",

third_party/mbedtls/repo

Submodule repo updated from 1b9cea3 to 6b36a5d

third_party/nanopb/repo

third_party/openthread/repo

Submodule repo updated 68 files

0 commit comments

Comments
 (0)