Rename from Mei to Manufacturer-specific

project-chip · markus-becker-tridonic-com · Dec 12, 2024 · Dec 12, 2024 · Dec 12, 2024 · Dec 12, 2024
commit 6923bb8f27c0ea25d92383409e84b834cf546628
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -210,7 +210,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/matter-devices.xml \
                       src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml \
-                      src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/sample-manufacturer-specific-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml \

diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
@@ -317,7 +317,7 @@ config CHIP_PROJECT_CONFIG
 	  platform-specific settings.
 
 config  CHIP_PROJECT_APP_COMMON_INCLUDE_DIRS
-	string "Project specific app-common directory for MEI clusters"
+	string "Project specific app-common directory for Manufacturer-specific clusters"
 	help
 	  Provides a directory to the app-common/ folder.
 

diff --git a/examples/chef/README.md b/examples/chef/README.md
@@ -235,9 +235,9 @@ To add new devices for chef:
 ## Manufacturer Extensions / Custom Clusters
 
 You may add vendor-defined features to chef. The
-`rootnode_onofflight_meisample*` device showcases its usage by using the Sample
-MEI cluster which is defined on
-`src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml`
+`rootnode_onofflight_manufacturer_specific_sample*` device showcases its usage by using the Sample
+Manufacturer-specific cluster which is defined in
+`src/app/zap-templates/zcl/data-model/chip/sample-manufacturer-specific-cluster.xml`
 
 This cluster has
 
@@ -246,15 +246,15 @@ This cluster has
 -   A command/response pair `add-arguments`. The command takes two uint8
     arguments and the response command returns their sum.
 
-You may test the `Sample MEI` via chip-tool using the following commands:
+You may test the `Sample Manufacturer Specific Cluster` via chip-tool using the following commands:
 
 ```
 # commissioning of on-network chef device
 chip-tool pairing onnetwork 1 20202021
 # tests command to sum arguments: returns 30
-chip-tool samplemei add-arguments 1 1 10 20
+chip-tool sample-manufacturer-specific add-arguments 1 1 10 20
 # sets Flip-Flop to false
-chip-tool samplemei write flip-flop 0 1 1
+chip-tool sample-manufacturer-specific write flip-flop 0 1 1
 # reads Flip-Flop
-chip-tool samplemei read flip-flop 1 1
+chip-tool sample-manufacturer-specific read flip-flop 1 1
 ```
diff --git a/...ices/rootnode_onofflight_samplemei.matter → ...light_manufacturer_specific_sample.matter b/...ices/rootnode_onofflight_samplemei.matter → ...light_manufacturer_specific_sample.matter
@@ -1756,7 +1756,7 @@ cluster FixedLabel = 64 {
 }
 
 /** The Sample MEI cluster showcases a cluster manufacturer extensions */
-cluster SampleMei = 4294048800 {
+cluster SampleManufacturerSpecific = 4294048800 {
   revision 1; // NOTE: Default/not specifically set
 
   fabric_sensitive info event PingCountEvent = 0 {
@@ -2082,7 +2082,7 @@ endpoint 1 {
     callback attribute clusterRevision;
   }
 
-  server cluster SampleMei {
+  server cluster SampleManufacturerSpecific {
     emits event PingCountEvent;
     ram      attribute flipFlop default = false;
     callback attribute generatedCommandList;
@@ -2096,5 +2096,3 @@ endpoint 1 {
     handle command AddArguments;
   }
 }
-
-
diff --git a/...devices/rootnode_onofflight_samplemei.zap → ...offlight_manufacturer_specific_sample.zap b/...devices/rootnode_onofflight_samplemei.zap → ...offlight_manufacturer_specific_sample.zap
@@ -3258,10 +3258,10 @@
           "enabled": 1
         },
         {
-          "name": "Sample MEI",
+          "name": "Sample Manufacturer-Specific",
           "code": 4294048800,
           "mfgCode": null,
-          "define": "SAMPLE_MEI_CLUSTER",
+          "define": "SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [

diff --git a/...rnal-mei-app/external-mei-common/BUILD.gn → ...app/manufacturer-specific-common/BUILD.gn b/...rnal-mei-app/external-mei-common/BUILD.gn → ...app/manufacturer-specific-common/BUILD.gn
diff --git a/...external-mei-common/include/ColorFormat.h → ...rer-specific-common/include/ColorFormat.h b/...external-mei-common/include/ColorFormat.h → ...rer-specific-common/include/ColorFormat.h
diff --git a/...rnal-mei-common/include/LightingManager.h → ...specific-common/include/LightingManager.h b/...rnal-mei-common/include/LightingManager.h → ...specific-common/include/LightingManager.h
diff --git a/...ternal-mei-common/external-mei-app.matter → ...c-common/manufacturer-specific-app.matter b/...ternal-mei-common/external-mei-app.matter → ...c-common/manufacturer-specific-app.matter
diff --git a/.../external-mei-common/external-mei-app.zap → ...ific-common/manufacturer-specific-app.zap b/.../external-mei-common/external-mei-app.zap → ...ific-common/manufacturer-specific-app.zap
@@ -34,7 +34,7 @@
     },
     {
       "pathRelativity": "relativeToZap",
-      "path": "../nrfconnect/mei/xml/sample-external-mei-cluster.xml",
+      "path": "../nrfconnect/manufacturer-specific/xml/sample-external-manufacturer-specific-cluster.xml",
       "type": "zcl-xml-standalone"
     }
   ],
@@ -5649,10 +5649,10 @@
           ]
         },
         {
-          "name": "Sample External MEI",
+          "name": "Sample External manufacturer-specific cluster",
           "code": 4294048801,
           "mfgCode": null,
-          "define": "SAMPLE_EXTERNAL_MEI_CLUSTER",
+          "define": "SAMPLE_EXTERNAL_MANUFACTURER_SPECIFIC_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [

diff --git a/...p/external-mei-common/src/ColorFormat.cpp → ...turer-specific-common/src/ColorFormat.cpp b/...p/external-mei-common/src/ColorFormat.cpp → ...turer-specific-common/src/ColorFormat.cpp
diff --git a/...ternal-mei-common/src/LightingManager.cpp → ...r-specific-common/src/LightingManager.cpp b/...ternal-mei-common/src/LightingManager.cpp → ...r-specific-common/src/LightingManager.cpp
@@ -17,15 +17,15 @@ cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(NRFCONNECT_COMMON ${CHIP_ROOT}/examples/platform/nrfconnect REALPATH)
-get_filename_component(EXTERNAL_MEI_COMMON ${CHIP_ROOT}/examples/external-mei-app/external-mei-common REALPATH)
+get_filename_component(MANUFACTURER_SPECIFIC_COMMON ${CHIP_ROOT}/examples/manufacturer-specific-app/manufacturer-specific-common REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
 include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake)
 
 list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 
-project(chip-nrfconnect-external-mei-example)
+project(chip-nrfconnect-manufacturer-specific-app)
 
 include(${CHIP_ROOT}/config/nrfconnect/app/check-sysbuild-use.cmake)
 include(${CHIP_ROOT}/config/nrfconnect/app/enable-gnu-std.cmake)
@@ -40,10 +40,10 @@ target_compile_options(app PRIVATE -Werror -Wno-error=maybe-uninitialized)
 
 target_include_directories(app PRIVATE
                            main/include
-                           ${EXTERNAL_MEI_COMMON}
+                           ${MANUFACTURER_SPECIFIC_COMMON}
                            ${GEN_DIR}
                            # ${GEN_DIR}/app-common
-                           ${GEN_DIR}/external-mei-app
+                           ${GEN_DIR}/manufacturer-specific-app
                            ${NRFCONNECT_COMMON}/util/include
                            ${NRFCONNECT_COMMON}/app/include)
 
@@ -55,22 +55,22 @@ target_sources(app PRIVATE
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
                ${NRFCONNECT_COMMON}/util/PWMDevice.cpp)
 
-# add on MEI clusters
+# add on manufacturer specific cluster
 target_sources(app PRIVATE
-               mei/clusters/sample-external-mei-server.cpp
-               mei/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
-               mei/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+               manufacturer-specific/clusters/sample-manufacturer-specific-server.cpp
+               manufacturer-specific/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+               manufacturer-specific/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
 )
 
 target_include_directories(app PUBLIC
-                           mei/clusters/
-                           mei/zzz_generated/app-common
+                           manufacturer-specific/clusters/
+                           manufacturer-specific/zzz_generated/app-common
 )
 
 chip_configure_data_model(app
-    ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../external-mei-common/external-mei-app.zap
+    ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../manufacturer-specific-common/manufacturer-specific-app.zap
     EXTERNAL_CLUSTERS SAMPLE_EXTERNAL_MEI_CLUSTER
-    EXTERNAL_APP_COMMON mei/zzz_generated/app-common
+    EXTERNAL_APP_COMMON manufacturer-specific/zzz_generated/app-common
 )
 
 if(CONFIG_CHIP_OTA_REQUESTOR OR CONFIG_MCUMGR_TRANSPORT_BT)

@@ -13,7 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-mainmenu "Matter nRF Connect External MEI Example Application"
+mainmenu "Matter nRF Connect External Manufacturer-specific Cluster Example Application"
 
 # Sample configuration used for Thread networking
 if NET_L2_OPENTHREAD

@@ -1,4 +1,4 @@
-#include "sample-external-mei-server.h"
+#include "sample-external-manufacturer-specific-server.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>

@@ -1,5 +1,5 @@
-#ifndef SRC_APP_CLUSTERS_SAMPLE_MEI_CLUSTER_SERVER_SERVER_H_
-#define SRC_APP_CLUSTERS_SAMPLE_MEI_CLUSTER_SERVER_SERVER_H_
+#ifndef SRC_APP_CLUSTERS_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER_SERVER_H_
+#define SRC_APP_CLUSTERS_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER_SERVER_H_
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
@@ -11,13 +11,13 @@
 #include <lib/support/Span.h>
 #include <platform/CHIPDeviceConfig.h>
 
-#ifdef ZCL_USING_SAMPLE_MEI_CLUSTER_SERVER
-#define SAMPLE_MEI_NUM_SUPPORTED_ENDPOINTS                                                                                         \
-    (MATTER_DM_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT)
+#ifdef ZCL_USING_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER
+#define SAMPLE_MANUFACTURER_SPECIFIC_NUM_SUPPORTED_ENDPOINTS                                                                                         \
+    (MATTER_DM_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT)
 #else
-#define SAMPLE_MEI_NUM_SUPPORTED_ENDPOINTS CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT
-#endif /* ZCL_USING_SAMPLE_MEI_CLUSTER_SERVER */
-static constexpr size_t kNumSupportedEndpoints = SAMPLE_MEI_NUM_SUPPORTED_ENDPOINTS;
+#define SAMPLE_MANUFACTURER_SPECIFIC_NUM_SUPPORTED_ENDPOINTS CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT
+#endif /* ZCL_USING_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER */
+static constexpr size_t kNumSupportedEndpoints = SAMPLE_MANUFACTURER_SPECIFIC_NUM_SUPPORTED_ENDPOINTS;
 
 namespace chip {
 namespace app {
@@ -87,4 +87,4 @@ class SampleExternalMeiServer : public AttributeAccessInterface, public CommandH
 } // namespace app
 } // namespace chip
 
-#endif // SRC_APP_CLUSTERS_SAMPLE_MEI_CLUSTER_SERVER_SERVER_H_
+#endif // SRC_APP_CLUSTERS_SAMPLE_MANUFACTURER_SPECIFIC_CLUSTER_SERVER_SERVER_H_
@@ -34,7 +34,7 @@ CommandHandlerInterfaceOnlyClusters:
     - Activated Carbon Filter Monitoring
     - HEPA Filter Monitoring
     - RVC Operational State
-    - Sample MEI
+    - Sample Manufacturer-specific
     - Microwave Oven Control
     - Chime
     - Commissioner Control
@@ -64,7 +64,7 @@ ClustersWithInitFunctions:
     - Time Format Localization
     - Thermostat
     - Mode Select
-    - Sample MEI
+    - Sample Manufacturer-specific
     - Scenes Management
 
 ClustersWithAttributeChangedFunctions:
@@ -82,7 +82,7 @@ ClustersWithShutdownFunctions:
     - Door Lock
     - Level Control
     - Color Control
-    - Sample MEI
+    - Sample Manufacturer-specific
     - Scenes Management
     - Thermostat
 

diff --git a/...mei-app/nrfconnect/mei/mei-templates.json → ...ific/manufacturer-specific-templates.json b/...mei-app/nrfconnect/mei/mei-templates.json → ...ific/manufacturer-specific-templates.json
@@ -1,5 +1,5 @@
 {
-    "name": "CHIP Application MEI templates",
+    "name": "CHIP Application manufacturer-specific templates",
     "version": "chip-v1",
     "helpers": [
         "partials/helper.js",
@@ -100,4 +100,4 @@
             "output": "cluster-enums-check.h"
         }
     ]
-}
+}
@@ -19,14 +19,14 @@ limitations under the License.
 
   <cluster>
     <domain>General</domain>
-    <name>Sample External MEI</name>
+    <name>Sample External manufacturer-specific cluster</name>
     <!-- The MSB 16 bits of <code> are the VendorID. Replace this with your
          VendorID. 0xFFF1 is a Test VendorID.
 
          The LSB 16 bits of <code> are a self-assigned ClusterID -->
     <code>0xFFF1FC21</code>
-    <define>SAMPLE_EXTERNAL_MEI_CLUSTER</define>
-    <description>The Sample External MEI cluster showcases an out-of-tree cluster manufacturer extensions</description>
+    <define>SAMPLE_EXTERNAL_MANUFACTURER_SPECIFIC_MEI_CLUSTER</define>
+    <description>The Sample External manufacturer-specific cluster showcases an out-of-tree cluster manufacturer extensions</description>
 
     <!-- Attributes -->
     <!-- A simple boolean attribute that flips or flops -->