From 80cb0564cdf5d267477cbcabeb389182a9aae20c Mon Sep 17 00:00:00 2001
From: Stephan Hadinger
Date: Fri, 29 Apr 2022 23:43:55 +0200
Subject: [PATCH] Berry easier MQTT subscribe
---
lib/libesp32/berry/generate/be_const_strtab.h | 5 +
.../berry/generate/be_const_strtab_def.h | 2498 +++++++++--------
lib/libesp32/berry/generate/be_fixed_mqtt.h | 9 +-
lib/libesp32/berry_tasmota/src/be_mqtt_lib.c | 288 ++
.../berry_tasmota/src/be_mqtt_lib.cpp | 21 -
.../berry_tasmota/src/be_tasmota_lib.c | 228 +-
.../berry_tasmota/src/embedded/Tasmota.be | 11 +-
.../src/embedded/partition_core2.be | 510 ++++
tasmota/xdrv_52_3_berry_mqtt.ino | 22 +-
9 files changed, 2199 insertions(+), 1393 deletions(-)
create mode 100644 lib/libesp32/berry_tasmota/src/be_mqtt_lib.c
delete mode 100644 lib/libesp32/berry_tasmota/src/be_mqtt_lib.cpp
create mode 100644 lib/libesp32/berry_tasmota/src/embedded/partition_core2.be
diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h
index 7eea6873c..5ae3888e6 100644
--- a/lib/libesp32/berry/generate/be_const_strtab.h
+++ b/lib/libesp32/berry/generate/be_const_strtab.h
@@ -258,6 +258,7 @@ extern const bcstring be_const_str__rules;
extern const bcstring be_const_str__settings_def;
extern const bcstring be_const_str__settings_ptr;
extern const bcstring be_const_str__splash;
+extern const bcstring be_const_str__subscribe;
extern const bcstring be_const_str__t;
extern const bcstring be_const_str__timers;
extern const bcstring be_const_str__validate;
@@ -667,6 +668,9 @@ extern const bcstring be_const_str_model;
extern const bcstring be_const_str_module;
extern const bcstring be_const_str_month;
extern const bcstring be_const_str_montserrat_font;
+extern const bcstring be_const_str_mqtt;
+extern const bcstring be_const_str_mqtt_data;
+extern const bcstring be_const_str_mqtt_listener;
extern const bcstring be_const_str_name;
extern const bcstring be_const_str_nan;
extern const bcstring be_const_str_next;
@@ -934,6 +938,7 @@ extern const bcstring be_const_str_toint;
extern const bcstring be_const_str_tolower;
extern const bcstring be_const_str_tomap;
extern const bcstring be_const_str_top;
+extern const bcstring be_const_str_topic;
extern const bcstring be_const_str_toptr;
extern const bcstring be_const_str_tostring;
extern const bcstring be_const_str_touch_update;
diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h
index 1820a7668..382db86bf 100644
--- a/lib/libesp32/berry/generate/be_const_strtab_def.h
+++ b/lib/libesp32/berry/generate/be_const_strtab_def.h
@@ -1,900 +1,904 @@
-be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str__X23autoexec_X2Ebe);
-be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf);
-be_define_const_str(_X0A_X29_X3E, "\n)>", 804061574u, 0, 3, &be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27);
-be_define_const_str(_X20, " ", 621580159u, 0, 1, NULL);
-be_define_const_str(_X20_X20, " ", 2982523533u, 0, 2, &be_const_str_next_cron);
-be_define_const_str(_X20_X28, " (", 2848302581u, 0, 2, &be_const_str_argument_X20must_X20be_X20a_X20function);
+be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str__request_from);
+be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_get_temp);
+be_define_const_str(_X0A_X29_X3E, "\n)>", 804061574u, 0, 3, &be_const_str_ALIGN_LEFT_MID);
+be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str__read);
+be_define_const_str(_X20_X20, " ", 2982523533u, 0, 2, &be_const_str_cos);
+be_define_const_str(_X20_X28, " (", 2848302581u, 0, 2, &be_const_str_exp);
be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, NULL);
-be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_get_width);
-be_define_const_str(_X22, "\"", 655135397u, 0, 1, &be_const_str_ALIGN_LEFT_MID);
-be_define_const_str(_X22_X3A, "\":", 399167565u, 0, 2, &be_const_str__debug_present);
-be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_except);
-be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_00);
-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_Partition_info);
-be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_argument_X20must_X20be_X20a_X20list);
-be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str__request_from);
-be_define_const_str(_X25, "%", 537692064u, 0, 1, &be_const_str_begin);
-be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str__X2F_X2Eautoconf);
-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_atan2);
-be_define_const_str(_X2508x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2508x, "%08x-%04x-%04x-%04x-%04x%08x", 1670063141u, 0, 28, &be_const_str___upper__);
-be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_for);
-be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str__ccmd);
-be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str__X2D);
-be_define_const_str(_X27_X20_X2D_X20, "' - ", 3420378487u, 0, 4, &be_const_str_arg_name);
-be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str__X2D_X2A);
-be_define_const_str(_X29, ")", 739023492u, 0, 1, &be_const_str_MI32);
-be_define_const_str(_X2A, "*", 789356349u, 0, 1, &be_const_str_event);
-be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_bytes);
-be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str__X3D_X3C_X3E_X21);
-be_define_const_str(_X2C_X22AXP192_X22_X3A_X7B_X22VBusVoltage_X22_X3A_X25_X2E3f_X2C_X22VBusCurrent_X22_X3A_X25_X2E1f_X2C_X22BattVoltage_X22_X3A_X25_X2E3f_X2C_X22BattCurrent_X22_X3A_X25_X2E1f_X2C_X22Temperature_X22_X3A_X25_X2E1f_X7D, ",\"AXP192\":{\"VBusVoltage\":%.3f,\"VBusCurrent\":%.1f,\"BattVoltage\":%.3f,\"BattCurrent\":%.1f,\"Temperature\":%.1f}", 2598755376u, 0, 106, &be_const_str_write_bit);
-be_define_const_str(_X2D, "-", 671913016u, 0, 1, &be_const_str_is_dirty);
-be_define_const_str(_X2D_X2A, "-*", 499980374u, 0, 2, &be_const_str_lv_clock);
-be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29);
+be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_SERIAL_7E1);
+be_define_const_str(_X22, "\"", 655135397u, 0, 1, &be_const_str_wifi_arcs);
+be_define_const_str(_X22_X3A, "\":", 399167565u, 0, 2, &be_const_str_BLE);
+be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_event_cb);
+be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_Wire);
+be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str__splash);
+be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_set_width);
+be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_gen_cb);
+be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str__X2Fstate_X2F);
+be_define_const_str(_X25, "%", 537692064u, 0, 1, &be_const_str_check_not_method);
+be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_list);
+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_offset);
+be_define_const_str(_X2508x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2508x, "%08x-%04x-%04x-%04x-%04x%08x", 1670063141u, 0, 28, &be_const_str__X2D_X2D_X3A_X2D_X2D);
+be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_url_encode);
+be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str__X2E_X2E);
+be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_ALIGN_BOTTOM_MID);
+be_define_const_str(_X27_X20_X2D_X20, "' - ", 3420378487u, 0, 4, &be_const_str_solidified);
+be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_BRY_X3A_X20bytecode_X20has_X20wrong_X20version_X20_X27_X25s_X27_X20_X28_X25i_X29);
+be_define_const_str(_X29, ")", 739023492u, 0, 1, &be_const_str_clear_first_time);
+be_define_const_str(_X2A, "*", 789356349u, 0, 1, NULL);
+be_define_const_str(_X2B, "+", 772578730u, 0, 1, NULL);
+be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_get_battery_chargin_status);
+be_define_const_str(_X2C_X22AXP192_X22_X3A_X7B_X22VBusVoltage_X22_X3A_X25_X2E3f_X2C_X22VBusCurrent_X22_X3A_X25_X2E1f_X2C_X22BattVoltage_X22_X3A_X25_X2E3f_X2C_X22BattCurrent_X22_X3A_X25_X2E1f_X2C_X22Temperature_X22_X3A_X25_X2E1f_X7D, ",\"AXP192\":{\"VBusVoltage\":%.3f,\"VBusCurrent\":%.1f,\"BattVoltage\":%.3f,\"BattCurrent\":%.1f,\"Temperature\":%.1f}", 2598755376u, 0, 106, &be_const_str_lv_);
+be_define_const_str(_X2D, "-", 671913016u, 0, 1, &be_const_str_load);
+be_define_const_str(_X2D_X2A, "-*", 499980374u, 0, 2, &be_const_str_internal_error);
+be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__);
be_define_const_str(_X2E, ".", 722245873u, 0, 1, NULL);
-be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str_publish_rule);
-be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL);
-be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_connected);
-be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27);
-be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, NULL);
-be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_compress);
-be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_web_add_button);
-be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_cb_event_closure);
-be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_WS2812);
-be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_ceil);
-be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_every_50ms);
-be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_get_switch);
-be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, NULL);
-be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_set_MAC);
-be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_CT);
-be_define_const_str(_X2Flights_X2F, "/lights/", 2370247908u, 0, 8, &be_const_str_assign_rmt);
-be_define_const_str(_X2Fstate_X2F, "/state/", 4226179876u, 0, 7, &be_const_str_fast_loop_enabled);
-be_define_const_str(00, "00", 569209421u, 0, 2, &be_const_str_get_input_power_status);
-be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_run_cron);
-be_define_const_str(_X3C, "<", 957132539u, 0, 1, NULL);
-be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "
", 3546571739u, 0, 11, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E);
-be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "", 1863865923u, 0, 16, NULL);
-be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_SERIAL_5E2);
-be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus);
-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_json_fdump_list);
-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_continue);
-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_X3EAuto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "", 2058443583u, 0, 110, &be_const_str_get_power);
-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, "", 3546571739u, 0, 11, NULL);
+be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "", 1863865923u, 0, 16, &be_const_str_MI32);
+be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_power_off);
+be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_AudioFileSource);
+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_PART_MAIN);
+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_subscribe);
+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_X3EAuto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "", 2058443583u, 0, 110, &be_const_str_consume_silence);
+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, "