You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/08/14 15:02:32 UTC
[incubator-nuttx-apps] branch master updated (efeb1d1 -> aaa198f)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from efeb1d1 netutils/ftpc: Change watchdog callback prototype
new 7099bc4 interpreters/duktape: Add console/print/alart support
new 08c5998 graphics/lvgl: Specific LVGL version by kconfig
new aaa198f interpreters/duktape: Clean objects
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/lvgldemo/Makefile | 2 +-
graphics/lvgl/Kconfig | 4 ++++
graphics/lvgl/Makefile | 2 +-
interpreters/duktape/Makefile | 20 +++++++++++++++++---
4 files changed, 23 insertions(+), 5 deletions(-)
[incubator-nuttx-apps] 02/03: graphics/lvgl: Specific LVGL version
by kconfig
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 08c5998472af05c0dab97388b599513bdfb77c50
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri Aug 14 20:31:51 2020 +0800
graphics/lvgl: Specific LVGL version by kconfig
Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
examples/lvgldemo/Makefile | 2 +-
graphics/lvgl/Kconfig | 4 ++++
graphics/lvgl/Makefile | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index 1e48d47..2b30f47 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -39,7 +39,7 @@ include $(APPDIR)/Make.defs
CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_examples/archive
-LVGL_EXAMPLES_VERSION ?= 7.0.2
+LVGL_EXAMPLES_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LVGL_VERSION)))
LVGL_EXAMPLES_TARBALL = v$(LVGL_EXAMPLES_VERSION).zip
WGET ?= wget
diff --git a/graphics/lvgl/Kconfig b/graphics/lvgl/Kconfig
index c0fa713..993a40e 100644
--- a/graphics/lvgl/Kconfig
+++ b/graphics/lvgl/Kconfig
@@ -11,6 +11,10 @@ menuconfig GRAPHICS_LVGL
if GRAPHICS_LVGL
+config LVGL_VERSION
+ string "LVGL Version"
+ default "7.3.0"
+
config LV_MEM_SIZE
int "Heap size of the graphics library"
default 32768
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index 16e278a..adf0c3a 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -57,7 +57,7 @@ WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
CONFIG_GRAPH_LVGL_URL ?= "https://github.com/lvgl/lvgl/archive"
-LVGL_VERSION ?= 7.0.2
+LVGL_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LVGL_VERSION)))
LVGL_TARBALL = v$(LVGL_VERSION).zip
WGET ?= wget
[incubator-nuttx-apps] 03/03: interpreters/duktape: Clean objects
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit aaa198f08c360ddeffea9bd1525d5854be44c100
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri Aug 14 21:48:50 2020 +0800
interpreters/duktape: Clean objects
Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
interpreters/duktape/Makefile | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/interpreters/duktape/Makefile b/interpreters/duktape/Makefile
index 84f1000..f090972 100644
--- a/interpreters/duktape/Makefile
+++ b/interpreters/duktape/Makefile
@@ -26,11 +26,16 @@ DUKTAPE_TARBALL = duktape-$(DUKTAPE_VERSION).tar.xz
DUKTAPE_URL_BASE = https://github.com/svaarala/duktape/releases/download/
DUKTAPE_URL = $(DUKTAPE_URL_BASE)v$(DUKTAPE_VERSION)/$(DUKTAPE_TARBALL)
-CSRCS = $(DUKTAPE_UNPACK)/src-noline/duktape.c
-CSRCS += $(DUKTAPE_UNPACK)/extras/console/duk_console.c
-CSRCS += $(DUKTAPE_UNPACK)/extras/print-alert/duk_print_alert.c
+CSRCS = duktape.c
+CSRCS += duk_console.c
+CSRCS += duk_print_alert.c
-MAINSRC = $(DUKTAPE_UNPACK)/examples/cmdline/duk_cmdline.c
+MAINSRC = duk_cmdline.c
+
+VPATH += $(DUKTAPE_UNPACK)/src-noline
+VPATH += $(DUKTAPE_UNPACK)/extras/console
+VPATH += $(DUKTAPE_UNPACK)/extras/print-alert
+VPATH += $(DUKTAPE_UNPACK)/examples/cmdline
PROGNAME = duk
PRIORITY = $(CONFIG_INTERPRETERS_DUKTAPE_PRIORITY)
[incubator-nuttx-apps] 01/03: interpreters/duktape: Add
console/print/alart support
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 7099bc4b02f4e9c598a9266d2c4fb78a64c4b658
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri Aug 14 13:51:32 2020 +0800
interpreters/duktape: Add console/print/alart support
Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
interpreters/duktape/Makefile | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/interpreters/duktape/Makefile b/interpreters/duktape/Makefile
index 1ed39c1..84f1000 100644
--- a/interpreters/duktape/Makefile
+++ b/interpreters/duktape/Makefile
@@ -27,6 +27,8 @@ DUKTAPE_URL_BASE = https://github.com/svaarala/duktape/releases/download/
DUKTAPE_URL = $(DUKTAPE_URL_BASE)v$(DUKTAPE_VERSION)/$(DUKTAPE_TARBALL)
CSRCS = $(DUKTAPE_UNPACK)/src-noline/duktape.c
+CSRCS += $(DUKTAPE_UNPACK)/extras/console/duk_console.c
+CSRCS += $(DUKTAPE_UNPACK)/extras/print-alert/duk_print_alert.c
MAINSRC = $(DUKTAPE_UNPACK)/examples/cmdline/duk_cmdline.c
@@ -36,6 +38,10 @@ STACKSIZE = $(CONFIG_INTERPRETERS_DUKTAPE_STACKSIZE)
MODULE = $(CONFIG_INTERPRETERS_DUKTAPE)
CFLAGS += -I$(DUKTAPE_UNPACK)/src-noline
+CFLAGS += -I$(DUKTAPE_UNPACK)/extras/console
+CFLAGS += -I$(DUKTAPE_UNPACK)/extras/print-alert
+CFLAGS += -DDUK_CMDLINE_CONSOLE_SUPPORT
+CFLAGS += -DDUK_CMDLINE_PRINTALERT_SUPPORT
$(DUKTAPE_TARBALL):
@echo "Downloading $(DUKTAPE_TARBALL)"
@@ -46,8 +52,11 @@ $(DUKTAPE_UNPACK): $(DUKTAPE_TARBALL)
@tar xvfJ $(DUKTAPE_TARBALL)
@echo "Patching $(DUKTAPE_UNPACK)"
@patch -p0 < duk_cmdline.patch
+ @touch $(DUKTAPE_UNPACK)/.patch
-context:: $(DUKTAPE_UNPACK)
+$(DUKTAPE_UNPACK)/.patch: $(DUKTAPE_UNPACK)
+
+context:: $(DUKTAPE_UNPACK)/.patch
distclean::
$(call DELDIR, $(DUKTAPE_UNPACK))