From c09165c7b21809fd19c40767906558c0f3f654f4 Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Sat, 3 Jun 2023 19:47:10 +0200 Subject: [PATCH] Matter fix saving config (#18786) --- lib/libesp32/berry_matter/src/embedded/Matter_UI.be | 6 +++--- .../berry_matter/src/solidify/solidified_Matter_UI.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_UI.be b/lib/libesp32/berry_matter/src/embedded/Matter_UI.be index 769a458c9..169fbc7f4 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_UI.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_UI.be @@ -248,8 +248,8 @@ class Matter_UI # special case for root node # display a fake configuration item (disabled) - webserver.content_send("") - webserver.content_send("") + webserver.content_send("") webserver.content_send(" ") @@ -438,7 +438,7 @@ class Matter_UI tasmota.log(string.format("MTR: /matterc received '%s' command", 'config'), 3) # iterate by id - var idx = 1 + var idx = 0 var idx_str = string.format("%03i", idx) while webserver.has_arg('ep'+idx_str) diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_UI.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_UI.h index 308381b54..c950220be 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_UI.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_UI.h @@ -651,7 +651,7 @@ be_local_closure(Matter_UI_page_part_ctl, /* name */ 0x7C240600, // 00D2 CALL R9 3 0x5828000C, // 00D3 LDCONST R10 K12 0x7C1C0600, // 00D4 CALL R7 3 - 0x581C002A, // 00D5 LDCONST R7 K42 + 0x581C0025, // 00D5 LDCONST R7 K37 0x8C20050A, // 00D6 GETMET R8 R2 K10 0x5828002F, // 00D7 LDCONST R10 K47 0x5C2C0E00, // 00D8 MOVE R11 R7 @@ -892,8 +892,8 @@ be_local_closure(Matter_UI_show_plugins_configuration, /* name */ /* K11 */ be_nested_str_weak(k2l_num), /* K12 */ be_nested_str_weak(plugins_config), /* K13 */ be_const_int(0), - /* K14 */ be_nested_str_weak(_X3Ctr_X3E_X3Ctd_X3E_X3Cinput_X20type_X3D_X27text_X27_X20name_X3D_X27ep000_X27_X20maxlength_X3D_X274_X27_X20size_X3D_X273_X27_X20value_X3D_X270_X27_X20readonly_X20disabled_X3E_X3C_X2Ftd_X3E), - /* K15 */ be_nested_str_weak(_X3Ctd_X3E_X3Cselect_X20name_X3D_X27pi000_X27_X3E), + /* K14 */ be_nested_str_weak(_X3Ctr_X3E_X3Ctd_X3E_X3Cinput_X20type_X3D_X27text_X27_X20name_X3D_X27epnone_X27_X20maxlength_X3D_X274_X27_X20size_X3D_X273_X27_X20value_X3D_X270_X27_X20readonly_X20disabled_X3E_X3C_X2Ftd_X3E), + /* K15 */ be_nested_str_weak(_X3Ctd_X3E_X3Cselect_X20name_X3D_X27pinone_X27_X3E), /* K16 */ be_nested_str_weak(_X3Coption_X20value_X3D_X27_X27_X20selected_X20disabled_X3ERoot_X20node_X3C_X2Foption_X3E), /* K17 */ be_nested_str_weak(_X3C_X2Fselect_X3E_X3C_X2Ftd_X3E), /* K18 */ be_nested_str_weak(_X3Ctd_X3E_X3Cfont_X20size_X3D_X27_X2D1_X27_X3E_X26nbsp_X3B_X3C_X2Ffont_X3E_X3C_X2Ftd_X3E),