mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Berry fix memory corruption due to unicode character

This commit is contained in:
Stephan Hadinger 2021-12-16 16:43:13 +01:00
parent 49a5ce3411
commit fe682ea97f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32/berry/default/be_i2c_axp192_lib.c
View File

@ -712,7 +712,7 @@ be_local_closure(AXP192_web_sensor, /* name */
/* K4 */ be_nested_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D),
/* K5 */ be_nested_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D),
/* K6 */ be_nested_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D),
/* K7 */ be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D),
/* K7 */ be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D),
/* K8 */ be_nested_str(get_vbus_voltage),
/* K9 */ be_nested_str(get_bat_voltage),
/* K10 */ be_nested_str(get_bat_current),

2
lib/libesp32/berry/default/embedded/i2c_axp192.be
View File

@ -153,7 +153,7 @@ class AXP192 : I2C_Driver
"{s}Batt Voltage{m}%.3f V{e}"..
"{s}Batt Current{m}%.1f mA{e}"..
#"{s}Batt Power{m}%.3f{e}"..
"{s}Temp AXP{m}%.1f °C{e}",
"{s}Temp AXP{m}%.1f C{e}",
self.get_vbus_voltage(), self.get_vbus_voltage(),
self.get_bat_voltage(), self.get_bat_current(),
#self.get_bat_power(),

2
lib/libesp32/berry/generate/be_const_strtab.h
View File

@ -162,7 +162,7 @@ extern const bcstring be_const_str__X7B;
extern const bcstring be_const_str__X7B_X7D;
extern const bcstring be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D;
extern const bcstring be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D;
extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D;
extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D;
extern const bcstring be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D;
extern const bcstring be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D;
extern const bcstring be_const_str__X7D;

6
lib/libesp32/berry/generate/be_const_strtab_def.h
View File

@ -577,7 +577,7 @@ be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL);
be_define_const_str(running, "running", 343848780u, 0, 7, NULL);
be_define_const_str(save, "save", 3439296072u, 0, 4, NULL);
be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, &be_const_str_scale_uint);
be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D);
be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, NULL);
be_define_const_str(scan, "scan", 3974641896u, 0, 4, NULL);
be_define_const_str(search, "search", 2150836393u, 0, 6, NULL);
be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL);
@ -642,7 +642,7 @@ be_define_const_str(super, "super", 4152230356u, 0, 5, NULL);
be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL);
be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL);
be_define_const_str(tan, "tan", 2633446552u, 0, 3, &be_const_str_do);
be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL);
be_define_const_str(tanh, "tanh", 153638352u, 0, 4, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D);
be_define_const_str(target, "target", 845187144u, 0, 6, NULL);
be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL);
be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL);
@ -732,7 +732,7 @@ be_define_const_str(zip, "zip", 2877453236u, 0, 3, NULL);
be_define_const_str(_X7B, "{", 4262220314u, 0, 1, NULL);
be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, NULL);
be_define_const_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}Batt Voltage{m}%.3f V{e}", 3184308199u, 0, 27, NULL);
be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D, "{s}Temp AXP{m}%.1f \u00b0C{e}", 2304457292u, 0, 24, NULL);
be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D, "{s}Temp AXP{m}%.1f C{e}", 3211020286u, 0, 23, NULL);
be_define_const_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}VBus Current{m}%.1f mA{e}", 1032721155u, 0, 28, NULL);
be_define_const_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}VBus Voltage{m}%.3f V{e}", 165651270u, 0, 27, NULL);
be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL);