From a793296bc14596469aad4a7f8ee8f7b09ba5a1a8 Mon Sep 17 00:00:00 2001
From: Christian Baars
Date: Sat, 2 Jul 2022 21:30:04 +0200
Subject: [PATCH 1/3] ESP32: support ULP via Berry
---
lib/libesp32/berry/default/be_modtab.c | 4 +
lib/libesp32/berry/generate/be_const_strtab.h | 6 +
.../berry/generate/be_const_strtab_def.h | 2157 +++++++++--------
lib/libesp32/berry/generate/be_fixed_ULP.h | 24 +
lib/libesp32/berry_tasmota/src/be_ULP_lib.c | 55 +
.../xdrv_52_3_berry_ulp.ino | 117 +
6 files changed, 1289 insertions(+), 1074 deletions(-)
create mode 100644 lib/libesp32/berry/generate/be_fixed_ULP.h
create mode 100644 lib/libesp32/berry_tasmota/src/be_ULP_lib.c
create mode 100644 tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_ulp.ino
diff --git a/lib/libesp32/berry/default/be_modtab.c b/lib/libesp32/berry/default/be_modtab.c
index 8275ec739..68a06f05b 100644
--- a/lib/libesp32/berry/default/be_modtab.c
+++ b/lib/libesp32/berry/default/be_modtab.c
@@ -50,6 +50,7 @@ be_extern_native_module(animate);
be_extern_native_module(partition_core);
be_extern_native_module(crc);
be_extern_native_module(crypto);
+be_extern_native_module(ULP);
#ifdef USE_ZIGBEE
be_extern_native_module(zigbee);
#endif // USE_ZIGBEE
@@ -162,6 +163,9 @@ BERRY_LOCAL const bntvmodule* const be_module_table[] = {
#ifdef USE_ALEXA_AVS
&be_native_module(crypto),
#endif
+#if defined(USE_BERRY_ULP) && defined(CONFIG_IDF_TARGET_ESP32)
+ &be_native_module(ULP),
+#endif // USE_BERRY_ULP
/* user-defined modules register end */
NULL /* do not remove */
diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h
index 9ed74e75b..d7b7959dd 100644
--- a/lib/libesp32/berry/generate/be_const_strtab.h
+++ b/lib/libesp32/berry/generate/be_const_strtab.h
@@ -237,6 +237,7 @@ extern const bcstring be_const_str_a;
extern const bcstring be_const_str_abs;
extern const bcstring be_const_str_acos;
extern const bcstring be_const_str_active_otadata;
+extern const bcstring be_const_str_adc_config;
extern const bcstring be_const_str_add;
extern const bcstring be_const_str_add_anim;
extern const bcstring be_const_str_add_cb_event_closure;
@@ -456,6 +457,7 @@ extern const bcstring be_const_str_get_image_size;
extern const bcstring be_const_str_get_input_power_status;
extern const bcstring be_const_str_get_light;
extern const bcstring be_const_str_get_log;
+extern const bcstring be_const_str_get_mem;
extern const bcstring be_const_str_get_name;
extern const bcstring be_const_str_get_object_from_ptr;
extern const bcstring be_const_str_get_option;
@@ -475,6 +477,7 @@ extern const bcstring be_const_str_getfloat;
extern const bcstring be_const_str_geti;
extern const bcstring be_const_str_global;
extern const bcstring be_const_str_gpio;
+extern const bcstring be_const_str_gpio_init;
extern const bcstring be_const_str_group_def;
extern const bcstring be_const_str_groups;
extern const bcstring be_const_str_h;
@@ -724,6 +727,7 @@ extern const bcstring be_const_str_set_ldo_enable;
extern const bcstring be_const_str_set_ldo_voltage;
extern const bcstring be_const_str_set_light;
extern const bcstring be_const_str_set_matrix_pixel_color;
+extern const bcstring be_const_str_set_mem;
extern const bcstring be_const_str_set_mode_ct;
extern const bcstring be_const_str_set_mode_rgb;
extern const bcstring be_const_str_set_ota_max;
@@ -749,6 +753,7 @@ extern const bcstring be_const_str_signal_change;
extern const bcstring be_const_str_sin;
extern const bcstring be_const_str_sinh;
extern const bcstring be_const_str_size;
+extern const bcstring be_const_str_sleep;
extern const bcstring be_const_str_slots;
extern const bcstring be_const_str_solidified;
extern const bcstring be_const_str_spiffs;
@@ -826,6 +831,7 @@ extern const bcstring be_const_str_value_error;
extern const bcstring be_const_str_valuer_error;
extern const bcstring be_const_str_var;
extern const bcstring be_const_str_w;
+extern const bcstring be_const_str_wake_period;
extern const bcstring be_const_str_wd;
extern const bcstring be_const_str_web_add_button;
extern const bcstring be_const_str_web_add_config_button;
diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h
index 96acac467..b9f20a7d8 100644
--- a/lib/libesp32/berry/generate/be_const_strtab_def.h
+++ b/lib/libesp32/berry/generate/be_const_strtab_def.h
@@ -1,810 +1,815 @@
-be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_SERIAL_7O1);
-be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E);
-be_define_const_str(_X0A_X29_X3E, "\n)>", 804061574u, 0, 3, &be_const_str_battery_present);
-be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_SK6812_GRBW);
-be_define_const_str(_X20_X20, " ", 2982523533u, 0, 2, &be_const_str__X2C);
-be_define_const_str(_X20_X28, " (", 2848302581u, 0, 2, &be_const_str_add_cmd);
-be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_close);
-be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29);
-be_define_const_str(_X22, "\"", 655135397u, 0, 1, &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(_X22_X3A, "\":", 399167565u, 0, 2, &be_const_str_timer_cb);
-be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str__fl);
-be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_Invalid_X20ota_X20partition_X20number);
-be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_begin);
-be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_issubclass);
-be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_get_factory_slot);
-be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_unsubscribe);
-be_define_const_str(_X25, "%", 537692064u, 0, 1, &be_const_str_reverse);
-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__X2D_X2A);
-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__ptr);
-be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str__X2A);
-be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_add_fast_loop);
-be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_full_state);
-be_define_const_str(_X27_X20_X2D_X20, "' - ", 3420378487u, 0, 4, &be_const_str_EVENT_DELETE);
-be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str__unsubscribe);
-be_define_const_str(_X29, ")", 739023492u, 0, 1, NULL);
-be_define_const_str(_X2A, "*", 789356349u, 0, 1, &be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_X27_X25s_X27_X20_X28_X25s_X20_X2D_X20_X25s_X29);
-be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str__X2Flights_X2F);
-be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_try_run_compiled);
-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, NULL);
-be_define_const_str(_X2D, "-", 671913016u, 0, 1, &be_const_str_SERIAL_5E2);
-be_define_const_str(_X2D_X2A, "-*", 499980374u, 0, 2, &be_const_str_remove_cmd);
-be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_lvgl_event_dispatch);
-be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__X3A);
-be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL);
-be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E);
-be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_POST);
-be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, NULL);
-be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_HTTP_POST);
-be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_response_append);
-be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_a);
+be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_argument_X20must_X20be_X20a_X20list);
+be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str__X21_X3D);
+be_define_const_str(_X0A_X29_X3E, "\n)>", 804061574u, 0, 3, &be_const_str__X2Ew);
+be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E);
+be_define_const_str(_X20_X20, " ", 2982523533u, 0, 2, &be_const_str_byte);
+be_define_const_str(_X20_X28, " (", 2848302581u, 0, 2, &be_const_str_call);
+be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E);
+be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_imin);
+be_define_const_str(_X22, "\"", 655135397u, 0, 1, NULL);
+be_define_const_str(_X22_X3A, "\":", 399167565u, 0, 2, &be_const_str_BRY_X3A_X20bytecode_X20has_X20wrong_X20version_X20_X27_X25s_X27_X20_X28_X25i_X29);
+be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_has_arg);
+be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_SK6812_GRBW);
+be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_i2c_enabled);
+be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, NULL);
+be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_otadata);
+be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, NULL);
+be_define_const_str(_X25, "%", 537692064u, 0, 1, NULL);
+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_get_ota_slot);
+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_close);
+be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_CFG_X3A_X20running_X20);
+be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_exec_cmd);
+be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_allocated);
+be_define_const_str(_X27_X20_X2D_X20, "' - ", 3420378487u, 0, 4, &be_const_str_push_path);
+be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str__X2Fstate_X2F);
+be_define_const_str(_X29, ")", 739023492u, 0, 1, &be_const_str_cmd_res);
+be_define_const_str(_X2A, "*", 789356349u, 0, 1, &be_const_str_content_start);
+be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_SERIAL_5O2);
+be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str__rules);
+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__error);
+be_define_const_str(_X2D, "-", 671913016u, 0, 1, &be_const_str_get_light);
+be_define_const_str(_X2D_X2A, "-*", 499980374u, 0, 2, &be_const_str_cosh);
+be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_file);
+be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, NULL);
+be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_get_switch);
+be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_try_run_compiled);
+be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29);
+be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_get_temp);
+be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_Unknown);
+be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, NULL);
+be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_count);
be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, NULL);
-be_define_const_str(_X2F, "/", 705468254u, 0, 1, NULL);
-be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_assert);
-be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, NULL);
-be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_SERIAL_8E1);
-be_define_const_str(_X2Flights_X2F, "/lights/", 2370247908u, 0, 8, &be_const_str_WS2812_GRB);
-be_define_const_str(_X2Fstate_X2F, "/state/", 4226179876u, 0, 7, &be_const_str_DIMMER);
-be_define_const_str(00, "00", 569209421u, 0, 2, &be_const_str_CFG_X3A_X20running_X20);
-be_define_const_str(0x_X2502X, "0x%02X", 2626549866u, 0, 6, &be_const_str_SERIAL_5O1);
-be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_I2C_X3A);
-be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_CFG_X3A_X20loaded_X20_X20);
-be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "
", 3546571739u, 0, 11, &be_const_str_toptr);
-be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "", 1863865923u, 0, 16, &be_const_str_active_otadata);
-be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str__filename);
-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__change_buffer);
-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_publish);
-be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "