Merge pull request #14087 from s-hadinger/berry_lvgl_module_phase1

Berry move LVGL mapping to its own library

lib/libesp32/berry/default/be_modtab.c

@@ -157,9 +157,7 @@ extern void be_load_driver_audio_lib(bvm *vm);
 #endif
 
 #ifdef USE_LVGL
-extern void be_load_lv_color_class(bvm *vm);
+#include "lv_berry.h"
-extern void be_load_lv_font_class(bvm *vm);
-extern void be_load_LVGL_glob_class(bvm *vm);
 // custom widgets
 extern void be_load_lv_signal_bars_class(bvm *vm);
 extern void be_load_lv_wifi_bars_class(bvm *vm);
@@ -213,10 +211,7 @@ BERRY_API void be_load_custom_libs(bvm *vm)
 #endif
 #ifdef USE_LVGL
     // LVGL
-    be_load_lv_color_class(vm);
+    be_load_lvgl_classes(vm);
-    be_load_lv_font_class(vm);
-
-    be_load_LVGL_glob_class(vm);
     // custom widgets
     be_load_lv_signal_bars_class(vm);
     be_load_lv_wifi_bars_class(vm);

lib/libesp32/berry/gen.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src -c default/berry_conf.h
+python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src ../../libesp32_lvgl/lv_berry/src -c default/berry_conf.h

lib/libesp32/berry_mapping/src/be_class_wrapper.c

@@ -13,6 +13,14 @@
 #include "be_exec.h"
 #include <string.h>
 
+// By default the cb generator is cb.gen_cb
+// This can be changed. Note: it is across all VMs
+static const char * be_gen_cb_name = "cb.gen_cb";
+
+void be_set_gen_cb_name(bvm *vm, const char * gen_cb) {
+  if (gen_cb) be_gen_cb_name = gen_cb;
+}
+
 /*********************************************************************************************\
  * Create an object of `class_name` given an external poinrt `ptr`.
  * 
@@ -115,7 +123,7 @@ int be_find_global_or_module_member(bvm *vm, const char * name) {
  *   's' be_str
  * 
  * - arg_type: optionally check the types of input arguments, or throw an error
- *   string of argument types, '+' marks optional arguments
+ *   string of argument types
  *   '.' don't care
  *   'i' be_int
  *   'b' be_bool
@@ -125,7 +133,7 @@ int be_find_global_or_module_member(bvm *vm, const char * name) {
  *   'lv_obj' be_instance of type or subtype
  *   '^lv_event_cb' callback of a named class - will call `_lvgl.gen_cb(arg_type, closure, self)` and expects a callback address in return
  * 
- * Ex: "oii+s" takes 3 mandatory arguments (obj_instance, int, int) and an optional fourth one [,string]
+ * Ex: ".ii" takes 3 arguments, first one is any type, followed by 2 ints
 \*********************************************************************************************/
 // general form of lv_obj_t* function, up to 4 parameters
 // We can only send 32 bits arguments (no 64 bits nor double) and we expect pointers to be 32 bits
@@ -302,7 +310,7 @@ void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type,
       }
     }
     // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func arg %i, type %s", i, arg_type_check ? type_short_name : "<null>");
-    p[p_idx++] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : NULL, "_lvgl.gen_cb");
+    p[p_idx++] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : NULL, be_gen_cb_name);
   }
 
   // check if we are missing arguments
@@ -324,11 +332,13 @@ void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type,
 //   ptr: the C pointer for internal data (can be NULL), will be stored in an instance variable
 //   name: name of instance variable to store the pointer as `comptr`.
 //         If NULL, this function does nothing
-//         the name can be prefixed with `+`, if so first char is ignored.
+//         the name can be prefixed with `+` or `=`, if so first char is ignored.
 //         Ex: `+_p` stores in instance variable `_p`
+//         `+` forbids any NULL value (raises an exception) while `=` allows a NULL value
 static void be_set_ctor_ptr(bvm *vm, void * ptr, const char *name) {
   if (name == NULL) return;    // do nothing if no name of attribute
-  if (name[0] == '+') { name++; }   // skip prefix '^' if any
+  if (name[0] == '=' && ptr == NULL)  { be_raise(vm, "value_error", "argument cannot be NULL"); }
+  if (name[0] == '+' || name[0] == '=') { name++; }   // skip prefix '^' if any
   if (strlen(name) == 0) return;  // do nothing if name is empty
 
   be_pushcomptr(vm, ptr);
@@ -362,7 +372,7 @@ int be_call_c_func(bvm *vm, void * func, const char * return_type, const char *
 
   // check if we call a constructor, in this case we store the return type into the new object
   // check if we call a constructor with a comptr as first arg
-  if (return_type && return_type[0] == '+') {
+  if (return_type && (return_type[0] == '+' || return_type[0] == '=')) {
     if (argc > 1 && be_iscomptr(vm, 2)) {
       void * obj = be_tocomptr(vm, 2);
       be_set_ctor_ptr(vm, obj, return_type);
@@ -380,7 +390,7 @@ int be_call_c_func(bvm *vm, void * func, const char * return_type, const char *
   // berry_log_C("be_call_c_func '%s' -> '%s': (%i,%i,%i,%i,%i,%i) -> %i", return_type, arg_type, p[0], p[1], p[2], p[3], p[4], p[5], ret);
 
   if ((return_type == NULL) || (strlen(return_type) == 0))       { be_return_nil(vm); }  // does not return
-  else if (return_type[0] == '+') {
+  else if (return_type[0] == '+' || return_type[0] == '=') {
     void * obj = (void*) ret;
     be_set_ctor_ptr(vm, obj, return_type);
     be_return_nil(vm);

lib/libesp32/berry_mapping/src/be_mapping.h

@@ -43,6 +43,7 @@ typedef struct be_ntv_class_def_t {
 } be_ntv_class_def_t;
 
 void be_raisef(bvm *vm, const char *except, const char *msg, ...);
+void be_set_gen_cb_name(bvm *vm, const char * gen_cb);
 
 extern void be_map_insert_int(bvm *vm, const char *key, bint value);
 extern void be_map_insert_bool(bvm *vm, const char *key, bbool value);

lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c

@@ -6,8 +6,6 @@
  *******************************************************************/
 #include "be_constobj.h"
 
-#ifdef USE_LVGL
-
 #include "lvgl.h"
 #include "be_mapping.h"
 #include "lv_theme_openhasp.h"
@@ -682,6 +680,4 @@ be_local_module(lv,
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(lv);
 
-#endif // USE_LVGL
-
 /********************************************************************/

lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c

@@ -8,8 +8,6 @@
  *******************************************************************/
 #include "be_constobj.h"
 
-#ifdef USE_LVGL
-
 #include "lvgl.h"
 
 extern int lv0_init(bvm *vm);
@@ -1559,6 +1557,3 @@ void be_load_lv_textarea_class(bvm *vm) {
     be_pop(vm, 1);
 }
 
-
-#endif // USE_LVGL
-

lib/libesp32_lvgl/lv_berry/library.json

@@ -0,0 +1,25 @@
+{
+    "name": "Berry mapping to LVGL",
+    "version": "1.0",
+    "description": "Mapping of LVGL functions to Berry",
+    "license": "MIT",
+    "homepage": "https://github.com/arendst/Tasmota",
+    "frameworks": "*",
+    "platforms": "*",
+    "authors":
+    {
+      "name": "Stephan Hadinger",
+      "maintainer": true
+    },
+    "build": {
+        "srcFilter": [
+            "+<*.c>",
+            "+<../generate/*.c>",
+            "+<../generate/*.cpp>",
+            "+<../generate/*.hpp>",
+            "+<*.cpp>",
+            "+<*.h>"
+        ],
+      "flags": [ "-I$PROJECT_DIR/include" ]
+    }
+  }

lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h

@@ -28,7 +28,7 @@ lv_coord_t lv_get_ver_res(void);
 // ======================================================================
 
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_disp.h
+// ../../lvgl/src/core/lv_disp.h
 lv_obj_t * lv_disp_get_scr_act(lv_disp_t * disp)
 lv_obj_t * lv_disp_get_scr_prev(lv_disp_t * disp)
 void lv_disp_load_scr(lv_obj_t * scr)
@@ -50,7 +50,7 @@ static inline void lv_scr_load(lv_obj_t * scr)
 static inline lv_coord_t lv_dpx(lv_coord_t n)
 static inline lv_coord_t lv_disp_dpx(const lv_disp_t * disp, lv_coord_t n)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_event.h
+// ../../lvgl/src/core/lv_event.h
 lv_res_t lv_event_send(struct _lv_obj_t * obj, lv_event_code_t event_code, void * param)
 lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e)
 uint32_t lv_event_register_id(void)
@@ -60,7 +60,7 @@ bool lv_obj_remove_event_dsc(struct _lv_obj_t * obj, struct _lv_event_dsc_t * ev
 void lv_event_set_ext_draw_size(lv_event_t * e, lv_coord_t size)
 void lv_event_set_cover_res(lv_event_t * e, lv_cover_res_t res)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_group.h
+// ../../lvgl/src/core/lv_group.h
 lv_group_t * lv_group_create(void)
 void lv_group_del(lv_group_t * group)
 void lv_group_set_default(lv_group_t * group)
@@ -83,7 +83,7 @@ bool lv_group_get_editing(const lv_group_t * group)
 bool lv_group_get_wrap(lv_group_t * group)
 uint32_t lv_group_get_obj_count(lv_group_t * group)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_indev.h
+// ../../lvgl/src/core/lv_indev.h
 void lv_indev_read_timer_cb(lv_timer_t * timer)
 void lv_indev_enable(lv_indev_t * indev, bool en)
 lv_indev_t * lv_indev_get_act(void)
@@ -104,9 +104,9 @@ lv_obj_t * lv_indev_get_obj_act(void)
 lv_timer_t * lv_indev_get_read_timer(lv_disp_t * indev)
 lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_indev_scroll.h
+// ../../lvgl/src/core/lv_indev_scroll.h
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj.h
+// ../../lvgl/src/core/lv_obj.h
 lv_obj_t * lv_obj_create(lv_obj_t * parent)
 void lv_obj_add_flag(lv_obj_t * obj, lv_obj_flag_t f)
 void lv_obj_clear_flag(lv_obj_t * obj, lv_obj_flag_t f)
@@ -126,13 +126,13 @@ const lv_obj_class_t * lv_obj_get_class(const lv_obj_t * obj)
 bool lv_obj_is_valid(const lv_obj_t * obj)
 static inline lv_coord_t lv_obj_dpx(const lv_obj_t * obj, lv_coord_t n)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_class.h
+// ../../lvgl/src/core/lv_obj_class.h
 struct _lv_obj_t * lv_obj_class_create_obj(const struct _lv_obj_class_t * class_p, struct _lv_obj_t * parent)
 void lv_obj_class_init_obj(struct _lv_obj_t * obj)
 bool lv_obj_is_editable(struct _lv_obj_t * obj)
 bool lv_obj_is_group_def(struct _lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_draw.h
+// ../../lvgl/src/core/lv_obj_draw.h
 void lv_obj_init_draw_rect_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_rect_dsc_t * draw_dsc)
 void lv_obj_init_draw_label_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_label_dsc_t * draw_dsc)
 void lv_obj_init_draw_img_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_img_dsc_t * draw_dsc)
@@ -142,7 +142,7 @@ lv_coord_t lv_obj_calculate_ext_draw_size(struct _lv_obj_t * obj, uint32_t part)
 void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, const lv_area_t * clip_area)
 void lv_obj_refresh_ext_draw_size(struct _lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_pos.h
+// ../../lvgl/src/core/lv_obj_pos.h
 void lv_obj_set_pos(struct _lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
 void lv_obj_set_x(struct _lv_obj_t * obj, lv_coord_t x)
 void lv_obj_set_y(struct _lv_obj_t * obj, lv_coord_t y)
@@ -187,7 +187,7 @@ bool lv_obj_hit_test(struct _lv_obj_t * obj, const lv_point_t * point)
 lv_coord_t lv_clamp_width(lv_coord_t width, lv_coord_t min_width, lv_coord_t max_width, lv_coord_t ref_width)
 lv_coord_t lv_clamp_height(lv_coord_t height, lv_coord_t min_height, lv_coord_t max_height, lv_coord_t ref_height)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_scroll.h
+// ../../lvgl/src/core/lv_obj_scroll.h
 void lv_obj_set_scrollbar_mode(struct _lv_obj_t * obj, lv_scrollbar_mode_t mode)
 void lv_obj_set_scroll_dir(struct _lv_obj_t * obj, lv_dir_t dir)
 void lv_obj_set_scroll_snap_x(struct _lv_obj_t * obj, lv_scroll_snap_t align)
@@ -215,7 +215,7 @@ void lv_obj_get_scrollbar_area(struct _lv_obj_t * obj, lv_area_t * hor, lv_area_
 void lv_obj_scrollbar_invalidate(struct _lv_obj_t * obj)
 void lv_obj_readjust_scroll(struct _lv_obj_t * obj, lv_anim_enable_t anim_en)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style.h
+// ../../lvgl/src/core/lv_obj_style.h
 void lv_obj_add_style(struct _lv_obj_t * obj, lv_style_t * style, lv_style_selector_t selector)
 void lv_obj_remove_style(struct _lv_obj_t * obj, lv_style_t * style, lv_style_selector_t selector)
 static inline void lv_obj_remove_style_all(struct _lv_obj_t * obj)
@@ -236,7 +236,7 @@ static inline void lv_obj_set_style_pad_ver(struct _lv_obj_t * obj, lv_coord_t v
 static inline void lv_obj_set_style_pad_gap(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 static inline void lv_obj_set_style_size(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style_gen.h
+// ../../lvgl/src/core/lv_obj_style_gen.h
 static inline lv_coord_t lv_obj_get_style_width(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_min_width(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_max_width(const struct _lv_obj_t * obj, uint32_t part)
@@ -416,7 +416,7 @@ void lv_obj_set_style_arc_color_filtered(struct _lv_obj_t * obj, lv_color_t valu
 void lv_obj_set_style_arc_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
 void lv_obj_set_style_arc_img_src(struct _lv_obj_t * obj, const void * value, lv_style_selector_t selector)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_tree.h
+// ../../lvgl/src/core/lv_obj_tree.h
 void lv_obj_del(struct _lv_obj_t * obj)
 void lv_obj_clean(struct _lv_obj_t * obj)
 void lv_obj_del_anim_ready_cb(lv_anim_t * a)
@@ -432,10 +432,10 @@ uint32_t lv_obj_get_child_cnt(const struct _lv_obj_t * obj)
 uint32_t lv_obj_get_child_id(const struct _lv_obj_t * obj)
 void lv_obj_tree_walk(struct _lv_obj_t * start_obj, lv_obj_tree_walk_cb_t cb, void * user_data)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_refr.h
+// ../../lvgl/src/core/lv_refr.h
 void lv_refr_now(lv_disp_t * disp)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_theme.h
+// ../../lvgl/src/core/lv_theme.h
 lv_theme_t * lv_theme_get_from_obj(lv_obj_t * obj)
 void lv_theme_apply(lv_obj_t * obj)
 void lv_theme_set_parent(lv_theme_t * new_theme, lv_theme_t * parent)
@@ -446,30 +446,30 @@ const lv_font_t * lv_theme_get_font_large(lv_obj_t * obj)
 lv_color_t lv_theme_get_color_primary(lv_obj_t * obj)
 lv_color_t lv_theme_get_color_secondary(lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw.h
+// ../../lvgl/src/draw/lv_draw.h
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_arc.h
+// ../../lvgl/src/draw/lv_draw_arc.h
 void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc)
 void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, uint16_t start_angle, uint16_t end_angle, const lv_area_t * clip_area, const lv_draw_arc_dsc_t * dsc)
 void lv_draw_arc_get_area(lv_coord_t x, lv_coord_t y, uint16_t radius, uint16_t start_angle, uint16_t end_angle, lv_coord_t w, bool rounded, lv_area_t * area)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_blend.h
+// ../../lvgl/src/draw/lv_draw_blend.h
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_img.h
+// ../../lvgl/src/draw/lv_draw_img.h
 void lv_draw_img_dsc_init(lv_draw_img_dsc_t * dsc)
 void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, const void * src, const lv_draw_img_dsc_t * dsc)
 lv_img_src_t lv_img_src_get_type(const void * src)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_label.h
+// ../../lvgl/src/draw/lv_draw_label.h
 void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc)
 void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_draw_label_dsc_t * dsc, const char * txt, lv_draw_label_hint_t * hint)
 void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * clip_area, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_line.h
+// ../../lvgl/src/draw/lv_draw_line.h
 void lv_draw_line(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip, const lv_draw_line_dsc_t * dsc)
 void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_mask.h
+// ../../lvgl/src/draw/lv_draw_mask.h
 static inline uint8_t lv_draw_mask_get_cnt(void)
 int16_t lv_draw_mask_add(void * param, void * custom_id)
 lv_draw_mask_res_t lv_draw_mask_apply(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len)
@@ -483,28 +483,28 @@ void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area
 void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t * coords, lv_opa_t opa_top, lv_coord_t y_top, lv_opa_t opa_bottom, lv_coord_t y_bottom)
 void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * coords, const lv_opa_t * map)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_rect.h
+// ../../lvgl/src/draw/lv_draw_rect.h
 void lv_draw_rect_dsc_init(lv_draw_rect_dsc_t * dsc)
 void lv_draw_rect(const lv_area_t * coords, const lv_area_t * mask, const lv_draw_rect_dsc_t * dsc)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_triangle.h
+// ../../lvgl/src/draw/lv_draw_triangle.h
 void lv_draw_triangle(const lv_point_t points[], const lv_area_t * clip, const lv_draw_rect_dsc_t * draw_dsc)
 void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_area_t * mask, const lv_draw_rect_dsc_t * draw_dsc)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_img_buf.h
+// ../../lvgl/src/draw/lv_img_buf.h
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_img_cache.h
+// ../../lvgl/src/draw/lv_img_cache.h
 
-// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_img_decoder.h
+// ../../lvgl/src/draw/lv_img_decoder.h
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/themes/default/lv_theme_default.h
+// ../../lvgl/src/extra/themes/default/lv_theme_default.h
 lv_theme_t * lv_theme_default_init(lv_disp_t * disp, lv_color_t color_primary, lv_color_t color_secondary, bool dark, const lv_font_t * font)
 bool lv_theme_default_is_inited(void)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/themes/mono/lv_theme_mono.h
+// ../../lvgl/src/extra/themes/mono/lv_theme_mono.h
 lv_theme_t * lv_theme_mono_init(lv_disp_t * disp, bool dark_bg, const lv_font_t * font)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/chart/lv_chart.h
+// ../../lvgl/src/extra/widgets/chart/lv_chart.h
 lv_obj_t * lv_chart_create(lv_obj_t * parent)
 void lv_chart_set_type(lv_obj_t * obj, lv_chart_type_t type)
 void lv_chart_set_point_count(lv_obj_t * obj, uint16_t cnt)
@@ -542,7 +542,7 @@ lv_coord_t * lv_chart_get_y_array(const lv_obj_t * obj, lv_chart_series_t * ser)
 lv_coord_t * lv_chart_get_x_array(const lv_obj_t * obj, lv_chart_series_t * ser)
 uint32_t lv_chart_get_pressed_point(const lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/colorwheel/lv_colorwheel.h
+// ../../lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h
 lv_obj_t * lv_colorwheel_create(lv_obj_t * parent, bool knob_recolor)
 bool lv_colorwheel_set_hsv(lv_obj_t * obj, lv_color_hsv_t hsv)
 bool lv_colorwheel_set_rgb(lv_obj_t * obj, lv_color_t color)
@@ -553,11 +553,11 @@ lv_color_t lv_colorwheel_get_rgb(lv_obj_t * obj)
 lv_colorwheel_mode_t lv_colorwheel_get_color_mode(lv_obj_t * obj)
 bool lv_colorwheel_get_color_mode_fixed(lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/imgbtn/lv_imgbtn.h
+// ../../lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h
 lv_obj_t * lv_imgbtn_create(lv_obj_t * parent)
 void lv_imgbtn_set_src(lv_obj_t * imgbtn, lv_imgbtn_state_t state, const void * src_left, const void * src_mid, const void * src_right)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/led/lv_led.h
+// ../../lvgl/src/extra/widgets/led/lv_led.h
 lv_obj_t * lv_led_create(lv_obj_t * parent)
 void lv_led_set_color(lv_obj_t * led, lv_color_t color)
 void lv_led_set_brightness(lv_obj_t * led, uint8_t bright)
@@ -566,7 +566,7 @@ void lv_led_off(lv_obj_t * led)
 void lv_led_toggle(lv_obj_t * led)
 uint8_t lv_led_get_brightness(const lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/meter/lv_meter.h
+// ../../lvgl/src/extra/widgets/meter/lv_meter.h
 lv_obj_t * lv_meter_create(lv_obj_t * parent)
 lv_meter_scale_t * lv_meter_add_scale(lv_obj_t * obj)
 void lv_meter_set_scale_ticks(lv_obj_t * obj, lv_meter_scale_t * scale, uint16_t cnt, uint16_t width, uint16_t len, lv_color_t color)
@@ -580,7 +580,7 @@ void lv_meter_set_indicator_value(lv_obj_t * obj, lv_meter_indicator_t * indic,
 void lv_meter_set_indicator_start_value(lv_obj_t * obj, lv_meter_indicator_t * indic, int32_t value)
 void lv_meter_set_indicator_end_value(lv_obj_t * obj, lv_meter_indicator_t * indic, int32_t value)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/msgbox/lv_msgbox.h
+// ../../lvgl/src/extra/widgets/msgbox/lv_msgbox.h
 lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char * txt, const char * btn_txts[], bool add_close_btn)
 lv_obj_t * lv_msgbox_get_title(lv_obj_t * mbox)
 lv_obj_t * lv_msgbox_get_close_btn(lv_obj_t * mbox)
@@ -589,7 +589,7 @@ lv_obj_t * lv_msgbox_get_btns(lv_obj_t * mbox)
 const char * lv_msgbox_get_active_btn_text(lv_obj_t * mbox)
 void lv_msgbox_close(lv_obj_t * mbox)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinbox/lv_spinbox.h
+// ../../lvgl/src/extra/widgets/spinbox/lv_spinbox.h
 lv_obj_t * lv_spinbox_create(lv_obj_t * parent)
 void lv_spinbox_set_value(lv_obj_t * obj, int32_t i)
 void lv_spinbox_set_rollover(lv_obj_t * obj, bool b)
@@ -604,10 +604,10 @@ void lv_spinbox_step_prev(lv_obj_t * obj)
 void lv_spinbox_increment(lv_obj_t * obj)
 void lv_spinbox_decrement(lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinner/lv_spinner.h
+// ../../lvgl/src/extra/widgets/spinner/lv_spinner.h
 lv_obj_t * lv_spinner_create(lv_obj_t * parent, uint32_t time, uint32_t arc_length)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/misc/lv_style_gen.h
+// ../../lvgl/src/misc/lv_style_gen.h
 void lv_style_set_width(lv_style_t * style, lv_coord_t value)
 void lv_style_set_min_width(lv_style_t * style, lv_coord_t value)
 void lv_style_set_max_width(lv_style_t * style, lv_coord_t value)
@@ -698,7 +698,7 @@ void lv_style_set_arc_color_filtered(lv_style_t * style, lv_color_t value)
 void lv_style_set_arc_opa(lv_style_t * style, lv_opa_t value)
 void lv_style_set_arc_img_src(lv_style_t * style, const void * value)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_arc.h
+// ../../lvgl/src/widgets/lv_arc.h
 lv_obj_t * lv_arc_create(lv_obj_t * parent)
 void lv_arc_set_start_angle(lv_obj_t * arc, uint16_t start)
 void lv_arc_set_end_angle(lv_obj_t * arc, uint16_t end)
@@ -720,7 +720,7 @@ int16_t lv_arc_get_min_value(const lv_obj_t * obj)
 int16_t lv_arc_get_max_value(const lv_obj_t * obj)
 lv_arc_mode_t lv_arc_get_mode(const lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_bar.h
+// ../../lvgl/src/widgets/lv_bar.h
 lv_obj_t * lv_bar_create(lv_obj_t * parent)
 void lv_bar_set_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim)
 void lv_bar_set_start_value(lv_obj_t * obj, int32_t start_value, lv_anim_enable_t anim)
@@ -732,10 +732,10 @@ int32_t lv_bar_get_min_value(const lv_obj_t * obj)
 int32_t lv_bar_get_max_value(const lv_obj_t * obj)
 lv_bar_mode_t lv_bar_get_mode(lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_btn.h
+// ../../lvgl/src/widgets/lv_btn.h
 lv_obj_t * lv_btn_create(lv_obj_t * parent)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_btnmatrix.h
+// ../../lvgl/src/widgets/lv_btnmatrix.h
 lv_obj_t * lv_btnmatrix_create(lv_obj_t * parent)
 void lv_btnmatrix_set_map(lv_obj_t * obj, const char * map[])
 void lv_btnmatrix_set_ctrl_map(lv_obj_t * obj, const lv_btnmatrix_ctrl_t ctrl_map[])
@@ -752,7 +752,7 @@ const char * lv_btnmatrix_get_btn_text(const lv_obj_t * obj, uint16_t btn_id)
 bool lv_btnmatrix_has_btn_ctrl(lv_obj_t * obj, uint16_t btn_id, lv_btnmatrix_ctrl_t ctrl)
 bool lv_btnmatrix_get_one_checked(const lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_canvas.h
+// ../../lvgl/src/widgets/lv_canvas.h
 lv_obj_t * lv_canvas_create(lv_obj_t * parent)
 void lv_canvas_set_buffer(lv_obj_t * canvas, void * buf, lv_coord_t w, lv_coord_t h, lv_img_cf_t cf)
 void lv_canvas_set_px(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_color_t c)
@@ -771,13 +771,13 @@ void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t points[], uint32_t
 void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t points[], uint32_t point_cnt, const lv_draw_rect_dsc_t * draw_dsc)
 void lv_canvas_draw_arc(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord_t r, int32_t start_angle, int32_t end_angle, const lv_draw_arc_dsc_t * draw_dsc)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_checkbox.h
+// ../../lvgl/src/widgets/lv_checkbox.h
 lv_obj_t * lv_checkbox_create(lv_obj_t * parent)
 void lv_checkbox_set_text(lv_obj_t * obj, const char * txt)
 void lv_checkbox_set_text_static(lv_obj_t * obj, const char * txt)
 const char * lv_checkbox_get_text(const lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_dropdown.h
+// ../../lvgl/src/widgets/lv_dropdown.h
 lv_obj_t * lv_dropdown_create(lv_obj_t * parent)
 void lv_dropdown_set_text(lv_obj_t * obj, const char * txt)
 void lv_dropdown_set_options(lv_obj_t * obj, const char * options)
@@ -800,7 +800,7 @@ lv_dir_t lv_dropdown_get_dir(const lv_obj_t * obj)
 void lv_dropdown_open(lv_obj_t * dropdown_obj)
 void lv_dropdown_close(lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_img.h
+// ../../lvgl/src/widgets/lv_img.h
 lv_obj_t * lv_img_create(lv_obj_t * parent)
 void lv_img_set_src(lv_obj_t * obj, const void * src)
 void lv_img_set_offset_x(lv_obj_t * obj, lv_coord_t x)
@@ -817,7 +817,7 @@ void lv_img_get_pivot(lv_obj_t * obj, lv_point_t * pivot)
 uint16_t lv_img_get_zoom(lv_obj_t * obj)
 bool lv_img_get_antialias(lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_label.h
+// ../../lvgl/src/widgets/lv_label.h
 lv_obj_t * lv_label_create(lv_obj_t * parent)
 void lv_label_set_text(lv_obj_t * obj, const char * text)
 void lv_label_set_text_fmt(lv_obj_t * obj, const char * fmt, ...) LV_FORMAT_ATTRIBUTE(2, 3)
@@ -837,15 +837,15 @@ uint32_t lv_label_get_text_selection_end(const lv_obj_t * obj)
 void lv_label_ins_text(lv_obj_t * obj, uint32_t pos, const char * txt)
 void lv_label_cut_text(lv_obj_t * obj, uint32_t pos, uint32_t cnt)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_line.h
+// ../../lvgl/src/widgets/lv_line.h
 lv_obj_t * lv_line_create(lv_obj_t * parent)
 void lv_line_set_points(lv_obj_t * obj, const lv_point_t points[], uint16_t point_num)
 void lv_line_set_y_invert(lv_obj_t * obj, bool en)
 bool lv_line_get_y_invert(const lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_objx_templ.h
+// ../../lvgl/src/widgets/lv_objx_templ.h
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_roller.h
+// ../../lvgl/src/widgets/lv_roller.h
 lv_obj_t * lv_roller_create(lv_obj_t * parent)
 void lv_roller_set_options(lv_obj_t * obj, const char * options, lv_roller_mode_t mode)
 void lv_roller_set_selected(lv_obj_t * obj, uint16_t sel_opt, lv_anim_enable_t anim)
@@ -855,7 +855,7 @@ void lv_roller_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf_s
 const char * lv_roller_get_options(const lv_obj_t * obj)
 uint16_t lv_roller_get_option_cnt(const lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_slider.h
+// ../../lvgl/src/widgets/lv_slider.h
 lv_obj_t * lv_slider_create(lv_obj_t * parent)
 static inline void lv_slider_set_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim)
 static inline void lv_slider_set_left_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim)
@@ -868,10 +868,10 @@ static inline int32_t lv_slider_get_max_value(const lv_obj_t * obj)
 bool lv_slider_is_dragged(const lv_obj_t * obj)
 static inline lv_slider_mode_t lv_slider_get_mode(lv_obj_t * slider)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_switch.h
+// ../../lvgl/src/widgets/lv_switch.h
 lv_obj_t * lv_switch_create(lv_obj_t * parent)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_table.h
+// ../../lvgl/src/widgets/lv_table.h
 lv_obj_t * lv_table_create(lv_obj_t * parent)
 void lv_table_set_cell_value(lv_obj_t * obj, uint16_t row, uint16_t col, const char * txt)
 void lv_table_set_cell_value_fmt(lv_obj_t * obj, uint16_t row, uint16_t col, const char * fmt, ...)
@@ -887,7 +887,7 @@ lv_coord_t lv_table_get_col_width(lv_obj_t * obj, uint16_t col)
 bool lv_table_has_cell_ctrl(lv_obj_t * obj, uint16_t row, uint16_t col, lv_table_cell_ctrl_t ctrl)
 void lv_table_get_selected_cell(lv_obj_t * obj, uint16_t * row, uint16_t * col)
 
-// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_textarea.h
+// ../../lvgl/src/widgets/lv_textarea.h
 lv_obj_t * lv_textarea_create(lv_obj_t * parent)
 void lv_textarea_add_char(lv_obj_t * obj, uint32_t c)
 void lv_textarea_add_text(lv_obj_t * obj, const char * txt)
@@ -923,7 +923,7 @@ void lv_textarea_cursor_left(lv_obj_t * obj)
 void lv_textarea_cursor_down(lv_obj_t * obj)
 void lv_textarea_cursor_up(lv_obj_t * obj)
 
-// ../../lib/libesp32_lvgl/LVGL_assets/src/lv_theme_openhasp.h
+// ../../LVGL_assets/src/lv_theme_openhasp.h
 lv_theme_t * lv_theme_openhasp_init(lv_disp_t * disp, lv_color_t color_primary, lv_color_t color_secondary, bool dark, const lv_font_t * font)
 bool lv_theme_openhasp_is_inited(void)
 

lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c

@@ -3,8 +3,6 @@
  *******************************************************************/
 #include "be_ctypes.h"
 
-#ifdef USE_LVGL
-
 #include "lvgl.h"
 #include "be_mapping.h"
 
@@ -527,5 +525,3 @@ be_ctypes_class_by_name_t be_ctypes_lvgl_classes[] = {
 const size_t be_ctypes_lvgl_classes_size = sizeof(be_ctypes_lvgl_classes)/sizeof(be_ctypes_lvgl_classes[0]);
 
 /********************************************************************/
-
-#endif // USE_LVGL

lib/libesp32_lvgl/lv_berry/src/be_lvgl_glob_lib.c

@@ -3,10 +3,6 @@
  *******************************************************************/
 #include "be_constobj.h"
 
-#ifdef USE_LVGL
-
-#include "lvgl.h"
-
 /********************************************************************
 ** Solidified function: get_object_from_ptr
 ********************************************************************/
@@ -823,5 +819,3 @@ void be_load_LVGL_glob_class(bvm *vm) {
     be_setglobal(vm, "LVGL_glob");
     be_pop(vm, 1);
 }
-
-#endif // USE_LVGL

lib/libesp32_lvgl/lv_berry/src/lv_berry.c

@@ -0,0 +1,11 @@
+#include "lv_berry.h"
+
+extern void be_load_lv_color_class(bvm *vm);
+extern void be_load_lv_font_class(bvm *vm);
+extern void be_load_LVGL_glob_class(bvm *vm);
+
+void be_load_lvgl_classes(bvm *vm) {
+  be_load_lv_color_class(vm);
+  be_load_lv_font_class(vm);
+  be_load_LVGL_glob_class(vm);
+}

lib/libesp32_lvgl/lv_berry/src/lv_berry.h

@@ -0,0 +1,17 @@
+
+
+#ifndef __LV_BERRY__
+#define __LV_BERRY__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "berry.h"
+
+extern void be_load_lvgl_classes(bvm *vm);
+
+#ifdef __cplusplus
+}
+#endif
+#endif // __LV_BERRY__

lib/libesp32_lvgl/lv_berry/tools/convert.py

@@ -1,11 +1,11 @@
 import re
 import sys
 
-lv_widgets_file = "lv_funcs.h"
+lv_widgets_file = "../mapping/lv_funcs.h"
-lv_module_file = "lv_enum.h"
+lv_module_file = "../mapping/lv_enum.h"
 
-out_prefix = "../../tasmota/lvgl_berry/"
+out_prefix = "../generate/"
-lvgl_prefix = "../../lib/libesp32/Berry/default/"
+lvgl_prefix = "../generate/"
 
 be_lv_defines = "be_lv_defines.h"
 be_lv_c_mapping = "be_lv_c_mapping.h"
@@ -425,8 +425,6 @@ print("""
  *******************************************************************/
 #include "be_constobj.h"
 
-#ifdef USE_LVGL
-
 #include "lvgl.h"
 
 extern int lv0_init(bvm *vm);
@@ -642,9 +640,6 @@ be_local_class(lv_{subtype},
 }}
 """)
 
-print("""
-#endif // USE_LVGL
-""")
 sys.stdout.close()
 
 
@@ -658,8 +653,6 @@ print("""/********************************************************************
  *******************************************************************/
 #include "be_constobj.h"
 
-#ifdef USE_LVGL
-
 #include "lvgl.h"
 #include "be_mapping.h"
 #include "lv_theme_openhasp.h"
@@ -778,8 +771,6 @@ be_local_module(lv,
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(lv);
-
-#endif // USE_LVGL
 """)
 
 print("/********************************************************************/")

lib/libesp32_lvgl/lv_berry/tools/preprocessor.py

@@ -48,7 +48,7 @@ def clean_source(raw):
 # Parse function signatures
 # ################################################################################
 
-lv_src_prefix = "../../lib/libesp32_lvgl/LVGL8/src/"
+lv_src_prefix = "../../lvgl/src/"
 lv_fun_globs = [ 
                   "widgets/*.h",   # all widgets
                   # "extra/widgets/*/*.h",
@@ -69,14 +69,14 @@ lv_fun_globs = [
                   #"**/*.h",
               ]
 headers_names = list_files(lv_src_prefix, lv_fun_globs)
-headers_names += list_files("../../lib/libesp32_lvgl/LVGL_assets/src/", ["lv_theme_openhasp.h"])
+headers_names += list_files("../../LVGL_assets/src/", ["lv_theme_openhasp.h"])
 # headers_names += ["lv_pre_style.h"] # for LVGL v7, add pre-generated style functions from C preprocessor
 
 # unit test
 # headers_names = [ '../../lib/libesp32_lvgl/LVGL/src/lv_widgets/lv_btn.h' ]
 # headers_names = [ '../../lib/libesp32_lvgl/LVGL/src/lv_api_map.h' ]
 
-output_filename = "lv_funcs.h"
+output_filename = "../mapping/lv_funcs.h"
 sys.stdout = open(output_filename, 'w')
 
 print("""
@@ -169,11 +169,11 @@ sys.stdout.close()
 # Parse 'enum'
 # ################################################################################
 
-lv_src_prefix = "../../lib/libesp32_lvgl/LVGL8/src/"
+lv_src_prefix = "../../lvgl/src/"
 lv_fun_globs = [ "**/*.h" ]
 headers_names = list_files(lv_src_prefix, lv_fun_globs)
 
-output_filename = "lv_enum.h"
+output_filename = "../mapping/lv_enum.h"
 sys.stdout = open(output_filename, 'w')
 print("""// ======================================================================
 // Functions