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

LVGL add string to buffer

This commit is contained in:
Stephan Hadinger 2022-03-10 22:25:38 +01:00
parent 76345c3234
commit 03c9664778
3 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libesp32/berry_tasmota/src/be_ctypes.c
View File

@ -294,8 +294,13 @@ int be_ctypes_setmember(bvm *vm) {
}
// If the value is a pointer, replace with an int of same value (works only on 32 bits CPU)
if (be_iscomptr(vm, 3) || be_isstring(vm, 3)) {
void* v;
if (be_iscomptr(vm, 3)) {
void * v = be_tocomptr(vm, 3);
v = be_tocomptr(vm, 3);
} else {
v = be_tostring(vm, 3);
}
be_pushint(vm, (int32_t) v);
be_moveto(vm, -1, 3);
be_pop(vm, 1);

11
lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c
View File

@ -12,6 +12,14 @@
static const char * be_ctypes_instance_mappings[]; /* forward definition */
const be_ctypes_structure_t be_lv_coord = {
2, /* size in bytes */
1, /* number of elements */
be_ctypes_instance_mappings,
(const be_ctypes_structure_item_t[1]) {
{ "v", 0, 0, 0, ctypes_i16, 0 },
}};
const be_ctypes_structure_t be_lv_point = {
4, /* size in bytes */
2, /* number of elements */
@ -693,6 +701,7 @@ static be_define_ctypes_class(lv_chart_cursor, &be_lv_chart_cursor, &be_class_ct
static be_define_ctypes_class(lv_chart_series, &be_lv_chart_series, &be_class_ctypes, "lv_chart_series");
static be_define_ctypes_class(lv_chart_tick_dsc, &be_lv_chart_tick_dsc, &be_class_ctypes, "lv_chart_tick_dsc");
static be_define_ctypes_class(lv_color_filter_dsc, &be_lv_color_filter_dsc, &be_class_ctypes, "lv_color_filter_dsc");
static be_define_ctypes_class(lv_coord, &be_lv_coord, &be_class_ctypes, "lv_coord");
static be_define_ctypes_class(lv_draw_arc_dsc, &be_lv_draw_arc_dsc, &be_class_ctypes, "lv_draw_arc_dsc");
static be_define_ctypes_class(lv_draw_ctx, &be_lv_draw_ctx, &be_class_ctypes, "lv_draw_ctx");
static be_define_ctypes_class(lv_draw_img_dsc, &be_lv_draw_img_dsc, &be_class_ctypes, "lv_draw_img_dsc");
@ -738,6 +747,7 @@ void be_load_ctypes_lvgl_definitions_lib(bvm *vm) {
ctypes_register_class(vm, &be_class_lv_chart_series, &be_lv_chart_series);
ctypes_register_class(vm, &be_class_lv_chart_tick_dsc, &be_lv_chart_tick_dsc);
ctypes_register_class(vm, &be_class_lv_color_filter_dsc, &be_lv_color_filter_dsc);
ctypes_register_class(vm, &be_class_lv_coord, &be_lv_coord);
ctypes_register_class(vm, &be_class_lv_draw_arc_dsc, &be_lv_draw_arc_dsc);
ctypes_register_class(vm, &be_class_lv_draw_ctx, &be_lv_draw_ctx);
ctypes_register_class(vm, &be_class_lv_draw_img_dsc, &be_lv_draw_img_dsc);
@ -784,6 +794,7 @@ be_ctypes_class_by_name_t be_ctypes_lvgl_classes[] = {
{ "lv_chart_series", &be_class_lv_chart_series },
{ "lv_chart_tick_dsc", &be_class_lv_chart_tick_dsc },
{ "lv_color_filter_dsc", &be_class_lv_color_filter_dsc },
{ "lv_coord", &be_class_lv_coord },
{ "lv_draw_arc_dsc", &be_class_lv_draw_arc_dsc },
{ "lv_draw_ctx", &be_class_lv_draw_ctx },
{ "lv_draw_img_dsc", &be_class_lv_draw_img_dsc },

75
lib/libesp32_lvgl/lv_berry/src/embedded/lvgl_ctypes.be
View File

@ -17,7 +17,7 @@ lv_meter_indicator_type_t = ctypes.u8
lv_opa = ctypes.u8
lv_blend_mode = ctypes.u8
lv_align = ctypes.u8
lv_coord = ctypes.i16
lv_coord_t = ctypes.i16
lv_bidi_dir = ctypes.u8
lv_txt_flag = ctypes.u8
lv_text_decor = ctypes.u8
@ -40,17 +40,22 @@ uint32_t = ctypes.u32
int32_t = ctypes.i32
ptr = ctypes.ptr32
lv_coord = [ # valid LVGL8
[lv_coord_t, "v"],
]
lv_coord = ctypes.structure(lv_coord, "lv_coord")
lv_point = [ # valid LVGL8
[lv_coord, "x"],
[lv_coord, "y"],
[lv_coord_t, "x"],
[lv_coord_t, "y"],
]
lv_point = ctypes.structure(lv_point, "lv_point")
lv_area = [ # valid LVGL8
[lv_coord, "x1"],
[lv_coord, "y1"],
[lv_coord, "x2"],
[lv_coord, "y2"],
[lv_coord_t, "x1"],
[lv_coord_t, "y1"],
[lv_coord_t, "x2"],
[lv_coord_t, "y2"],
]
lv_area = ctypes.structure(lv_area, "lv_area")
@ -72,7 +77,7 @@ lv_grad_dsc = [
lv_grad_dsc = ctypes.structure(lv_grad_dsc, "lv_grad_dsc")
lv_draw_rect_dsc = [ # valid LVGL8.2
[lv_coord, "radius"],
[lv_coord_t, "radius"],
[lv_blend_mode, "blend_mode"],
#/*Background*/
@ -90,32 +95,32 @@ lv_draw_rect_dsc = [ # valid LVGL8.2
#/*Border*/
[lv_color, "border_color"],
[lv_coord, "border_width"],
[lv_coord_t, "border_width"],
[lv_opa, "border_opa"],
[uint8_t_1, "border_post"],
[uint8_t_5, "border_side"],
#/*Outline*/
[lv_color, "outline_color"],
[lv_coord, "outline_width"],
[lv_coord, "outline_pad"],
[lv_coord_t, "outline_width"],
[lv_coord_t, "outline_pad"],
[lv_opa, "outline_opa"],
#/*Shadow*/
[lv_color, "shadow_color"],
[lv_coord, "shadow_width"],
[lv_coord, "shadow_ofs_x"],
[lv_coord, "shadow_ofs_y"],
[lv_coord, "shadow_spread"],
[lv_coord_t, "shadow_width"],
[lv_coord_t, "shadow_ofs_x"],
[lv_coord_t, "shadow_ofs_y"],
[lv_coord_t, "shadow_spread"],
[lv_opa, "shadow_opa"],
]
lv_draw_rect_dsc = ctypes.structure(lv_draw_rect_dsc, "lv_draw_rect_dsc")
lv_draw_line_dsc = [ # valid LVGL8.2
[lv_color, "color"],
[lv_coord, "width"],
[lv_coord, "dash_width"],
[lv_coord, "dash_gap"],
[lv_coord_t, "width"],
[lv_coord_t, "dash_width"],
[lv_coord_t, "dash_gap"],
[lv_opa, "opa"],
[uint8_t_2, "blend_mode"],
[uint8_t_1, "round_start"],
@ -126,7 +131,7 @@ lv_draw_line_dsc = ctypes.structure(lv_draw_line_dsc, "lv_draw_line_dsc")
lv_draw_arc_dsc = [ # valid LVGL8.2
[lv_color, "color"],
[lv_coord, "width"],
[lv_coord_t, "width"],
[uint16_t, "start_angle"],
[uint16_t, "end_angle"],
[ptr, "img_src"],
@ -168,7 +173,7 @@ lv_obj_draw_part_dsc = [ # valid LVGL8.2
[uint32_t, "text_length"],
[uint32_t, "part"],
[uint32_t, "id"],
[lv_coord, "radius"],
[lv_coord_t, "radius"],
[int32_t, "value"],
[ptr, "sub_part_ptr"],
]
@ -221,8 +226,8 @@ lv_draw_mask_line_param = ctypes.structure(lv_draw_mask_line_param, "lv_draw_mas
lv_draw_mask_angle_param_cfg = [ # valid LVGL8.2
[lv_point, "vertex_p"],
[lv_coord, "start_angle"],
[lv_coord, "end_angle"],
[lv_coord_t, "start_angle"],
[lv_coord_t, "end_angle"],
]
lv_draw_mask_angle_param_cfg = ctypes.structure(lv_draw_mask_angle_param_cfg, "lv_draw_mask_angle_param_cfg")
@ -240,7 +245,7 @@ lv_draw_mask_angle_param = ctypes.structure(lv_draw_mask_angle_param, "lv_draw_m
lv_draw_mask_radius_param_cfg = [ # valid LVGL8.2
[lv_area, "rect"],
[lv_coord, "radius"],
[lv_coord_t, "radius"],
[uint8_t_1, "outer"],
]
lv_draw_mask_radius_param_cfg = ctypes.structure(lv_draw_mask_radius_param_cfg, "lv_draw_mask_radius_param_cfg")
@ -252,7 +257,7 @@ lv_draw_mask_radius_circle_dsc = [ # valid LVGL8.2
[ptr, "opa_start_on_y"],
[int32_t, "life"],
[uint32_t, "used_cnt"],
[lv_coord, "radius"],
[lv_coord_t, "radius"],
]
lv_draw_mask_radius_circle_dsc = ctypes.structure(lv_draw_mask_radius_circle_dsc, "lv_draw_mask_radius_circle_dsc")
@ -267,8 +272,8 @@ lv_draw_mask_radius_param = ctypes.structure(lv_draw_mask_radius_param, "lv_draw
lv_draw_mask_fade_param_cfg = [ # valid LVGL8.2
[lv_area, "coords"],
[lv_coord, "y_top"],
[lv_coord, "y_bottom"],
[lv_coord_t, "y_top"],
[lv_coord_t, "y_bottom"],
[lv_opa, "opa_top"],
[lv_opa, "opa_bottom"],
]
@ -431,9 +436,9 @@ lv_chart_cursor = [ # valid LVGL8.2
lv_chart_cursor = ctypes.structure(lv_chart_cursor, "lv_chart_cursor")
lv_chart_tick_dsc = [ # valid LVGL8.2
[lv_coord, "major_len"],
[lv_coord, "minor_len"],
[lv_coord, "draw_size"],
[lv_coord_t, "major_len"],
[lv_coord_t, "minor_len"],
[lv_coord_t, "draw_size"],
[uint16_t_15, "minor_cnt"],
[uint16_t_15, "major_cnt"],
[uint8_t_1, "label_en"],
@ -456,8 +461,8 @@ lv_obj_class = [ # valid LVGL8.2
[destructor_cb, "destructor_cb"],
[ptr, "user_data"],
[event_cb, "event_cb"],
[lv_coord, "width_def"],
[lv_coord, "height_def"],
[lv_coord_t, "width_def"],
[lv_coord_t, "height_def"],
[uint8_t_2, "editable"],
[uint8_t_2, "group_def"],
[uint16_t_16, "instance_size"],
@ -592,10 +597,10 @@ lv_draw_ctx = ctypes.structure(lv_draw_ctx, "lv_draw_ctx")
# Special structure used to calibrate resistive touchscreens
#######################################################################
lv_ts_calibration = [ # valid LVGL8
[lv_coord, "raw_x"],
[lv_coord, "raw_y"],
[lv_coord, "x"],
[lv_coord, "y"],
[lv_coord_t, "raw_x"],
[lv_coord_t, "raw_y"],
[lv_coord_t, "x"],
[lv_coord_t, "y"],
[int32_t, "state"],
]
lv_ts_calibration = ctypes.structure(lv_ts_calibration, "lv_ts_calibration")