Fix matter lights (#24126)

* matter: add FeatureMap to Light 1

* matter: add missing attributes to Light 2

* matter: fix datatype of attributes on Light 3

Author: RoadRunnr

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_0.be

@@ -47,6 +47,7 @@ class Matter_Plugin
   # static var TYPES = { <device_type>: <revision> }    # needs to be defined for each endpoint
   # `FEATURE_MAPS` contains any non-zero value per cluster, if not present default to `0`
   static var FEATURE_MAPS = {               # feature map per cluster
+    0x0008: 0x03,                           # Level Control: On/Off + Lighting
     0x0031: 0x04,                           # Put Eth for now which should work for any on-network
     # 0x0046: 0x04,                           # LITS: LongIdleTimeSupport
     0x0102: 1 + 4,                          # Lift + PA_LF

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Light2.be

@@ -35,7 +35,7 @@ class Matter_Plugin_Light2 : Matter_Plugin_Light1
     # 0x0005: inherited                                     # Scenes 1.4 p.30 - no writable
     # 0x0006: inherited                                     # On/Off 1.5 p.48
     # 0x0008: inherited                                     # Level Control 1.6 p.57
-    0x0300: [7,8,0xF,0x400B,0x400C],                        # Color Control 3.2 p.111
+    0x0300: [7,8,0xF,0x10,0x4001,0x400A,0x400B,0x400C],     # Color Control 3.2 p.111
   })
   static var UPDATE_COMMANDS = matter.UC_LIST(_class, "CT")
   static var TYPES = { 0x010C: 2 }                  # Color Temperature Light
@@ -135,16 +135,24 @@ class Matter_Plugin_Light2 : Matter_Plugin_Light1
     if   cluster == 0x0300              # ========== Color Control 3.2 p.111 ==========
       self.update_shadow_lazy()
       if   attribute == 0x0007          #  ---------- ColorTemperatureMireds / u2 ----------
-        return tlv_solo.set_or_nil(TLV.U1, self.shadow_ct)   # if `nil` it is replaced with TLV.NULL
+        return tlv_solo.set_or_nil(TLV.U2, self.shadow_ct)   # if `nil` it is replaced with TLV.NULL
       elif attribute == 0x0008          #  ---------- ColorMode / u1 ----------
-        return tlv_solo.set(TLV.U1, 2)# 2 = ColorTemperatureMireds
+        return tlv_solo.set(TLV.U1, 2)  # 2 = ColorTemperatureMireds
       elif attribute == 0x000F          #  ---------- Options / u1 ----------
         return tlv_solo.set(TLV.U1, 0)
+      elif attribute == 0x4001          #  ---------- EnhancedColorMode / u1 ----------
+        return tlv_solo.set(TLV.U1, 2)  # 2 = ColorTemperatureMireds
+      elif attribute == 0x400A          #  ---------- ColorCapabilities / map2 ----------
+        return tlv_solo.set(TLV.U2, 0x10)    # CT
       elif attribute == 0x400B          #  ---------- ColorTempPhysicalMinMireds / u2 ----------
-        return tlv_solo.set(TLV.U1, self.ct_min)
+        return tlv_solo.set(TLV.U2, self.ct_min)
       elif attribute == 0x400C          #  ---------- ColorTempPhysicalMaxMireds / u2 ----------
-        return tlv_solo.set(TLV.U1, self.ct_max)
+        return tlv_solo.set(TLV.U2, self.ct_max)
 
+      # Defined Primaries Information Attribute Set
+      elif attribute == 0x0010          #  ---------- NumberOfPrimaries / u1 ----------
+        return tlv_solo.set(TLV.U1, 0)
+        
       elif attribute == 0xFFFC          #  ---------- FeatureMap / map32 ----------
         return tlv_solo.set(TLV.U4, 0x10)    # CT
       end

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Light3.be

@@ -150,15 +150,15 @@ class Matter_Plugin_Light3 : Matter_Plugin_Light1
       elif attribute == 0x0001          #  ---------- CurrentSaturation / u2 ----------
         return tlv_solo.set_or_nil(TLV.U1, self.shadow_sat)
       elif attribute == 0x0007          #  ---------- ColorTemperatureMireds / u2 ----------
-        return tlv_solo.set(TLV.U1, 0)
+        return tlv_solo.set(TLV.U2, 0)
       elif attribute == 0x0008          #  ---------- ColorMode / u1 ----------
         return tlv_solo.set(TLV.U1, 0)# 0 = CurrentHue and CurrentSaturation
       elif attribute == 0x000F          #  ---------- Options / u1 ----------
         return tlv_solo.set(TLV.U1, 0)
       elif attribute == 0x4001          #  ---------- EnhancedColorMode / u1 ----------
         return tlv_solo.set(TLV.U1, 0)
       elif attribute == 0x400A          #  ---------- ColorCapabilities / map2 ----------
-        return tlv_solo.set(TLV.U1, 0x01)    # HS
+        return tlv_solo.set(TLV.U2, 0x01)    # HS
 
       # Defined Primaries Information Attribute Set
       elif attribute == 0x0010          #  ---------- NumberOfPrimaries / u1 ----------

lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_0.h

@@ -1430,10 +1430,11 @@ be_local_class(Matter_Plugin,
         { be_const_key_weak(endpoint, 6), be_const_var(2) },
         { be_const_key_weak(get_endpoint, -1), be_const_closure(class_Matter_Plugin_get_endpoint_closure) },
         { be_const_key_weak(FEATURE_MAPS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, {
-        be_const_map( *     be_nested_map(3,
+        be_const_map( *     be_nested_map(4,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_const_key_int(258, -1), be_const_int(5) },
-        { be_const_key_int(49, 2), be_const_int(4) },
+        { be_const_key_int(8, -1), be_const_int(3) },
+        { be_const_key_int(49, -1), be_const_int(4) },
+        { be_const_key_int(258, 3), be_const_int(5) },
         { be_const_key_int(514, -1), be_const_int(2) },
     }))    ) } )) },
         { be_const_key_weak(ARG, -1), be_nested_str_weak() },