diff --git a/lv_obj/lv_style.c b/lv_obj/lv_style.c index 89d38c53b..2c867e517 100644 --- a/lv_obj/lv_style.c +++ b/lv_obj/lv_style.c @@ -162,7 +162,7 @@ void lv_style_init (void) lv_style_btn_rel.body.padding.ver = LV_DPI / 6; lv_style_btn_rel.body.padding.inner = LV_DPI / 10; lv_style_btn_rel.body.border.color = LV_COLOR_MAKE(0x0b, 0x19, 0x28); - lv_style_btn_rel.body.border.width = 1;//LV_DPI / 50 >= 1 ? LV_DPI / 50 : 1; + lv_style_btn_rel.body.border.width = LV_DPI / 50 >= 1 ? LV_DPI / 50 : 1; lv_style_btn_rel.body.border.opa = LV_OPA_70; lv_style_btn_rel.text.color = LV_COLOR_MAKE(0xff, 0xff, 0xff); lv_style_btn_rel.body.shadow.color = LV_COLOR_GRAY; diff --git a/lvgl.mk b/lvgl.mk index 4eac5a2d5..648779bdd 100644 --- a/lvgl.mk +++ b/lvgl.mk @@ -1,105 +1,105 @@ -CFILES += \ -$(LVGL_PATH)/lv_draw/lv_draw_vbasic.c \ -$(LVGL_PATH)/lv_draw/lv_draw.c \ -$(LVGL_PATH)/lv_draw/lv_draw_rbasic.c \ -$(LVGL_PATH)/lv_misc/lv_font.c \ -$(LVGL_PATH)/lv_misc/lv_circ.c \ -$(LVGL_PATH)/lv_misc/lv_area.c \ -$(LVGL_PATH)/lv_misc/lv_task.c \ -$(LVGL_PATH)/lv_misc/lv_fs.c \ -$(LVGL_PATH)/lv_misc/lv_anim.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_20_feedback.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_cyrillic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_sup.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_cyrillic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_cyrillic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_30_file.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_40_file.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_30_basic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_10_feedback.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_60_file.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_sup.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_cyrillic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_30_feedback.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_80_file.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_60_feedback.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_40_feedback.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_cyrillic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_sup.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_sup.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_sup.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_10_basic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_cyrillic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_60_basic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_sup.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_80_feedback.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_20_file.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_20_basic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_40_basic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_80_basic.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/symbol_10_file.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c \ -$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c \ -$(LVGL_PATH)/lv_misc/lv_mem.c \ -$(LVGL_PATH)/lv_misc/lv_templ.c \ -$(LVGL_PATH)/lv_misc/lv_ll.c \ -$(LVGL_PATH)/lv_misc/lv_color.c \ -$(LVGL_PATH)/lv_misc/lv_txt.c \ -$(LVGL_PATH)/lv_misc/lv_ufs.c \ -$(LVGL_PATH)/lv_misc/lv_trigo.c \ -$(LVGL_PATH)/lv_objx/lv_roller.c \ -$(LVGL_PATH)/lv_objx/lv_ddlist.c \ -$(LVGL_PATH)/lv_objx/lv_page.c \ -$(LVGL_PATH)/lv_objx/lv_list.c \ -$(LVGL_PATH)/lv_objx/lv_ta.c \ -$(LVGL_PATH)/lv_objx/lv_tabview.c \ -$(LVGL_PATH)/lv_objx/lv_btn.c \ -$(LVGL_PATH)/lv_objx/lv_kb.c \ -$(LVGL_PATH)/lv_objx/lv_bar.c \ -$(LVGL_PATH)/lv_objx/lv_lmeter.c \ -$(LVGL_PATH)/lv_objx/lv_cb.c \ -$(LVGL_PATH)/lv_objx/lv_slider.c \ -$(LVGL_PATH)/lv_objx/lv_win.c \ -$(LVGL_PATH)/lv_objx/lv_label.c \ -$(LVGL_PATH)/lv_objx/lv_line.c \ -$(LVGL_PATH)/lv_objx/lv_mbox.c \ -$(LVGL_PATH)/lv_objx/lv_sw.c \ -$(LVGL_PATH)/lv_objx/lv_led.c \ -$(LVGL_PATH)/lv_objx/lv_chart.c \ -$(LVGL_PATH)/lv_objx/lv_img.c \ -$(LVGL_PATH)/lv_objx/lv_gauge.c \ -$(LVGL_PATH)/lv_objx/lv_objx_templ.c \ -$(LVGL_PATH)/lv_objx/lv_btnm.c \ -$(LVGL_PATH)/lv_objx/lv_cont.c \ -$(LVGL_PATH)/lv_hal/lv_hal_indev.c \ -$(LVGL_PATH)/lv_hal/lv_hal_tick.c \ -$(LVGL_PATH)/lv_hal/lv_hal_disp.c \ -$(LVGL_PATH)/lv_themes/lv_theme_alien.c \ -$(LVGL_PATH)/lv_themes/lv_theme_templ.c \ -$(LVGL_PATH)/lv_themes/lv_theme.c \ -$(LVGL_PATH)/lv_themes/lv_theme_night.c \ -$(LVGL_PATH)/lv_themes/lv_theme_default.c \ -$(LVGL_PATH)/lv_obj/lv_group.c \ -$(LVGL_PATH)/lv_obj/lv_vdb.c \ -$(LVGL_PATH)/lv_obj/lv_obj.c \ -$(LVGL_PATH)/lv_obj/lv_style.c \ -$(LVGL_PATH)/lv_obj/lv_indev.c \ -$(LVGL_PATH)/lv_obj/lv_refr.c +OBJFILES += \ +$(LVGL_PATH)/lv_draw/lv_draw_vbasic.o \ +$(LVGL_PATH)/lv_draw/lv_draw.o \ +$(LVGL_PATH)/lv_draw/lv_draw_rbasic.o \ +$(LVGL_PATH)/lv_misc/lv_font.o \ +$(LVGL_PATH)/lv_misc/lv_circ.o \ +$(LVGL_PATH)/lv_misc/lv_area.o \ +$(LVGL_PATH)/lv_misc/lv_task.o \ +$(LVGL_PATH)/lv_misc/lv_fs.o \ +$(LVGL_PATH)/lv_misc/lv_anim.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_latin_ext_a.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_20_feedback.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_cyrillic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_latin_ext_a.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_sup.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_latin_ext_b.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_cyrillic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_cyrillic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_30_file.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_40_file.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_30_basic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_10_feedback.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_60_file.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_sup.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_cyrillic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_latin_ext_a.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_30_feedback.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_latin_ext_a.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_latin_ext_b.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_80_file.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_60_feedback.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_40_feedback.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_cyrillic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60_sup.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_sup.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_sup.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_10_basic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30_cyrillic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_60_basic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_latin_ext_a.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_60.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_sup.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_80_feedback.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_20_latin_ext_b.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_20_file.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_30.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_20_basic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_40_basic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_40_latin_ext_b.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_80_basic.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_latin_ext_b.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/symbol_10_file.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_80_latin_ext_b.o \ +$(LVGL_PATH)/lv_misc/lv_fonts/dejavu_10_latin_ext_a.o \ +$(LVGL_PATH)/lv_misc/lv_mem.o \ +$(LVGL_PATH)/lv_misc/lv_templ.o \ +$(LVGL_PATH)/lv_misc/lv_ll.o \ +$(LVGL_PATH)/lv_misc/lv_color.o \ +$(LVGL_PATH)/lv_misc/lv_txt.o \ +$(LVGL_PATH)/lv_misc/lv_ufs.o \ +$(LVGL_PATH)/lv_misc/lv_trigo.o \ +$(LVGL_PATH)/lv_objx/lv_roller.o \ +$(LVGL_PATH)/lv_objx/lv_ddlist.o \ +$(LVGL_PATH)/lv_objx/lv_page.o \ +$(LVGL_PATH)/lv_objx/lv_list.o \ +$(LVGL_PATH)/lv_objx/lv_ta.o \ +$(LVGL_PATH)/lv_objx/lv_tabview.o \ +$(LVGL_PATH)/lv_objx/lv_btn.o \ +$(LVGL_PATH)/lv_objx/lv_kb.o \ +$(LVGL_PATH)/lv_objx/lv_bar.o \ +$(LVGL_PATH)/lv_objx/lv_lmeter.o \ +$(LVGL_PATH)/lv_objx/lv_cb.o \ +$(LVGL_PATH)/lv_objx/lv_slider.o \ +$(LVGL_PATH)/lv_objx/lv_win.o \ +$(LVGL_PATH)/lv_objx/lv_label.o \ +$(LVGL_PATH)/lv_objx/lv_line.o \ +$(LVGL_PATH)/lv_objx/lv_mbox.o \ +$(LVGL_PATH)/lv_objx/lv_sw.o \ +$(LVGL_PATH)/lv_objx/lv_led.o \ +$(LVGL_PATH)/lv_objx/lv_chart.o \ +$(LVGL_PATH)/lv_objx/lv_img.o \ +$(LVGL_PATH)/lv_objx/lv_gauge.o \ +$(LVGL_PATH)/lv_objx/lv_objx_templ.o \ +$(LVGL_PATH)/lv_objx/lv_btnm.o \ +$(LVGL_PATH)/lv_objx/lv_cont.o \ +$(LVGL_PATH)/lv_hal/lv_hal_indev.o \ +$(LVGL_PATH)/lv_hal/lv_hal_tick.o \ +$(LVGL_PATH)/lv_hal/lv_hal_disp.o \ +$(LVGL_PATH)/lv_themes/lv_theme_alien.o \ +$(LVGL_PATH)/lv_themes/lv_theme_templ.o \ +$(LVGL_PATH)/lv_themes/lv_theme.o \ +$(LVGL_PATH)/lv_themes/lv_theme_night.o \ +$(LVGL_PATH)/lv_themes/lv_theme_default.o \ +$(LVGL_PATH)/lv_obj/lv_group.o \ +$(LVGL_PATH)/lv_obj/lv_vdb.o \ +$(LVGL_PATH)/lv_obj/lv_obj.o \ +$(LVGL_PATH)/lv_obj/lv_style.o \ +$(LVGL_PATH)/lv_obj/lv_indev.o \ +$(LVGL_PATH)/lv_obj/lv_refr.o