From d8ef44142474e4520f3951f88dc71293475d4bb6 Mon Sep 17 00:00:00 2001
From: Stephan Hadinger
Date: Sun, 30 Jan 2022 11:07:15 +0100
Subject: [PATCH] Small fixes to Berry audio
---
lib/libesp32/berry/generate/be_const_strtab.h | 3 +
.../berry/generate/be_const_strtab_def.h | 1988 +++++++++--------
.../be_fixed_be_class_audio_output_i2s.h | 5 +-
.../berry_tasmota/src/be_audio_opus_lib.c | 20 +-
.../berry_tasmota/src/be_i2s_audio_lib.cpp | 6 +
tasmota/berry/alexa_avs/uuid.be | 15 +
6 files changed, 1039 insertions(+), 998 deletions(-)
create mode 100644 tasmota/berry/alexa_avs/uuid.be
diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h
index acd699c9d..fb8a56d9f 100644
--- a/lib/libesp32/berry/generate/be_const_strtab.h
+++ b/lib/libesp32/berry/generate/be_const_strtab.h
@@ -41,12 +41,15 @@ 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;
+extern const bcstring be_const_str_EXTERNAL_I2S;
extern const bcstring be_const_str_False;
extern const bcstring be_const_str_GET;
extern const bcstring be_const_str_HTTP_GET;
extern const bcstring be_const_str_HTTP_POST;
extern const bcstring be_const_str_I2C_Driver;
extern const bcstring be_const_str_I2C_X3A;
+extern const bcstring be_const_str_INTERNAL_DAC;
+extern const bcstring be_const_str_INTERNAL_PDM;
extern const bcstring be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback;
extern const bcstring be_const_str_LVG_X3A_X20object_X3A;
extern const bcstring be_const_str_Leds;
diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h
index c8f53f50e..4c7ce6911 100644
--- a/lib/libesp32/berry/generate/be_const_strtab_def.h
+++ b/lib/libesp32/berry/generate/be_const_strtab_def.h
@@ -1,769 +1,772 @@
-be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_AudioFileSourceFS);
-be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_True);
-be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_due);
-be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_i2c_enabled);
-be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_STATE_DEFAULT);
-be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_Unknown_X20command);
-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_consume_mono);
-be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_Timer);
-be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_response_append);
-be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_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);
-be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker);
-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_exec_cmd);
-be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str___lower__);
-be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_lv_wifi_arcs);
-be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_I2C_Driver);
-be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, NULL);
-be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_collect);
-be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_SERIAL_6N2);
-be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str_contains);
-be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_codedump);
-be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str_HTTP_GET);
-be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27);
-be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson);
-be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_set);
-be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_AudioOutputI2S);
-be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_SERIAL_5E1);
-be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_SERIAL_7O1);
-be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_cosh);
-be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_widget_instance_size);
-be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str__end_transmission);
-be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str__dirty);
-be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_AudioGeneratorWAV);
-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_cb_event_closure);
-be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_create_custom_widget);
-be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29);
-be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_lv_coord_arr);
+be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range);
+be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_duration);
+be_define_const_str(_X20, " ", 621580159u, 0, 1, NULL);
+be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_input);
+be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str__X2Fac);
+be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_I2C_Driver);
+be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_EXTERNAL_I2S);
+be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &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(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_SERIAL_5O2);
+be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, NULL);
+be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_chars_in_string);
+be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_tostring);
+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_has_X20already_X20an_X20event_X20callback);
+be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_tasmota);
+be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str__X3D_X3C_X3E_X21);
+be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_Timer);
+be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_resp_cmnd);
+be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_add_fast_loop);
+be_define_const_str(_X2C, ",", 688690635u, 0, 1, NULL);
+be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X2E);
+be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_LVG_X3A_X20object_X3A);
+be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str_True);
+be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_invalidate);
+be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_class_init_obj);
+be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_read_bytes);
+be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_run_deferred);
+be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, NULL);
+be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_SERIAL_6E1);
+be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_SERIAL_6E2);
+be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_page_autoconf_ctl);
+be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, NULL);
+be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_line_dsc);
+be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_path);
+be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_tolower);
+be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_ctypes_bytes_dyn);
+be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_OpusDecoder);
+be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting);
+be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_json);
be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "
", 3546571739u, 0, 11, NULL);
-be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "", 1863865923u, 0, 16, &be_const_str_set_chg_current);
-be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_connected);
-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_add_rule);
-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__archive);
-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_add_handler);
-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_LVG_X3A_X20object_X3A);
-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, "", 2058443583u, 0, 110, NULL);
+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, "