From 4cd13016d34aff903090d4e1efce25866a1a676a Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 1 Feb 2019 05:44:19 +0100 Subject: [PATCH 1/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8f30b4676..0e5ba11c7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

LittlevGL - Open-source Embedded GUI Library

- - + +

From 17c19fc35a6edcf3be80aac62baef75eb63c703d Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 1 Feb 2019 15:10:59 +0100 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e5ba11c7..324930a63 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@
- +

From dc69cf82eb7bbc82eea01c67abc319398f1ca937 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 1 Feb 2019 21:53:12 +0100 Subject: [PATCH 3/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 324930a63..fe87a15d8 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ style_btn_rel.body.radius = LV_RADIUS_CIRCLE; style_btn_rel.text.color = LV_COLOR_HEX3(0xDEF); static lv_style_t style_btn_pr; /*A variable to store the pressed style*/ -lv_style_copy(&style_btn_pr, &style_btn_rel); /*Initialize from a built-in style*/ +lv_style_copy(&style_btn_pr, &style_btn_rel); /*Initialize from the released style*/ style_btn_pr.body.border.color = LV_COLOR_HEX3(0x46B); style_btn_pr.body.main_color = LV_COLOR_HEX3(0x8BD); style_btn_pr.body.grad_color = LV_COLOR_HEX3(0x24A); From 9a272039d33ad1abd3728be3f7cb067ae6a8d8ee Mon Sep 17 00:00:00 2001 From: Themba D <42941056+embeddedt@users.noreply.github.com> Date: Fri, 1 Feb 2019 16:05:46 -0500 Subject: [PATCH 4/8] Change v5.3 to 5.3 When the badge already says 'version' it doesn't make sense to put the 'v' before the version number. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe87a15d8..8f6ebc09a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

LittlevGL - Open-source Embedded GUI Library

- +

From b66e8410f6d20aca063931988858c061016ea7cc Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 1 Feb 2019 22:27:57 +0100 Subject: [PATCH 5/8] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe87a15d8..2258ca068 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ bool touchpad_read(lv_indev_data_t * data) static lv_coord_t last_x = 0; static lv_coord_t last_y = 0; - /*Save the state and save the pressed cooridnate*/ + /*Save the state and save the pressed coordinate*/ data->state = touchpad_is_pressed() ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL; if(data->state == LV_INDEV_STATE_PR) touchpad_get_xy(&last_x, &last_y); @@ -116,9 +116,9 @@ bool touchpad_read(lv_indev_data_t * data) return false; /*Return `false` because we are not buffering and no more data to read*/ } ``` -6. Call `lv_task_handler()` periodically every few milliseconds. +6. Call `lv_task_handler()` periodically every few milliseconds in the main `while(1)` loop, in Timer interrupt or in an Operation system task. -For a detailed description check the [Online documatation](https://docs.littlevgl.com/#Porting) or the [Porting tutorial](https://github.com/littlevgl/lv_examples/blob/master/lv_tutorial/0_porting/lv_tutorial_porting.c) +For a detailed description check the [Documatation](https://docs.littlevgl.com/#Porting) or the [Porting tutorial](https://github.com/littlevgl/lv_examples/blob/master/lv_tutorial/0_porting/lv_tutorial_porting.c) ### Code examples From 148539d2428329a6723235ab90cb5315b2527fda Mon Sep 17 00:00:00 2001 From: 0xflotus <0xflotus@gmail.com> Date: Sat, 2 Feb 2019 02:26:49 +0100 Subject: [PATCH 6/8] fixed small errors --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2258ca068..3f1677760 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ The easiest way to get started with LittlevGL is to run it in a simulator on you Choose a project with your favourite IDE: -| Eclipse | CodeBlock | Visual Studio | PlatfomIO | Qt Creator | +| Eclipse | CodeBlock | Visual Studio | PlatformIO | Qt Creator | |-------------|----------- |---------------|-----------|------------| | [![Eclipse](https://littlevgl.com/logo/ide/eclipse.jpg)](https://github.com/littlevgl/pc_simulator_sdl_eclipse) | [![CodeBlocks](https://littlevgl.com/logo/ide/codeblocks.jpg)](https://github.com/littlevgl/pc_simulator_win_codeblocks) | [![VisualStudio](https://littlevgl.com/logo/ide/visualstudio.jpg)](https://github.com/littlevgl/visual_studio_2017_sdl_x64) | [![PlatformIO](https://littlevgl.com/logo/ide/platformio.jpg)](https://github.com/littlevgl/pc_simulator_sdl_platformio) | [![QtCreator](https://littlevgl.com/logo/ide/qtcreator.jpg)](https://blog.littlevgl.com/2019-01-03/qt-creator) | | Cross-platform
with SDL | Native Windows | Cross-platform
with SDL | Cross-platform
with SDL | Cross-platform
with SDL | @@ -109,7 +109,7 @@ bool touchpad_read(lv_indev_data_t * data) data->state = touchpad_is_pressed() ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL; if(data->state == LV_INDEV_STATE_PR) touchpad_get_xy(&last_x, &last_y); - /*Set the coordinates (if released use the last pressed cooridantes)*/ + /*Set the coordinates (if released use the last pressed coordinates)*/ data->point.x = last_x; data->point.y = last_y; @@ -118,7 +118,7 @@ bool touchpad_read(lv_indev_data_t * data) ``` 6. Call `lv_task_handler()` periodically every few milliseconds in the main `while(1)` loop, in Timer interrupt or in an Operation system task. -For a detailed description check the [Documatation](https://docs.littlevgl.com/#Porting) or the [Porting tutorial](https://github.com/littlevgl/lv_examples/blob/master/lv_tutorial/0_porting/lv_tutorial_porting.c) +For a detailed description check the [Documentation](https://docs.littlevgl.com/#Porting) or the [Porting tutorial](https://github.com/littlevgl/lv_examples/blob/master/lv_tutorial/0_porting/lv_tutorial_porting.c) ### Code examples @@ -161,8 +161,8 @@ style_btn_pr.body.grad_color = LV_COLOR_HEX3(0x24A); style_btn_pr.body.shadow.width = 2; style_btn_pr.text.color = LV_COLOR_HEX3(0xBCD); -lv_btn_set_style(btn, LV_BTN_STYLE_REL, &style_btn_rel); /*Set the buton's released style*/ -lv_btn_set_style(btn, LV_BTN_STYLE_PR, &style_btn_pr); /*Set the buton's pressed style*/ +lv_btn_set_style(btn, LV_BTN_STYLE_REL, &style_btn_rel); /*Set the button's released style*/ +lv_btn_set_style(btn, LV_BTN_STYLE_PR, &style_btn_pr); /*Set the button's pressed style*/ ``` ![Simple button with LittelvGL](https://littlevgl.com/github/btn2.gif) From fb1a7fc0fc4857cd3eae24f35d36bca5fa5fab46 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 4 Feb 2019 15:28:01 +0100 Subject: [PATCH 7/8] Update stale.yml --- .github/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/stale.yml b/.github/stale.yml index 1b48a4379..914189811 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -7,7 +7,7 @@ exemptLabels: - architecture - pinned # Label to use when marking an issue as stale -# staleLabel: + staleLabel: stale # Comment to post when marking an issue as stale. Set to `false` to disable markComment: > This issue or pull request has been automatically marked as stale because it has not had From b0b1174564c0aac5e645bd5e0550faee3e4f28f3 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Thu, 7 Feb 2019 10:27:18 +0100 Subject: [PATCH 8/8] lv_canvas: fix with LV_COLOR_16_SWAP --- lv_objx/lv_canvas.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lv_objx/lv_canvas.c b/lv_objx/lv_canvas.c index 12fea9783..32e47b71a 100644 --- a/lv_objx/lv_canvas.c +++ b/lv_objx/lv_canvas.c @@ -340,9 +340,27 @@ void lv_canvas_mult_buf(lv_obj_t * canvas, void * to_copy, lv_coord_t w, lv_coor lv_coord_t j; for(i = 0; i < h; i++) { for(j = 0; j < w; j++) { +#if LV_COLOR_DEPTH == 32 canvas_buf_color[j].red = (uint16_t) ((uint16_t) canvas_buf_color[j].red * copy_buf_color[j].red) >> 8; canvas_buf_color[j].green = (uint16_t) ((uint16_t) canvas_buf_color[j].green * copy_buf_color[j].green) >> 8; canvas_buf_color[j].blue = (uint16_t) ((uint16_t) canvas_buf_color[j].blue * copy_buf_color[j].blue) >> 8; +#elif LV_COLOR_DEPTH == 16 + + canvas_buf_color[j].red = (uint16_t) ((uint16_t) canvas_buf_color[j].red * copy_buf_color[j].red) >> 5; + canvas_buf_color[j].blue = (uint16_t) ((uint16_t) canvas_buf_color[j].blue * copy_buf_color[j].blue) >> 5; +# if LV_COLOR_16_SWAP == 0 + canvas_buf_color[j].green = (uint16_t) ((uint16_t) canvas_buf_color[j].green * copy_buf_color[j].green) >> 6; +# else + canvas_buf_color[j].red = (uint16_t) ((uint16_t) canvas_buf_color[j].red * copy_buf_color[j].red) >> 6; + canvas_buf_color[j].blue = (uint16_t) ((uint16_t) canvas_buf_color[j].blue * copy_buf_color[j].blue) >> 6; + canvas_buf_color[j].red = (uint16_t) ((uint16_t) canvas_buf_color[j].red * copy_buf_color[j].red) >> 6; +# endif /*LV_COLOR_16_SWAP*/ + +#elif LV_COLOR_DEPTH == 8 + canvas_buf_color[j].red = (uint16_t) ((uint16_t) canvas_buf_color[j].red * copy_buf_color[j].red) >> 3; + canvas_buf_color[j].green = (uint16_t) ((uint16_t) canvas_buf_color[j].green * copy_buf_color[j].green) >> 3; + canvas_buf_color[j].blue = (uint16_t) ((uint16_t) canvas_buf_color[j].blue * copy_buf_color[j].blue) >> 2; +#endif } copy_buf_color += w; canvas_buf_color += ext->dsc.header.w;