Skip to content

Commit 7beac4f

Browse files
Alami-AmineAlami-Amine
authored
Merge branch 'master' into AA/mDNSnlunit
2 parents 40560b8 + b4650b9 commit 7beac4f

File tree

68 files changed

+1833
-1883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1833
-1883
lines changed

‎.github/workflows/third-party-check.yaml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright (c) 2024 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: Check for Unintentional Submodule Updates
16+
17+
on:
18+
pull_request:
19+
branches-ignore:
20+
- 'dependabot/**'
21+
paths:
22+
- "third_party/**"
23+
- ".gitmodules"
24+
25+
jobs:
26+
check-submodule-update-label:
27+
name: Check For Submodule Update Label
28+
runs-on: ubuntu-latest
29+
if: "!contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose')"
30+
steps:
31+
- name: Error Message
32+
run: echo This pull request attempts to update submodules without the changing-submodules-on-purpose label. Please apply that label if the changes are intentional, or remove those changes.
33+
- name: Fail Job
34+
run: exit 1

‎examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static void BoundDeviceChangedHandler(const EmberBindingTableEntry & binding, ch
8080
}
8181

8282
if (binding.type == MATTER_UNICAST_BINDING && binding.local == 1 &&
83-
(!binding.clusterId.HasValue() || binding.clusterId.Value() == Clusters::OnOff::Id))
83+
binding.clusterId.value_or(Clusters::OnOff::Id) == Clusters::OnOff::Id)
8484
{
8585
auto onSuccess = [](const ConcreteCommandPath & commandPath, const StatusIB & status, const auto & dataResponse) {
8686
ChipLogProgress(NotSpecified, "OnOff command succeeds");

‎examples/all-clusters-app/ameba/main/BindingHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ CHIP_ERROR BindingGroupBindCommandHandler(int argc, char ** argv)
194194
entry->fabricIndex = atoi(argv[0]);
195195
entry->groupId = atoi(argv[1]);
196196
entry->local = 1; // Hardcoded to endpoint 1 for now
197-
entry->clusterId.SetValue(6); // Hardcoded to OnOff cluster for now
197+
entry->clusterId.emplace(6); // Hardcoded to OnOff cluster for now
198198

199199
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
200200
return CHIP_NO_ERROR;
@@ -210,7 +210,7 @@ CHIP_ERROR BindingUnicastBindCommandHandler(int argc, char ** argv)
210210
entry->nodeId = atoi(argv[1]);
211211
entry->local = 1; // Hardcoded to endpoint 1 for now
212212
entry->remote = atoi(argv[2]);
213-
entry->clusterId.SetValue(6); // Hardcode to OnOff cluster for now
213+
entry->clusterId.emplace(6); // Hardcode to OnOff cluster for now
214214

215215
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
216216
return CHIP_NO_ERROR;

‎examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@
5454
#define APP_TASK_STACK_SIZE (5000)
5555
#define APP_TASK_PRIORITY 4
5656
#define APP_EVENT_QUEUE_SIZE 10
57-
58-
#if (CHIP_CONFIG_ENABLE_ICD_SERVER == 1)
59-
#define LED_ENABLE 0
60-
#else
61-
#define LED_ENABLE 1
62-
#endif
6357
#define BUTTON_ENABLE 1
6458

6559
using namespace ::chip;
@@ -68,7 +62,6 @@ using namespace ::chip::DeviceLayer;
6862

6963
static TaskHandle_t sAppTaskHandle;
7064
static QueueHandle_t sAppEventQueue;
71-
7265
static Button_Handle sAppLeftHandle;
7366
static Button_Handle sAppRightHandle;
7467
static DeviceInfoProviderImpl sExampleDeviceInfoProvider;

‎examples/all-clusters-app/cc13x4_26x4/main/Globals.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818

1919
#include "Globals.h"
2020

21+
#if (LED_ENABLE == 1)
2122
LED_Handle sAppRedHandle;
2223
LED_Handle sAppGreenHandle;
24+
#endif

‎examples/all-clusters-app/cc13x4_26x4/main/include/Globals.h

+7
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,12 @@ void cc13xx_26xxLog(const char * aFormat, ...);
3131
#ifdef __cplusplus
3232
}
3333
#endif
34+
35+
#if (CHIP_CONFIG_ENABLE_ICD_SERVER == 1)
36+
#define LED_ENABLE 0
37+
#else
38+
#define LED_ENABLE 1
39+
#endif
40+
3441
extern LED_Handle sAppRedHandle;
3542
extern LED_Handle sAppGreenHandle;

‎examples/all-clusters-app/nxp/mw320/binding-handler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static void BoundDeviceChangedHandler(const EmberBindingTableEntry & binding, ch
8181
}
8282

8383
if (binding.type == MATTER_UNICAST_BINDING && binding.local == 1 &&
84-
(!binding.clusterId.HasValue() || binding.clusterId.Value() == Clusters::OnOff::Id))
84+
binding.clusterId.value_or(Clusters::OnOff::Id) == Clusters::OnOff::Id)
8585
{
8686
auto onSuccess = [](const ConcreteCommandPath & commandPath, const StatusIB & status, const auto & dataResponse) {
8787
ChipLogProgress(NotSpecified, "OnOff command succeeds");

‎examples/light-switch-app/ameba/main/BindingHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ CHIP_ERROR BindingGroupBindCommandHandler(int argc, char ** argv)
250250
entry->fabricIndex = atoi(argv[0]);
251251
entry->groupId = atoi(argv[1]);
252252
entry->local = 1; // Hardcoded to endpoint 1 for now
253-
entry->clusterId.SetValue(6); // Hardcoded to OnOff cluster for now
253+
entry->clusterId.emplace(6); // Hardcoded to OnOff cluster for now
254254

255255
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
256256
return CHIP_NO_ERROR;
@@ -266,7 +266,7 @@ CHIP_ERROR BindingUnicastBindCommandHandler(int argc, char ** argv)
266266
entry->nodeId = atoi(argv[1]);
267267
entry->local = 1; // Hardcoded to endpoint 1 for now
268268
entry->remote = atoi(argv[2]);
269-
entry->clusterId.SetValue(6); // Hardcode to OnOff cluster for now
269+
entry->clusterId.emplace(6); // Hardcode to OnOff cluster for now
270270

271271
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
272272
return CHIP_NO_ERROR;

‎examples/light-switch-app/asr/src/BindingHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ void BindingHandler::PrintBindingTable()
280280
\t+ ClusterId %d \n \
281281
\t+ RemoteEndpointId %d \n \
282282
\t+ NodeId %d",
283-
(int) entry.fabricIndex, (int) entry.local, (int) entry.clusterId.Value(), (int) entry.remote,
284-
(int) entry.nodeId);
283+
(int) entry.fabricIndex, (int) entry.local, (int) entry.clusterId.value_or(kInvalidClusterId),
284+
(int) entry.remote, (int) entry.nodeId);
285285
break;
286286
case MATTER_MULTICAST_BINDING:
287287
ASR_LOG("[%d] GROUP:", i++);

‎examples/light-switch-app/esp32/main/BindingHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ CHIP_ERROR BindingGroupBindCommandHandler(int argc, char ** argv)
248248
entry->fabricIndex = atoi(argv[0]);
249249
entry->groupId = atoi(argv[1]);
250250
entry->local = 1; // Hardcoded to endpoint 1 for now
251-
entry->clusterId.SetValue(6); // Hardcoded to OnOff cluster for now
251+
entry->clusterId.emplace(6); // Hardcoded to OnOff cluster for now
252252

253253
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
254254
return CHIP_NO_ERROR;
@@ -264,7 +264,7 @@ CHIP_ERROR BindingUnicastBindCommandHandler(int argc, char ** argv)
264264
entry->nodeId = atoi(argv[1]);
265265
entry->local = 1; // Hardcoded to endpoint 1 for now
266266
entry->remote = atoi(argv[2]);
267-
entry->clusterId.SetValue(6); // Hardcode to OnOff cluster for now
267+
entry->clusterId.emplace(6); // Hardcode to OnOff cluster for now
268268

269269
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
270270
return CHIP_NO_ERROR;

‎examples/light-switch-app/genio/src/BindingHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ CHIP_ERROR BindingGroupBindCommandHandler(int argc, char ** argv)
247247
entry->fabricIndex = atoi(argv[0]);
248248
entry->groupId = atoi(argv[1]);
249249
entry->local = 1; // Hardcoded to endpoint 1 for now
250-
entry->clusterId.SetValue(6); // Hardcoded to OnOff cluster for now
250+
entry->clusterId.emplace(6); // Hardcoded to OnOff cluster for now
251251

252252
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
253253
return CHIP_NO_ERROR;
@@ -263,7 +263,7 @@ CHIP_ERROR BindingUnicastBindCommandHandler(int argc, char ** argv)
263263
entry->nodeId = atoi(argv[1]);
264264
entry->local = 1; // Hardcoded to endpoint 1 for now
265265
entry->remote = atoi(argv[2]);
266-
entry->clusterId.SetValue(6); // Hardcode to OnOff cluster for now
266+
entry->clusterId.emplace(6); // Hardcode to OnOff cluster for now
267267

268268
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
269269
return CHIP_NO_ERROR;

‎examples/light-switch-app/infineon/cyw30739/src/AppShellCommands.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ CHIP_ERROR GroupBindCommandHandler(int argc, char ** argv)
365365
entry->local = 1; // Hardcoded to endpoint 1 for now
366366
entry->fabricIndex = atoi(argv[0]);
367367
entry->groupId = atoi(argv[1]);
368-
entry->clusterId.SetValue(atoi(argv[3]));
368+
entry->clusterId.emplace(atoi(argv[3]));
369369

370370
DeviceLayer::PlatformMgr().ScheduleWork(BindingHandler::BindingWorkerHandler, reinterpret_cast<intptr_t>(entry));
371371
return CHIP_NO_ERROR;
@@ -384,7 +384,7 @@ CHIP_ERROR UnicastBindCommandHandler(int argc, char ** argv)
384384
entry->fabricIndex = atoi(argv[0]);
385385
entry->nodeId = atoi(argv[1]);
386386
entry->remote = atoi(argv[2]);
387-
entry->clusterId.SetValue(atoi(argv[3]));
387+
entry->clusterId.emplace(atoi(argv[3]));
388388

389389
DeviceLayer::PlatformMgr().ScheduleWork(BindingHandler::BindingWorkerHandler, reinterpret_cast<intptr_t>(entry));
390390
return CHIP_NO_ERROR;

‎examples/light-switch-app/infineon/cyw30739/src/BindingHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ void BindingHandler::PrintBindingTable()
306306
\t+ ClusterId %d \n \
307307
\t+ RemoteEndpointId %d \n \
308308
\t+ NodeId %d \n",
309-
(int) entry.fabricIndex, (int) entry.local, (int) entry.clusterId.Value(), (int) entry.remote,
310-
(int) entry.nodeId);
309+
(int) entry.fabricIndex, (int) entry.local, (int) entry.clusterId.value_or(kInvalidClusterId),
310+
(int) entry.remote, (int) entry.nodeId);
311311
break;
312312
case MATTER_MULTICAST_BINDING:
313313
printf("[%d] GROUP:", i++);

‎examples/light-switch-app/nrfconnect/main/BindingHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ void BindingHandler::PrintBindingTable()
284284
\t+ ClusterId %d \n \
285285
\t+ RemoteEndpointId %d \n \
286286
\t+ NodeId %d",
287-
(int) entry.fabricIndex, (int) entry.local, (int) entry.clusterId.Value(), (int) entry.remote,
288-
(int) entry.nodeId);
287+
(int) entry.fabricIndex, (int) entry.local, (int) entry.clusterId.value_or(kInvalidClusterId),
288+
(int) entry.remote, (int) entry.nodeId);
289289
break;
290290
case MATTER_MULTICAST_BINDING:
291291
LOG_INF("[%d] GROUP:", i++);

‎examples/light-switch-app/silabs/src/ShellCommands.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ CHIP_ERROR BindingGroupBindCommandHandler(int argc, char ** argv)
143143
entry->fabricIndex = atoi(argv[0]);
144144
entry->groupId = atoi(argv[1]);
145145
entry->local = 1; // Hardcoded to endpoint 1 for now
146-
entry->clusterId.SetValue(6); // Hardcoded to OnOff cluster for now
146+
entry->clusterId.emplace(6); // Hardcoded to OnOff cluster for now
147147

148148
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
149149
return CHIP_NO_ERROR;
@@ -159,7 +159,7 @@ CHIP_ERROR BindingUnicastBindCommandHandler(int argc, char ** argv)
159159
entry->nodeId = atoi(argv[1]);
160160
entry->local = 1; // Hardcoded to endpoint 1 for now
161161
entry->remote = atoi(argv[2]);
162-
entry->clusterId.SetValue(6); // Hardcode to OnOff cluster for now
162+
entry->clusterId.emplace(6); // Hardcode to OnOff cluster for now
163163

164164
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
165165
return CHIP_NO_ERROR;

‎examples/light-switch-app/telink/src/binding-handler.cpp

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ CHIP_ERROR BindingGroupBindCommandHandler(int argc, char ** argv)
243243
entry->fabricIndex = atoi(argv[0]);
244244
entry->groupId = atoi(argv[1]);
245245
entry->local = 1; // Hardcoded to endpoint 1 for now
246-
entry->clusterId.SetValue(6); // Hardcoded to OnOff cluster for now
246+
entry->clusterId.emplace(6); // Hardcoded to OnOff cluster for now
247247

248248
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
249249
return CHIP_NO_ERROR;
@@ -259,7 +259,7 @@ CHIP_ERROR BindingUnicastBindCommandHandler(int argc, char ** argv)
259259
entry->nodeId = atoi(argv[1]);
260260
entry->local = 1; // Hardcoded to endpoint 1 for now
261261
entry->remote = atoi(argv[2]);
262-
entry->clusterId.SetValue(6); // Hardcode to OnOff cluster for now
262+
entry->clusterId.emplace(6); // Hardcode to OnOff cluster for now
263263

264264
DeviceLayer::PlatformMgr().ScheduleWork(BindingWorkerFunction, reinterpret_cast<intptr_t>(entry));
265265
return CHIP_NO_ERROR;

‎examples/lighting-app/cc13x4_26x4/src/AppTask.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,10 @@ using namespace ::chip::DeviceLayer;
8181

8282
static TaskHandle_t sAppTaskHandle;
8383
static QueueHandle_t sAppEventQueue;
84-
84+
#if (LED_ENABLE == 1)
8585
static LED_Handle sAppRedHandle;
8686
static LED_Handle sAppGreenHandle;
87+
#endif
8788
static Button_Handle sAppLeftHandle;
8889
static Button_Handle sAppRightHandle;
8990
static DeviceInfoProviderImpl sExampleDeviceInfoProvider;

‎examples/lock-app/cc13x4_26x4/src/AppTask.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@ using namespace ::chip::app::Clusters::DoorLock;
7272

7373
static TaskHandle_t sAppTaskHandle;
7474
static QueueHandle_t sAppEventQueue;
75-
75+
#if (LED_ENABLE == 1)
7676
static LED_Handle sAppRedHandle;
7777
static LED_Handle sAppGreenHandle;
78+
#endif
7879
static Button_Handle sAppLeftHandle;
7980
static Button_Handle sAppRightHandle;
8081

‎examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#pragma once
2525

26+
#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 22
2627
#define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0
2728
#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0
2829
#define OPENTHREAD_CONFIG_DIAG_ENABLE 0

‎examples/pump-app/cc13x4_26x4/main/AppTask.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ using namespace chip::app::Clusters;
7979

8080
static TaskHandle_t sAppTaskHandle;
8181
static QueueHandle_t sAppEventQueue;
82-
82+
#if (LED_ENABLE == 1)
8383
static LED_Handle sAppRedHandle;
8484
static LED_Handle sAppGreenHandle;
85+
#endif
8586
static Button_Handle sAppLeftHandle;
8687
static Button_Handle sAppRightHandle;
8788

‎examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ using namespace ::chip::DeviceLayer;
6868

6969
static TaskHandle_t sAppTaskHandle;
7070
static QueueHandle_t sAppEventQueue;
71-
71+
#if (LED_ENABLE == 1)
7272
static LED_Handle sAppRedHandle;
7373
static LED_Handle sAppGreenHandle;
74+
#endif
7475
static Button_Handle sAppLeftHandle;
7576
static Button_Handle sAppRightHandle;
7677

‎examples/tv-casting-app/linux/CastingShellCommands.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void PrintBindings()
9191
"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
9292
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
9393
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
94-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
94+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
9595
}
9696
}
9797

‎examples/tv-casting-app/linux/simple-app-helper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ void PrintBindings()
294294
"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
295295
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
296296
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
297-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
297+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
298298
}
299299
}
300300

‎examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ void CastingServer::ReadServerClustersForNode(NodeId nodeId)
312312
"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
313313
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
314314
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
315-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
315+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
316316
if (binding.type == MATTER_UNICAST_BINDING && nodeId == binding.nodeId)
317317
{
318318
if (!mActiveTargetVideoPlayerInfo.HasEndpoint(binding.remote))
@@ -584,7 +584,7 @@ void CastingServer::DeviceEventCallback(const DeviceLayer::ChipDeviceEvent * eve
584584
"CastingServer::DeviceEventCallback Read cached binding type=%d fabrixIndex=%d nodeId=0x" ChipLogFormatX64
585585
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
586586
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
587-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
587+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
588588
if (binding.type == MATTER_UNICAST_BINDING && event->BindingsChanged.fabricIndex == binding.fabricIndex)
589589
{
590590
ChipLogProgress(
@@ -675,7 +675,7 @@ NodeId CastingServer::GetVideoPlayerNodeForFabricIndex(FabricIndex fabricIndex)
675675
"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
676676
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
677677
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
678-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
678+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
679679
if (binding.type == MATTER_UNICAST_BINDING && fabricIndex == binding.fabricIndex)
680680
{
681681
ChipLogProgress(NotSpecified, "GetVideoPlayerNodeForFabricIndex nodeId=0x" ChipLogFormatX64,
@@ -701,7 +701,7 @@ FabricIndex CastingServer::GetVideoPlayerFabricIndexForNode(NodeId nodeId)
701701
"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
702702
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
703703
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
704-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
704+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
705705
if (binding.type == MATTER_UNICAST_BINDING && nodeId == binding.nodeId)
706706
{
707707
ChipLogProgress(NotSpecified, "GetVideoPlayerFabricIndexForNode fabricIndex=%d nodeId=0x" ChipLogFormatX64,

‎examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void ChipDeviceEventHandler::HandleBindingsChangedViaCluster(const chip::DeviceL
155155
"nodeId=0x" ChipLogFormatX64
156156
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
157157
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
158-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
158+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
159159
if (binding.type == MATTER_UNICAST_BINDING && event->BindingsChanged.fabricIndex == binding.fabricIndex)
160160
{
161161
ChipLogProgress(AppServer,

‎examples/tv-casting-app/tv-casting-common/support/EndpointListLoader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ CHIP_ERROR EndpointListLoader::Load()
8686
"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
8787
" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
8888
binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
89-
binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
89+
binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
9090
if (binding.type == MATTER_UNICAST_BINDING && CastingPlayer::GetTargetCastingPlayer()->GetNodeId() == binding.nodeId)
9191
{
9292
// if we discovered a new Endpoint from the bindings, read its EndpointAttributes

0 commit comments

Comments
 (0)