From fdc259c8d8f72e1d559496f009c4e377f5582a9a Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sun, 28 Jul 2024 19:56:25 +0200 Subject: [PATCH] Matter improve encoding of attributes to reduce flash size --- .../src/embedded/Matter_0_Inspect.be | 42 +- .../embedded/Matter_Path_1_PathGenerator.be | 23 +- .../src/embedded/Matter_Plugin_0.be | 29 +- .../solidify/solidified_Matter_0_Inspect.h | 259 ++-- .../solidified_Matter_Path_1_PathGenerator.h | 119 +- .../src/solidify/solidified_Matter_Plugin_0.h | 1295 ++++++++--------- .../solidified_Matter_Plugin_1_Aggregator.h | 28 +- .../solidified_Matter_Plugin_1_Device.h | 74 +- .../solidified_Matter_Plugin_1_Root.h | 205 +-- .../solidify/solidified_Matter_Plugin_2_Fan.h | 89 +- .../solidified_Matter_Plugin_2_Light0.h | 86 +- ...ified_Matter_Plugin_2_Sensor_Air_Quality.h | 182 +-- ...Matter_Plugin_2_Sensor_GenericSwitch_Btn.h | 88 +- .../solidified_Matter_Plugin_2_Shutter.h | 93 +- .../solidified_Matter_Plugin_3_Light1.h | 102 +- ...olidified_Matter_Plugin_3_Sensor_Contact.h | 86 +- .../solidified_Matter_Plugin_3_Sensor_Flow.h | 88 +- ...lidified_Matter_Plugin_3_Sensor_Humidity.h | 88 +- ...ified_Matter_Plugin_3_Sensor_Illuminance.h | 88 +- ...idified_Matter_Plugin_3_Sensor_Occupancy.h | 88 +- .../solidified_Matter_Plugin_3_Sensor_OnOff.h | 86 +- ...lidified_Matter_Plugin_3_Sensor_Pressure.h | 88 +- .../solidified_Matter_Plugin_3_Sensor_Rain.h | 86 +- .../solidified_Matter_Plugin_3_Sensor_Temp.h | 88 +- ...idified_Matter_Plugin_3_Sensor_Waterleak.h | 86 +- .../solidified_Matter_Plugin_3_ShutterTilt.h | 96 +- .../solidified_Matter_Plugin_4_Light2.h | 118 +- .../solidified_Matter_Plugin_4_Light3.h | 120 +- 28 files changed, 1109 insertions(+), 2811 deletions(-) diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_0_Inspect.be b/lib/libesp32/berry_matter/src/embedded/Matter_0_Inspect.be index a916691ccdd8..0846415e727f 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_0_Inspect.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_0_Inspect.be @@ -89,20 +89,35 @@ matter.inspect = inspect # from the inheritance hierarchy #@ solidify:matter.consolidate_clusters,weak def consolidate_clusters(cl, m) - var cl_parent = super(cl) != nil ? super(cl).CLUSTERS : {} + var cl_parent = (super(cl) != nil) ? super(cl).CLUSTERS : {} var ret = {} # clone cl_parent for k: cl_parent.keys() # print(f"{k=} {cl_parent[k]=}") - ret[k] = cl_parent[k].copy() + # rebuild an actual list + var attr_arr = [] + var attr_bytes = cl_parent[k] + var attr_bytes_sz = (attr_bytes != nil) ? size(attr_bytes) / 2 : 0 + var idx = 0 + while (idx < attr_bytes_sz) + attr_arr.push(attr_bytes.get(idx * 2, -2)) + idx += 1 + end + ret[k] = attr_arr + # ret[k] = cl_parent[k].copy() end # add all keys from m # print("--- step 2") for k: m.keys() # print(f"{k=} {ret.find(k)=} {m[k]=}") - var l = ret.find(k) - if l == nil l = [] end - ret[k] = l + m[k] + if !ret.contains(k) + ret[k] = [] + end + for v: m[k] + if ret[k].find(v) == nil + ret[k].push(v) + end + end end # add all auto-attribbutes to each cluster var AUTO_ATTRIBUTES = [ # pre-defined auto attributes for every cluster @@ -120,6 +135,23 @@ def consolidate_clusters(cl, m) end end end + # sort all lists + for k: ret.keys() + var attr_list = ret[k] + # sort in place + ret[k] = matter.sort(attr_list) + end + # convert back to bytes + for k: ret.keys() + var attr_arr = ret[k] + var attr_bytes = bytes() + var idx = 0 + while (idx < size(attr_arr)) + attr_bytes.add(attr_arr[idx], -2) + idx += 1 + end + ret[k] = attr_bytes + end # print(ret) return ret end diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Path_1_PathGenerator.be b/lib/libesp32/berry_matter/src/embedded/Matter_Path_1_PathGenerator.be index 49be5faacf5a..96e74025b5b9 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_Path_1_PathGenerator.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_Path_1_PathGenerator.be @@ -266,17 +266,32 @@ class Matter_PathGenerator def _next_attribute() if (self.attribute == false) return false end # exhausted all possible values - var attributes = self.pi.get_attribute_list(self.cluster) + var attributes_bytes = self.pi.get_attribute_list_bytes(self.cluster) + var attributes_bytes_sz = (attributes_bytes != nil) ? size(attributes_bytes) / 2 : 0 var attr_filter = self.path_in_attribute + var idx = -1 if (self.attribute != nil) - idx = attributes.find(self.attribute) # find index in current list + var i = 0 + while true + if (i < attributes_bytes_sz) + if attributes_bytes.get(i * 2, -2) == self.attribute + idx = i + break + end + i += 1 + else + idx = nil + break + end + end + # idx = attributes.find(self.attribute) # finds index in current list end # safeguard if (idx != nil) - while (idx + 1 < size(attributes)) + while (idx + 1 < attributes_bytes_sz) idx += 1 # move to next item - self.attribute = attributes[idx] + self.attribute = attributes_bytes.get(idx * 2, -2) if (attr_filter == nil) || (attr_filter == self.attribute) return self.attribute end diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_0.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_0.be index 32d2235936b0..e40a37b5e71b 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_0.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_0.be @@ -99,7 +99,6 @@ class Matter_Plugin static var UPDATE_COMMANDS = [] var device # reference to the `device` global object var endpoint # current endpoint - var clusters # map from cluster to list of attributes, typically constructed from CLUSTERS hierachy var tick # tick value when it was last updated var node_label # name of the endpoint, used only in bridge mode, "" if none @@ -118,7 +117,6 @@ class Matter_Plugin def init(device, endpoint, config) self.device = device self.endpoint = endpoint - self.clusters = self.get_clusters() self.parse_configuration(config) self.node_label = config.find("name", "") end @@ -277,20 +275,26 @@ matter_device.events.dump() return self.endpoint end def get_cluster_list_sorted() - return self.device.k2l(self.clusters) + return self.device.k2l(self.CLUSTERS) end def contains_cluster(cluster) - return self.clusters.contains(cluster) + return self.CLUSTERS.contains(cluster) end - def get_attribute_list(cluster) - return self.clusters.find(cluster, []) + # def get_attribute_list(cluster) + # return self.clusters.find(cluster, []) + # end + # returns as a constant bytes of 16-bit ints, big endian + def get_attribute_list_bytes(cluster) + return self.CLUSTERS.find(cluster, nil) end def contains_attribute(cluster, attribute) - var attr_list = self.clusters.find(cluster) + var attr_list = self.CLUSTERS.find(cluster) + # log(f"MTR: contains_attribute {cluster=} {attribute=} {attr_list=}") if attr_list != nil var idx = 0 - while idx < size(attr_list) - if attr_list[idx] == attribute + var attr_sz = size(attr_list) / 2 # group of 16-bit integers, big endian + while idx < attr_sz + if attr_list.get(idx * 2, -2) == attribute return true end idx += 1 @@ -359,10 +363,11 @@ matter_device.events.dump() return gcl # return empty list elif attribute == 0xFFFB # AttributeList var acli = TLV.Matter_TLV_array() - var attr_list = self.get_attribute_list(cluster) + var attr_list_bytes = self.get_attribute_list_bytes(cluster) + var attr_list_bytes_sz = (attr_list_bytes != nil) ? size(attr_list_bytes) : 0 var idx = 0 - while idx < size(attr_list) - acli.add_TLV(nil, TLV.U2, attr_list[idx]) + while idx < attr_list_bytes_sz + acli.add_TLV(nil, TLV.U2, attr_list_bytes.get(idx * 2, -2)) idx += 1 end return acli # TODO, empty list for now diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_0_Inspect.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_0_Inspect.h index 46efb89a391a..e39e54d86e12 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_0_Inspect.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_0_Inspect.h @@ -249,7 +249,7 @@ be_local_closure(module_matter_inspect, /* name */ ********************************************************************/ be_local_closure(module_matter_consolidate_clusters, /* name */ be_nested_proto( - 12, /* nstack */ + 16, /* nstack */ 2, /* argc */ 0, /* varg */ 0, /* has upvals */ @@ -257,17 +257,24 @@ be_local_closure(module_matter_consolidate_clusters, /* name */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ - ( &(const bvalue[ 6]) { /* constants */ + ( &(const bvalue[13]) { /* constants */ /* K0 */ be_nested_str_weak(CLUSTERS), /* K1 */ be_nested_str_weak(keys), - /* K2 */ be_nested_str_weak(copy), - /* K3 */ be_nested_str_weak(stop_iteration), - /* K4 */ be_nested_str_weak(find), - /* K5 */ be_nested_str_weak(push), + /* K2 */ be_const_int(2), + /* K3 */ be_const_int(0), + /* K4 */ be_nested_str_weak(push), + /* K5 */ be_nested_str_weak(get), + /* K6 */ be_const_int(1), + /* K7 */ be_nested_str_weak(stop_iteration), + /* K8 */ be_nested_str_weak(contains), + /* K9 */ be_nested_str_weak(find), + /* K10 */ be_nested_str_weak(matter), + /* K11 */ be_nested_str_weak(sort), + /* K12 */ be_nested_str_weak(add), }), be_str_weak(consolidate_clusters), &be_const_str_solidified, - ( &(const binstruction[100]) { /* code */ + ( &(const binstruction[180]) { /* code */ 0x60080003, // 0000 GETGBL R2 G3 0x5C0C0000, // 0001 MOVE R3 R0 0x7C080200, // 0002 CALL R2 1 @@ -287,87 +294,167 @@ be_local_closure(module_matter_consolidate_clusters, /* name */ 0x8C140501, // 0010 GETMET R5 R2 K1 0x7C140200, // 0011 CALL R5 1 0x7C100200, // 0012 CALL R4 1 - 0xA8020006, // 0013 EXBLK 0 #001B + 0xA802001A, // 0013 EXBLK 0 #002F 0x5C140800, // 0014 MOVE R5 R4 0x7C140000, // 0015 CALL R5 0 - 0x94180405, // 0016 GETIDX R6 R2 R5 - 0x8C180D02, // 0017 GETMET R6 R6 K2 - 0x7C180200, // 0018 CALL R6 1 - 0x980C0A06, // 0019 SETIDX R3 R5 R6 - 0x7001FFF8, // 001A JMP #0014 - 0x58100003, // 001B LDCONST R4 K3 - 0xAC100200, // 001C CATCH R4 1 0 - 0xB0080000, // 001D RAISE 2 R0 R0 - 0x60100010, // 001E GETGBL R4 G16 - 0x8C140301, // 001F GETMET R5 R1 K1 - 0x7C140200, // 0020 CALL R5 1 - 0x7C100200, // 0021 CALL R4 1 - 0xA802000E, // 0022 EXBLK 0 #0032 - 0x5C140800, // 0023 MOVE R5 R4 - 0x7C140000, // 0024 CALL R5 0 - 0x8C180704, // 0025 GETMET R6 R3 K4 - 0x5C200A00, // 0026 MOVE R8 R5 - 0x7C180400, // 0027 CALL R6 2 - 0x4C1C0000, // 0028 LDNIL R7 - 0x1C1C0C07, // 0029 EQ R7 R6 R7 - 0x781E0002, // 002A JMPF R7 #002E - 0x601C0012, // 002B GETGBL R7 G18 - 0x7C1C0000, // 002C CALL R7 0 - 0x5C180E00, // 002D MOVE R6 R7 - 0x941C0205, // 002E GETIDX R7 R1 R5 - 0x001C0C07, // 002F ADD R7 R6 R7 - 0x980C0A07, // 0030 SETIDX R3 R5 R7 - 0x7001FFF0, // 0031 JMP #0023 - 0x58100003, // 0032 LDCONST R4 K3 - 0xAC100200, // 0033 CATCH R4 1 0 - 0xB0080000, // 0034 RAISE 2 R0 R0 - 0x60100012, // 0035 GETGBL R4 G18 - 0x7C100000, // 0036 CALL R4 0 - 0x5416FFF7, // 0037 LDINT R5 65528 - 0x40140805, // 0038 CONNECT R5 R4 R5 - 0x5416FFF8, // 0039 LDINT R5 65529 - 0x40140805, // 003A CONNECT R5 R4 R5 - 0x5416FFF9, // 003B LDINT R5 65530 - 0x40140805, // 003C CONNECT R5 R4 R5 - 0x5416FFFA, // 003D LDINT R5 65531 - 0x40140805, // 003E CONNECT R5 R4 R5 - 0x5416FFFB, // 003F LDINT R5 65532 - 0x40140805, // 0040 CONNECT R5 R4 R5 - 0x5416FFFC, // 0041 LDINT R5 65533 - 0x40140805, // 0042 CONNECT R5 R4 R5 - 0x60140010, // 0043 GETGBL R5 G16 - 0x8C180301, // 0044 GETMET R6 R1 K1 - 0x7C180200, // 0045 CALL R6 1 - 0x7C140200, // 0046 CALL R5 1 - 0xA8020017, // 0047 EXBLK 0 #0060 - 0x5C180A00, // 0048 MOVE R6 R5 - 0x7C180000, // 0049 CALL R6 0 - 0x601C0010, // 004A GETGBL R7 G16 - 0x5C200800, // 004B MOVE R8 R4 - 0x7C1C0200, // 004C CALL R7 1 - 0xA802000D, // 004D EXBLK 0 #005C - 0x5C200E00, // 004E MOVE R8 R7 - 0x7C200000, // 004F CALL R8 0 - 0x94240606, // 0050 GETIDX R9 R3 R6 - 0x8C241304, // 0051 GETMET R9 R9 K4 - 0x5C2C1000, // 0052 MOVE R11 R8 - 0x7C240400, // 0053 CALL R9 2 - 0x4C280000, // 0054 LDNIL R10 - 0x1C24120A, // 0055 EQ R9 R9 R10 - 0x78260003, // 0056 JMPF R9 #005B - 0x94240606, // 0057 GETIDX R9 R3 R6 - 0x8C241305, // 0058 GETMET R9 R9 K5 - 0x5C2C1000, // 0059 MOVE R11 R8 - 0x7C240400, // 005A CALL R9 2 - 0x7001FFF1, // 005B JMP #004E - 0x581C0003, // 005C LDCONST R7 K3 - 0xAC1C0200, // 005D CATCH R7 1 0 - 0xB0080000, // 005E RAISE 2 R0 R0 - 0x7001FFE7, // 005F JMP #0048 - 0x58140003, // 0060 LDCONST R5 K3 - 0xAC140200, // 0061 CATCH R5 1 0 - 0xB0080000, // 0062 RAISE 2 R0 R0 - 0x80040600, // 0063 RET 1 R3 + 0x60180012, // 0016 GETGBL R6 G18 + 0x7C180000, // 0017 CALL R6 0 + 0x941C0405, // 0018 GETIDX R7 R2 R5 + 0x4C200000, // 0019 LDNIL R8 + 0x20200E08, // 001A NE R8 R7 R8 + 0x78220004, // 001B JMPF R8 #0021 + 0x6020000C, // 001C GETGBL R8 G12 + 0x5C240E00, // 001D MOVE R9 R7 + 0x7C200200, // 001E CALL R8 1 + 0x0C201102, // 001F DIV R8 R8 K2 + 0x70020000, // 0020 JMP #0022 + 0x58200003, // 0021 LDCONST R8 K3 + 0x58240003, // 0022 LDCONST R9 K3 + 0x14281208, // 0023 LT R10 R9 R8 + 0x782A0007, // 0024 JMPF R10 #002D + 0x8C280D04, // 0025 GETMET R10 R6 K4 + 0x8C300F05, // 0026 GETMET R12 R7 K5 + 0x08381302, // 0027 MUL R14 R9 K2 + 0x543DFFFD, // 0028 LDINT R15 -2 + 0x7C300600, // 0029 CALL R12 3 + 0x7C280400, // 002A CALL R10 2 + 0x00241306, // 002B ADD R9 R9 K6 + 0x7001FFF5, // 002C JMP #0023 + 0x980C0A06, // 002D SETIDX R3 R5 R6 + 0x7001FFE4, // 002E JMP #0014 + 0x58100007, // 002F LDCONST R4 K7 + 0xAC100200, // 0030 CATCH R4 1 0 + 0xB0080000, // 0031 RAISE 2 R0 R0 + 0x60100010, // 0032 GETGBL R4 G16 + 0x8C140301, // 0033 GETMET R5 R1 K1 + 0x7C140200, // 0034 CALL R5 1 + 0x7C100200, // 0035 CALL R4 1 + 0xA802001E, // 0036 EXBLK 0 #0056 + 0x5C140800, // 0037 MOVE R5 R4 + 0x7C140000, // 0038 CALL R5 0 + 0x8C180708, // 0039 GETMET R6 R3 K8 + 0x5C200A00, // 003A MOVE R8 R5 + 0x7C180400, // 003B CALL R6 2 + 0x741A0002, // 003C JMPT R6 #0040 + 0x60180012, // 003D GETGBL R6 G18 + 0x7C180000, // 003E CALL R6 0 + 0x980C0A06, // 003F SETIDX R3 R5 R6 + 0x60180010, // 0040 GETGBL R6 G16 + 0x941C0205, // 0041 GETIDX R7 R1 R5 + 0x7C180200, // 0042 CALL R6 1 + 0xA802000D, // 0043 EXBLK 0 #0052 + 0x5C1C0C00, // 0044 MOVE R7 R6 + 0x7C1C0000, // 0045 CALL R7 0 + 0x94200605, // 0046 GETIDX R8 R3 R5 + 0x8C201109, // 0047 GETMET R8 R8 K9 + 0x5C280E00, // 0048 MOVE R10 R7 + 0x7C200400, // 0049 CALL R8 2 + 0x4C240000, // 004A LDNIL R9 + 0x1C201009, // 004B EQ R8 R8 R9 + 0x78220003, // 004C JMPF R8 #0051 + 0x94200605, // 004D GETIDX R8 R3 R5 + 0x8C201104, // 004E GETMET R8 R8 K4 + 0x5C280E00, // 004F MOVE R10 R7 + 0x7C200400, // 0050 CALL R8 2 + 0x7001FFF1, // 0051 JMP #0044 + 0x58180007, // 0052 LDCONST R6 K7 + 0xAC180200, // 0053 CATCH R6 1 0 + 0xB0080000, // 0054 RAISE 2 R0 R0 + 0x7001FFE0, // 0055 JMP #0037 + 0x58100007, // 0056 LDCONST R4 K7 + 0xAC100200, // 0057 CATCH R4 1 0 + 0xB0080000, // 0058 RAISE 2 R0 R0 + 0x60100012, // 0059 GETGBL R4 G18 + 0x7C100000, // 005A CALL R4 0 + 0x5416FFF7, // 005B LDINT R5 65528 + 0x40140805, // 005C CONNECT R5 R4 R5 + 0x5416FFF8, // 005D LDINT R5 65529 + 0x40140805, // 005E CONNECT R5 R4 R5 + 0x5416FFF9, // 005F LDINT R5 65530 + 0x40140805, // 0060 CONNECT R5 R4 R5 + 0x5416FFFA, // 0061 LDINT R5 65531 + 0x40140805, // 0062 CONNECT R5 R4 R5 + 0x5416FFFB, // 0063 LDINT R5 65532 + 0x40140805, // 0064 CONNECT R5 R4 R5 + 0x5416FFFC, // 0065 LDINT R5 65533 + 0x40140805, // 0066 CONNECT R5 R4 R5 + 0x60140010, // 0067 GETGBL R5 G16 + 0x8C180301, // 0068 GETMET R6 R1 K1 + 0x7C180200, // 0069 CALL R6 1 + 0x7C140200, // 006A CALL R5 1 + 0xA8020017, // 006B EXBLK 0 #0084 + 0x5C180A00, // 006C MOVE R6 R5 + 0x7C180000, // 006D CALL R6 0 + 0x601C0010, // 006E GETGBL R7 G16 + 0x5C200800, // 006F MOVE R8 R4 + 0x7C1C0200, // 0070 CALL R7 1 + 0xA802000D, // 0071 EXBLK 0 #0080 + 0x5C200E00, // 0072 MOVE R8 R7 + 0x7C200000, // 0073 CALL R8 0 + 0x94240606, // 0074 GETIDX R9 R3 R6 + 0x8C241309, // 0075 GETMET R9 R9 K9 + 0x5C2C1000, // 0076 MOVE R11 R8 + 0x7C240400, // 0077 CALL R9 2 + 0x4C280000, // 0078 LDNIL R10 + 0x1C24120A, // 0079 EQ R9 R9 R10 + 0x78260003, // 007A JMPF R9 #007F + 0x94240606, // 007B GETIDX R9 R3 R6 + 0x8C241304, // 007C GETMET R9 R9 K4 + 0x5C2C1000, // 007D MOVE R11 R8 + 0x7C240400, // 007E CALL R9 2 + 0x7001FFF1, // 007F JMP #0072 + 0x581C0007, // 0080 LDCONST R7 K7 + 0xAC1C0200, // 0081 CATCH R7 1 0 + 0xB0080000, // 0082 RAISE 2 R0 R0 + 0x7001FFE7, // 0083 JMP #006C + 0x58140007, // 0084 LDCONST R5 K7 + 0xAC140200, // 0085 CATCH R5 1 0 + 0xB0080000, // 0086 RAISE 2 R0 R0 + 0x60140010, // 0087 GETGBL R5 G16 + 0x8C180701, // 0088 GETMET R6 R3 K1 + 0x7C180200, // 0089 CALL R6 1 + 0x7C140200, // 008A CALL R5 1 + 0xA8020008, // 008B EXBLK 0 #0095 + 0x5C180A00, // 008C MOVE R6 R5 + 0x7C180000, // 008D CALL R6 0 + 0x941C0606, // 008E GETIDX R7 R3 R6 + 0xB8221400, // 008F GETNGBL R8 K10 + 0x8C20110B, // 0090 GETMET R8 R8 K11 + 0x5C280E00, // 0091 MOVE R10 R7 + 0x7C200400, // 0092 CALL R8 2 + 0x980C0C08, // 0093 SETIDX R3 R6 R8 + 0x7001FFF6, // 0094 JMP #008C + 0x58140007, // 0095 LDCONST R5 K7 + 0xAC140200, // 0096 CATCH R5 1 0 + 0xB0080000, // 0097 RAISE 2 R0 R0 + 0x60140010, // 0098 GETGBL R5 G16 + 0x8C180701, // 0099 GETMET R6 R3 K1 + 0x7C180200, // 009A CALL R6 1 + 0x7C140200, // 009B CALL R5 1 + 0xA8020012, // 009C EXBLK 0 #00B0 + 0x5C180A00, // 009D MOVE R6 R5 + 0x7C180000, // 009E CALL R6 0 + 0x941C0606, // 009F GETIDX R7 R3 R6 + 0x60200015, // 00A0 GETGBL R8 G21 + 0x7C200000, // 00A1 CALL R8 0 + 0x58240003, // 00A2 LDCONST R9 K3 + 0x6028000C, // 00A3 GETGBL R10 G12 + 0x5C2C0E00, // 00A4 MOVE R11 R7 + 0x7C280200, // 00A5 CALL R10 1 + 0x1428120A, // 00A6 LT R10 R9 R10 + 0x782A0005, // 00A7 JMPF R10 #00AE + 0x8C28110C, // 00A8 GETMET R10 R8 K12 + 0x94300E09, // 00A9 GETIDX R12 R7 R9 + 0x5435FFFD, // 00AA LDINT R13 -2 + 0x7C280600, // 00AB CALL R10 3 + 0x00241306, // 00AC ADD R9 R9 K6 + 0x7001FFF4, // 00AD JMP #00A3 + 0x980C0C08, // 00AE SETIDX R3 R6 R8 + 0x7001FFEC, // 00AF JMP #009D + 0x58140007, // 00B0 LDCONST R5 K7 + 0xAC140200, // 00B1 CATCH R5 1 0 + 0xB0080000, // 00B2 RAISE 2 R0 R0 + 0x80040600, // 00B3 RET 1 R3 }) ) ); diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Path_1_PathGenerator.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Path_1_PathGenerator.h index e8d89dfb54b2..698ec5627e7b 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Path_1_PathGenerator.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Path_1_PathGenerator.h @@ -3,8 +3,8 @@ * Generated code, don't edit * \********************************************************************/ #include "be_constobj.h" -// compact class 'Matter_PathGenerator' ktab size: 34, total: 78 (saved 352 bytes) -static const bvalue be_ktab_class_Matter_PathGenerator[34] = { +// compact class 'Matter_PathGenerator' ktab size: 37, total: 80 (saved 344 bytes) +static const bvalue be_ktab_class_Matter_PathGenerator[37] = { /* K0 */ be_nested_str_weak(path_concrete), /* K1 */ be_nested_str_weak(reset), /* K2 */ be_nested_str_weak(pi), @@ -35,10 +35,13 @@ static const bvalue be_ktab_class_Matter_PathGenerator[34] = { /* K27 */ be_nested_str_weak(UNSUPPORTED_CLUSTER), /* K28 */ be_nested_str_weak(UNSUPPORTED_ATTRIBUTE), /* K29 */ be_nested_str_weak(UNREPORTABLE_ATTRIBUTE), - /* K30 */ be_nested_str_weak(get_attribute_list), - /* K31 */ be_nested_str_weak(plugins), - /* K32 */ be_nested_str_weak(get_cluster_list_sorted), - /* K33 */ be_nested_str_weak(Path), + /* K30 */ be_nested_str_weak(get_attribute_list_bytes), + /* K31 */ be_const_int(2), + /* K32 */ be_const_int(0), + /* K33 */ be_nested_str_weak(get), + /* K34 */ be_nested_str_weak(plugins), + /* K35 */ be_nested_str_weak(get_cluster_list_sorted), + /* K36 */ be_nested_str_weak(Path), }; @@ -403,7 +406,7 @@ be_local_closure(class_Matter_PathGenerator__default_status_error, /* name */ ********************************************************************/ be_local_closure(class_Matter_PathGenerator__next_attribute, /* name */ be_nested_proto( - 7, /* nstack */ + 10, /* nstack */ 1, /* argc */ 10, /* varg */ 0, /* has upvals */ @@ -414,7 +417,7 @@ be_local_closure(class_Matter_PathGenerator__next_attribute, /* name */ &be_ktab_class_Matter_PathGenerator, /* shared constants */ be_str_weak(_next_attribute), &be_const_str_solidified, - ( &(const binstruction[45]) { /* code */ + ( &(const binstruction[69]) { /* code */ 0x88040104, // 0000 GETMBR R1 R0 K4 0x50080000, // 0001 LDBOOL R2 0 0 0x1C040202, // 0002 EQ R1 R1 R2 @@ -425,41 +428,65 @@ be_local_closure(class_Matter_PathGenerator__next_attribute, /* name */ 0x8C04031E, // 0007 GETMET R1 R1 K30 0x880C0103, // 0008 GETMBR R3 R0 K3 0x7C040400, // 0009 CALL R1 2 - 0x88080109, // 000A GETMBR R2 R0 K9 - 0x540DFFFE, // 000B LDINT R3 -1 - 0x88100104, // 000C GETMBR R4 R0 K4 - 0x4C140000, // 000D LDNIL R5 - 0x20100805, // 000E NE R4 R4 R5 - 0x78120003, // 000F JMPF R4 #0014 - 0x8C100317, // 0010 GETMET R4 R1 K23 - 0x88180104, // 0011 GETMBR R6 R0 K4 - 0x7C100400, // 0012 CALL R4 2 - 0x5C0C0800, // 0013 MOVE R3 R4 - 0x4C100000, // 0014 LDNIL R4 - 0x20100604, // 0015 NE R4 R3 R4 - 0x78120011, // 0016 JMPF R4 #0029 - 0x00100718, // 0017 ADD R4 R3 K24 - 0x6014000C, // 0018 GETGBL R5 G12 - 0x5C180200, // 0019 MOVE R6 R1 - 0x7C140200, // 001A CALL R5 1 - 0x14100805, // 001B LT R4 R4 R5 - 0x7812000B, // 001C JMPF R4 #0029 - 0x000C0718, // 001D ADD R3 R3 K24 - 0x94100203, // 001E GETIDX R4 R1 R3 - 0x90020804, // 001F SETMBR R0 K4 R4 - 0x4C100000, // 0020 LDNIL R4 - 0x1C100404, // 0021 EQ R4 R2 R4 - 0x74120002, // 0022 JMPT R4 #0026 - 0x88100104, // 0023 GETMBR R4 R0 K4 - 0x1C100404, // 0024 EQ R4 R2 R4 - 0x78120001, // 0025 JMPF R4 #0028 - 0x88100104, // 0026 GETMBR R4 R0 K4 - 0x80040800, // 0027 RET 1 R4 - 0x7001FFED, // 0028 JMP #0017 - 0x50100000, // 0029 LDBOOL R4 0 0 - 0x90020804, // 002A SETMBR R0 K4 R4 - 0x50100000, // 002B LDBOOL R4 0 0 - 0x80040800, // 002C RET 1 R4 + 0x4C080000, // 000A LDNIL R2 + 0x20080202, // 000B NE R2 R1 R2 + 0x780A0004, // 000C JMPF R2 #0012 + 0x6008000C, // 000D GETGBL R2 G12 + 0x5C0C0200, // 000E MOVE R3 R1 + 0x7C080200, // 000F CALL R2 1 + 0x0C08051F, // 0010 DIV R2 R2 K31 + 0x70020000, // 0011 JMP #0013 + 0x58080020, // 0012 LDCONST R2 K32 + 0x880C0109, // 0013 GETMBR R3 R0 K9 + 0x5411FFFE, // 0014 LDINT R4 -1 + 0x88140104, // 0015 GETMBR R5 R0 K4 + 0x4C180000, // 0016 LDNIL R6 + 0x20140A06, // 0017 NE R5 R5 R6 + 0x78160012, // 0018 JMPF R5 #002C + 0x58140020, // 0019 LDCONST R5 K32 + 0x50180200, // 001A LDBOOL R6 1 0 + 0x781A000F, // 001B JMPF R6 #002C + 0x14180A02, // 001C LT R6 R5 R2 + 0x781A000A, // 001D JMPF R6 #0029 + 0x8C180321, // 001E GETMET R6 R1 K33 + 0x08200B1F, // 001F MUL R8 R5 K31 + 0x5425FFFD, // 0020 LDINT R9 -2 + 0x7C180600, // 0021 CALL R6 3 + 0x881C0104, // 0022 GETMBR R7 R0 K4 + 0x1C180C07, // 0023 EQ R6 R6 R7 + 0x781A0001, // 0024 JMPF R6 #0027 + 0x5C100A00, // 0025 MOVE R4 R5 + 0x70020004, // 0026 JMP #002C + 0x00140B18, // 0027 ADD R5 R5 K24 + 0x70020001, // 0028 JMP #002B + 0x4C100000, // 0029 LDNIL R4 + 0x70020000, // 002A JMP #002C + 0x7001FFED, // 002B JMP #001A + 0x4C140000, // 002C LDNIL R5 + 0x20140805, // 002D NE R5 R4 R5 + 0x78160011, // 002E JMPF R5 #0041 + 0x00140918, // 002F ADD R5 R4 K24 + 0x14140A02, // 0030 LT R5 R5 R2 + 0x7816000E, // 0031 JMPF R5 #0041 + 0x00100918, // 0032 ADD R4 R4 K24 + 0x8C140321, // 0033 GETMET R5 R1 K33 + 0x081C091F, // 0034 MUL R7 R4 K31 + 0x5421FFFD, // 0035 LDINT R8 -2 + 0x7C140600, // 0036 CALL R5 3 + 0x90020805, // 0037 SETMBR R0 K4 R5 + 0x4C140000, // 0038 LDNIL R5 + 0x1C140605, // 0039 EQ R5 R3 R5 + 0x74160002, // 003A JMPT R5 #003E + 0x88140104, // 003B GETMBR R5 R0 K4 + 0x1C140605, // 003C EQ R5 R3 R5 + 0x78160001, // 003D JMPF R5 #0040 + 0x88140104, // 003E GETMBR R5 R0 K4 + 0x80040A00, // 003F RET 1 R5 + 0x7001FFED, // 0040 JMP #002F + 0x50140000, // 0041 LDBOOL R5 0 0 + 0x90020805, // 0042 SETMBR R0 K4 R5 + 0x50140000, // 0043 LDBOOL R5 0 0 + 0x80040A00, // 0044 RET 1 R5 }) ) ); @@ -490,7 +517,7 @@ be_local_closure(class_Matter_PathGenerator__next_endpoint, /* name */ 0x50040000, // 0004 LDBOOL R1 0 0 0x80040200, // 0005 RET 1 R1 0x88040106, // 0006 GETMBR R1 R0 K6 - 0x8804031F, // 0007 GETMBR R1 R1 K31 + 0x88040322, // 0007 GETMBR R1 R1 K34 0x88080107, // 0008 GETMBR R2 R0 K7 0x4C0C0000, // 0009 LDNIL R3 0x90020603, // 000A SETMBR R0 K3 R3 @@ -526,7 +553,7 @@ be_local_closure(class_Matter_PathGenerator__next_endpoint, /* name */ 0x1C100404, // 0028 EQ R4 R2 R4 0x78120005, // 0029 JMPF R4 #0030 0x88100102, // 002A GETMBR R4 R0 K2 - 0x8C100920, // 002B GETMET R4 R4 K32 + 0x8C100923, // 002B GETMET R4 R4 K35 0x7C100200, // 002C CALL R4 1 0x90020A04, // 002D SETMBR R0 K5 R4 0x88100102, // 002E GETMBR R4 R0 K2 @@ -595,7 +622,7 @@ be_local_closure(class_Matter_PathGenerator_start, /* name */ &be_const_str_solidified, ( &(const binstruction[22]) { /* code */ 0xB8163200, // 0000 GETNGBL R5 K25 - 0x8C140B21, // 0001 GETMET R5 R5 K33 + 0x8C140B24, // 0001 GETMET R5 R5 K36 0x7C140200, // 0002 CALL R5 1 0x90020005, // 0003 SETMBR R0 K0 R5 0x8C140101, // 0004 GETMET R5 R0 K1 diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_0.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_0.h index 8d4d0b73e90e..e27b73416545 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_0.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_0.h @@ -4,52 +4,52 @@ \********************************************************************/ #include "be_constobj.h" extern const bclass be_class_Matter_Plugin; -// compact class 'Matter_Plugin' ktab size: 62, total: 103 (saved 328 bytes) -static const bvalue be_ktab_class_Matter_Plugin[62] = { - /* K0 */ be_nested_str_weak(tick), - /* K1 */ be_nested_str_weak(device), - /* K2 */ be_nested_str_weak(json), - /* K3 */ be_nested_str_weak(node_label), - /* K4 */ be_nested_str_weak(_X2C_X22Name_X22_X3A_X25s), - /* K5 */ be_nested_str_weak(dump), - /* K6 */ be_nested_str_weak(), - /* K7 */ be_nested_str_weak(append_state_json), - /* K8 */ be_nested_str_weak(_X7B_X22Ep_X22_X3A_X25i_X25s_X25s_X7D), - /* K9 */ be_nested_str_weak(endpoint), - /* K10 */ be_nested_str_weak(msg), - /* K11 */ be_nested_str_weak(message_handler), - /* K12 */ be_nested_str_weak(im), - /* K13 */ be_nested_str_weak(send_ack_now), - /* K14 */ be_nested_str_weak(update_next), - /* K15 */ be_nested_str_weak(matter), - /* K16 */ be_nested_str_weak(jitter), - /* K17 */ be_nested_str_weak(UPDATE_TIME), - /* K18 */ be_nested_str_weak(tasmota), - /* K19 */ be_nested_str_weak(time_reached), - /* K20 */ be_nested_str_weak(update_shadow), - /* K21 */ be_nested_str_weak(millis), - /* K22 */ be_nested_str_weak(events), - /* K23 */ be_nested_str_weak(publish_event), - /* K24 */ be_nested_str_weak(attribute_updated), - /* K25 */ be_const_class(be_class_Matter_Plugin), - /* K26 */ be_nested_str_weak(ARG), - /* K27 */ be_nested_str_weak(ARG_TYPE), - /* K28 */ be_nested_str_weak(clusters), - /* K29 */ be_nested_str_weak(get_clusters), - /* K30 */ be_nested_str_weak(parse_configuration), - /* K31 */ be_nested_str_weak(find), - /* K32 */ be_nested_str_weak(name), - /* K33 */ be_nested_str_weak(BRIDGE), - /* K34 */ be_nested_str_weak(UPDATE_COMMANDS), - /* K35 */ be_nested_str_weak(k2l), - /* K36 */ be_const_int(0), - /* K37 */ be_const_int(1), +// compact class 'Matter_Plugin' ktab size: 61, total: 104 (saved 344 bytes) +static const bvalue be_ktab_class_Matter_Plugin[61] = { + /* K0 */ be_nested_str_weak(), + /* K1 */ be_nested_str_weak(json), + /* K2 */ be_nested_str_weak(node_label), + /* K3 */ be_nested_str_weak(_X2C_X22Name_X22_X3A_X25s), + /* K4 */ be_nested_str_weak(dump), + /* K5 */ be_nested_str_weak(append_state_json), + /* K6 */ be_nested_str_weak(_X7B_X22Ep_X22_X3A_X25i_X25s_X25s_X7D), + /* K7 */ be_nested_str_weak(endpoint), + /* K8 */ be_nested_str_weak(CLUSTERS), + /* K9 */ be_nested_str_weak(find), + /* K10 */ be_const_class(be_class_Matter_Plugin), + /* K11 */ be_nested_str_weak(ARG), + /* K12 */ be_nested_str_weak(msg), + /* K13 */ be_nested_str_weak(device), + /* K14 */ be_nested_str_weak(message_handler), + /* K15 */ be_nested_str_weak(im), + /* K16 */ be_nested_str_weak(send_ack_now), + /* K17 */ be_nested_str_weak(k2l), + /* K18 */ be_nested_str_weak(parse_configuration), + /* K19 */ be_nested_str_weak(name), + /* K20 */ be_nested_str_weak(ARG_TYPE), + /* K21 */ be_nested_str_weak(update_next), + /* K22 */ be_nested_str_weak(matter), + /* K23 */ be_nested_str_weak(jitter), + /* K24 */ be_nested_str_weak(UPDATE_TIME), + /* K25 */ be_nested_str_weak(tasmota), + /* K26 */ be_nested_str_weak(time_reached), + /* K27 */ be_nested_str_weak(tick), + /* K28 */ be_nested_str_weak(update_shadow), + /* K29 */ be_nested_str_weak(millis), + /* K30 */ be_nested_str_weak(events), + /* K31 */ be_nested_str_weak(publish_event), + /* K32 */ be_nested_str_weak(attribute_updated), + /* K33 */ be_const_int(0), + /* K34 */ be_const_int(2), + /* K35 */ be_nested_str_weak(get), + /* K36 */ be_const_int(1), + /* K37 */ be_nested_str_weak(UPDATE_COMMANDS), /* K38 */ be_nested_str_weak(_X25s_X3A_X25s), /* K39 */ be_nested_str_weak(_X25s_X2C_X25s_X3A_X25s), /* K40 */ be_nested_str_weak(publish_command), /* K41 */ be_nested_str_weak(MtrReceived), - /* K42 */ be_nested_str_weak(CLUSTERS), - /* K43 */ be_nested_str_weak(contains), + /* K42 */ be_nested_str_weak(contains), + /* K43 */ be_nested_str_weak(BRIDGE), /* K44 */ be_nested_str_weak(TLV), /* K45 */ be_nested_str_weak(cluster), /* K46 */ be_nested_str_weak(attribute), @@ -62,23 +62,22 @@ static const bvalue be_ktab_class_Matter_Plugin[62] = { /* K53 */ be_nested_str_weak(stop_iteration), /* K54 */ be_nested_str_weak(get_cluster_list_sorted), /* K55 */ be_nested_str_weak(U4), - /* K56 */ be_const_int(2), - /* K57 */ be_const_int(3), - /* K58 */ be_nested_str_weak(set), - /* K59 */ be_nested_str_weak(get_attribute_list), - /* K60 */ be_nested_str_weak(FEATURE_MAPS), - /* K61 */ be_nested_str_weak(CLUSTER_REVISIONS), + /* K56 */ be_const_int(3), + /* K57 */ be_nested_str_weak(set), + /* K58 */ be_nested_str_weak(get_attribute_list_bytes), + /* K59 */ be_nested_str_weak(FEATURE_MAPS), + /* K60 */ be_nested_str_weak(CLUSTER_REVISIONS), }; extern const bclass be_class_Matter_Plugin; /******************************************************************** -** Solidified function: update_shadow +** Solidified function: append_state_json ********************************************************************/ -be_local_closure(class_Matter_Plugin_update_shadow, /* name */ +be_local_closure(class_Matter_Plugin_append_state_json, /* name */ be_nested_proto( - 2, /* nstack */ + 1, /* nstack */ 1, /* argc */ 10, /* varg */ 0, /* has upvals */ @@ -87,13 +86,10 @@ be_local_closure(class_Matter_Plugin_update_shadow, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(update_shadow), + be_str_weak(append_state_json), &be_const_str_solidified, - ( &(const binstruction[ 4]) { /* code */ - 0x88040101, // 0000 GETMBR R1 R0 K1 - 0x88040300, // 0001 GETMBR R1 R1 K0 - 0x90020001, // 0002 SETMBR R0 K0 R1 - 0x80000000, // 0003 RET 0 + ( &(const binstruction[ 1]) { /* code */ + 0x80060000, // 0000 RET 1 K0 }) ) ); @@ -117,23 +113,23 @@ be_local_closure(class_Matter_Plugin_state_json, /* name */ be_str_weak(state_json), &be_const_str_solidified, ( &(const binstruction[25]) { /* code */ - 0xA4060400, // 0000 IMPORT R1 K2 - 0x88080103, // 0001 GETMBR R2 R0 K3 + 0xA4060200, // 0000 IMPORT R1 K1 + 0x88080102, // 0001 GETMBR R2 R0 K2 0x780A0006, // 0002 JMPF R2 #000A 0x60080018, // 0003 GETGBL R2 G24 - 0x580C0004, // 0004 LDCONST R3 K4 - 0x8C100305, // 0005 GETMET R4 R1 K5 - 0x88180103, // 0006 GETMBR R6 R0 K3 + 0x580C0003, // 0004 LDCONST R3 K3 + 0x8C100304, // 0005 GETMET R4 R1 K4 + 0x88180102, // 0006 GETMBR R6 R0 K2 0x7C100400, // 0007 CALL R4 2 0x7C080400, // 0008 CALL R2 2 0x70020000, // 0009 JMP #000B - 0x58080006, // 000A LDCONST R2 K6 - 0x8C0C0107, // 000B GETMET R3 R0 K7 + 0x58080000, // 000A LDCONST R2 K0 + 0x8C0C0105, // 000B GETMET R3 R0 K5 0x7C0C0200, // 000C CALL R3 1 0x780E0007, // 000D JMPF R3 #0016 0x60100018, // 000E GETGBL R4 G24 - 0x58140008, // 000F LDCONST R5 K8 - 0x88180109, // 0010 GETMBR R6 R0 K9 + 0x58140006, // 000F LDCONST R5 K6 + 0x88180107, // 0010 GETMBR R6 R0 K7 0x5C1C0400, // 0011 MOVE R7 R2 0x5C200600, // 0012 MOVE R8 R3 0x7C100800, // 0013 CALL R4 4 @@ -149,12 +145,12 @@ be_local_closure(class_Matter_Plugin_state_json, /* name */ /******************************************************************** -** Solidified function: ack_request +** Solidified function: timed_request ********************************************************************/ -be_local_closure(class_Matter_Plugin_ack_request, /* name */ +be_local_closure(class_Matter_Plugin_timed_request, /* name */ be_nested_proto( - 6, /* nstack */ - 2, /* argc */ + 5, /* nstack */ + 4, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -162,22 +158,11 @@ be_local_closure(class_Matter_Plugin_ack_request, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(ack_request), + be_str_weak(timed_request), &be_const_str_solidified, - ( &(const binstruction[13]) { /* code */ - 0x8808030A, // 0000 GETMBR R2 R1 K10 - 0x4C0C0000, // 0001 LDNIL R3 - 0x200C0403, // 0002 NE R3 R2 R3 - 0x780E0005, // 0003 JMPF R3 #000A - 0x880C0101, // 0004 GETMBR R3 R0 K1 - 0x880C070B, // 0005 GETMBR R3 R3 K11 - 0x880C070C, // 0006 GETMBR R3 R3 K12 - 0x8C0C070D, // 0007 GETMET R3 R3 K13 - 0x5C140400, // 0008 MOVE R5 R2 - 0x7C0C0400, // 0009 CALL R3 2 - 0x4C0C0000, // 000A LDNIL R3 - 0x90061403, // 000B SETMBR R1 K10 R3 - 0x80000000, // 000C RET 0 + ( &(const binstruction[ 2]) { /* code */ + 0x4C100000, // 0000 LDNIL R4 + 0x80040800, // 0001 RET 1 R4 }) ) ); @@ -185,12 +170,12 @@ be_local_closure(class_Matter_Plugin_ack_request, /* name */ /******************************************************************** -** Solidified function: write_attribute +** Solidified function: get_attribute_list_bytes ********************************************************************/ -be_local_closure(class_Matter_Plugin_write_attribute, /* name */ +be_local_closure(class_Matter_Plugin_get_attribute_list_bytes, /* name */ be_nested_proto( - 5, /* nstack */ - 4, /* argc */ + 6, /* nstack */ + 2, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -198,11 +183,15 @@ be_local_closure(class_Matter_Plugin_write_attribute, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(write_attribute), + be_str_weak(get_attribute_list_bytes), &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x4C100000, // 0000 LDNIL R4 - 0x80040800, // 0001 RET 1 R4 + ( &(const binstruction[ 6]) { /* code */ + 0x88080108, // 0000 GETMBR R2 R0 K8 + 0x8C080509, // 0001 GETMET R2 R2 K9 + 0x5C100200, // 0002 MOVE R4 R1 + 0x4C140000, // 0003 LDNIL R5 + 0x7C080600, // 0004 CALL R2 3 + 0x80040400, // 0005 RET 1 R2 }) ) ); @@ -210,12 +199,12 @@ be_local_closure(class_Matter_Plugin_write_attribute, /* name */ /******************************************************************** -** Solidified function: invoke_request +** Solidified function: parse_sensors ********************************************************************/ -be_local_closure(class_Matter_Plugin_invoke_request, /* name */ +be_local_closure(class_Matter_Plugin_parse_sensors, /* name */ be_nested_proto( - 5, /* nstack */ - 4, /* argc */ + 2, /* nstack */ + 2, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -223,11 +212,10 @@ be_local_closure(class_Matter_Plugin_invoke_request, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(invoke_request), + be_str_weak(parse_sensors), &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x4C100000, // 0000 LDNIL R4 - 0x80040800, // 0001 RET 1 R4 + ( &(const binstruction[ 1]) { /* code */ + 0x80000000, // 0000 RET 0 }) ) ); @@ -235,12 +223,12 @@ be_local_closure(class_Matter_Plugin_invoke_request, /* name */ /******************************************************************** -** Solidified function: append_state_json +** Solidified function: update_virtual ********************************************************************/ -be_local_closure(class_Matter_Plugin_append_state_json, /* name */ +be_local_closure(class_Matter_Plugin_update_virtual, /* name */ be_nested_proto( - 1, /* nstack */ - 1, /* argc */ + 2, /* nstack */ + 2, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -248,10 +236,10 @@ be_local_closure(class_Matter_Plugin_append_state_json, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(append_state_json), + be_str_weak(update_virtual), &be_const_str_solidified, ( &(const binstruction[ 1]) { /* code */ - 0x80060C00, // 0000 RET 1 K6 + 0x80000000, // 0000 RET 0 }) ) ); @@ -259,11 +247,11 @@ be_local_closure(class_Matter_Plugin_append_state_json, /* name */ /******************************************************************** -** Solidified function: every_250ms +** Solidified function: get_name ********************************************************************/ -be_local_closure(class_Matter_Plugin_every_250ms, /* name */ +be_local_closure(class_Matter_Plugin_get_name, /* name */ be_nested_proto( - 4, /* nstack */ + 2, /* nstack */ 1, /* argc */ 10, /* varg */ 0, /* has upvals */ @@ -272,37 +260,11 @@ be_local_closure(class_Matter_Plugin_every_250ms, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(every_250ms), + be_str_weak(get_name), &be_const_str_solidified, - ( &(const binstruction[28]) { /* code */ - 0x8804010E, // 0000 GETMBR R1 R0 K14 - 0x4C080000, // 0001 LDNIL R2 - 0x1C040202, // 0002 EQ R1 R1 R2 - 0x78060005, // 0003 JMPF R1 #000A - 0xB8061E00, // 0004 GETNGBL R1 K15 - 0x8C040310, // 0005 GETMET R1 R1 K16 - 0x880C0111, // 0006 GETMBR R3 R0 K17 - 0x7C040400, // 0007 CALL R1 2 - 0x90021C01, // 0008 SETMBR R0 K14 R1 - 0x70020010, // 0009 JMP #001B - 0xB8062400, // 000A GETNGBL R1 K18 - 0x8C040313, // 000B GETMET R1 R1 K19 - 0x880C010E, // 000C GETMBR R3 R0 K14 - 0x7C040400, // 000D CALL R1 2 - 0x7806000B, // 000E JMPF R1 #001B - 0x88040100, // 000F GETMBR R1 R0 K0 - 0x88080101, // 0010 GETMBR R2 R0 K1 - 0x88080500, // 0011 GETMBR R2 R2 K0 - 0x20040202, // 0012 NE R1 R1 R2 - 0x78060001, // 0013 JMPF R1 #0016 - 0x8C040114, // 0014 GETMET R1 R0 K20 - 0x7C040200, // 0015 CALL R1 1 - 0xB8062400, // 0016 GETNGBL R1 K18 - 0x8C040315, // 0017 GETMET R1 R1 K21 - 0x880C0111, // 0018 GETMBR R3 R0 K17 - 0x7C040400, // 0019 CALL R1 2 - 0x90021C01, // 001A SETMBR R0 K14 R1 - 0x80000000, // 001B RET 0 + ( &(const binstruction[ 2]) { /* code */ + 0x88040102, // 0000 GETMBR R1 R0 K2 + 0x80040200, // 0001 RET 1 R1 }) ) ); @@ -310,35 +272,34 @@ be_local_closure(class_Matter_Plugin_every_250ms, /* name */ /******************************************************************** -** Solidified function: publish_event +** Solidified function: ui_conf_to_string ********************************************************************/ -be_local_closure(class_Matter_Plugin_publish_event, /* name */ +be_local_closure(class_Matter_Plugin_ui_conf_to_string, /* name */ be_nested_proto( - 17, /* nstack */ - 7, /* argc */ - 10, /* varg */ + 9, /* nstack */ + 2, /* argc */ + 12, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(publish_event), + be_str_weak(ui_conf_to_string), &be_const_str_solidified, - ( &(const binstruction[13]) { /* code */ - 0x881C0101, // 0000 GETMBR R7 R0 K1 - 0x881C0F16, // 0001 GETMBR R7 R7 K22 - 0x8C1C0F17, // 0002 GETMET R7 R7 K23 - 0x88240109, // 0003 GETMBR R9 R0 K9 - 0x5C280200, // 0004 MOVE R10 R1 - 0x5C2C0400, // 0005 MOVE R11 R2 - 0x50300200, // 0006 LDBOOL R12 1 0 - 0x5C340600, // 0007 MOVE R13 R3 - 0x5C380800, // 0008 MOVE R14 R4 - 0x5C3C0A00, // 0009 MOVE R15 R5 - 0x5C400C00, // 000A MOVE R16 R6 - 0x7C1C1200, // 000B CALL R7 9 - 0x80000000, // 000C RET 0 + ( &(const binstruction[12]) { /* code */ + 0x5808000A, // 0000 LDCONST R2 K10 + 0x880C010B, // 0001 GETMBR R3 R0 K11 + 0x780E0006, // 0002 JMPF R3 #000A + 0x60100008, // 0003 GETGBL R4 G8 + 0x8C140309, // 0004 GETMET R5 R1 K9 + 0x5C1C0600, // 0005 MOVE R7 R3 + 0x58200000, // 0006 LDCONST R8 K0 + 0x7C140600, // 0007 CALL R5 3 + 0x7C100200, // 0008 CALL R4 1 + 0x70020000, // 0009 JMP #000B + 0x58100000, // 000A LDCONST R4 K0 + 0x80040800, // 000B RET 1 R4 }) ) ); @@ -346,9 +307,9 @@ be_local_closure(class_Matter_Plugin_publish_event, /* name */ /******************************************************************** -** Solidified function: set_name +** Solidified function: ack_request ********************************************************************/ -be_local_closure(class_Matter_Plugin_set_name, /* name */ +be_local_closure(class_Matter_Plugin_ack_request, /* name */ be_nested_proto( 6, /* nstack */ 2, /* argc */ @@ -359,18 +320,22 @@ be_local_closure(class_Matter_Plugin_set_name, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(set_name), + be_str_weak(ack_request), &be_const_str_solidified, - ( &(const binstruction[ 9]) { /* code */ - 0x88080103, // 0000 GETMBR R2 R0 K3 - 0x20080202, // 0001 NE R2 R1 R2 - 0x780A0003, // 0002 JMPF R2 #0007 - 0x8C080118, // 0003 GETMET R2 R0 K24 - 0x54120038, // 0004 LDINT R4 57 - 0x54160004, // 0005 LDINT R5 5 - 0x7C080600, // 0006 CALL R2 3 - 0x90020601, // 0007 SETMBR R0 K3 R1 - 0x80000000, // 0008 RET 0 + ( &(const binstruction[13]) { /* code */ + 0x8808030C, // 0000 GETMBR R2 R1 K12 + 0x4C0C0000, // 0001 LDNIL R3 + 0x200C0403, // 0002 NE R3 R2 R3 + 0x780E0005, // 0003 JMPF R3 #000A + 0x880C010D, // 0004 GETMBR R3 R0 K13 + 0x880C070E, // 0005 GETMBR R3 R3 K14 + 0x880C070F, // 0006 GETMBR R3 R3 K15 + 0x8C0C0710, // 0007 GETMET R3 R3 K16 + 0x5C140400, // 0008 MOVE R5 R2 + 0x7C0C0400, // 0009 CALL R3 2 + 0x4C0C0000, // 000A LDNIL R3 + 0x90061803, // 000B SETMBR R1 K12 R3 + 0x80000000, // 000C RET 0 }) ) ); @@ -378,26 +343,61 @@ be_local_closure(class_Matter_Plugin_set_name, /* name */ /******************************************************************** -** Solidified function: +** Solidified function: get_cluster_list_sorted ********************************************************************/ -be_local_closure(class_Matter_Plugin__X3Clambda_X3E, /* name */ +be_local_closure(class_Matter_Plugin_get_cluster_list_sorted, /* name */ be_nested_proto( - 3, /* nstack */ + 4, /* nstack */ 1, /* argc */ - 8, /* varg */ + 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(_X3Clambda_X3E), + be_str_weak(get_cluster_list_sorted), &be_const_str_solidified, - ( &(const binstruction[ 4]) { /* code */ - 0x60040008, // 0000 GETGBL R1 G8 - 0x5C080000, // 0001 MOVE R2 R0 - 0x7C040200, // 0002 CALL R1 1 - 0x80040200, // 0003 RET 1 R1 + ( &(const binstruction[ 5]) { /* code */ + 0x8804010D, // 0000 GETMBR R1 R0 K13 + 0x8C040311, // 0001 GETMET R1 R1 K17 + 0x880C0108, // 0002 GETMBR R3 R0 K8 + 0x7C040400, // 0003 CALL R1 2 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(class_Matter_Plugin_init, /* name */ + be_nested_proto( + 8, /* nstack */ + 4, /* argc */ + 10, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + &be_ktab_class_Matter_Plugin, /* shared constants */ + be_str_weak(init), + &be_const_str_solidified, + ( &(const binstruction[11]) { /* code */ + 0x90021A01, // 0000 SETMBR R0 K13 R1 + 0x90020E02, // 0001 SETMBR R0 K7 R2 + 0x8C100112, // 0002 GETMET R4 R0 K18 + 0x5C180600, // 0003 MOVE R6 R3 + 0x7C100400, // 0004 CALL R4 2 + 0x8C100709, // 0005 GETMET R4 R3 K9 + 0x58180013, // 0006 LDCONST R6 K19 + 0x581C0000, // 0007 LDCONST R7 K0 + 0x7C100600, // 0008 CALL R4 3 + 0x90020404, // 0009 SETMBR R0 K2 R4 + 0x80000000, // 000A RET 0 }) ) ); @@ -421,9 +421,9 @@ be_local_closure(class_Matter_Plugin_ui_string_to_conf, /* name */ be_str_weak(ui_string_to_conf), &be_const_str_solidified, ( &(const binstruction[10]) { /* code */ - 0x580C0019, // 0000 LDCONST R3 K25 - 0x8810011A, // 0001 GETMBR R4 R0 K26 - 0x8814011B, // 0002 GETMBR R5 R0 K27 + 0x580C000A, // 0000 LDCONST R3 K10 + 0x8810010B, // 0001 GETMBR R4 R0 K11 + 0x88140114, // 0002 GETMBR R5 R0 K20 0x780A0004, // 0003 JMPF R2 #0009 0x78120003, // 0004 JMPF R4 #0009 0x5C180A00, // 0005 MOVE R6 R5 @@ -438,12 +438,12 @@ be_local_closure(class_Matter_Plugin_ui_string_to_conf, /* name */ /******************************************************************** -** Solidified function: timed_request +** Solidified function: every_250ms ********************************************************************/ -be_local_closure(class_Matter_Plugin_timed_request, /* name */ +be_local_closure(class_Matter_Plugin_every_250ms, /* name */ be_nested_proto( - 5, /* nstack */ - 4, /* argc */ + 4, /* nstack */ + 1, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -451,11 +451,37 @@ be_local_closure(class_Matter_Plugin_timed_request, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(timed_request), + be_str_weak(every_250ms), &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x4C100000, // 0000 LDNIL R4 - 0x80040800, // 0001 RET 1 R4 + ( &(const binstruction[28]) { /* code */ + 0x88040115, // 0000 GETMBR R1 R0 K21 + 0x4C080000, // 0001 LDNIL R2 + 0x1C040202, // 0002 EQ R1 R1 R2 + 0x78060005, // 0003 JMPF R1 #000A + 0xB8062C00, // 0004 GETNGBL R1 K22 + 0x8C040317, // 0005 GETMET R1 R1 K23 + 0x880C0118, // 0006 GETMBR R3 R0 K24 + 0x7C040400, // 0007 CALL R1 2 + 0x90022A01, // 0008 SETMBR R0 K21 R1 + 0x70020010, // 0009 JMP #001B + 0xB8063200, // 000A GETNGBL R1 K25 + 0x8C04031A, // 000B GETMET R1 R1 K26 + 0x880C0115, // 000C GETMBR R3 R0 K21 + 0x7C040400, // 000D CALL R1 2 + 0x7806000B, // 000E JMPF R1 #001B + 0x8804011B, // 000F GETMBR R1 R0 K27 + 0x8808010D, // 0010 GETMBR R2 R0 K13 + 0x8808051B, // 0011 GETMBR R2 R2 K27 + 0x20040202, // 0012 NE R1 R1 R2 + 0x78060001, // 0013 JMPF R1 #0016 + 0x8C04011C, // 0014 GETMET R1 R0 K28 + 0x7C040200, // 0015 CALL R1 1 + 0xB8063200, // 0016 GETNGBL R1 K25 + 0x8C04031D, // 0017 GETMET R1 R1 K29 + 0x880C0118, // 0018 GETMBR R3 R0 K24 + 0x7C040400, // 0019 CALL R1 2 + 0x90022A01, // 001A SETMBR R0 K21 R1 + 0x80000000, // 001B RET 0 }) ) ); @@ -463,12 +489,12 @@ be_local_closure(class_Matter_Plugin_timed_request, /* name */ /******************************************************************** -** Solidified function: init +** Solidified function: publish_event ********************************************************************/ -be_local_closure(class_Matter_Plugin_init, /* name */ +be_local_closure(class_Matter_Plugin_publish_event, /* name */ be_nested_proto( - 8, /* nstack */ - 4, /* argc */ + 17, /* nstack */ + 7, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -476,23 +502,22 @@ be_local_closure(class_Matter_Plugin_init, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(init), + be_str_weak(publish_event), &be_const_str_solidified, - ( &(const binstruction[14]) { /* code */ - 0x90020201, // 0000 SETMBR R0 K1 R1 - 0x90021202, // 0001 SETMBR R0 K9 R2 - 0x8C10011D, // 0002 GETMET R4 R0 K29 - 0x7C100200, // 0003 CALL R4 1 - 0x90023804, // 0004 SETMBR R0 K28 R4 - 0x8C10011E, // 0005 GETMET R4 R0 K30 - 0x5C180600, // 0006 MOVE R6 R3 - 0x7C100400, // 0007 CALL R4 2 - 0x8C10071F, // 0008 GETMET R4 R3 K31 - 0x58180020, // 0009 LDCONST R6 K32 - 0x581C0006, // 000A LDCONST R7 K6 - 0x7C100600, // 000B CALL R4 3 - 0x90020604, // 000C SETMBR R0 K3 R4 - 0x80000000, // 000D RET 0 + ( &(const binstruction[13]) { /* code */ + 0x881C010D, // 0000 GETMBR R7 R0 K13 + 0x881C0F1E, // 0001 GETMBR R7 R7 K30 + 0x8C1C0F1F, // 0002 GETMET R7 R7 K31 + 0x88240107, // 0003 GETMBR R9 R0 K7 + 0x5C280200, // 0004 MOVE R10 R1 + 0x5C2C0400, // 0005 MOVE R11 R2 + 0x50300200, // 0006 LDBOOL R12 1 0 + 0x5C340600, // 0007 MOVE R13 R3 + 0x5C380800, // 0008 MOVE R14 R4 + 0x5C3C0A00, // 0009 MOVE R15 R5 + 0x5C400C00, // 000A MOVE R16 R6 + 0x7C1C1200, // 000B CALL R7 9 + 0x80000000, // 000C RET 0 }) ) ); @@ -500,12 +525,12 @@ be_local_closure(class_Matter_Plugin_init, /* name */ /******************************************************************** -** Solidified function: is_local_device +** Solidified function: subscribe_event ********************************************************************/ -be_local_closure(class_Matter_Plugin_is_local_device, /* name */ +be_local_closure(class_Matter_Plugin_subscribe_event, /* name */ be_nested_proto( - 2, /* nstack */ - 1, /* argc */ + 6, /* nstack */ + 5, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -513,14 +538,11 @@ be_local_closure(class_Matter_Plugin_is_local_device, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(is_local_device), + be_str_weak(subscribe_event), &be_const_str_solidified, - ( &(const binstruction[ 5]) { /* code */ - 0x88040121, // 0000 GETMBR R1 R0 K33 - 0x78060000, // 0001 JMPF R1 #0003 - 0x50040001, // 0002 LDBOOL R1 0 1 - 0x50040200, // 0003 LDBOOL R1 1 0 - 0x80040200, // 0004 RET 1 R1 + ( &(const binstruction[ 2]) { /* code */ + 0x4C140000, // 0000 LDNIL R5 + 0x80040A00, // 0001 RET 1 R5 }) ) ); @@ -528,12 +550,12 @@ be_local_closure(class_Matter_Plugin_is_local_device, /* name */ /******************************************************************** -** Solidified function: consolidate_update_commands +** Solidified function: parse_configuration ********************************************************************/ -be_local_closure(class_Matter_Plugin_consolidate_update_commands, /* name */ +be_local_closure(class_Matter_Plugin_parse_configuration, /* name */ be_nested_proto( 2, /* nstack */ - 1, /* argc */ + 2, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -541,11 +563,10 @@ be_local_closure(class_Matter_Plugin_consolidate_update_commands, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(consolidate_update_commands), + be_str_weak(parse_configuration), &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x88040122, // 0000 GETMBR R1 R0 K34 - 0x80040200, // 0001 RET 1 R1 + ( &(const binstruction[ 1]) { /* code */ + 0x80000000, // 0000 RET 0 }) ) ); @@ -553,12 +574,12 @@ be_local_closure(class_Matter_Plugin_consolidate_update_commands, /* name */ /******************************************************************** -** Solidified function: update_shadow_lazy +** Solidified function: _parse_update_virtual ********************************************************************/ -be_local_closure(class_Matter_Plugin_update_shadow_lazy, /* name */ +be_local_closure(class_Matter_Plugin__parse_update_virtual, /* name */ be_nested_proto( - 3, /* nstack */ - 1, /* argc */ + 12, /* nstack */ + 7, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -566,20 +587,27 @@ be_local_closure(class_Matter_Plugin_update_shadow_lazy, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(update_shadow_lazy), + be_str_weak(_parse_update_virtual), &be_const_str_solidified, - ( &(const binstruction[11]) { /* code */ - 0x88040100, // 0000 GETMBR R1 R0 K0 - 0x88080101, // 0001 GETMBR R2 R0 K1 - 0x88080500, // 0002 GETMBR R2 R2 K0 - 0x20040202, // 0003 NE R1 R1 R2 - 0x78060004, // 0004 JMPF R1 #000A - 0x8C040114, // 0005 GETMET R1 R0 K20 - 0x7C040200, // 0006 CALL R1 1 - 0x88040101, // 0007 GETMBR R1 R0 K1 - 0x88040300, // 0008 GETMBR R1 R1 K0 - 0x90020001, // 0009 SETMBR R0 K0 R1 - 0x80000000, // 000A RET 0 + ( &(const binstruction[18]) { /* code */ + 0x8C1C0309, // 0000 GETMET R7 R1 K9 + 0x5C240400, // 0001 MOVE R9 R2 + 0x7C1C0400, // 0002 CALL R7 2 + 0x4C200000, // 0003 LDNIL R8 + 0x20200E08, // 0004 NE R8 R7 R8 + 0x7822000A, // 0005 JMPF R8 #0011 + 0x5C200800, // 0006 MOVE R8 R4 + 0x5C240E00, // 0007 MOVE R9 R7 + 0x7C200200, // 0008 CALL R8 1 + 0x5C1C1000, // 0009 MOVE R7 R8 + 0x20200E03, // 000A NE R8 R7 R3 + 0x78220003, // 000B JMPF R8 #0010 + 0x8C200120, // 000C GETMET R8 R0 K32 + 0x5C280A00, // 000D MOVE R10 R5 + 0x5C2C0C00, // 000E MOVE R11 R6 + 0x7C200600, // 000F CALL R8 3 + 0x80040E00, // 0010 RET 1 R7 + 0x80040600, // 0011 RET 1 R3 }) ) ); @@ -587,12 +615,12 @@ be_local_closure(class_Matter_Plugin_update_shadow_lazy, /* name */ /******************************************************************** -** Solidified function: get_cluster_list_sorted +** Solidified function: subscribe_attribute ********************************************************************/ -be_local_closure(class_Matter_Plugin_get_cluster_list_sorted, /* name */ +be_local_closure(class_Matter_Plugin_subscribe_attribute, /* name */ be_nested_proto( - 4, /* nstack */ - 1, /* argc */ + 6, /* nstack */ + 5, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -600,14 +628,11 @@ be_local_closure(class_Matter_Plugin_get_cluster_list_sorted, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(get_cluster_list_sorted), + be_str_weak(subscribe_attribute), &be_const_str_solidified, - ( &(const binstruction[ 5]) { /* code */ - 0x88040101, // 0000 GETMBR R1 R0 K1 - 0x8C040323, // 0001 GETMET R1 R1 K35 - 0x880C011C, // 0002 GETMBR R3 R0 K28 - 0x7C040400, // 0003 CALL R1 2 - 0x80040200, // 0004 RET 1 R1 + ( &(const binstruction[ 2]) { /* code */ + 0x4C140000, // 0000 LDNIL R5 + 0x80040A00, // 0001 RET 1 R5 }) ) ); @@ -615,34 +640,48 @@ be_local_closure(class_Matter_Plugin_get_cluster_list_sorted, /* name */ /******************************************************************** -** Solidified function: ui_conf_to_string +** Solidified function: contains_attribute ********************************************************************/ -be_local_closure(class_Matter_Plugin_ui_conf_to_string, /* name */ +be_local_closure(class_Matter_Plugin_contains_attribute, /* name */ be_nested_proto( - 9, /* nstack */ - 2, /* argc */ - 12, /* varg */ + 10, /* nstack */ + 3, /* argc */ + 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(ui_conf_to_string), + be_str_weak(contains_attribute), &be_const_str_solidified, - ( &(const binstruction[12]) { /* code */ - 0x58080019, // 0000 LDCONST R2 K25 - 0x880C011A, // 0001 GETMBR R3 R0 K26 - 0x780E0006, // 0002 JMPF R3 #000A - 0x60100008, // 0003 GETGBL R4 G8 - 0x8C14031F, // 0004 GETMET R5 R1 K31 - 0x5C1C0600, // 0005 MOVE R7 R3 - 0x58200006, // 0006 LDCONST R8 K6 - 0x7C140600, // 0007 CALL R5 3 - 0x7C100200, // 0008 CALL R4 1 - 0x70020000, // 0009 JMP #000B - 0x58100006, // 000A LDCONST R4 K6 - 0x80040800, // 000B RET 1 R4 + ( &(const binstruction[26]) { /* code */ + 0x880C0108, // 0000 GETMBR R3 R0 K8 + 0x8C0C0709, // 0001 GETMET R3 R3 K9 + 0x5C140200, // 0002 MOVE R5 R1 + 0x7C0C0400, // 0003 CALL R3 2 + 0x4C100000, // 0004 LDNIL R4 + 0x20100604, // 0005 NE R4 R3 R4 + 0x78120010, // 0006 JMPF R4 #0018 + 0x58100021, // 0007 LDCONST R4 K33 + 0x6014000C, // 0008 GETGBL R5 G12 + 0x5C180600, // 0009 MOVE R6 R3 + 0x7C140200, // 000A CALL R5 1 + 0x0C140B22, // 000B DIV R5 R5 K34 + 0x14180805, // 000C LT R6 R4 R5 + 0x781A0009, // 000D JMPF R6 #0018 + 0x8C180723, // 000E GETMET R6 R3 K35 + 0x08200922, // 000F MUL R8 R4 K34 + 0x5425FFFD, // 0010 LDINT R9 -2 + 0x7C180600, // 0011 CALL R6 3 + 0x1C180C02, // 0012 EQ R6 R6 R2 + 0x781A0001, // 0013 JMPF R6 #0016 + 0x50180200, // 0014 LDBOOL R6 1 0 + 0x80040C00, // 0015 RET 1 R6 + 0x00100924, // 0016 ADD R4 R4 K36 + 0x7001FFF3, // 0017 JMP #000C + 0x50100000, // 0018 LDBOOL R4 0 0 + 0x80040800, // 0019 RET 1 R4 }) ) ); @@ -650,12 +689,12 @@ be_local_closure(class_Matter_Plugin_ui_conf_to_string, /* name */ /******************************************************************** -** Solidified function: attribute_updated +** Solidified function: get_clusters ********************************************************************/ -be_local_closure(class_Matter_Plugin_attribute_updated, /* name */ +be_local_closure(class_Matter_Plugin_get_clusters, /* name */ be_nested_proto( - 10, /* nstack */ - 4, /* argc */ + 2, /* nstack */ + 1, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -663,17 +702,11 @@ be_local_closure(class_Matter_Plugin_attribute_updated, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(attribute_updated), + be_str_weak(get_clusters), &be_const_str_solidified, - ( &(const binstruction[ 8]) { /* code */ - 0x88100101, // 0000 GETMBR R4 R0 K1 - 0x8C100918, // 0001 GETMET R4 R4 K24 - 0x88180109, // 0002 GETMBR R6 R0 K9 - 0x5C1C0200, // 0003 MOVE R7 R1 - 0x5C200400, // 0004 MOVE R8 R2 - 0x5C240600, // 0005 MOVE R9 R3 - 0x7C100A00, // 0006 CALL R4 5 - 0x80000000, // 0007 RET 0 + ( &(const binstruction[ 2]) { /* code */ + 0x88040108, // 0000 GETMBR R1 R0 K8 + 0x80040200, // 0001 RET 1 R1 }) ) ); @@ -681,23 +714,26 @@ be_local_closure(class_Matter_Plugin_attribute_updated, /* name */ /******************************************************************** -** Solidified function: update_virtual +** Solidified function: ********************************************************************/ -be_local_closure(class_Matter_Plugin_update_virtual, /* name */ +be_local_closure(class_Matter_Plugin__X3Clambda_X3E, /* name */ be_nested_proto( - 2, /* nstack */ - 2, /* argc */ - 10, /* varg */ + 3, /* nstack */ + 1, /* argc */ + 8, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(update_virtual), + be_str_weak(_X3Clambda_X3E), &be_const_str_solidified, - ( &(const binstruction[ 1]) { /* code */ - 0x80000000, // 0000 RET 0 + ( &(const binstruction[ 4]) { /* code */ + 0x60040008, // 0000 GETGBL R1 G8 + 0x5C080000, // 0001 MOVE R2 R0 + 0x7C040200, // 0002 CALL R1 1 + 0x80040200, // 0003 RET 1 R1 }) ) ); @@ -705,12 +741,12 @@ be_local_closure(class_Matter_Plugin_update_virtual, /* name */ /******************************************************************** -** Solidified function: _parse_update_virtual +** Solidified function: update_shadow_lazy ********************************************************************/ -be_local_closure(class_Matter_Plugin__parse_update_virtual, /* name */ +be_local_closure(class_Matter_Plugin_update_shadow_lazy, /* name */ be_nested_proto( - 12, /* nstack */ - 7, /* argc */ + 3, /* nstack */ + 1, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -718,27 +754,20 @@ be_local_closure(class_Matter_Plugin__parse_update_virtual, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(_parse_update_virtual), + be_str_weak(update_shadow_lazy), &be_const_str_solidified, - ( &(const binstruction[18]) { /* code */ - 0x8C1C031F, // 0000 GETMET R7 R1 K31 - 0x5C240400, // 0001 MOVE R9 R2 - 0x7C1C0400, // 0002 CALL R7 2 - 0x4C200000, // 0003 LDNIL R8 - 0x20200E08, // 0004 NE R8 R7 R8 - 0x7822000A, // 0005 JMPF R8 #0011 - 0x5C200800, // 0006 MOVE R8 R4 - 0x5C240E00, // 0007 MOVE R9 R7 - 0x7C200200, // 0008 CALL R8 1 - 0x5C1C1000, // 0009 MOVE R7 R8 - 0x20200E03, // 000A NE R8 R7 R3 - 0x78220003, // 000B JMPF R8 #0010 - 0x8C200118, // 000C GETMET R8 R0 K24 - 0x5C280A00, // 000D MOVE R10 R5 - 0x5C2C0C00, // 000E MOVE R11 R6 - 0x7C200600, // 000F CALL R8 3 - 0x80040E00, // 0010 RET 1 R7 - 0x80040600, // 0011 RET 1 R3 + ( &(const binstruction[11]) { /* code */ + 0x8804011B, // 0000 GETMBR R1 R0 K27 + 0x8808010D, // 0001 GETMBR R2 R0 K13 + 0x8808051B, // 0002 GETMBR R2 R2 K27 + 0x20040202, // 0003 NE R1 R1 R2 + 0x78060004, // 0004 JMPF R1 #000A + 0x8C04011C, // 0005 GETMET R1 R0 K28 + 0x7C040200, // 0006 CALL R1 1 + 0x8804010D, // 0007 GETMBR R1 R0 K13 + 0x8804031B, // 0008 GETMBR R1 R1 K27 + 0x90023601, // 0009 SETMBR R0 K27 R1 + 0x80000000, // 000A RET 0 }) ) ); @@ -746,12 +775,12 @@ be_local_closure(class_Matter_Plugin__parse_update_virtual, /* name */ /******************************************************************** -** Solidified function: parse_configuration +** Solidified function: consolidate_update_commands ********************************************************************/ -be_local_closure(class_Matter_Plugin_parse_configuration, /* name */ +be_local_closure(class_Matter_Plugin_consolidate_update_commands, /* name */ be_nested_proto( 2, /* nstack */ - 2, /* argc */ + 1, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -759,10 +788,11 @@ be_local_closure(class_Matter_Plugin_parse_configuration, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(parse_configuration), + be_str_weak(consolidate_update_commands), &be_const_str_solidified, - ( &(const binstruction[ 1]) { /* code */ - 0x80000000, // 0000 RET 0 + ( &(const binstruction[ 2]) { /* code */ + 0x88040125, // 0000 GETMBR R1 R0 K37 + 0x80040200, // 0001 RET 1 R1 }) ) ); @@ -770,12 +800,12 @@ be_local_closure(class_Matter_Plugin_parse_configuration, /* name */ /******************************************************************** -** Solidified function: get_name +** Solidified function: publish_command ********************************************************************/ -be_local_closure(class_Matter_Plugin_get_name, /* name */ +be_local_closure(class_Matter_Plugin_publish_command, /* name */ be_nested_proto( - 2, /* nstack */ - 1, /* argc */ + 16, /* nstack */ + 7, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -783,11 +813,55 @@ be_local_closure(class_Matter_Plugin_get_name, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(get_name), + be_str_weak(publish_command), &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x88040103, // 0000 GETMBR R1 R0 K3 - 0x80040200, // 0001 RET 1 R1 + ( &(const binstruction[46]) { /* code */ + 0xA41E0200, // 0000 IMPORT R7 K1 + 0x60200018, // 0001 GETGBL R8 G24 + 0x58240026, // 0002 LDCONST R9 K38 + 0x8C280F04, // 0003 GETMET R10 R7 K4 + 0x5C300200, // 0004 MOVE R12 R1 + 0x7C280400, // 0005 CALL R10 2 + 0x8C2C0F04, // 0006 GETMET R11 R7 K4 + 0x5C340400, // 0007 MOVE R13 R2 + 0x7C2C0400, // 0008 CALL R11 2 + 0x7C200600, // 0009 CALL R8 3 + 0x4C240000, // 000A LDNIL R9 + 0x20240609, // 000B NE R9 R3 R9 + 0x7826000A, // 000C JMPF R9 #0018 + 0x60240018, // 000D GETGBL R9 G24 + 0x58280027, // 000E LDCONST R10 K39 + 0x5C2C1000, // 000F MOVE R11 R8 + 0x8C300F04, // 0010 GETMET R12 R7 K4 + 0x5C380600, // 0011 MOVE R14 R3 + 0x7C300400, // 0012 CALL R12 2 + 0x8C340F04, // 0013 GETMET R13 R7 K4 + 0x5C3C0800, // 0014 MOVE R15 R4 + 0x7C340400, // 0015 CALL R13 2 + 0x7C240800, // 0016 CALL R9 4 + 0x5C201200, // 0017 MOVE R8 R9 + 0x4C240000, // 0018 LDNIL R9 + 0x20240A09, // 0019 NE R9 R5 R9 + 0x7826000A, // 001A JMPF R9 #0026 + 0x60240018, // 001B GETGBL R9 G24 + 0x58280027, // 001C LDCONST R10 K39 + 0x5C2C1000, // 001D MOVE R11 R8 + 0x8C300F04, // 001E GETMET R12 R7 K4 + 0x5C380A00, // 001F MOVE R14 R5 + 0x7C300400, // 0020 CALL R12 2 + 0x8C340F04, // 0021 GETMET R13 R7 K4 + 0x5C3C0C00, // 0022 MOVE R15 R6 + 0x7C340400, // 0023 CALL R13 2 + 0x7C240800, // 0024 CALL R9 4 + 0x5C201200, // 0025 MOVE R8 R9 + 0xB8262C00, // 0026 GETNGBL R9 K22 + 0x8C241328, // 0027 GETMET R9 R9 K40 + 0x582C0029, // 0028 LDCONST R11 K41 + 0x88300107, // 0029 GETMBR R12 R0 K7 + 0x88340102, // 002A GETMBR R13 R0 K2 + 0x5C381000, // 002B MOVE R14 R8 + 0x7C240A00, // 002C CALL R9 5 + 0x80000000, // 002D RET 0 }) ) ); @@ -795,12 +869,12 @@ be_local_closure(class_Matter_Plugin_get_name, /* name */ /******************************************************************** -** Solidified function: get_endpoint +** Solidified function: contains_cluster ********************************************************************/ -be_local_closure(class_Matter_Plugin_get_endpoint, /* name */ +be_local_closure(class_Matter_Plugin_contains_cluster, /* name */ be_nested_proto( - 2, /* nstack */ - 1, /* argc */ + 5, /* nstack */ + 2, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -808,11 +882,14 @@ be_local_closure(class_Matter_Plugin_get_endpoint, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(get_endpoint), + be_str_weak(contains_cluster), &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x88040109, // 0000 GETMBR R1 R0 K9 - 0x80040200, // 0001 RET 1 R1 + ( &(const binstruction[ 5]) { /* code */ + 0x88080108, // 0000 GETMBR R2 R0 K8 + 0x8C08052A, // 0001 GETMET R2 R2 K42 + 0x5C100200, // 0002 MOVE R4 R1 + 0x7C080400, // 0003 CALL R2 2 + 0x80040400, // 0004 RET 1 R2 }) ) ); @@ -820,12 +897,12 @@ be_local_closure(class_Matter_Plugin_get_endpoint, /* name */ /******************************************************************** -** Solidified function: contains_attribute +** Solidified function: set_name ********************************************************************/ -be_local_closure(class_Matter_Plugin_contains_attribute, /* name */ +be_local_closure(class_Matter_Plugin_set_name, /* name */ be_nested_proto( - 7, /* nstack */ - 3, /* argc */ + 6, /* nstack */ + 2, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -833,31 +910,18 @@ be_local_closure(class_Matter_Plugin_contains_attribute, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(contains_attribute), + be_str_weak(set_name), &be_const_str_solidified, - ( &(const binstruction[22]) { /* code */ - 0x880C011C, // 0000 GETMBR R3 R0 K28 - 0x8C0C071F, // 0001 GETMET R3 R3 K31 - 0x5C140200, // 0002 MOVE R5 R1 - 0x7C0C0400, // 0003 CALL R3 2 - 0x4C100000, // 0004 LDNIL R4 - 0x20100604, // 0005 NE R4 R3 R4 - 0x7812000C, // 0006 JMPF R4 #0014 - 0x58100024, // 0007 LDCONST R4 K36 - 0x6014000C, // 0008 GETGBL R5 G12 - 0x5C180600, // 0009 MOVE R6 R3 - 0x7C140200, // 000A CALL R5 1 - 0x14140805, // 000B LT R5 R4 R5 - 0x78160006, // 000C JMPF R5 #0014 - 0x94140604, // 000D GETIDX R5 R3 R4 - 0x1C140A02, // 000E EQ R5 R5 R2 - 0x78160001, // 000F JMPF R5 #0012 - 0x50140200, // 0010 LDBOOL R5 1 0 - 0x80040A00, // 0011 RET 1 R5 - 0x00100925, // 0012 ADD R4 R4 K37 - 0x7001FFF3, // 0013 JMP #0008 - 0x50100000, // 0014 LDBOOL R4 0 0 - 0x80040800, // 0015 RET 1 R4 + ( &(const binstruction[ 9]) { /* code */ + 0x88080102, // 0000 GETMBR R2 R0 K2 + 0x20080202, // 0001 NE R2 R1 R2 + 0x780A0003, // 0002 JMPF R2 #0007 + 0x8C080120, // 0003 GETMET R2 R0 K32 + 0x54120038, // 0004 LDINT R4 57 + 0x54160004, // 0005 LDINT R5 5 + 0x7C080600, // 0006 CALL R2 3 + 0x90020401, // 0007 SETMBR R0 K2 R1 + 0x80000000, // 0008 RET 0 }) ) ); @@ -865,12 +929,12 @@ be_local_closure(class_Matter_Plugin_contains_attribute, /* name */ /******************************************************************** -** Solidified function: subscribe_event +** Solidified function: get_endpoint ********************************************************************/ -be_local_closure(class_Matter_Plugin_subscribe_event, /* name */ +be_local_closure(class_Matter_Plugin_get_endpoint, /* name */ be_nested_proto( - 6, /* nstack */ - 5, /* argc */ + 2, /* nstack */ + 1, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -878,11 +942,11 @@ be_local_closure(class_Matter_Plugin_subscribe_event, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(subscribe_event), + be_str_weak(get_endpoint), &be_const_str_solidified, ( &(const binstruction[ 2]) { /* code */ - 0x4C140000, // 0000 LDNIL R5 - 0x80040A00, // 0001 RET 1 R5 + 0x88040107, // 0000 GETMBR R1 R0 K7 + 0x80040200, // 0001 RET 1 R1 }) ) ); @@ -890,12 +954,12 @@ be_local_closure(class_Matter_Plugin_subscribe_event, /* name */ /******************************************************************** -** Solidified function: read_event +** Solidified function: write_attribute ********************************************************************/ -be_local_closure(class_Matter_Plugin_read_event, /* name */ +be_local_closure(class_Matter_Plugin_write_attribute, /* name */ be_nested_proto( - 6, /* nstack */ - 5, /* argc */ + 5, /* nstack */ + 4, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -903,11 +967,11 @@ be_local_closure(class_Matter_Plugin_read_event, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(read_event), + be_str_weak(write_attribute), &be_const_str_solidified, ( &(const binstruction[ 2]) { /* code */ - 0x4C140000, // 0000 LDNIL R5 - 0x80040A00, // 0001 RET 1 R5 + 0x4C100000, // 0000 LDNIL R4 + 0x80040800, // 0001 RET 1 R4 }) ) ); @@ -915,12 +979,12 @@ be_local_closure(class_Matter_Plugin_read_event, /* name */ /******************************************************************** -** Solidified function: parse_sensors +** Solidified function: update_shadow ********************************************************************/ -be_local_closure(class_Matter_Plugin_parse_sensors, /* name */ +be_local_closure(class_Matter_Plugin_update_shadow, /* name */ be_nested_proto( 2, /* nstack */ - 2, /* argc */ + 1, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -928,10 +992,13 @@ be_local_closure(class_Matter_Plugin_parse_sensors, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(parse_sensors), + be_str_weak(update_shadow), &be_const_str_solidified, - ( &(const binstruction[ 1]) { /* code */ - 0x80000000, // 0000 RET 0 + ( &(const binstruction[ 4]) { /* code */ + 0x8804010D, // 0000 GETMBR R1 R0 K13 + 0x8804031B, // 0001 GETMBR R1 R1 K27 + 0x90023601, // 0002 SETMBR R0 K27 R1 + 0x80000000, // 0003 RET 0 }) ) ); @@ -939,12 +1006,12 @@ be_local_closure(class_Matter_Plugin_parse_sensors, /* name */ /******************************************************************** -** Solidified function: get_attribute_list +** Solidified function: invoke_request ********************************************************************/ -be_local_closure(class_Matter_Plugin_get_attribute_list, /* name */ +be_local_closure(class_Matter_Plugin_invoke_request, /* name */ be_nested_proto( - 6, /* nstack */ - 2, /* argc */ + 5, /* nstack */ + 4, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -952,16 +1019,11 @@ be_local_closure(class_Matter_Plugin_get_attribute_list, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(get_attribute_list), + be_str_weak(invoke_request), &be_const_str_solidified, - ( &(const binstruction[ 7]) { /* code */ - 0x8808011C, // 0000 GETMBR R2 R0 K28 - 0x8C08051F, // 0001 GETMET R2 R2 K31 - 0x5C100200, // 0002 MOVE R4 R1 - 0x60140012, // 0003 GETGBL R5 G18 - 0x7C140000, // 0004 CALL R5 0 - 0x7C080600, // 0005 CALL R2 3 - 0x80040400, // 0006 RET 1 R2 + ( &(const binstruction[ 2]) { /* code */ + 0x4C100000, // 0000 LDNIL R4 + 0x80040800, // 0001 RET 1 R4 }) ) ); @@ -969,12 +1031,12 @@ be_local_closure(class_Matter_Plugin_get_attribute_list, /* name */ /******************************************************************** -** Solidified function: publish_command +** Solidified function: attribute_updated ********************************************************************/ -be_local_closure(class_Matter_Plugin_publish_command, /* name */ +be_local_closure(class_Matter_Plugin_attribute_updated, /* name */ be_nested_proto( - 16, /* nstack */ - 7, /* argc */ + 10, /* nstack */ + 4, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -982,55 +1044,17 @@ be_local_closure(class_Matter_Plugin_publish_command, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(publish_command), + be_str_weak(attribute_updated), &be_const_str_solidified, - ( &(const binstruction[46]) { /* code */ - 0xA41E0400, // 0000 IMPORT R7 K2 - 0x60200018, // 0001 GETGBL R8 G24 - 0x58240026, // 0002 LDCONST R9 K38 - 0x8C280F05, // 0003 GETMET R10 R7 K5 - 0x5C300200, // 0004 MOVE R12 R1 - 0x7C280400, // 0005 CALL R10 2 - 0x8C2C0F05, // 0006 GETMET R11 R7 K5 - 0x5C340400, // 0007 MOVE R13 R2 - 0x7C2C0400, // 0008 CALL R11 2 - 0x7C200600, // 0009 CALL R8 3 - 0x4C240000, // 000A LDNIL R9 - 0x20240609, // 000B NE R9 R3 R9 - 0x7826000A, // 000C JMPF R9 #0018 - 0x60240018, // 000D GETGBL R9 G24 - 0x58280027, // 000E LDCONST R10 K39 - 0x5C2C1000, // 000F MOVE R11 R8 - 0x8C300F05, // 0010 GETMET R12 R7 K5 - 0x5C380600, // 0011 MOVE R14 R3 - 0x7C300400, // 0012 CALL R12 2 - 0x8C340F05, // 0013 GETMET R13 R7 K5 - 0x5C3C0800, // 0014 MOVE R15 R4 - 0x7C340400, // 0015 CALL R13 2 - 0x7C240800, // 0016 CALL R9 4 - 0x5C201200, // 0017 MOVE R8 R9 - 0x4C240000, // 0018 LDNIL R9 - 0x20240A09, // 0019 NE R9 R5 R9 - 0x7826000A, // 001A JMPF R9 #0026 - 0x60240018, // 001B GETGBL R9 G24 - 0x58280027, // 001C LDCONST R10 K39 - 0x5C2C1000, // 001D MOVE R11 R8 - 0x8C300F05, // 001E GETMET R12 R7 K5 - 0x5C380A00, // 001F MOVE R14 R5 - 0x7C300400, // 0020 CALL R12 2 - 0x8C340F05, // 0021 GETMET R13 R7 K5 - 0x5C3C0C00, // 0022 MOVE R15 R6 - 0x7C340400, // 0023 CALL R13 2 - 0x7C240800, // 0024 CALL R9 4 - 0x5C201200, // 0025 MOVE R8 R9 - 0xB8261E00, // 0026 GETNGBL R9 K15 - 0x8C241328, // 0027 GETMET R9 R9 K40 - 0x582C0029, // 0028 LDCONST R11 K41 - 0x88300109, // 0029 GETMBR R12 R0 K9 - 0x88340103, // 002A GETMBR R13 R0 K3 - 0x5C381000, // 002B MOVE R14 R8 - 0x7C240A00, // 002C CALL R9 5 - 0x80000000, // 002D RET 0 + ( &(const binstruction[ 8]) { /* code */ + 0x8810010D, // 0000 GETMBR R4 R0 K13 + 0x8C100920, // 0001 GETMET R4 R4 K32 + 0x88180107, // 0002 GETMBR R6 R0 K7 + 0x5C1C0200, // 0003 MOVE R7 R1 + 0x5C200400, // 0004 MOVE R8 R2 + 0x5C240600, // 0005 MOVE R9 R3 + 0x7C100A00, // 0006 CALL R4 5 + 0x80000000, // 0007 RET 0 }) ) ); @@ -1038,9 +1062,9 @@ be_local_closure(class_Matter_Plugin_publish_command, /* name */ /******************************************************************** -** Solidified function: get_clusters +** Solidified function: is_local_device ********************************************************************/ -be_local_closure(class_Matter_Plugin_get_clusters, /* name */ +be_local_closure(class_Matter_Plugin_is_local_device, /* name */ be_nested_proto( 2, /* nstack */ 1, /* argc */ @@ -1051,11 +1075,14 @@ be_local_closure(class_Matter_Plugin_get_clusters, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(get_clusters), + be_str_weak(is_local_device), &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x8804012A, // 0000 GETMBR R1 R0 K42 - 0x80040200, // 0001 RET 1 R1 + ( &(const binstruction[ 5]) { /* code */ + 0x8804012B, // 0000 GETMBR R1 R0 K43 + 0x78060000, // 0001 JMPF R1 #0003 + 0x50040001, // 0002 LDBOOL R1 0 1 + 0x50040200, // 0003 LDBOOL R1 1 0 + 0x80040200, // 0004 RET 1 R1 }) ) ); @@ -1063,12 +1090,12 @@ be_local_closure(class_Matter_Plugin_get_clusters, /* name */ /******************************************************************** -** Solidified function: contains_cluster +** Solidified function: read_event ********************************************************************/ -be_local_closure(class_Matter_Plugin_contains_cluster, /* name */ +be_local_closure(class_Matter_Plugin_read_event, /* name */ be_nested_proto( - 5, /* nstack */ - 2, /* argc */ + 6, /* nstack */ + 5, /* argc */ 10, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -1076,14 +1103,11 @@ be_local_closure(class_Matter_Plugin_contains_cluster, /* name */ NULL, /* no sub protos */ 1, /* has constants */ &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(contains_cluster), + be_str_weak(read_event), &be_const_str_solidified, - ( &(const binstruction[ 5]) { /* code */ - 0x8808011C, // 0000 GETMBR R2 R0 K28 - 0x8C08052B, // 0001 GETMET R2 R2 K43 - 0x5C100200, // 0002 MOVE R4 R1 - 0x7C080400, // 0003 CALL R2 2 - 0x80040400, // 0004 RET 1 R2 + ( &(const binstruction[ 2]) { /* code */ + 0x4C140000, // 0000 LDNIL R5 + 0x80040A00, // 0001 RET 1 R5 }) ) ); @@ -1095,7 +1119,7 @@ be_local_closure(class_Matter_Plugin_contains_cluster, /* name */ ********************************************************************/ be_local_closure(class_Matter_Plugin_read_attribute, /* name */ be_nested_proto( - 17, /* nstack */ + 19, /* nstack */ 4, /* argc */ 10, /* varg */ 0, /* has upvals */ @@ -1106,15 +1130,15 @@ be_local_closure(class_Matter_Plugin_read_attribute, /* name */ &be_ktab_class_Matter_Plugin, /* shared constants */ be_str_weak(read_attribute), &be_const_str_solidified, - ( &(const binstruction[161]) { /* code */ - 0xB8121E00, // 0000 GETNGBL R4 K15 + ( &(const binstruction[169]) { /* code */ + 0xB8122C00, // 0000 GETNGBL R4 K22 0x8810092C, // 0001 GETMBR R4 R4 K44 0x8814052D, // 0002 GETMBR R5 R2 K45 0x8818052E, // 0003 GETMBR R6 R2 K46 0x541E001C, // 0004 LDINT R7 29 0x1C1C0A07, // 0005 EQ R7 R5 R7 0x781E0050, // 0006 JMPF R7 #0058 - 0x1C1C0D24, // 0007 EQ R7 R6 K36 + 0x1C1C0D21, // 0007 EQ R7 R6 K33 0x781E001B, // 0008 JMPF R7 #0025 0x8C1C092F, // 0009 GETMET R7 R4 K47 0x7C1C0200, // 000A CALL R7 1 @@ -1129,12 +1153,12 @@ be_local_closure(class_Matter_Plugin_read_attribute, /* name */ 0x8C2C0F32, // 0013 GETMET R11 R7 K50 0x7C2C0200, // 0014 CALL R11 1 0x8C301733, // 0015 GETMET R12 R11 K51 - 0x58380024, // 0016 LDCONST R14 K36 + 0x58380021, // 0016 LDCONST R14 K33 0x883C0934, // 0017 GETMBR R15 R4 K52 0x5C401400, // 0018 MOVE R16 R10 0x7C300800, // 0019 CALL R12 4 0x8C301733, // 001A GETMET R12 R11 K51 - 0x58380025, // 001B LDCONST R14 K37 + 0x58380024, // 001B LDCONST R14 K36 0x883C0934, // 001C GETMBR R15 R4 K52 0x9440100A, // 001D GETIDX R16 R8 R10 0x7C300800, // 001E CALL R12 4 @@ -1144,7 +1168,7 @@ be_local_closure(class_Matter_Plugin_read_attribute, /* name */ 0xB0080000, // 0022 RAISE 2 R0 R0 0x80040E00, // 0023 RET 1 R7 0x70020032, // 0024 JMP #0058 - 0x1C1C0D25, // 0025 EQ R7 R6 K37 + 0x1C1C0D24, // 0025 EQ R7 R6 K36 0x781E0013, // 0026 JMPF R7 #003B 0x8C1C092F, // 0027 GETMET R7 R4 K47 0x7C1C0200, // 0028 CALL R7 1 @@ -1166,13 +1190,13 @@ be_local_closure(class_Matter_Plugin_read_attribute, /* name */ 0xB0080000, // 0038 RAISE 2 R0 R0 0x80040E00, // 0039 RET 1 R7 0x7002001C, // 003A JMP #0058 - 0x1C1C0D38, // 003B EQ R7 R6 K56 + 0x1C1C0D22, // 003B EQ R7 R6 K34 0x781E0003, // 003C JMPF R7 #0041 0x8C1C092F, // 003D GETMET R7 R4 K47 0x7C1C0200, // 003E CALL R7 1 0x80040E00, // 003F RET 1 R7 0x70020016, // 0040 JMP #0058 - 0x1C1C0D39, // 0041 EQ R7 R6 K57 + 0x1C1C0D38, // 0041 EQ R7 R6 K56 0x781E0003, // 0042 JMPF R7 #0047 0x8C1C092F, // 0043 GETMET R7 R4 K47 0x7C1C0200, // 0044 CALL R7 1 @@ -1181,18 +1205,18 @@ be_local_closure(class_Matter_Plugin_read_attribute, /* name */ 0x541EFFFB, // 0047 LDINT R7 65532 0x1C1C0C07, // 0048 EQ R7 R6 R7 0x781E0005, // 0049 JMPF R7 #0050 - 0x8C1C073A, // 004A GETMET R7 R3 K58 + 0x8C1C0739, // 004A GETMET R7 R3 K57 0x88240937, // 004B GETMBR R9 R4 K55 - 0x58280024, // 004C LDCONST R10 K36 + 0x58280021, // 004C LDCONST R10 K33 0x7C1C0600, // 004D CALL R7 3 0x80040E00, // 004E RET 1 R7 0x70020007, // 004F JMP #0058 0x541EFFFC, // 0050 LDINT R7 65533 0x1C1C0C07, // 0051 EQ R7 R6 R7 0x781E0004, // 0052 JMPF R7 #0058 - 0x8C1C073A, // 0053 GETMET R7 R3 K58 + 0x8C1C0739, // 0053 GETMET R7 R3 K57 0x88240937, // 0054 GETMBR R9 R4 K55 - 0x58280025, // 0055 LDCONST R10 K37 + 0x58280024, // 0055 LDCONST R10 K36 0x7C1C0600, // 0056 CALL R7 3 0x80040E00, // 0057 RET 1 R7 0x541EFFF7, // 0058 LDINT R7 65528 @@ -1201,98 +1225,81 @@ be_local_closure(class_Matter_Plugin_read_attribute, /* name */ 0x8C1C092F, // 005B GETMET R7 R4 K47 0x7C1C0200, // 005C CALL R7 1 0x80040E00, // 005D RET 1 R7 - 0x7002003F, // 005E JMP #009F + 0x70020047, // 005E JMP #00A7 0x541EFFFA, // 005F LDINT R7 65531 0x1C1C0C07, // 0060 EQ R7 R6 R7 - 0x781E0013, // 0061 JMPF R7 #0076 + 0x781E001B, // 0061 JMPF R7 #007E 0x8C1C092F, // 0062 GETMET R7 R4 K47 0x7C1C0200, // 0063 CALL R7 1 - 0x8C20013B, // 0064 GETMET R8 R0 K59 + 0x8C20013A, // 0064 GETMET R8 R0 K58 0x5C280A00, // 0065 MOVE R10 R5 0x7C200400, // 0066 CALL R8 2 - 0x58240024, // 0067 LDCONST R9 K36 - 0x6028000C, // 0068 GETGBL R10 G12 - 0x5C2C1000, // 0069 MOVE R11 R8 - 0x7C280200, // 006A CALL R10 1 - 0x1428120A, // 006B LT R10 R9 R10 - 0x782A0006, // 006C JMPF R10 #0074 - 0x8C280F33, // 006D GETMET R10 R7 K51 - 0x4C300000, // 006E LDNIL R12 - 0x88340934, // 006F GETMBR R13 R4 K52 - 0x94381009, // 0070 GETIDX R14 R8 R9 - 0x7C280800, // 0071 CALL R10 4 - 0x00241325, // 0072 ADD R9 R9 K37 - 0x7001FFF3, // 0073 JMP #0068 - 0x80040E00, // 0074 RET 1 R7 - 0x70020028, // 0075 JMP #009F - 0x541EFFF9, // 0076 LDINT R7 65530 - 0x1C1C0C07, // 0077 EQ R7 R6 R7 - 0x781E0003, // 0078 JMPF R7 #007D - 0x8C1C092F, // 0079 GETMET R7 R4 K47 - 0x7C1C0200, // 007A CALL R7 1 - 0x80040E00, // 007B RET 1 R7 - 0x70020021, // 007C JMP #009F - 0x541EFFF8, // 007D LDINT R7 65529 - 0x1C1C0C07, // 007E EQ R7 R6 R7 - 0x781E0003, // 007F JMPF R7 #0084 - 0x8C1C092F, // 0080 GETMET R7 R4 K47 - 0x7C1C0200, // 0081 CALL R7 1 - 0x80040E00, // 0082 RET 1 R7 - 0x7002001A, // 0083 JMP #009F - 0x541EFFFB, // 0084 LDINT R7 65532 - 0x1C1C0C07, // 0085 EQ R7 R6 R7 - 0x781E000A, // 0086 JMPF R7 #0092 - 0x881C013C, // 0087 GETMBR R7 R0 K60 - 0x8C1C0F1F, // 0088 GETMET R7 R7 K31 - 0x5C240A00, // 0089 MOVE R9 R5 - 0x58280024, // 008A LDCONST R10 K36 - 0x7C1C0600, // 008B CALL R7 3 - 0x8C20073A, // 008C GETMET R8 R3 K58 - 0x88280937, // 008D GETMBR R10 R4 K55 - 0x5C2C0E00, // 008E MOVE R11 R7 - 0x7C200600, // 008F CALL R8 3 - 0x80041000, // 0090 RET 1 R8 - 0x7002000C, // 0091 JMP #009F - 0x541EFFFC, // 0092 LDINT R7 65533 - 0x1C1C0C07, // 0093 EQ R7 R6 R7 - 0x781E0009, // 0094 JMPF R7 #009F - 0x881C013D, // 0095 GETMBR R7 R0 K61 - 0x8C1C0F1F, // 0096 GETMET R7 R7 K31 - 0x5C240A00, // 0097 MOVE R9 R5 - 0x58280025, // 0098 LDCONST R10 K37 - 0x7C1C0600, // 0099 CALL R7 3 - 0x8C20073A, // 009A GETMET R8 R3 K58 - 0x88280937, // 009B GETMBR R10 R4 K55 - 0x5C2C0E00, // 009C MOVE R11 R7 - 0x7C200600, // 009D CALL R8 3 - 0x80041000, // 009E RET 1 R8 - 0x4C1C0000, // 009F LDNIL R7 - 0x80040E00, // 00A0 RET 1 R7 - }) - ) -); -/*******************************************************************/ - - -/******************************************************************** -** Solidified function: subscribe_attribute -********************************************************************/ -be_local_closure(class_Matter_Plugin_subscribe_attribute, /* name */ - be_nested_proto( - 6, /* nstack */ - 5, /* argc */ - 10, /* varg */ - 0, /* has upvals */ - NULL, /* no upvals */ - 0, /* has sup protos */ - NULL, /* no sub protos */ - 1, /* has constants */ - &be_ktab_class_Matter_Plugin, /* shared constants */ - be_str_weak(subscribe_attribute), - &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0x4C140000, // 0000 LDNIL R5 - 0x80040A00, // 0001 RET 1 R5 + 0x4C240000, // 0067 LDNIL R9 + 0x20241009, // 0068 NE R9 R8 R9 + 0x78260003, // 0069 JMPF R9 #006E + 0x6024000C, // 006A GETGBL R9 G12 + 0x5C281000, // 006B MOVE R10 R8 + 0x7C240200, // 006C CALL R9 1 + 0x70020000, // 006D JMP #006F + 0x58240021, // 006E LDCONST R9 K33 + 0x58280021, // 006F LDCONST R10 K33 + 0x142C1409, // 0070 LT R11 R10 R9 + 0x782E0009, // 0071 JMPF R11 #007C + 0x8C2C0F33, // 0072 GETMET R11 R7 K51 + 0x4C340000, // 0073 LDNIL R13 + 0x88380934, // 0074 GETMBR R14 R4 K52 + 0x8C3C1123, // 0075 GETMET R15 R8 K35 + 0x08441522, // 0076 MUL R17 R10 K34 + 0x5449FFFD, // 0077 LDINT R18 -2 + 0x7C3C0600, // 0078 CALL R15 3 + 0x7C2C0800, // 0079 CALL R11 4 + 0x00281524, // 007A ADD R10 R10 K36 + 0x7001FFF3, // 007B JMP #0070 + 0x80040E00, // 007C RET 1 R7 + 0x70020028, // 007D JMP #00A7 + 0x541EFFF9, // 007E LDINT R7 65530 + 0x1C1C0C07, // 007F EQ R7 R6 R7 + 0x781E0003, // 0080 JMPF R7 #0085 + 0x8C1C092F, // 0081 GETMET R7 R4 K47 + 0x7C1C0200, // 0082 CALL R7 1 + 0x80040E00, // 0083 RET 1 R7 + 0x70020021, // 0084 JMP #00A7 + 0x541EFFF8, // 0085 LDINT R7 65529 + 0x1C1C0C07, // 0086 EQ R7 R6 R7 + 0x781E0003, // 0087 JMPF R7 #008C + 0x8C1C092F, // 0088 GETMET R7 R4 K47 + 0x7C1C0200, // 0089 CALL R7 1 + 0x80040E00, // 008A RET 1 R7 + 0x7002001A, // 008B JMP #00A7 + 0x541EFFFB, // 008C LDINT R7 65532 + 0x1C1C0C07, // 008D EQ R7 R6 R7 + 0x781E000A, // 008E JMPF R7 #009A + 0x881C013B, // 008F GETMBR R7 R0 K59 + 0x8C1C0F09, // 0090 GETMET R7 R7 K9 + 0x5C240A00, // 0091 MOVE R9 R5 + 0x58280021, // 0092 LDCONST R10 K33 + 0x7C1C0600, // 0093 CALL R7 3 + 0x8C200739, // 0094 GETMET R8 R3 K57 + 0x88280937, // 0095 GETMBR R10 R4 K55 + 0x5C2C0E00, // 0096 MOVE R11 R7 + 0x7C200600, // 0097 CALL R8 3 + 0x80041000, // 0098 RET 1 R8 + 0x7002000C, // 0099 JMP #00A7 + 0x541EFFFC, // 009A LDINT R7 65533 + 0x1C1C0C07, // 009B EQ R7 R6 R7 + 0x781E0009, // 009C JMPF R7 #00A7 + 0x881C013C, // 009D GETMBR R7 R0 K60 + 0x8C1C0F09, // 009E GETMET R7 R7 K9 + 0x5C240A00, // 009F MOVE R9 R5 + 0x58280024, // 00A0 LDCONST R10 K36 + 0x7C1C0600, // 00A1 CALL R7 3 + 0x8C200739, // 00A2 GETMET R8 R3 K57 + 0x88280937, // 00A3 GETMBR R10 R4 K55 + 0x5C2C0E00, // 00A4 MOVE R11 R7 + 0x7C200600, // 00A5 CALL R8 3 + 0x80041000, // 00A6 RET 1 R8 + 0x4C1C0000, // 00A7 LDNIL R7 + 0x80040E00, // 00A8 RET 1 R7 }) ) ); @@ -1303,59 +1310,53 @@ be_local_closure(class_Matter_Plugin_subscribe_attribute, /* name */ ** Solidified class: Matter_Plugin ********************************************************************/ be_local_class(Matter_Plugin, - 6, + 5, NULL, - be_nested_map(52, + be_nested_map(51, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_weak(subscribe_attribute, -1), be_const_closure(class_Matter_Plugin_subscribe_attribute_closure) }, - { be_const_key_weak(state_json, 38), be_const_closure(class_Matter_Plugin_state_json_closure) }, - { be_const_key_weak(update_shadow_lazy, -1), be_const_closure(class_Matter_Plugin_update_shadow_lazy_closure) }, - { be_const_key_weak(device, -1), be_const_var(1) }, - { be_const_key_weak(ack_request, -1), be_const_closure(class_Matter_Plugin_ack_request_closure) }, - { be_const_key_weak(UPDATE_TIME, -1), be_const_int(5000) }, - { be_const_key_weak(get_cluster_list_sorted, -1), be_const_closure(class_Matter_Plugin_get_cluster_list_sorted_closure) }, - { be_const_key_weak(write_attribute, -1), be_const_closure(class_Matter_Plugin_write_attribute_closure) }, - { be_const_key_weak(BRIDGE, -1), be_const_bool(0) }, - { be_const_key_weak(get_clusters, -1), be_const_closure(class_Matter_Plugin_get_clusters_closure) }, - { be_const_key_weak(CLUSTERS, 51), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { - be_const_map( * be_nested_map(1, + { 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, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(29, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(258, -1), be_const_int(5) }, + { be_const_key_int(49, 2), be_const_int(4) }, + { be_const_key_int(514, -1), be_const_int(2) }, })) ) } )) }, - { be_const_key_weak(UPDATE_COMMANDS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { + { be_const_key_weak(append_state_json, -1), be_const_closure(class_Matter_Plugin_append_state_json_closure) }, + { be_const_key_weak(init, -1), be_const_closure(class_Matter_Plugin_init_closure) }, + { be_const_key_weak(state_json, -1), be_const_closure(class_Matter_Plugin_state_json_closure) }, + { be_const_key_weak(read_attribute, 10), be_const_closure(class_Matter_Plugin_read_attribute_closure) }, + { be_const_key_weak(timed_request, -1), be_const_closure(class_Matter_Plugin_timed_request_closure) }, + { be_const_key_weak(get_attribute_list_bytes, -1), be_const_closure(class_Matter_Plugin_get_attribute_list_bytes_closure) }, + { be_const_key_weak(read_event, 39), be_const_closure(class_Matter_Plugin_read_event_closure) }, + { be_const_key_weak(update_virtual, -1), be_const_closure(class_Matter_Plugin_update_virtual_closure) }, + { be_const_key_weak(is_local_device, -1), be_const_closure(class_Matter_Plugin_is_local_device_closure) }, + { be_const_key_weak(UPDATE_TIME, -1), be_const_int(5000) }, + { be_const_key_weak(ack_request, -1), be_const_closure(class_Matter_Plugin_ack_request_closure) }, + { be_const_key_weak(get_cluster_list_sorted, -1), be_const_closure(class_Matter_Plugin_get_cluster_list_sorted_closure) }, + { be_const_key_weak(ui_conf_to_string, 34), be_const_static_closure(class_Matter_Plugin_ui_conf_to_string_closure) }, + { be_const_key_weak(attribute_updated, -1), be_const_closure(class_Matter_Plugin_attribute_updated_closure) }, + { be_const_key_weak(UPDATE_COMMANDS, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { be_const_list( * be_nested_list(0, ( (struct bvalue*) &(const bvalue[]) { })) ) } )) }, - { be_const_key_weak(every_250ms, 0), be_const_closure(class_Matter_Plugin_every_250ms_closure) }, - { be_const_key_weak(publish_command, -1), be_const_closure(class_Matter_Plugin_publish_command_closure) }, - { be_const_key_weak(get_attribute_list, -1), be_const_closure(class_Matter_Plugin_get_attribute_list_closure) }, - { be_const_key_weak(set_name, -1), be_const_closure(class_Matter_Plugin_set_name_closure) }, + { be_const_key_weak(ui_string_to_conf, -1), be_const_static_closure(class_Matter_Plugin_ui_string_to_conf_closure) }, + { be_const_key_weak(update_next, 48), be_const_var(0) }, + { be_const_key_weak(device, -1), be_const_var(1) }, + { be_const_key_weak(publish_event, -1), be_const_closure(class_Matter_Plugin_publish_event_closure) }, + { be_const_key_weak(subscribe_event, -1), be_const_closure(class_Matter_Plugin_subscribe_event_closure) }, + { be_const_key_weak(ARG, -1), be_nested_str_weak() }, + { be_const_key_weak(parse_configuration, 30), be_const_closure(class_Matter_Plugin_parse_configuration_closure) }, + { be_const_key_weak(update_shadow_lazy, -1), be_const_closure(class_Matter_Plugin_update_shadow_lazy_closure) }, + { be_const_key_weak(consolidate_update_commands, 12), be_const_closure(class_Matter_Plugin_consolidate_update_commands_closure) }, + { be_const_key_weak(subscribe_attribute, -1), be_const_closure(class_Matter_Plugin_subscribe_attribute_closure) }, + { be_const_key_weak(contains_attribute, 38), be_const_closure(class_Matter_Plugin_contains_attribute_closure) }, + { be_const_key_weak(get_clusters, -1), be_const_closure(class_Matter_Plugin_get_clusters_closure) }, { be_const_key_weak(ARG_TYPE, -1), be_const_static_closure(class_Matter_Plugin__X3Clambda_X3E_closure) }, - { be_const_key_weak(update_virtual, -1), be_const_closure(class_Matter_Plugin_update_virtual_closure) }, - { be_const_key_weak(timed_request, -1), be_const_closure(class_Matter_Plugin_timed_request_closure) }, - { be_const_key_weak(init, -1), be_const_closure(class_Matter_Plugin_init_closure) }, - { be_const_key_weak(is_local_device, 34), be_const_closure(class_Matter_Plugin_is_local_device_closure) }, - { be_const_key_weak(COMMANDS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { - be_const_map( * be_nested_map(1, - ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(29, -1), be_const_nil() }, - })) ) } )) }, - { be_const_key_weak(clusters, -1), be_const_var(3) }, - { be_const_key_weak(VIRTUAL, 5), be_const_bool(0) }, - { be_const_key_weak(CLUSTER_REVISIONS, 23), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { + { be_const_key_weak(get_name, 23), be_const_closure(class_Matter_Plugin_get_name_closure) }, + { be_const_key_weak(write_attribute, 47), be_const_closure(class_Matter_Plugin_write_attribute_closure) }, + { be_const_key_weak(TYPE, -1), be_nested_str_weak() }, + { be_const_key_weak(tick, -1), be_const_var(3) }, + { be_const_key_weak(CLUSTER_REVISIONS, 7), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(25, ( (struct bmapnode*) &(const bmapnode[]) { { be_const_key_int(8, -1), be_const_int(5) }, @@ -1384,39 +1385,31 @@ be_local_class(Matter_Plugin, { be_const_key_int(6, -1), be_const_int(5) }, { be_const_key_int(1024, -1), be_const_int(3) }, })) ) } )) }, - { be_const_key_weak(consolidate_update_commands, 6), be_const_closure(class_Matter_Plugin_consolidate_update_commands_closure) }, - { be_const_key_weak(ui_conf_to_string, -1), be_const_static_closure(class_Matter_Plugin_ui_conf_to_string_closure) }, - { be_const_key_weak(_parse_update_virtual, 36), be_const_closure(class_Matter_Plugin__parse_update_virtual_closure) }, - { be_const_key_weak(update_next, 17), be_const_var(0) }, - { be_const_key_weak(ARG_HINT, -1), be_nested_str_weak(_Not_X20used_) }, - { be_const_key_weak(parse_configuration, -1), be_const_closure(class_Matter_Plugin_parse_configuration_closure) }, - { be_const_key_weak(invoke_request, 27), be_const_closure(class_Matter_Plugin_invoke_request_closure) }, - { be_const_key_weak(node_label, -1), be_const_var(5) }, - { be_const_key_weak(update_shadow, 30), be_const_closure(class_Matter_Plugin_update_shadow_closure) }, - { be_const_key_weak(endpoint, 2), be_const_var(2) }, - { be_const_key_weak(get_name, -1), be_const_closure(class_Matter_Plugin_get_name_closure) }, - { be_const_key_weak(attribute_updated, -1), be_const_closure(class_Matter_Plugin_attribute_updated_closure) }, - { 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_key_weak(get_endpoint, 24), be_const_closure(class_Matter_Plugin_get_endpoint_closure) }, + { be_const_key_weak(COMMANDS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { + be_const_map( * be_nested_map(1, ( (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(514, -1), be_const_int(2) }, + { be_const_key_int(29, -1), be_const_nil() }, })) ) } )) }, - { be_const_key_weak(ARG, -1), be_nested_str_weak() }, - { be_const_key_weak(subscribe_event, -1), be_const_closure(class_Matter_Plugin_subscribe_event_closure) }, - { be_const_key_weak(TYPE, -1), be_nested_str_weak() }, - { be_const_key_weak(read_event, -1), be_const_closure(class_Matter_Plugin_read_event_closure) }, - { be_const_key_weak(publish_event, 21), be_const_closure(class_Matter_Plugin_publish_event_closure) }, - { be_const_key_weak(parse_sensors, -1), be_const_closure(class_Matter_Plugin_parse_sensors_closure) }, - { be_const_key_weak(DISPLAY_NAME, 14), be_nested_str_weak() }, - { be_const_key_weak(ui_string_to_conf, 13), be_const_static_closure(class_Matter_Plugin_ui_string_to_conf_closure) }, - { be_const_key_weak(contains_attribute, 9), be_const_closure(class_Matter_Plugin_contains_attribute_closure) }, - { be_const_key_weak(tick, -1), be_const_var(4) }, + { be_const_key_weak(ARG_HINT, -1), be_nested_str_weak(_Not_X20used_) }, + { be_const_key_weak(set_name, -1), be_const_closure(class_Matter_Plugin_set_name_closure) }, { be_const_key_weak(contains_cluster, -1), be_const_closure(class_Matter_Plugin_contains_cluster_closure) }, - { be_const_key_weak(read_attribute, -1), be_const_closure(class_Matter_Plugin_read_attribute_closure) }, - { be_const_key_weak(append_state_json, -1), be_const_closure(class_Matter_Plugin_append_state_json_closure) }, + { be_const_key_weak(publish_command, -1), be_const_closure(class_Matter_Plugin_publish_command_closure) }, + { be_const_key_weak(update_shadow, -1), be_const_closure(class_Matter_Plugin_update_shadow_closure) }, + { be_const_key_weak(invoke_request, -1), be_const_closure(class_Matter_Plugin_invoke_request_closure) }, + { be_const_key_weak(parse_sensors, 21), be_const_closure(class_Matter_Plugin_parse_sensors_closure) }, + { be_const_key_weak(CLUSTERS, 14), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { + be_const_map( * be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key_int(29, -1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + })) ) } )) }, + { be_const_key_weak(VIRTUAL, -1), be_const_bool(0) }, + { be_const_key_weak(DISPLAY_NAME, 4), be_nested_str_weak() }, + { be_const_key_weak(node_label, 9), be_const_var(4) }, + { be_const_key_weak(_parse_update_virtual, -1), be_const_closure(class_Matter_Plugin__parse_update_virtual_closure) }, + { be_const_key_weak(every_250ms, -1), be_const_closure(class_Matter_Plugin_every_250ms_closure) }, + { be_const_key_weak(endpoint, -1), be_const_var(2) }, + { be_const_key_weak(BRIDGE, 0), be_const_bool(0) }, })), be_str_weak(Matter_Plugin) ); diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h index b5b6f034d013..ab3289d1fcdc 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h @@ -209,32 +209,8 @@ be_local_class(Matter_Plugin_Aggregator, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(2, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(29, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(29, -1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 0), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(invoke_request, -1), be_const_closure(class_Matter_Plugin_Aggregator_invoke_request_closure) }, })), diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Device.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Device.h index 1513d697574f..cd89a67e0bbd 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Device.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Device.h @@ -1335,75 +1335,11 @@ be_local_class(Matter_Plugin_Device, { be_const_key_weak(CLUSTERS, 7), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(5, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, -1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, 1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(invoke_request, -1), be_const_closure(class_Matter_Plugin_Device_invoke_request_closure) }, { be_const_key_weak(init, -1), be_const_closure(class_Matter_Plugin_Device_init_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Root.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Root.h index 7eff47eae891..c6b837e1dd1a 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Root.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Root.h @@ -2130,197 +2130,20 @@ be_local_class(Matter_Plugin_Root, { be_const_key_weak(CLUSTERS, 7), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(14, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(56, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(7), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 11), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(44, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(31, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(60, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(63, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(6, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(62, 13), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(49, 5), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(4), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(50, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(6, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(51, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(8), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(52, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(6, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(43, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(40, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(21, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(6), - be_const_int(7), - be_const_int(8), - be_const_int(9), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(19), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(48, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(56, -1), be_const_bytes_instance(000000010007FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 11), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(44, -1), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(31, -1), be_const_bytes_instance(0000000200030004FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(60, -1), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(63, -1), be_const_bytes_instance(FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(62, 13), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(49, 5), be_const_bytes_instance(00030004FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(50, -1), be_const_bytes_instance(FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(51, -1), be_const_bytes_instance(0000000100020008FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(52, -1), be_const_bytes_instance(FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(43, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(40, -1), be_const_bytes_instance(0000000100020003000400050006000700080009000A000F001100120013FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(48, -1), be_const_bytes_instance(00000001000200030004FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(read_attribute, -1), be_const_closure(class_Matter_Plugin_Root_read_attribute_closure) }, })), diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Fan.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Fan.h index b38d3b11d469..f50748581831 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Fan.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Fan.h @@ -473,89 +473,12 @@ be_local_class(Matter_Plugin_Fan, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(514, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(514, 1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(set_fan_mode, 1), be_const_closure(class_Matter_Plugin_Fan_set_fan_mode_closure) }, { be_const_key_weak(TYPES, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Light0.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Light0.h index 5d25648a4643..5f255c9a3b6d 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Light0.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Light0.h @@ -615,86 +615,12 @@ be_local_class(Matter_Plugin_Light0, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(6, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(6, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(ARG, -1), be_nested_str_weak(relay) }, { be_const_key_weak(invoke_request, 10), be_const_closure(class_Matter_Plugin_Light0_invoke_request_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Air_Quality.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Air_Quality.h index 5693e1f72615..97bf2aad16ff 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Air_Quality.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Air_Quality.h @@ -718,176 +718,18 @@ be_local_class(Matter_Plugin_Sensor_Air_Quality, { be_const_key_weak(CLUSTERS, 4), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(12, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(1068, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(8), - be_const_int(9), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1069, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(8), - be_const_int(9), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1070, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(8), - be_const_int(9), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, 8), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1037, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(8), - be_const_int(9), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(91, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 6), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1066, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(8), - be_const_int(9), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1043, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(8), - be_const_int(9), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(1068, -1), be_const_bytes_instance(00000001000200080009FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1069, -1), be_const_bytes_instance(00000001000200080009FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1070, -1), be_const_bytes_instance(00000001000200080009FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, 8), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1037, -1), be_const_bytes_instance(00000001000200080009FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(91, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 6), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1066, -1), be_const_bytes_instance(00000001000200080009FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1043, -1), be_const_bytes_instance(00000001000200080009FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, })), be_str_weak(Matter_Plugin_Sensor_Air_Quality) diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_GenericSwitch_Btn.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_GenericSwitch_Btn.h index 66aa1dfbfbd5..7481aae2c8be 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_GenericSwitch_Btn.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_GenericSwitch_Btn.h @@ -386,88 +386,12 @@ be_local_class(Matter_Plugin_Sensor_GenericSwitch_Btn, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(59, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, 1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, -1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(59, 0), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, })), be_str_weak(Matter_Plugin_Sensor_GenericSwitch_Btn) diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Shutter.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Shutter.h index fe1887a781ec..f5d5be5bccc3 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Shutter.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Shutter.h @@ -613,93 +613,12 @@ be_local_class(Matter_Plugin_Shutter, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(258, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(14, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(5), - be_const_int(7), - be_const_int(10), - be_const_int(11), - be_const_int(13), - be_const_int(14), - be_const_int(23), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(258, -1), be_const_bytes_instance(000000050007000A000B000D000E0017FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(invoke_request, 3), be_const_closure(class_Matter_Plugin_Shutter_invoke_request_closure) }, { be_const_key_weak(read_attribute, 11), be_const_closure(class_Matter_Plugin_Shutter_read_attribute_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Light1.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Light1.h index 3b4352584aec..63d9c8716a12 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Light1.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Light1.h @@ -804,101 +804,13 @@ be_local_class(Matter_Plugin_Light1, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(7, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(29, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(8, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(2), - be_const_int(3), - be_const_int(15), - be_const_int(17), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(6, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(29, 2), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(8, 0), be_const_bytes_instance(000000020003000F0011FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(6, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(web_values, -1), be_const_closure(class_Matter_Plugin_Light1_web_values_closure) }, { be_const_key_weak(init, 11), be_const_closure(class_Matter_Plugin_Light1_init_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h index 09e1374b2e04..150a06f12d12 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h @@ -248,86 +248,12 @@ be_local_class(Matter_Plugin_Sensor_Contact, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(69, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, 1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(69, 2), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(web_values, -1), be_const_closure(class_Matter_Plugin_Sensor_Contact_web_values_closure) }, { be_const_key_weak(TYPES, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Flow.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Flow.h index 6846bc331726..48f3199500fa 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Flow.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Flow.h @@ -211,88 +211,12 @@ be_local_class(Matter_Plugin_Sensor_Flow, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1028, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1028, -1), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(JSON_NAME, -1), be_nested_str_weak(Flow) }, { be_const_key_weak(pre_value, -1), be_const_closure(class_Matter_Plugin_Sensor_Flow_pre_value_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Humidity.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Humidity.h index 5894417d8f6d..3106947ce60d 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Humidity.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Humidity.h @@ -219,88 +219,12 @@ be_local_class(Matter_Plugin_Sensor_Humidity, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1029, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, 1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1029, 2), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(JSON_NAME, -1), be_nested_str_weak(Humidity) }, { be_const_key_weak(pre_value, -1), be_const_closure(class_Matter_Plugin_Sensor_Humidity_pre_value_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Illuminance.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Illuminance.h index 79e80b64e826..e9a45cbd653d 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Illuminance.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Illuminance.h @@ -220,88 +220,12 @@ be_local_class(Matter_Plugin_Sensor_Illuminance, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1024, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1024, 1), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(JSON_NAME, -1), be_nested_str_weak(Illuminance) }, { be_const_key_weak(pre_value, -1), be_const_closure(class_Matter_Plugin_Sensor_Illuminance_pre_value_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h index d1d1788ec49d..b1f8fd0133c1 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h @@ -268,88 +268,12 @@ be_local_class(Matter_Plugin_Sensor_Occupancy, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1030, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1030, 1), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(web_values, -1), be_const_closure(class_Matter_Plugin_Sensor_Occupancy_web_values_closure) }, { be_const_key_weak(TYPES, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h index b6d971888225..527cb8b1facc 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h @@ -141,86 +141,12 @@ be_local_class(Matter_Plugin_Sensor_OnOff, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(6, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(6, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(append_state_json, -1), be_const_closure(class_Matter_Plugin_Sensor_OnOff_append_state_json_closure) }, { be_const_key_weak(TYPES, 6), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Pressure.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Pressure.h index 77abbec271c7..b5264a407d7d 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Pressure.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Pressure.h @@ -210,88 +210,12 @@ be_local_class(Matter_Plugin_Sensor_Pressure, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(1027, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(1027, -1), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(JSON_NAME, -1), be_nested_str_weak(Pressure) }, { be_const_key_weak(pre_value, -1), be_const_closure(class_Matter_Plugin_Sensor_Pressure_pre_value_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Rain.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Rain.h index f4d3878d602e..23477d3f8a98 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Rain.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Rain.h @@ -248,86 +248,12 @@ be_local_class(Matter_Plugin_Sensor_Rain, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(69, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, 1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(69, 2), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(web_values, -1), be_const_closure(class_Matter_Plugin_Sensor_Rain_web_values_closure) }, { be_const_key_weak(TYPES, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Temp.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Temp.h index 526dacca4ad6..540d21ab4079 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Temp.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Temp.h @@ -255,88 +255,12 @@ be_local_class(Matter_Plugin_Sensor_Temp, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(1026, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(9, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(1026, -1), be_const_bytes_instance(000000010002FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(JSON_NAME, -1), be_nested_str_weak(Temperature) }, { be_const_key_weak(pre_value, -1), be_const_closure(class_Matter_Plugin_Sensor_Temp_pre_value_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Waterleak.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Waterleak.h index 6c4974a1e86e..842def36c615 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Waterleak.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Waterleak.h @@ -240,86 +240,12 @@ be_local_class(Matter_Plugin_Sensor_Waterleak, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(69, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 0), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, 1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(69, 2), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 0), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(web_values, -1), be_const_closure(class_Matter_Plugin_Sensor_Waterleak_web_values_closure) }, { be_const_key_weak(TYPES, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_ShutterTilt.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_ShutterTilt.h index 791c1bfaeaba..ea430dcbdcd2 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_ShutterTilt.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_ShutterTilt.h @@ -416,96 +416,12 @@ be_local_class(Matter_Plugin_ShutterTilt, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(6, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(258, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(17, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(5), - be_const_int(7), - be_const_int(10), - be_const_int(11), - be_const_int(13), - be_const_int(14), - be_const_int(23), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - be_const_int(7), - be_const_int(12), - be_const_int(15), - })) ) } )) }, - { be_const_key_int(5, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, 1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(258, -1), be_const_bytes_instance(000000050007000A000B000C000D000E000F0017FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, -1), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, 2), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, 1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(tilt_min, 8), be_const_var(1) }, { be_const_key_weak(parse_sensors, -1), be_const_closure(class_Matter_Plugin_ShutterTilt_parse_sensors_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light2.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light2.h index 20ce0312bb12..e92e3336b578 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light2.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light2.h @@ -672,116 +672,14 @@ be_local_class(Matter_Plugin_Light2, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(8, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(8, 7), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(2), - be_const_int(3), - be_const_int(15), - be_const_int(17), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(6, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(768, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(7), - be_const_int(8), - be_const_int(15), - be_const_int(16395), - be_const_int(16396), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(8, 7), be_const_bytes_instance(000000020003000F0011FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, -1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, 2), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(6, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(768, -1), be_const_bytes_instance(00070008000F400B400CFFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(init, -1), be_const_closure(class_Matter_Plugin_Light2_init_closure) }, { be_const_key_weak(invoke_request, -1), be_const_closure(class_Matter_Plugin_Light2_invoke_request_closure) }, diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light3.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light3.h index 4305aad09811..5c2f727c13aa 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light3.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Light3.h @@ -934,118 +934,14 @@ be_local_class(Matter_Plugin_Light3, { be_const_key_weak(CLUSTERS, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_map, { be_const_map( * be_nested_map(8, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key_int(8, 7), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(11, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(2), - be_const_int(3), - be_const_int(15), - be_const_int(17), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(57, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(3), - be_const_int(5), - be_const_int(10), - be_const_int(15), - be_const_int(17), - be_const_int(18), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(29, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(10, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(3, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(8, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(4, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(5, 2), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(12, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(2), - be_const_int(3), - be_const_int(4), - be_const_int(5), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(6, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(7, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, - { be_const_key_int(768, -1), be_const_simple_instance(be_nested_simple_instance(&be_class_list, { - be_const_list( * be_nested_list(13, - ( (struct bvalue*) &(const bvalue[]) { - be_const_int(0), - be_const_int(1), - be_const_int(7), - be_const_int(8), - be_const_int(15), - be_const_int(16385), - be_const_int(16394), - be_const_int(65528), - be_const_int(65529), - be_const_int(65530), - be_const_int(65531), - be_const_int(65532), - be_const_int(65533), - })) ) } )) }, + { be_const_key_int(8, 7), be_const_bytes_instance(000000020003000F0011FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(57, -1), be_const_bytes_instance(00030005000A000F00110012FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(29, -1), be_const_bytes_instance(0000000100020003FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(3, -1), be_const_bytes_instance(00000001FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(4, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(5, 2), be_const_bytes_instance(000000010002000300040005FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(6, -1), be_const_bytes_instance(0000FFF8FFF9FFFAFFFBFFFCFFFD) }, + { be_const_key_int(768, -1), be_const_bytes_instance(0000000100070008000F4001400AFFF8FFF9FFFAFFFBFFFCFFFD) }, })) ) } )) }, { be_const_key_weak(web_values, -1), be_const_closure(class_Matter_Plugin_Light3_web_values_closure) }, { be_const_key_weak(set_hue_sat, 12), be_const_closure(class_Matter_Plugin_Light3_set_hue_sat_closure) },