diff --git a/.github/workflows/build_micropython.yml b/.github/workflows/build_micropython.yml index 2c187075c0..6061680403 100644 --- a/.github/workflows/build_micropython.yml +++ b/.github/workflows/build_micropython.yml @@ -33,11 +33,6 @@ jobs: - name: Build mpy-cross run: make -j $(nproc) -C mpy-cross - name: Build the unix port - run: make -j $(nproc) -C ports/unix - - name: Run advanced_demo - run: > - echo "import gc,utime; - utime.sleep(5); - gc.collect(); - utime.sleep(5)" | - ports/unix/micropython -i lib/lv_bindings/examples/advanced_demo.py + run: make -j $(nproc) -C ports/unix VARIANT=dev DEBUG=1 + - name: Run tests + run: lib/lv_bindings/tests/run.sh diff --git a/examples/assets/font/lv_font_simsun_16_cjk.fnt b/examples/assets/font/lv_font_simsun_16_cjk.fnt new file mode 100644 index 0000000000..7c4368c4be Binary files /dev/null and b/examples/assets/font/lv_font_simsun_16_cjk.fnt differ diff --git a/examples/assets/font/montserrat-16.fnt b/examples/assets/font/montserrat-16.fnt new file mode 100644 index 0000000000..f5635065c7 Binary files /dev/null and b/examples/assets/font/montserrat-16.fnt differ diff --git a/examples/assets/font/montserrat-22.fnt b/examples/assets/font/montserrat-22.fnt new file mode 100644 index 0000000000..6d4417905b Binary files /dev/null and b/examples/assets/font/montserrat-22.fnt differ diff --git a/examples/assets/img_caret_down.png b/examples/assets/img_caret_down.png new file mode 100644 index 0000000000..6b3320307a Binary files /dev/null and b/examples/assets/img_caret_down.png differ diff --git a/examples/assets/img_hand_hour.png b/examples/assets/img_hand_hour.png new file mode 100644 index 0000000000..1e47ff7b11 Binary files /dev/null and b/examples/assets/img_hand_hour.png differ diff --git a/examples/assets/img_skew_strip.png b/examples/assets/img_skew_strip.png new file mode 100644 index 0000000000..1ac4250bf6 Binary files /dev/null and b/examples/assets/img_skew_strip.png differ diff --git a/examples/assets/img_skew_strip_80x20_argb8888.fnt b/examples/assets/img_skew_strip_80x20_argb8888.fnt new file mode 100755 index 0000000000..ddfcbd8d84 Binary files /dev/null and b/examples/assets/img_skew_strip_80x20_argb8888.fnt differ diff --git a/examples/widgets/bar/lv_example_bar_4.py b/examples/widgets/bar/lv_example_bar_4.py index 3d2db4809e..1ee83c9afc 100644 --- a/examples/widgets/bar/lv_example_bar_4.py +++ b/examples/widgets/bar/lv_example_bar_4.py @@ -3,7 +3,7 @@ # def get_icon(filename,xres,yres): try: - sdl_filename = "../../assets/" + filename + "_" + str(xres) + "x" + str(yres) + "_argb8888.bin" + sdl_filename = "../../assets/" + filename + "_" + str(xres) + "x" + str(yres) + "_argb8888.fnt" print("file name: ", sdl_filename) with open(sdl_filename,'rb') as f: icon_data = f.read() diff --git a/examples/widgets/img/lv_example_img_3.py b/examples/widgets/img/lv_example_img_3.py index 87194a14f7..b287a5a6a1 100644 --- a/examples/widgets/img/lv_example_img_3.py +++ b/examples/widgets/img/lv_example_img_3.py @@ -55,7 +55,7 @@ a2.set_custom_exec_cb(lambda a,val: set_zoom(img,val)) a2.set_values(128, 256) a2.set_time(5000) a2.set_playback_time(3000) -a2.set_repeat_count(LV_ANIM_REPEAT_INFINITE) +a2.set_repeat_count(lv.ANIM_REPEAT.INFINITE) lv.anim_t.start(a2) diff --git a/examples/widgets/label/lv_example_label_3.py b/examples/widgets/label/lv_example_label_3.py index d6ed50b053..1dce0d1e08 100644 --- a/examples/widgets/label/lv_example_label_3.py +++ b/examples/widgets/label/lv_example_label_3.py @@ -13,7 +13,7 @@ fs_driver.fs_register(fs_drv, 'S') try: ltr_label.set_style_text_font(ltr_label, lv.font_montserrat_16, 0) except: - font_montserrat_16 = lv.font_load("S:../../assets/font/montserrat-16.bin") + font_montserrat_16 = lv.font_load("S:../../assets/font/montserrat-16.fnt") ltr_label.set_style_text_font(font_montserrat_16, 0) ltr_label.set_width(310) @@ -26,7 +26,7 @@ rtl_label.set_style_text_font(lv.font_dejavu_16_persian_hebrew, 0) rtl_label.set_width(310) rtl_label.align(lv.ALIGN.LEFT_MID, 5, 0) -font_simsun_16_cjk = lv.font_load("S:../../assets/font/lv_font_simsun_16_cjk.bin") +font_simsun_16_cjk = lv.font_load("S:../../assets/font/lv_font_simsun_16_cjk.fnt") cz_label = lv.label(lv.scr_act()) cz_label.set_style_text_font(font_simsun_16_cjk, 0) diff --git a/examples/widgets/list/lv_example_list_1.py b/examples/widgets/list/lv_example_list_1.py index 73b259ed4f..d0ae048a5a 100644 --- a/examples/widgets/list/lv_example_list_1.py +++ b/examples/widgets/list/lv_example_list_1.py @@ -35,6 +35,6 @@ btn_battery.add_event_cb(event_handler,lv.EVENT.ALL, None) list1.add_text("Exit") btn_apply = list1.add_btn(lv.SYMBOL.OK, "Apply") btn_apply.add_event_cb(event_handler,lv.EVENT.ALL, None) -btn_close = list1.add_btn(LV_SYMBOL.CLOSE, "Close") +btn_close = list1.add_btn(lv.SYMBOL.CLOSE, "Close") btn_close.add_event_cb(event_handler,lv.EVENT.ALL, None) diff --git a/examples/widgets/list/test.py b/examples/widgets/list/test.py index 999ff995c5..36ac6f8ea5 100755 --- a/examples/widgets/list/test.py +++ b/examples/widgets/list/test.py @@ -38,6 +38,6 @@ btn_battery.add_event_cb(event_handler,lv.EVENT.ALL, None) list1.add_text("Exit") btn_apply = list1.add_btn(lv.SYMBOL.OK, "Apply") btn_apply.add_event_cb(event_handler,lv.EVENT.ALL, None) -btn_close = list1.add_btn(LV_SYMBOL.CLOSE, "Close") +btn_close = list1.add_btn(lv.SYMBOL.CLOSE, "Close") btn_close.add_event_cb(event_handler,lv.EVENT.ALL, None) diff --git a/examples/widgets/meter/lv_example_meter_2.py b/examples/widgets/meter/lv_example_meter_2.py index 87ffcc7254..6edf3d1b60 100644 --- a/examples/widgets/meter/lv_example_meter_2.py +++ b/examples/widgets/meter/lv_example_meter_2.py @@ -61,7 +61,7 @@ a3.set_repeat_delay(100) a3.set_playback_delay(100) a3.set_playback_time(2000) a3.set_var(indic3) -a3.set_repeat_count(LV_ANIM_REPEAT_INFINITE) +a3.set_repeat_count(lv.ANIM_REPEAT.INFINITE) a3.set_custom_exec_cb(lambda a,val: set_value(indic3,val)) lv.anim_t.start(a3) diff --git a/examples/widgets/meter/lv_example_meter_4.py b/examples/widgets/meter/lv_example_meter_4.py index 2b4af53b80..1193972aa5 100644 --- a/examples/widgets/meter/lv_example_meter_4.py +++ b/examples/widgets/meter/lv_example_meter_4.py @@ -27,6 +27,6 @@ meter.set_indicator_start_value(indic2, 40) # Start from the previous meter.set_indicator_end_value(indic2, 80) indic3 = meter.add_arc(scale, indic_w, lv.palette_main(lv.PALETTE.DEEP_ORANGE), 0) -meter_set_indicator_start_value(indic3, 80) # Start from the previous -meter_set_indicator_end_value(indic3, 100) +meter.set_indicator_start_value(indic3, 80) # Start from the previous +meter.set_indicator_end_value(indic3, 100) diff --git a/examples/widgets/roller/lv_example_roller_2.py b/examples/widgets/roller/lv_example_roller_2.py index a26e3eb608..03e39f61ab 100644 --- a/examples/widgets/roller/lv_example_roller_2.py +++ b/examples/widgets/roller/lv_example_roller_2.py @@ -22,7 +22,7 @@ except: fs_drv = lv.fs_drv_t() fs_driver.fs_register(fs_drv, 'S') print("montserrat-22 not enabled in lv_conf.h, dynamically loading the font") - font_montserrat_22 = lv.font_load("S:" + "../../assets/font/montserrat-22.bin") + font_montserrat_22 = lv.font_load("S:" + "../../assets/font/montserrat-22.fnt") style_sel.set_text_font(font_montserrat_22) opts = "\n".join(["1","2","3","4","5","6","7","8","9","10"]) diff --git a/examples/widgets/switch/lv_example_switch_1.py b/examples/widgets/switch/lv_example_switch_1.py index fbb0807a3c..ec53cbcaf3 100644 --- a/examples/widgets/switch/lv_example_switch_1.py +++ b/examples/widgets/switch/lv_example_switch_1.py @@ -23,6 +23,6 @@ sw.add_state(lv.STATE.DISABLED) sw.add_event_cb(event_handler, lv.EVENT.ALL, None) sw = lv.switch(lv.scr_act()) -sw.add_state(STATE.CHECKED | lv.STATE.DISABLED) +sw.add_state(lv.STATE.CHECKED | lv.STATE.DISABLED) sw.add_event_cb(event_handler, lv.EVENT.ALL, None) diff --git a/examples/widgets/table/lv_example_table_1.py b/examples/widgets/table/lv_example_table_1.py index 3fe45fbecf..888dfc0fa2 100644 --- a/examples/widgets/table/lv_example_table_1.py +++ b/examples/widgets/table/lv_example_table_1.py @@ -6,20 +6,20 @@ def draw_part_event_cb(e): row = dsc.id // obj.get_col_cnt() col = dsc.id - row * obj.get_col_cnt() - # Make the texts in the first cell center aligned - if row == 0: - dsc.label_dsc.align = lv.TEXT_ALIGN.CENTER - dsc.rect_dsc.bg_color = lv.palette_main(lv.PALETTE.BLUE).color_mix(dsc.rect_dsc.bg_color, lv.OPA._20) - dsc.rect_dsc.bg_opa = lv.OPA.COVER + # Make the texts in the first cell center aligned + if row == 0: + dsc.label_dsc.align = lv.TEXT_ALIGN.CENTER + dsc.rect_dsc.bg_color = lv.palette_main(lv.PALETTE.BLUE).color_mix(dsc.rect_dsc.bg_color, lv.OPA._20) + dsc.rect_dsc.bg_opa = lv.OPA.COVER - # In the first column align the texts to the right - elif col == 0: - dsc.label_dsc.flag = lv.TEXT_ALIGN.RIGHT + # In the first column align the texts to the right + elif col == 0: + dsc.label_dsc.flag = lv.TEXT_ALIGN.RIGHT - # Make every 2nd row grayish - if row != 0 and (row % 2) == 0: - dsc.rect_dsc.bg_color = lv.palette_main(lv.PALETTE.GREY).color_mix(dsc.rect_dsc.bg_color, lv.OPA._10) - dsc.rect_dsc.bg_opa = lv.OPA.COVER + # Make every 2nd row grayish + if row != 0 and (row % 2) == 0: + dsc.rect_dsc.bg_color = lv.palette_main(lv.PALETTE.GREY).color_mix(dsc.rect_dsc.bg_color, lv.OPA._10) + dsc.rect_dsc.bg_opa = lv.OPA.COVER table = lv.table(lv.scr_act())