From 560e676be376da5448553ecba76ecf7dac543138 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Fri, 15 Oct 2021 21:26:33 +0200 Subject: [PATCH] LVGL Berry remove constants --- lib/libesp32/Berry/default/be_modtab.c | 4 - tasmota/lvgl_berry/be_lv_c_mapping.h | 103 ------------------------- tools/lv_berry/convert.py | 16 ---- 3 files changed, 123 deletions(-) diff --git a/lib/libesp32/Berry/default/be_modtab.c b/lib/libesp32/Berry/default/be_modtab.c index d9bce33d9..5d34177b7 100644 --- a/lib/libesp32/Berry/default/be_modtab.c +++ b/lib/libesp32/Berry/default/be_modtab.c @@ -126,8 +126,6 @@ extern void be_load_driver_audio_lib(bvm *vm); #ifdef USE_LVGL extern void be_load_lv_color_class(bvm *vm); extern void be_load_lv_font_class(bvm *vm); -extern void be_load_lv_all_lib(bvm *vm); -extern void be_load_ctypes_lvgl_definitions_lib(bvm *vm); extern void be_load_LVGL_glob_class(bvm *vm); // custom widgets extern void be_load_lv_signal_bars_class(bvm *vm); @@ -179,8 +177,6 @@ BERRY_API void be_load_custom_libs(bvm *vm) be_load_lv_color_class(vm); be_load_lv_font_class(vm); - be_load_lv_all_lib(vm); - be_load_ctypes_lvgl_definitions_lib(vm); be_load_LVGL_glob_class(vm); // custom widgets be_load_lv_signal_bars_class(vm); diff --git a/tasmota/lvgl_berry/be_lv_c_mapping.h b/tasmota/lvgl_berry/be_lv_c_mapping.h index c147f6a86..4745859c6 100644 --- a/tasmota/lvgl_berry/be_lv_c_mapping.h +++ b/tasmota/lvgl_berry/be_lv_c_mapping.h @@ -1046,109 +1046,6 @@ const size_t lv_classes_size = sizeof(lv_classes) / sizeof(lv_classes[0]); int lvbe_font_create(bvm *vm) { return be_call_c_func(vm, NULL, "+lv_group", ""); } - extern void be_load_lv_style_class(bvm *vm); - extern void be_load_lv_font_class(bvm *vm); - extern void be_load_lv_color_class(bvm *vm); - extern void be_load_lv_img_class(bvm *vm); - extern void be_load_lv_obj_class(bvm *vm); - extern void be_load_lv_group_class(bvm *vm); - extern void be_load_lv_indev_class(bvm *vm); - extern void be_load_lv_chart_class(bvm *vm); - extern void be_load_lv_colorwheel_class(bvm *vm); - extern void be_load_lv_imgbtn_class(bvm *vm); - extern void be_load_lv_led_class(bvm *vm); - extern void be_load_lv_meter_class(bvm *vm); - extern void be_load_lv_msgbox_class(bvm *vm); - extern void be_load_lv_spinbox_class(bvm *vm); - extern void be_load_lv_arc_class(bvm *vm); - extern void be_load_lv_bar_class(bvm *vm); - extern void be_load_lv_btn_class(bvm *vm); - extern void be_load_lv_btnmatrix_class(bvm *vm); - extern void be_load_lv_canvas_class(bvm *vm); - extern void be_load_lv_checkbox_class(bvm *vm); - extern void be_load_lv_dropdown_class(bvm *vm); - extern void be_load_lv_label_class(bvm *vm); - extern void be_load_lv_line_class(bvm *vm); - extern void be_load_lv_roller_class(bvm *vm); - extern void be_load_lv_slider_class(bvm *vm); - extern void be_load_lv_switch_class(bvm *vm); - extern void be_load_lv_table_class(bvm *vm); - extern void be_load_lv_textarea_class(bvm *vm); - - void be_load_lv_all_lib(bvm *vm) { - be_load_lv_style_class(vm); - be_load_lv_font_class(vm); - be_load_lv_color_class(vm); -#ifdef BE_LV_WIDGET_IMG - be_load_lv_img_class(vm); -#endif - be_load_lv_obj_class(vm); - be_load_lv_group_class(vm); - be_load_lv_indev_class(vm); -#ifdef BE_LV_WIDGET_CHART - be_load_lv_chart_class(vm); -#endif -#ifdef BE_LV_WIDGET_COLORWHEEL - be_load_lv_colorwheel_class(vm); -#endif -#ifdef BE_LV_WIDGET_IMGBTN - be_load_lv_imgbtn_class(vm); -#endif -#ifdef BE_LV_WIDGET_LED - be_load_lv_led_class(vm); -#endif -#ifdef BE_LV_WIDGET_METER - be_load_lv_meter_class(vm); -#endif -#ifdef BE_LV_WIDGET_MSGBOX - be_load_lv_msgbox_class(vm); -#endif -#ifdef BE_LV_WIDGET_SPINBOX - be_load_lv_spinbox_class(vm); -#endif -#ifdef BE_LV_WIDGET_ARC - be_load_lv_arc_class(vm); -#endif -#ifdef BE_LV_WIDGET_BAR - be_load_lv_bar_class(vm); -#endif -#ifdef BE_LV_WIDGET_BTN - be_load_lv_btn_class(vm); -#endif -#ifdef BE_LV_WIDGET_BTNMATRIX - be_load_lv_btnmatrix_class(vm); -#endif -#ifdef BE_LV_WIDGET_CANVAS - be_load_lv_canvas_class(vm); -#endif -#ifdef BE_LV_WIDGET_CHECKBOX - be_load_lv_checkbox_class(vm); -#endif -#ifdef BE_LV_WIDGET_DROPDOWN - be_load_lv_dropdown_class(vm); -#endif -#ifdef BE_LV_WIDGET_LABEL - be_load_lv_label_class(vm); -#endif -#ifdef BE_LV_WIDGET_LINE - be_load_lv_line_class(vm); -#endif -#ifdef BE_LV_WIDGET_ROLLER - be_load_lv_roller_class(vm); -#endif -#ifdef BE_LV_WIDGET_SLIDER - be_load_lv_slider_class(vm); -#endif -#ifdef BE_LV_WIDGET_SWITCH - be_load_lv_switch_class(vm); -#endif -#ifdef BE_LV_WIDGET_TABLE - be_load_lv_table_class(vm); -#endif -#ifdef BE_LV_WIDGET_TEXTAREA - be_load_lv_textarea_class(vm); -#endif - }; #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/tools/lv_berry/convert.py b/tools/lv_berry/convert.py index 9e140923e..7a31ed13f 100644 --- a/tools/lv_berry/convert.py +++ b/tools/lv_berry/convert.py @@ -386,23 +386,7 @@ print(""" int lvbe_font_create(bvm *vm) { return be_call_c_func(vm, NULL, "+lv_group", ""); } """) - print() -for subtype in lv: - print(f" extern void be_load_lv_{subtype}_class(bvm *vm);") -print() -print(f" void be_load_lv_all_lib(bvm *vm) {{") - -for subtype in lv: - define = f"BE_LV_WIDGET_" + subtype.upper() - if subtype in lv_widgets: - print(f"#ifdef {define}") - print(f" be_load_lv_{subtype}_class(vm);") - if subtype in lv_widgets: - print(f"#endif") - -print(f" }};") - print("#ifdef __cplusplus") print("} /* extern \"C\" */") print("#endif")