From 0cde972703453c1e48f8087b7db3e3c5d897683e Mon Sep 17 00:00:00 2001
From: Stephan Hadinger
Date: Sat, 22 Jan 2022 17:13:10 +0100
Subject: [PATCH] Fix crash when deleting custom widgets
---
lib/libesp32/berry/generate/be_const_strtab.h | 4 +-
.../berry/generate/be_const_strtab_def.h | 1945 +++++++++--------
.../src/be_lvgl_clock_icon_lib.c | 100 +-
.../berry_tasmota/src/be_lvgl_wifi_arcs_lib.c | 160 +-
.../berry_tasmota/src/be_lvgl_wifi_bars_lib.c | 160 +-
.../src/embedded/lv_clock_icon.be | 5 +-
.../src/embedded/lv_signal_arcs.be | 3 +-
.../src/embedded/lv_signal_bars.be | 3 +-
.../lv_berry/src/be_lvgl_glob_lib.c | 49 +-
.../lv_berry/src/embedded/lvgl_glob.be | 8 +-
10 files changed, 1239 insertions(+), 1198 deletions(-)
diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h
index 3f717b5ab..0168eaeec 100644
--- a/lib/libesp32/berry/generate/be_const_strtab.h
+++ b/lib/libesp32/berry/generate/be_const_strtab.h
@@ -37,6 +37,7 @@ extern const bcstring be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27
extern const bcstring be_const_str_COLOR_BLACK;
extern const bcstring be_const_str_COLOR_WHITE;
extern const bcstring be_const_str_EC_C25519;
+extern const bcstring be_const_str_EVENT_DELETE;
extern const bcstring be_const_str_EVENT_DRAW_MAIN;
extern const bcstring be_const_str_EVENT_DRAW_PART_BEGIN;
extern const bcstring be_const_str_EVENT_DRAW_PART_END;
@@ -210,6 +211,7 @@ extern const bcstring be_const_str_add;
extern const bcstring be_const_str_add_anim;
extern const bcstring be_const_str_add_cmd;
extern const bcstring be_const_str_add_driver;
+extern const bcstring be_const_str_add_event_cb;
extern const bcstring be_const_str_add_fast_loop;
extern const bcstring be_const_str_add_handler;
extern const bcstring be_const_str_add_header;
@@ -242,6 +244,7 @@ extern const bcstring be_const_str_b;
extern const bcstring be_const_str_back_forth;
extern const bcstring be_const_str_base_class;
extern const bcstring be_const_str_battery_present;
+extern const bcstring be_const_str_before_del;
extern const bcstring be_const_str_begin;
extern const bcstring be_const_str_begin_multicast;
extern const bcstring be_const_str_bool;
@@ -321,7 +324,6 @@ extern const bcstring be_const_str_decrypt;
extern const bcstring be_const_str_def;
extern const bcstring be_const_str_deg;
extern const bcstring be_const_str_deinit;
-extern const bcstring be_const_str_del;
extern const bcstring be_const_str_delay;
extern const bcstring be_const_str_delete_all_configs;
extern const bcstring be_const_str_depower;
diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h
index 1fcdcd95a..82ada2935 100644
--- a/lib/libesp32/berry/generate/be_const_strtab_def.h
+++ b/lib/libesp32/berry/generate/be_const_strtab_def.h
@@ -1,709 +1,711 @@
-be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_unknown_X20instruction);
-be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str__global_addr);
-be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_Restart_X201);
-be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, NULL);
-be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_SERIAL_7N1);
-be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20);
-be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, NULL);
-be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29);
-be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_is_first_time);
-be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str__ccmd);
-be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_shared_key);
-be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_lv_obj);
-be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str_try_rule);
-be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_running);
-be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_char);
-be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_back_forth);
-be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_Timer);
-be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_add_fast_loop);
-be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27);
-be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, NULL);
-be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str__X3D_X3C_X3E_X21);
-be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str_json_fdump_map);
-be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_add_anim);
-be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_delay);
-be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_SK6812_GRBW);
-be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str__X2Esize);
-be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_base_class);
-be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_WS2812);
-be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_engine);
-be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_json_append);
-be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_addr);
-be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20);
-be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_get_alternate);
-be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_content_start);
-be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_content_flush);
-be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_battery_present);
-be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27);
-be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_GET);
-be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "
", 3546571739u, 0, 11, &be_const_str_y1);
-be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "", 1863865923u, 0, 16, NULL);
+be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_introspect);
+be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str__X2Ew);
+be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_valuer_error);
+be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_SERIAL_8E1);
+be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_json_fdump);
+be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_get_string);
+be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str__error);
+be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, NULL);
+be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_pixel_size);
+be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_get_percentage);
+be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20);
+be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, NULL);
+be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, NULL);
+be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_size);
+be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_Tele);
+be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_light);
+be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27);
+be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_percentage);
+be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_argument_X20must_X20be_X20a_X20function);
+be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str_check_not_method);
+be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_content_send);
+be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str_SERIAL_7O2);
+be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_CFG_X3A_X20loading_X20);
+be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_call);
+be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_geti);
+be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E);
+be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_delete_all_configs);
+be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_dac_voltage);
+be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_tasmota);
+be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_line_dsc);
+be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, NULL);
+be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, NULL);
+be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_reset_search);
+be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_from_to);
+be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_name);
+be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29);
+be_define_const_str(_X3A, ":", 1057798253u, 0, 1, NULL);
+be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29);
+be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "", 3546571739u, 0, 11, &be_const_str_i2c_enabled);
+be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "", 1863865923u, 0, 16, &be_const_str_pc);
be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, NULL);
-be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, NULL);
-be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_constructor_cb);
-be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "", 2052843416u, 0, 25, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "", 452285201u, 0, 120, &be_const_str_day);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "