jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-19 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Matter fixed UI bug when no endpoints configured (#22008)

Browse Source
This commit is contained in:
s-hadinger 2024-08-24 18:04:28 +02:00 committed by GitHub
parent 831597e7d9
commit e143438552
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 94 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
### Fixed ### Fixed
- Matter fixed UI bug when no endpoints configured
### Removed ### Removed

2
lib/libesp32/berry_matter/src/embedded/Matter_zz_Device.be
View File

@ -531,7 +531,7 @@ class Matter_Device
self.ipv4only = bool(j.find("ipv4only", false)) self.ipv4only = bool(j.find("ipv4only", false))
self.disable_bridge_mode = bool(j.find("disable_bridge_mode", false)) self.disable_bridge_mode = bool(j.find("disable_bridge_mode", false))
self.next_ep = j.find("nextep", self.next_ep) self.next_ep = j.find("nextep", self.next_ep)
self.plugins_config = j.find("config") self.plugins_config = j.find("config", {})
self.debug = bool(j.find("debug")) # bool converts nil to false self.debug = bool(j.find("debug")) # bool converts nil to false
if self.plugins_config != nil if self.plugins_config != nil
log(f"MTR: Load_config = {self.plugins_config}", 3) log(f"MTR: Load_config = {self.plugins_config}", 3)

182
lib/libesp32/berry_matter/src/solidify/solidified_Matter_zz_Device.h
View File

@ -2184,10 +2184,10 @@ be_local_closure(class_Matter_Device_load_param, /* name */
&be_ktab_class_Matter_Device, /* shared constants */ &be_ktab_class_Matter_Device, /* shared constants */
be_str_weak(load_param), be_str_weak(load_param),
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[134]) { /* code */ ( &(const binstruction[136]) { /* code */
0xA406B000, // 0000 IMPORT R1 K88 0xA406B000, // 0000 IMPORT R1 K88
0x50080000, // 0001 LDBOOL R2 0 0 0x50080000, // 0001 LDBOOL R2 0 0
0xA8020054, // 0002 EXBLK 0 #0058 0xA8020056, // 0002 EXBLK 0 #005A
0x600C0011, // 0003 GETGBL R3 G17 0x600C0011, // 0003 GETGBL R3 G17
0x8810018F, // 0004 GETMBR R4 R0 K143 0x8810018F, // 0004 GETMBR R4 R0 K143
0x7C0C0200, // 0005 CALL R3 1 0x7C0C0200, // 0005 CALL R3 1
@ -2230,95 +2230,97 @@ be_local_closure(class_Matter_Device_load_param, /* name */
0x90028E07, // 002A SETMBR R0 K71 R7 0x90028E07, // 002A SETMBR R0 K71 R7
0x8C1C0D16, // 002B GETMET R7 R6 K22 0x8C1C0D16, // 002B GETMET R7 R6 K22
0x58240096, // 002C LDCONST R9 K150 0x58240096, // 002C LDCONST R9 K150
0x7C1C0400, // 002D CALL R7 2 0x60280013, // 002D GETGBL R10 G19
0x90026A07, // 002E SETMBR R0 K53 R7 0x7C280000, // 002E CALL R10 0
0x601C0017, // 002F GETGBL R7 G23 0x7C1C0600, // 002F CALL R7 3
0x8C200D16, // 0030 GETMET R8 R6 K22 0x90026A07, // 0030 SETMBR R0 K53 R7
0x58280097, // 0031 LDCONST R10 K151 0x601C0017, // 0031 GETGBL R7 G23
0x7C200400, // 0032 CALL R8 2 0x8C200D16, // 0032 GETMET R8 R6 K22
0x7C1C0200, // 0033 CALL R7 1 0x58280097, // 0033 LDCONST R10 K151
0x90032E07, // 0034 SETMBR R0 K151 R7 0x7C200400, // 0034 CALL R8 2
0x881C0135, // 0035 GETMBR R7 R0 K53 0x7C1C0200, // 0035 CALL R7 1
0x4C200000, // 0036 LDNIL R8 0x90032E07, // 0036 SETMBR R0 K151 R7
0x201C0E08, // 0037 NE R7 R7 R8 0x881C0135, // 0037 GETMBR R7 R0 K53
0x781E000D, // 0038 JMPF R7 #0047 0x4C200000, // 0038 LDNIL R8
0xB81E2E00, // 0039 GETNGBL R7 K23 0x201C0E08, // 0039 NE R7 R7 R8
0x60200018, // 003A GETGBL R8 G24 0x781E000D, // 003A JMPF R7 #0049
0x58240098, // 003B LDCONST R9 K152 0xB81E2E00, // 003B GETNGBL R7 K23
0x88280135, // 003C GETMBR R10 R0 K53 0x60200018, // 003C GETGBL R8 G24
0x7C200400, // 003D CALL R8 2 0x58240098, // 003D LDCONST R9 K152
0x58240030, // 003E LDCONST R9 K48 0x88280135, // 003E GETMBR R10 R0 K53
0x7C1C0400, // 003F CALL R7 2 0x7C200400, // 003F CALL R8 2
0x8C1C0137, // 0040 GETMET R7 R0 K55 0x58240030, // 0040 LDCONST R9 K48
0x7C1C0200, // 0041 CALL R7 1 0x7C1C0400, // 0041 CALL R7 2
0x8C1C0199, // 0042 GETMET R7 R0 K153 0x8C1C0137, // 0042 GETMET R7 R0 K55
0x7C1C0200, // 0043 CALL R7 1 0x7C1C0200, // 0043 CALL R7 1
0x5C080E00, // 0044 MOVE R2 R7 0x8C1C0199, // 0044 GETMET R7 R0 K153
0x501C0200, // 0045 LDBOOL R7 1 0 0x7C1C0200, // 0045 CALL R7 1
0x90020E07, // 0046 SETMBR R0 K7 R7 0x5C080E00, // 0046 MOVE R2 R7
0x8C1C0D16, // 0047 GETMET R7 R6 K22 0x501C0200, // 0047 LDBOOL R7 1 0
0x5824009A, // 0048 LDCONST R9 K154 0x90020E07, // 0048 SETMBR R0 K7 R7
0x60280013, // 0049 GETGBL R10 G19 0x8C1C0D16, // 0049 GETMET R7 R6 K22
0x7C280000, // 004A CALL R10 0 0x5824009A, // 004A LDCONST R9 K154
0x7C1C0600, // 004B CALL R7 3 0x60280013, // 004B GETGBL R10 G19
0x90022A07, // 004C SETMBR R0 K21 R7 0x7C280000, // 004C CALL R10 0
0x881C0115, // 004D GETMBR R7 R0 K21 0x7C1C0600, // 004D CALL R7 3
0x781E0006, // 004E JMPF R7 #0056 0x90022A07, // 004E SETMBR R0 K21 R7
0xB81E2E00, // 004F GETNGBL R7 K23 0x881C0115, // 004F GETMBR R7 R0 K21
0x60200008, // 0050 GETGBL R8 G8 0x781E0006, // 0050 JMPF R7 #0058
0x88240115, // 0051 GETMBR R9 R0 K21 0xB81E2E00, // 0051 GETNGBL R7 K23
0x7C200200, // 0052 CALL R8 1 0x60200008, // 0052 GETGBL R8 G8
0x00233608, // 0053 ADD R8 K155 R8 0x88240115, // 0053 GETMBR R9 R0 K21
0x58240030, // 0054 LDCONST R9 K48 0x7C200200, // 0054 CALL R8 1
0x7C1C0400, // 0055 CALL R7 2 0x00233608, // 0055 ADD R8 K155 R8
0xA8040001, // 0056 EXBLK 1 1 0x58240030, // 0056 LDCONST R9 K48
0x70020011, // 0057 JMP #006A 0x7C1C0400, // 0057 CALL R7 2
0xAC0C0002, // 0058 CATCH R3 0 2 0xA8040001, // 0058 EXBLK 1 1
0x7002000E, // 0059 JMP #0069 0x70020011, // 0059 JMP #006C
0x2014079C, // 005A NE R5 R3 K156 0xAC0C0002, // 005A CATCH R3 0 2
0x7816000B, // 005B JMPF R5 #0068 0x7002000E, // 005B JMP #006B
0xB8162E00, // 005C GETNGBL R5 K23 0x2014079C, // 005C NE R5 R3 K156
0x60180008, // 005D GETGBL R6 G8 0x7816000B, // 005D JMPF R5 #006A
0x5C1C0600, // 005E MOVE R7 R3 0xB8162E00, // 005E GETNGBL R5 K23
0x7C180200, // 005F CALL R6 1 0x60180008, // 005F GETGBL R6 G8
0x001B3A06, // 0060 ADD R6 K157 R6 0x5C1C0600, // 0060 MOVE R7 R3
0x00180D9E, // 0061 ADD R6 R6 K158 0x7C180200, // 0061 CALL R6 1
0x601C0008, // 0062 GETGBL R7 G8 0x001B3A06, // 0062 ADD R6 K157 R6
0x5C200800, // 0063 MOVE R8 R4 0x00180D9E, // 0063 ADD R6 R6 K158
0x7C1C0200, // 0064 CALL R7 1 0x601C0008, // 0064 GETGBL R7 G8
0x00180C07, // 0065 ADD R6 R6 R7 0x5C200800, // 0065 MOVE R8 R4
0x581C001D, // 0066 LDCONST R7 K29 0x7C1C0200, // 0066 CALL R7 1
0x7C140400, // 0067 CALL R5 2 0x00180C07, // 0067 ADD R6 R6 R7
0x70020000, // 0068 JMP #006A 0x581C001D, // 0068 LDCONST R7 K29
0xB0080000, // 0069 RAISE 2 R0 R0 0x7C140400, // 0069 CALL R5 2
0x880C0191, // 006A GETMBR R3 R0 K145 0x70020000, // 006A JMP #006C
0x4C100000, // 006B LDNIL R4 0xB0080000, // 006B RAISE 2 R0 R0
0x1C0C0604, // 006C EQ R3 R3 R4 0x880C0191, // 006C GETMBR R3 R0 K145
0x780E000A, // 006D JMPF R3 #0079 0x4C100000, // 006D LDNIL R4
0x8C0C039F, // 006E GETMET R3 R1 K159 0x1C0C0604, // 006E EQ R3 R3 R4
0x5814001D, // 006F LDCONST R5 K29 0x780E000A, // 006F JMPF R3 #007B
0x7C0C0400, // 0070 CALL R3 2 0x8C0C039F, // 0070 GETMET R3 R1 K159
0x8C0C0777, // 0071 GETMET R3 R3 K119 0x5814001D, // 0071 LDCONST R5 K29
0x58140006, // 0072 LDCONST R5 K6 0x7C0C0400, // 0072 CALL R3 2
0x5818001D, // 0073 LDCONST R6 K29 0x8C0C0777, // 0073 GETMET R3 R3 K119
0x7C0C0600, // 0074 CALL R3 3 0x58140006, // 0074 LDCONST R5 K6
0x54120FFE, // 0075 LDINT R4 4095 0x5818001D, // 0075 LDCONST R6 K29
0x2C0C0604, // 0076 AND R3 R3 R4 0x7C0C0600, // 0076 CALL R3 3
0x90032203, // 0077 SETMBR R0 K145 R3 0x54120FFE, // 0077 LDINT R4 4095
0x50080200, // 0078 LDBOOL R2 1 0 0x2C0C0604, // 0078 AND R3 R3 R4
0x880C0193, // 0079 GETMBR R3 R0 K147 0x90032203, // 0079 SETMBR R0 K145 R3
0x4C100000, // 007A LDNIL R4 0x50080200, // 007A LDBOOL R2 1 0
0x1C0C0604, // 007B EQ R3 R3 R4 0x880C0193, // 007B GETMBR R3 R0 K147
0x780E0004, // 007C JMPF R3 #0082 0x4C100000, // 007C LDNIL R4
0x880C0109, // 007D GETMBR R3 R0 K9 0x1C0C0604, // 007D EQ R3 R3 R4
0x8C0C07A0, // 007E GETMET R3 R3 K160 0x780E0004, // 007E JMPF R3 #0084
0x7C0C0200, // 007F CALL R3 1 0x880C0109, // 007F GETMBR R3 R0 K9
0x90032603, // 0080 SETMBR R0 K147 R3 0x8C0C07A0, // 0080 GETMET R3 R3 K160
0x50080200, // 0081 LDBOOL R2 1 0 0x7C0C0200, // 0081 CALL R3 1
0x780A0001, // 0082 JMPF R2 #0085 0x90032603, // 0082 SETMBR R0 K147 R3
0x8C0C0108, // 0083 GETMET R3 R0 K8 0x50080200, // 0083 LDBOOL R2 1 0
0x7C0C0200, // 0084 CALL R3 1 0x780A0001, // 0084 JMPF R2 #0087
0x80000000, // 0085 RET 0 0x8C0C0108, // 0085 GETMET R3 R0 K8
0x7C0C0200, // 0086 CALL R3 1
0x80000000, // 0087 RET 0
}) })
) )
); );