Fix some remainders of MEI

markus-becker-tridonic-com · markus-becker-tridonic-com · commit 9d9ce8185da4 · 2025-01-14T08:37:55.000+01:00
diff --git a/examples/manufacturer-specific-app/nrfconnect/manufacturer-specific/clusters/sample-external-manufacturer-specific-server.cpp b/examples/manufacturer-specific-app/nrfconnect/manufacturer-specific/clusters/sample-external-manufacturer-specific-server.cpp
@@ -28,7 +28,7 @@ using namespace chip::app::Clusters::SampleExternalManufacturerSpecific::Attribu
 
 void MatterSampleExternalManufacturerSpecificPluginServerInitCallback()
 {
-    ChipLogProgress(Zcl, "Sample MEI Init. Ep %d, Total Ep %u", MATTER_DM_SAMPLE_EXTERNAL_MEI_CLUSTER_SERVER_ENDPOINT_COUNT,
+    ChipLogProgress(Zcl, "Sample Manufacturer Specific Init. Ep %d, Total Ep %u", MATTER_DM_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER_ENDPOINT_COUNT,
                     static_cast<uint16_t>(kNumSupportedEndpoints));
     ReturnOnFailure(
         CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(&SampleExternalManufacturerSpecificServer::Instance()));
@@ -38,15 +38,15 @@ void MatterSampleExternalManufacturerSpecificPluginServerInitCallback()
 
 void emberAfSampleExternalManufacturerSpecificClusterServerInitCallback(chip::EndpointId endpoint)
 {
-    ChipLogProgress(Zcl, "Creating Sample MEI cluster, Ep %d", endpoint);
+    ChipLogProgress(Zcl, "Creating Sample Manufacturer Specific cluster, Ep %d", endpoint);
     SampleExternalManufacturerSpecificServer::Instance().RegisterEndpoint(endpoint);
 }
 
 void MatterSampleExternalManufacturerSpecificClusterServerShutdownCallback(chip::EndpointId endpoint)
 {
     // There's currently no whole-cluster shutdown callback. That would trigger
     // call to `Shutdown`. Thus ep-based shutdown calls `UnregisterEndpoint`
-    ChipLogProgress(Zcl, "Shutting down Sample MEI cluster, Ep %d", endpoint);
+    ChipLogProgress(Zcl, "Shutting down Sample Manufacturer Specific cluster, Ep %d", endpoint);
     SampleExternalManufacturerSpecificServer::Instance().UnregisterEndpoint(endpoint);
 }
 
diff --git a/src/app/clusters/manufacturer-specific-server/manufacturer-specific-server.cpp b/src/app/clusters/manufacturer-specific-server/manufacturer-specific-server.cpp
@@ -28,7 +28,7 @@ using namespace chip::app::Clusters::SampleManufacturerSpecific::Attributes;
 
 void MatterSampleManufacturerSpecificPluginServerInitCallback()
 {
-    ChipLogProgress(Zcl, "Sample MEI Init. Ep %d, Total Ep %u",
+    ChipLogProgress(Zcl, "Sample Manufacturer Specific Init. Ep %d, Total Ep %u",
                     MATTER_DM_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER_ENDPOINT_COUNT,
                     static_cast<uint16_t>(kNumSupportedEndpoints));
     ReturnOnFailure(
@@ -39,15 +39,15 @@ void MatterSampleManufacturerSpecificPluginServerInitCallback()
 
 void emberAfSampleManufacturerSpecificClusterServerInitCallback(chip::EndpointId endpoint)
 {
-    ChipLogProgress(Zcl, "Creating Sample MEI cluster, Ep %d", endpoint);
+    ChipLogProgress(Zcl, "Creating Sample Manufacturer Specific cluster, Ep %d", endpoint);
     SampleManufacturerSpecificServer::Instance().RegisterEndpoint(endpoint);
 }
 
 void MatterSampleManufacturerSpecificClusterServerShutdownCallback(chip::EndpointId endpoint)
 {
     // There's currently no whole-cluster shutdown callback. That would trigger
     // call to `Shutdown`. Thus ep-based shutdown calls `UnregisterEndpoint`
-    ChipLogProgress(Zcl, "Shutting down Sample MEI cluster, Ep %d", endpoint);
+    ChipLogProgress(Zcl, "Shutting down Sample Manufacturer Specific cluster, Ep %d", endpoint);
     SampleManufacturerSpecificServer::Instance().UnregisterEndpoint(endpoint);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ using namespace chip::app::Clusters::SampleExternalManufacturerSpecific::Attribu`
`28`	`28`
`29`	`29`	`void MatterSampleExternalManufacturerSpecificPluginServerInitCallback()`
`30`	`30`	`{`
`31`		`- ChipLogProgress(Zcl, "Sample MEI Init. Ep %d, Total Ep %u", MATTER_DM_SAMPLE_EXTERNAL_MEI_CLUSTER_SERVER_ENDPOINT_COUNT,`
	`31`	`+ ChipLogProgress(Zcl, "Sample Manufacturer Specific Init. Ep %d, Total Ep %u", MATTER_DM_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER_ENDPOINT_COUNT,`
`32`	`32`	`static_cast<uint16_t>(kNumSupportedEndpoints));`
`33`	`33`	`ReturnOnFailure(`
`34`	`34`	`CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(&SampleExternalManufacturerSpecificServer::Instance()));`
`@@ -38,15 +38,15 @@ void MatterSampleExternalManufacturerSpecificPluginServerInitCallback()`
`38`	`38`
`39`	`39`	`void emberAfSampleExternalManufacturerSpecificClusterServerInitCallback(chip::EndpointId endpoint)`
`40`	`40`	`{`
`41`		`- ChipLogProgress(Zcl, "Creating Sample MEI cluster, Ep %d", endpoint);`
	`41`	`+ ChipLogProgress(Zcl, "Creating Sample Manufacturer Specific cluster, Ep %d", endpoint);`
`42`	`42`	`SampleExternalManufacturerSpecificServer::Instance().RegisterEndpoint(endpoint);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`void MatterSampleExternalManufacturerSpecificClusterServerShutdownCallback(chip::EndpointId endpoint)`
`46`	`46`	`{`
`47`	`47`	`// There's currently no whole-cluster shutdown callback. That would trigger`
`48`	`48`	// call to `Shutdown`. Thus ep-based shutdown calls `UnregisterEndpoint`
`49`		`- ChipLogProgress(Zcl, "Shutting down Sample MEI cluster, Ep %d", endpoint);`
	`49`	`+ ChipLogProgress(Zcl, "Shutting down Sample Manufacturer Specific cluster, Ep %d", endpoint);`
`50`	`50`	`SampleExternalManufacturerSpecificServer::Instance().UnregisterEndpoint(endpoint);`
`51`	`51`	`}`
`52`	`52`