Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update/lvgl 8.3.6 #35

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update/lvgl 8.3.6 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7e65e9
Copy the source files from lvgl 8.3.6
Richard-Stump Apr 10, 2023
bda9eb5
Copy lvgl 8.3.6 headers over
Richard-Stump Apr 10, 2023
279187e
Fix includes
Richard-Stump Apr 10, 2023
401be2a
Fix build
Richard-Stump Apr 10, 2023
fa65830
Update version
Richard-Stump Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ EXCLUDE_COLD_LIBRARIES:=
# Set this to 1 to add additional rules to compile your project as a PROS library template
IS_LIBRARY:=1
LIBNAME:=liblvgl
VERSION:=8.3.2
VERSION:=8.3.6
# EXCLUDE_SRC_FROM_LIB= $(SRCDIR)/unpublishedfile.c
# this line excludes opcontrol.c and similar files
EXCLUDE_SRC_FROM_LIB+=$(foreach file, $(SRCDIR)/main,$(foreach cext,$(CEXTS),$(file).$(cext)) $(foreach cxxext,$(CXXEXTS),$(file).$(cxxext)))
Expand Down
20 changes: 20 additions & 0 deletions include/liblvgl/core/lv_core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
CSRCS += lv_disp.c
CSRCS += lv_group.c
CSRCS += lv_indev.c
CSRCS += lv_indev_scroll.c
CSRCS += lv_obj.c
CSRCS += lv_obj_class.c
CSRCS += lv_obj_draw.c
CSRCS += lv_obj_pos.c
CSRCS += lv_obj_scroll.c
CSRCS += lv_obj_style.c
CSRCS += lv_obj_style_gen.c
CSRCS += lv_obj_tree.c
CSRCS += lv_event.c
CSRCS += lv_refr.c
CSRCS += lv_theme.c

DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core
VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core

CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core"
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_disp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/hal/lv_hal.h"
#include "../hal/lv_hal.h"
#include "lv_obj.h"
#include "lv_theme.h"

Expand Down
6 changes: 3 additions & 3 deletions include/liblvgl/core/lv_group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ extern "C" {
* INCLUDES
*********************/

#include "liblvgl/lv_conf_internal.h"
#include "../lv_conf_internal.h"

#include <stdint.h>
#include <stdbool.h>
#include "liblvgl/misc/lv_ll.h"
#include "liblvgl/misc/lv_types.h"
#include "../misc/lv_ll.h"
#include "../misc/lv_types.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_indev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ extern "C" {
* INCLUDES
*********************/
#include "lv_obj.h"
#include "liblvgl/hal/lv_hal_indev.h"
#include "../hal/lv_hal_indev.h"
#include "lv_group.h"

/*********************
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_obj_draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/draw/lv_draw.h"
#include "../draw/lv_draw.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_obj_pos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/misc/lv_area.h"
#include "../misc/lv_area.h"

/*********************
* DEFINES
Expand Down
6 changes: 3 additions & 3 deletions include/liblvgl/core/lv_obj_scroll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/misc/lv_area.h"
#include "liblvgl/misc/lv_anim.h"
#include "liblvgl/misc/lv_types.h"
#include "../misc/lv_area.h"
#include "../misc/lv_anim.h"
#include "../misc/lv_types.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_obj_style.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extern "C" {
*********************/
#include <stdint.h>
#include <stdbool.h>
#include "liblvgl/misc/lv_bidi.h"
#include "../misc/lv_bidi.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_theme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/core/lv_obj.h"
#include "../core/lv_obj.h"

/*********************
* DEFINES
Expand Down
6 changes: 6 additions & 0 deletions include/liblvgl/draw/arm2d/lv_draw_arm2d.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CSRCS += lv_gpu_arm2d.c

DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d
VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d

CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d"
6 changes: 3 additions & 3 deletions include/liblvgl/draw/arm2d/lv_gpu_arm2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/misc/lv_color.h"
#include "liblvgl/hal/lv_hal_disp.h"
#include "liblvgl/draw/sw/lv_draw_sw.h"
#include "../../misc/lv_color.h"
#include "../../hal/lv_hal_disp.h"
#include "../sw/lv_draw_sw.h"

#if LV_USE_GPU_ARM2D

Expand Down
7 changes: 4 additions & 3 deletions include/liblvgl/draw/lv_draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/lv_conf_internal.h"
#include "../lv_conf_internal.h"

#include "liblvgl/misc/lv_style.h"
#include "liblvgl/misc/lv_txt.h"
#include "../misc/lv_style.h"
#include "../misc/lv_txt.h"
#include "lv_img_decoder.h"
#include "lv_img_cache.h"

Expand Down Expand Up @@ -72,6 +72,7 @@ typedef struct _lv_draw_ctx_t {
*/
const lv_area_t * clip_area;

void (*init_buf)(struct _lv_draw_ctx_t * draw_ctx);

void (*draw_rect)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);

Expand Down
25 changes: 25 additions & 0 deletions include/liblvgl/draw/lv_draw.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
CSRCS += lv_draw_arc.c
CSRCS += lv_draw.c
CSRCS += lv_draw_img.c
CSRCS += lv_draw_label.c
CSRCS += lv_draw_line.c
CSRCS += lv_draw_mask.c
CSRCS += lv_draw_rect.c
CSRCS += lv_draw_transform.c
CSRCS += lv_draw_layer.c
CSRCS += lv_draw_triangle.c
CSRCS += lv_img_buf.c
CSRCS += lv_img_cache.c
CSRCS += lv_img_decoder.c

DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw

CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw"

include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d/lv_draw_arm2d.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/lv_draw_nxp.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl/lv_draw_sdl.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/swm341_dma2d/lv_draw_swm341_dma2d.mk
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_arc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/lv_conf_internal.h"
#include "liblvgl/misc/lv_color.h"
#include "liblvgl/misc/lv_area.h"
#include "liblvgl/misc/lv_style.h"
#include "../lv_conf_internal.h"
#include "../misc/lv_color.h"
#include "../misc/lv_area.h"
#include "../misc/lv_style.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/draw/lv_draw_img.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extern "C" {
*********************/
#include "lv_img_decoder.h"
#include "lv_img_buf.h"
#include "liblvgl/misc/lv_style.h"
#include "../misc/lv_style.h"

/*********************
* DEFINES
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_label.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/misc/lv_bidi.h"
#include "liblvgl/misc/lv_txt.h"
#include "liblvgl/misc/lv_color.h"
#include "liblvgl/misc/lv_style.h"
#include "../misc/lv_bidi.h"
#include "../misc/lv_txt.h"
#include "../misc/lv_color.h"
#include "../misc/lv_style.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/draw/lv_draw_layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/lv_conf_internal.h"
#include "../lv_conf_internal.h"

/*********************
* DEFINES
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_line.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/lv_conf_internal.h"
#include "liblvgl/misc/lv_color.h"
#include "liblvgl/misc/lv_area.h"
#include "liblvgl/misc/lv_style.h"
#include "../lv_conf_internal.h"
#include "../misc/lv_color.h"
#include "../misc/lv_area.h"
#include "../misc/lv_style.h"

/*********************
* DEFINES
Expand Down
6 changes: 3 additions & 3 deletions include/liblvgl/draw/lv_draw_mask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern "C" {
* INCLUDES
*********************/
#include <stdbool.h>
#include "liblvgl/misc/lv_area.h"
#include "liblvgl/misc/lv_color.h"
#include "liblvgl/misc/lv_math.h"
#include "../misc/lv_area.h"
#include "../misc/lv_color.h"
#include "../misc/lv_math.h"

/*********************
* DEFINES
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_rect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/lv_conf_internal.h"
#include "liblvgl/misc/lv_color.h"
#include "liblvgl/misc/lv_area.h"
#include "liblvgl/misc/lv_style.h"
#include "../lv_conf_internal.h"
#include "../misc/lv_color.h"
#include "../misc/lv_area.h"
#include "../misc/lv_style.h"
#include "sw/lv_draw_sw_gradient.h"

/*********************
Expand Down
4 changes: 2 additions & 2 deletions include/liblvgl/draw/lv_draw_transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/lv_conf_internal.h"
#include "liblvgl/misc/lv_area.h"
#include "../lv_conf_internal.h"
#include "../misc/lv_area.h"

/*********************
* DEFINES
Expand Down
4 changes: 2 additions & 2 deletions include/liblvgl/draw/lv_img_buf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ extern "C" {
* INCLUDES
*********************/
#include <stdbool.h>
#include "liblvgl/misc/lv_color.h"
#include "liblvgl/misc/lv_area.h"
#include "../misc/lv_color.h"
#include "../misc/lv_area.h"

/*********************
* DEFINES
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_img_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "liblvgl/lv_conf_internal.h"
#include "../lv_conf_internal.h"

#include <stdint.h>
#include "lv_img_buf.h"
#include "liblvgl/misc/lv_fs.h"
#include "liblvgl/misc/lv_types.h"
#include "liblvgl/misc/lv_area.h"
#include "../misc/lv_fs.h"
#include "../misc/lv_types.h"
#include "../misc/lv_area.h"

/*********************
* DEFINES
Expand Down
7 changes: 7 additions & 0 deletions include/liblvgl/draw/nxp/lv_draw_nxp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp
VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp

CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp"

include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp/lv_draw_nxp_pxp.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/vglite/lv_draw_nxp_vglite.mk
9 changes: 9 additions & 0 deletions include/liblvgl/draw/nxp/pxp/lv_draw_nxp_pxp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CSRCS += lv_draw_pxp.c
CSRCS += lv_draw_pxp_blend.c
CSRCS += lv_gpu_nxp_pxp_osa.c
CSRCS += lv_gpu_nxp_pxp.c

DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp
VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp

CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp"
Loading