jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16852 from s-hadinger/lvgl_fix_get_text

Browse Source 
LVGL fix get text
This commit is contained in:
s-hadinger 2022-10-18 10:29:17 +02:00 committed by GitHub
commit 329f0e6b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32_lvgl/lv_binding_berry/generate/be_lv_c_mapping.h
View File

@ -899,7 +899,7 @@ const be_ntv_func_def_t lv_label_func[] = {
{ "get_letter_pos", { (const void*) &lv_label_get_letter_pos, "", "(lv.lv_obj)i(lv.lv_point)" } },
{ "get_long_mode", { (const void*) &lv_label_get_long_mode, "i", "(lv.lv_obj)" } },
{ "get_recolor", { (const void*) &lv_label_get_recolor, "b", "(lv.lv_obj)" } },
{ "get_text", { (const void*) &lv_label_get_text, "c", "(lv.lv_obj)" } },
{ "get_text", { (const void*) &lv_label_get_text, "s", "(lv.lv_obj)" } },
{ "get_text_selection_end", { (const void*) &lv_label_get_text_selection_end, "i", "(lv.lv_obj)" } },
{ "get_text_selection_start", { (const void*) &lv_label_get_text_selection_start, "i", "(lv.lv_obj)" } },
{ "ins_text", { (const void*) &lv_label_ins_text, "", "(lv.lv_obj)is" } },

2
lib/libesp32_lvgl/lv_binding_berry/tools/convert.py
View File

@ -38,6 +38,7 @@ return_types = {
"char *": "c",
"uint8_t *": "c",
"const char *": "s",
"retchar *": "s",
"constchar *": "s", # special construct
"lv_obj_user_data_t": "i",
@ -245,6 +246,7 @@ with open(lv_widgets_file) as f:
l_raw = re.sub('static ', '', l_raw)
l_raw = re.sub('inline ', '', l_raw)
l_raw = re.sub('const\s+char\s*\*', 'constchar *', l_raw)
l_raw = re.sub('^char\s*\*', 'retchar *', l_raw) # special case for returning a char*
l_raw = re.sub('const ', '', l_raw)
l_raw = re.sub('struct ', '', l_raw)
if (len(l_raw) == 0): continue

4
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota_global.ino
View File

@ -36,6 +36,7 @@ extern "C" {
4, /* number of elements */
nullptr,
(const be_ctypes_structure_item_t[4]) {
// Warning: fields below need to be in alphabetical order
{ "devices_present", offsetof(TasmotaGlobal_t, devices_present), 0, 0, ctypes_u8, 0 },
{ "fast_loop_enabled", offsetof(TasmotaGlobal_t, berry_fast_loop_enabled), 0, 0, ctypes_u8, 0 },
{ "restart_flag", offsetof(TasmotaGlobal_t, restart_flag), 0, 0, ctypes_u8, 0 },
@ -47,10 +48,11 @@ extern "C" {
2, /* number of elements */
nullptr,
(const be_ctypes_structure_item_t[2]) {
// Warning: fields below need to be in alphabetical order
{ "bootcount", offsetof(TSettings, bootcount), 0, 0, ctypes_u16, 0 },
{ "sleep", offsetof(TSettings, sleep), 0, 0, ctypes_u8, 0 },
}};
}
#endif // USE_BERRY
#endif // USE_BERRY