A few more casting file updates for bindings

andreilitvin · andreilitvin · commit b222f45bdd4c · 2024-04-19T12:45:40.000-04:00
diff --git a/examples/tv-casting-app/linux/simple-app-helper.cpp b/examples/tv-casting-app/linux/simple-app-helper.cpp
@@ -294,7 +294,7 @@ void PrintBindings()
                         "Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
                         " groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
                         binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
-                        binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
+                        binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
     }
 }
 
diff --git a/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp b/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp
@@ -155,7 +155,7 @@ void ChipDeviceEventHandler::HandleBindingsChangedViaCluster(const chip::DeviceL
                             "nodeId=0x" ChipLogFormatX64
                             " groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
                             binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
-                            binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
+                            binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
             if (binding.type == MATTER_UNICAST_BINDING && event->BindingsChanged.fabricIndex == binding.fabricIndex)
             {
                 ChipLogProgress(AppServer,
diff --git a/examples/tv-casting-app/tv-casting-common/support/EndpointListLoader.cpp b/examples/tv-casting-app/tv-casting-common/support/EndpointListLoader.cpp
@@ -86,7 +86,7 @@ CHIP_ERROR EndpointListLoader::Load()
                         "Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
                         " groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
                         binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
-                        binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
+                        binding.remote, ChipLogValueMEI(binding.clusterId.value_or(0)));
         if (binding.type == MATTER_UNICAST_BINDING && CastingPlayer::GetTargetCastingPlayer()->GetNodeId() == binding.nodeId)
         {
             // if we discovered a new Endpoint from the bindings, read its EndpointAttributes

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ void PrintBindings()`
`294`	`294`	`"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64`
`295`	`295`	`" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,`
`296`	`296`	`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)));`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ void ChipDeviceEventHandler::HandleBindingsChangedViaCluster(const chip::DeviceL`
`155`	`155`	`"nodeId=0x" ChipLogFormatX64`
`156`	`156`	`" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,`
`157`	`157`	`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)));`
`159`	`159`	`if (binding.type == MATTER_UNICAST_BINDING && event->BindingsChanged.fabricIndex == binding.fabricIndex)`
`160`	`160`	`{`
`161`	`161`	`ChipLogProgress(AppServer,`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ CHIP_ERROR EndpointListLoader::Load()`
`86`	`86`	`"Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64`
`87`	`87`	`" groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,`
`88`	`88`	`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)));`
`90`	`90`	`if (binding.type == MATTER_UNICAST_BINDING && CastingPlayer::GetTargetCastingPlayer()->GetNodeId() == binding.nodeId)`
`91`	`91`	`{`
`92`	`92`	`// if we discovered a new Endpoint from the bindings, read its EndpointAttributes`