Merge upstream LVGL 'v8.3.7' #41

faxe1008 · 2023-06-23T08:31:25Z

This PR is based on #33 work, but integrates the changes from 8.3.7.

Fixes performed include:

Rename the files in zephyr/CMakeLists.txt to match the upstream changes
Add missing checks for LV_COLOR_DEPTH_1 in a few places
Partially revert commit, as the changes done are leading to segfaults in the twister tests:

commit 657e752e7ed661e46cb2c765315dfb2d17fda09f
Author: Gabor Kiss-Vamosi <[email protected]>
Date:   Mon May 23 16:42:14 2022 +0200

    fix(disp): make lv_scr_load work better with lv_scr_load_anim and auto_del = true

    related to: https://forum.lvgl.io/t/crash-when-delete-a-screen-by-using-lv-obj-del/8930

I tested the zephyr lvgl sample on my nxp rt1060 evkb and it ran fine.
However I'd really appreciate feedback on the change regarding the commit revert.

* Update lv_gpu_stm32_dma2d.c fix stm32 DMA2D blend。 * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl

Co-authored-by: pengyiqiang <[email protected]>

For details see: https://docs.lvgl.io/master/overview/style.html

…OLOR_SCREEN_TRANSP With the new layer handling LV_COLOR_SCREEN_TRANSP will be enabled in a lot of cases but screen_transp still shouldn't be enabled.

* feat(cmsis-pack): Monthly update for April * fix typo

Co-authored-by: pengyiqiang <[email protected]>

fixes: #3306

Co-authored-by: pengyiqiang <[email protected]>

* fix(meter): remove unused code * add part_draw_dsc.p2 = &p_outer Co-authored-by: pengyiqiang <[email protected]>

Fixes https://forum.lvgl.io/t/crowded-mode-in-chart/8730

Co-authored-by: pengyiqiang <[email protected]>

* chore: correct the code format in lv_conf_template.h Signed-off-by: Xiang Xiao <[email protected]> * feat(config): support #undef in lv_conf_template.h Signed-off-by: Xiang Xiao <[email protected]>

…#3313) and order macro in lv_conf_kconfig.h as Kconfig and lv_conf_template.h Signed-off-by: Xiang Xiao <[email protected]>

Signed-off-by: Xiang Xiao <[email protected]>

* fix(config): add LV_LAYER_SIMPLE_BUF_SIZE to Kconfig Signed-off-by: Xiang Xiao <[email protected]> * fix(config): remove LV_USE_EXTERNAL_RENDERER which is unused anymore Signed-off-by: Xiang Xiao <[email protected]>

fixes: #4174

The method set_px_argb and set_px_argb_blend did not handle the case of monochrome color depth, leading to unititalized value warnings. Signed-off-by: Fabian Blatz <[email protected]>

This patch renames several files according to the changes performed in upstream lvgl. Signed-off-by: Fabian Blatz <[email protected]>

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

carlescufi · 2023-07-10T14:02:27Z

@faxe1008 I saw no merge commits in your PR, which surprised me. Did you use git merge to merge with the latest upstream?

faxe1008 · 2023-07-10T14:15:16Z

@carlescufi I used the branch by @diegoherranz https://github.com/diegoherranz/lvgl-zephyr/tree/v8.3.3-zephyr and iirc I rebased the changes since 8.3.7 from upstream onto his changes.

Related to zephyrproject-rtos/lvgl#41 (cherry picked from commit 55442c1) Original-Signed-off-by: Fabian Blatz <[email protected]> GitOrigin-RevId: 55442c1 Change-Id: I3b41b120b861bd56b9153ff31819a707d87c298e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4677429 Tested-by: ChromeOS Prod (Robot) <[email protected]> Reviewed-by: Al Semjonovs <[email protected]> Tested-by: Al Semjonovs <[email protected]> Commit-Queue: Al Semjonovs <[email protected]>

Merge upstream LVGL 'v8.3.7'

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

LikWoody and others added 30 commits June 22, 2023 21:54

feat(gpu): add SWM341 gpu support (synwit)

94eaeef

* Update lv_gpu_stm32_dma2d.c fix stm32 DMA2D blend。 * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl * add SWM341 DMA2D support for lvgl

docs(gesture): fix typo lv_indev_act() -> lv_indev_get_act() (#3291)

4e8e3b4

Co-authored-by: pengyiqiang <[email protected]>

feat(draw): support transforming widgets and improfe sw transform

a7c2505

For details see: https://docs.lvgl.io/master/overview/style.html

fix(draw): create intermediate layer for blend modes too

62843d0

docs(readme) update link to the PlatformIO Registry (#3296)

7d70334

feat(fsdrv) fix issues for win32 backends (#3284)

64320c5

fix(hal): disable driver->screen_transp by default regardless to LV_C…

940ff56

…OLOR_SCREEN_TRANSP With the new layer handling LV_COLOR_SCREEN_TRANSP will be enabled in a lot of cases but screen_transp still shouldn't be enabled.

feat(arc): add lv_arc_align_obj_to_angle and lv_arc_rotate_obj_to_angle

b5175e1

fix(draw): be sure angle values are in the correct range

237fcb2

feat(cmsis-pack): Monthly update for April (#3300)

8820631

* feat(cmsis-pack): Monthly update for April * fix typo

fix(draw): revert handling of style_opa on not MAIN parts

78cb763

fix(draw): fix img recolor

425b335

chore: fix warning

f68fbba

fix(lodepng): fix NULL pointer access (#3307)

cca840b

Co-authored-by: pengyiqiang <[email protected]>

fix(grid): fix dead branch

d5f8bab

fixes: #3306

fix(draw): update Makefiles (#3303)

6ece8c7

Co-authored-by: pengyiqiang <[email protected]>

fix(meter): fix typo (#3308)

e0fc089

* fix(meter): remove unused code * add part_draw_dsc.p2 = &p_outer Co-authored-by: pengyiqiang <[email protected]>

ci add Makefile test

87b6136

ci(makefile) fix typo in GitHub action

38a525e

chore(chart): fix typo in the comment

bfb8588

Fixes https://forum.lvgl.io/t/crowded-mode-in-chart/8730

docs(intro): update for v8.2.0 (#3316)

860211b

docs(pc-simulator): add MDK with FastModel (#3318)

86b5858

ci limit tests to 15 seconds

0b98814

ci make sure LVGL assertions cause tests to fail

84ce1b5

test(mem) add test for #3324

c23b47e

fix(refr): initializing row_cnt is to silence the warning (#3309)

bc289ea

Co-authored-by: pengyiqiang <[email protected]>

chore: correct the code format in lv_conf_template.h (#3310)

b00124c

* chore: correct the code format in lv_conf_template.h Signed-off-by: Xiang Xiao <[email protected]> * feat(config): support #undef in lv_conf_template.h Signed-off-by: Xiang Xiao <[email protected]>

fix(config): fix typo in LV_USE_PERF_MONITOR and LV_USE_MEM_MONITOR (…

5123928

…#3313) and order macro in lv_conf_kconfig.h as Kconfig and lv_conf_template.h Signed-off-by: Xiang Xiao <[email protected]>

fix(config): Keep the sequence of widget in order (#3314)

5508011

Signed-off-by: Xiang Xiao <[email protected]>

fix(config): add LV_LAYER_SIMPLE_BUF_SIZE to Kconfig (#3312)

6ade706

* fix(config): add LV_LAYER_SIMPLE_BUF_SIZE to Kconfig Signed-off-by: Xiang Xiao <[email protected]> * fix(config): remove LV_USE_EXTERNAL_RENDERER which is unused anymore Signed-off-by: Xiang Xiao <[email protected]>

tore-espressif and others added 11 commits June 22, 2023 21:56

fix(esp): fix ESP-IDF pedantic builds (backport v8.3) (#4135)

75a7de2

fix(menu): prevent setting the current page again (#4136)

777766b

feat(btnmatrix): review ctrl map and allow width values to be max 15

dff566b

fix(indev): fix integer overflow in recursive zoom calculation

b1a70ff

fix(style): fix trasition on bg_grad color

6ec76f5

fixes: #4174

fix(arm-2d): fix transform-chrome-keying issue (#4178)

cf258f2

fix (spinbox): doubling characters entered from the keyboard (#4190)

61a6792

docs(changelog): update changelog for v8.3.7

088c098

chore(cmsis-pack): update cmsis-pack for v8.3.7 (#4203)

cde1d0c

lvgl: Fix building for monochrome color depth

c618ffc

The method set_px_argb and set_px_argb_blend did not handle the case of monochrome color depth, leading to unititalized value warnings. Signed-off-by: Fabian Blatz <[email protected]>

zephyr/CMakeLists.txt: Rename files according to upstream

162c388

This patch renames several files according to the changes performed in upstream lvgl. Signed-off-by: Fabian Blatz <[email protected]>

This was referenced Jun 23, 2023

manifest: update LVGL to v8.3.7 zephyrproject-rtos/zephyr#59656

Merged

manifest: update LVGL to v8.3.3 zephyrproject-rtos/zephyr#53974

Closed

pdgendt approved these changes Jun 26, 2023

View reviewed changes

faxe1008 force-pushed the update_8.3.7 branch from f7c7777 to 162c388 Compare June 26, 2023 09:09

carlescufi approved these changes Jul 10, 2023

View reviewed changes

carlescufi merged commit f7cf01d into zephyrproject-rtos:zephyr Jul 10, 2023

faxe1008 added a commit to faxe1008/zephyr that referenced this pull request Jul 10, 2023

manifest: update LVGL to v8.3.7

4257480

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

carlescufi pushed a commit to zephyrproject-rtos/zephyr that referenced this pull request Jul 10, 2023

manifest: update LVGL to v8.3.7

55442c1

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

faxe1008 added a commit to faxe1008/zephyr-lvgl that referenced this pull request Jul 14, 2023

Merge pull request zephyrproject-rtos#41 from faxe1008/update_8.3.7

624d668

Merge upstream LVGL 'v8.3.7'

DRuffer-tmo pushed a commit to tmobile/DevEdge-IoTDevKit-ZephyrRTOS that referenced this pull request Jul 27, 2023

manifest: update LVGL to v8.3.7

e622873

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

DRuffer-tmo pushed a commit to tmobile/DevEdge-IoTDevKit-ZephyrRTOS that referenced this pull request Jul 27, 2023

manifest: update LVGL to v8.3.7

3aec2af

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

DRuffer-tmo pushed a commit to tmobile/DevEdge-IoTDevKit-ZephyrRTOS that referenced this pull request Aug 8, 2023

manifest: update LVGL to v8.3.7

ae666c6

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

DRuffer-tmo pushed a commit to tmobile/DevEdge-IoTDevKit-ZephyrRTOS that referenced this pull request Aug 9, 2023

manifest: update LVGL to v8.3.7

11c151c

Related to zephyrproject-rtos/lvgl#41 Signed-off-by: Fabian Blatz <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge upstream LVGL 'v8.3.7' #41

Merge upstream LVGL 'v8.3.7' #41

Uh oh!

faxe1008 commented Jun 23, 2023

Uh oh!

carlescufi commented Jul 10, 2023

Uh oh!

faxe1008 commented Jul 10, 2023 •

edited

Loading

Uh oh!

Uh oh!

Merge upstream LVGL 'v8.3.7' #41

Merge upstream LVGL 'v8.3.7' #41

Uh oh!

Conversation

faxe1008 commented Jun 23, 2023

Uh oh!

carlescufi commented Jul 10, 2023

Uh oh!

faxe1008 commented Jul 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

faxe1008 commented Jul 10, 2023 •

edited

Loading