From 56858d9dbdda1c60d8a9eea30a5be16617ae2d5c Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Mon, 17 Nov 2025 22:38:01 +0100
Subject: [PATCH] Matter fix generate script (#24134)

---
 .../generate/Matter_generate_c.be             |  1 +
 .../generate/be_matter_clusters.h             | 19 -------------------
 .../berry_matter/generate/matter_clusters.be  |  2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/lib/libesp32/berry_matter/generate/Matter_generate_c.be b/lib/libesp32/berry_matter/generate/Matter_generate_c.be
index 891550b12..a4177d3ef 100644
--- a/lib/libesp32/berry_matter/generate/Matter_generate_c.be
+++ b/lib/libesp32/berry_matter/generate/Matter_generate_c.be
@@ -91,6 +91,7 @@ for cl:cl_ids
   var attr_ids_local = k2l(attr_id_name)
 
   for attr_id:attr_ids_local
+    if attr_id >= 0xFFF0 continue end
     var reportable = attributes[attr_id].find('reportable', false)
     var writable = attributes[attr_id].find('writable', false)
     var flags = (writable ? 0x01 : 0x00) | (reportable ? 0x02 : 0x00)
diff --git a/lib/libesp32/berry_matter/generate/be_matter_clusters.h b/lib/libesp32/berry_matter/generate/be_matter_clusters.h
index 390bd2830..ab0fb2d2c 100644
--- a/lib/libesp32/berry_matter/generate/be_matter_clusters.h
+++ b/lib/libesp32/berry_matter/generate/be_matter_clusters.h
@@ -147,7 +147,6 @@ const matter_attribute_t matter_Attributes_001D[] = {
   { 0x0001, 0, 0x02, "ServerList" },
   { 0x0002, 0, 0x02, "ClientList" },
   { 0x0003, 0, 0x02, "PartsList" },
-  { 0x0004, 0, 0x02, "TagList" },
   { 0xFFFF, 0, 0x00, NULL },
 };
 
@@ -229,9 +228,6 @@ const matter_command_t matter_Commands_0028[] = {
 };
 
 const matter_attribute_t matter_Attributes_0029[] = {
-  { 0xFFFB, 0, 0x02, "AttributeList" },
-  { 0xFFFC, 0, 0x02, "FeatureMap" },
-  { 0xFFFD, 0, 0x02, "ClusterRevision" },
   { 0xFFFF, 0, 0x00, NULL },
 };
 
@@ -247,9 +243,6 @@ const matter_attribute_t matter_Attributes_002A[] = {
   { 0x0001, 0, 0x02, "UpdatePossible" },
   { 0x0002, 0, 0x02, "UpdateState" },
   { 0x0003, 0, 0x02, "UpdateStateProgress" },
-  { 0xFFFB, 0, 0x02, "AttributeList" },
-  { 0xFFFC, 0, 0x02, "FeatureMap" },
-  { 0xFFFD, 0, 0x02, "ClusterRevision" },
   { 0xFFFF, 0, 0x00, NULL },
 };
 
@@ -281,9 +274,6 @@ const matter_command_t matter_Commands_002C[] = {
 
 const matter_attribute_t matter_Attributes_002D[] = {
   { 0x0000, 0, 0x03, "TemperatureUnit" },
-  { 0xFFFB, 0, 0x02, "AttributeList" },
-  { 0xFFFC, 0, 0x02, "FeatureMap" },
-  { 0xFFFD, 0, 0x02, "ClusterRevision" },
   { 0xFFFF, 0, 0x00, NULL },
 };
 
@@ -842,9 +832,6 @@ const matter_attribute_t matter_Attributes_0201[] = {
   { 0x0020, 0, 0x02, "StartOfWeek" },
   { 0x0021, 0, 0x02, "NumberOfWeeklyTransitions" },
   { 0x0022, 0, 0x02, "NumberOfDailyTransitions" },
-  { 0xFFFB, 0, 0x02, "AttributeList" },
-  { 0xFFFC, 0, 0x02, "FeatureMap" },
-  { 0xFFFD, 0, 0x02, "ClusterRevision" },
   { 0xFFFF, 0, 0x00, NULL },
 };
 
@@ -1005,9 +992,6 @@ const matter_attribute_t matter_Attributes_0402[] = {
   { 0x0001, 0, 0x02, "MinMeasuredValue" },
   { 0x0002, 0, 0x02, "MaxMeasuredValue" },
   { 0x0003, 0, 0x02, "Tolerance" },
-  { 0xFFFB, 0, 0x02, "AttributeList" },
-  { 0xFFFC, 0, 0x02, "FeatureMap" },
-  { 0xFFFD, 0, 0x02, "ClusterRevision" },
   { 0xFFFF, 0, 0x00, NULL },
 };
 
@@ -1025,9 +1009,6 @@ const matter_attribute_t matter_Attributes_0403[] = {
   { 0x0012, 0, 0x02, "MaxScaledValue" },
   { 0x0013, 0, 0x02, "ScaledTolerance" },
   { 0x0014, 0, 0x02, "Scale" },
-  { 0xFFFB, 0, 0x02, "AttributeList" },
-  { 0xFFFC, 0, 0x02, "FeatureMap" },
-  { 0xFFFD, 0, 0x02, "ClusterRevision" },
   { 0xFFFF, 0, 0x00, NULL },
 };
 
diff --git a/lib/libesp32/berry_matter/generate/matter_clusters.be b/lib/libesp32/berry_matter/generate/matter_clusters.be
index 2ca6fc239..c13db67e9 100644
--- a/lib/libesp32/berry_matter/generate/matter_clusters.be
+++ b/lib/libesp32/berry_matter/generate/matter_clusters.be
@@ -1,6 +1,6 @@
 # Matter clusters
 #
-# Needs to be reword, this structure is huge...
+# Needs to be reworked, this structure is huge...
 #
 # imported from Python definition