You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/06/01 14:07:39 UTC
[incubator-nuttx-apps] branch master updated (d6d458c -> 99ec1be)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from d6d458c Include assert.h in necessary place
new 4a72b8d examples/lvgldemo: LVGL examples are now called lv_demos and not lv_examples.
new 99ec1be examples/lvgl & graphics/lvgl: Use the usual Q variable for quiet instead of `@`.
The 2 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/.gitignore | 2 +-
examples/lvgldemo/Makefile | 26 +++++++++++++-------------
graphics/lvgl/Makefile | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
[incubator-nuttx-apps] 02/02: examples/lvgl & graphics/lvgl: Use
the usual Q variable for quiet instead of `@`.
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 99ec1bec617a654b46c9c909f82577241eeba88a
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Tue Jun 1 14:00:44 2021 +0100
examples/lvgl & graphics/lvgl: Use the usual Q variable for quiet instead of `@`.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
examples/lvgldemo/Makefile | 4 ++--
graphics/lvgl/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index be3a7c5..cdb227f 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -93,11 +93,11 @@ CFLAGS += ${shell $(DEFINE) "$(CC)" LV_LVGL_H_INCLUDE_SIMPLE} -Wno-format
CXXFLAGS += ${shell $(DEFINE) "$(CC)" LV_LVGL_H_INCLUDE_SIMPLE} -Wno-format
$(LVGL_EXAMPLES_TARBALL):
- @echo "Downloading: $(LVGL_EXAMPLES_TARBALL)"
+ $(Q) echo "Downloading: $(LVGL_EXAMPLES_TARBALL)"
$(Q) curl -O -L $(CONFIG_LV_EXAMPLES_URL)/$(LVGL_EXAMPLES_TARBALL)
$(LVGL_EXAMPLES_UNPACKNAME): $(LVGL_EXAMPLES_TARBALL)
- @echo "Unpacking: $(LVGL_EXAMPLES_TARBALL) -> $(LVGL_EXAMPLES_UNPACKNAME)"
+ $(Q) echo "Unpacking: $(LVGL_EXAMPLES_TARBALL) -> $(LVGL_EXAMPLES_UNPACKNAME)"
$(Q) $(UNPACK) $(LVGL_EXAMPLES_TARBALL)
$(Q) mv lv_demos-$(LVGL_EXAMPLES_VERSION) $(LVGL_EXAMPLES_UNPACKNAME)
$(Q) touch $(LVGL_EXAMPLES_UNPACKNAME)
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index 502feec..299d509 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -76,11 +76,11 @@ UNPACK ?= unzip -o
LVGL_UNPACKDIR = $(WD)/$(LVGL_UNPACKNAME)
$(LVGL_TARBALL):
- @echo "Downloading: $(LVGL_TARBALL)"
+ $(Q) echo "Downloading: $(LVGL_TARBALL)"
$(Q) curl -O -L $(CONFIG_GRAPH_LVGL_URL)/$(LVGL_TARBALL)
$(LVGL_UNPACKNAME): $(LVGL_TARBALL)
- @echo "Unpacking: $(LVGL_TARBALL) -> $(LVGL_UNPACKNAME)"
+ $(Q) echo "Unpacking: $(LVGL_TARBALL) -> $(LVGL_UNPACKNAME)"
$(Q) $(UNPACK) $(LVGL_TARBALL)
$(Q) mv lvgl-$(LVGL_VERSION) $(LVGL_UNPACKNAME)
$(Q) touch $(LVGL_UNPACKNAME)
[incubator-nuttx-apps] 01/02: examples/lvgldemo: LVGL examples are
now called lv_demos and not lv_examples.
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 4a72b8d1324eb45ee468540a827d08ccb787d3b8
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Tue Jun 1 13:57:43 2021 +0100
examples/lvgldemo: LVGL examples are now called lv_demos and not
lv_examples.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
examples/lvgldemo/.gitignore | 2 +-
examples/lvgldemo/Makefile | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/examples/lvgldemo/.gitignore b/examples/lvgldemo/.gitignore
index 7340595..a60da0b 100644
--- a/examples/lvgldemo/.gitignore
+++ b/examples/lvgldemo/.gitignore
@@ -1,2 +1,2 @@
/*.zip
-/lv_examples
\ No newline at end of file
+/lv_demos
diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index 9655b38..be3a7c5 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -37,12 +37,12 @@ include $(APPDIR)/Make.defs
# LittleVGL demo built-in application info
-CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_examples/archive
+CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_demos/archive
LVGL_EXAMPLES_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LVGL_VERSION)))
LVGL_EXAMPLES_TARBALL = v$(LVGL_EXAMPLES_VERSION).zip
-LVGL_EXAMPLES_UNPACKNAME = lv_examples
+LVGL_EXAMPLES_UNPACKNAME = lv_demos
UNPACK ?= unzip -o
PROGNAME = lvgldemo
@@ -60,31 +60,31 @@ endif
# static common assets used in multiple examples
-LV_EXAMPLE_ASSETS = $(wildcard ./lv_examples/assets/*.c)
+LV_EXAMPLE_ASSETS = $(wildcard ./lv_demos/assets/*.c)
CSRCS += $(notdir $(LV_EXAMPLE_ASSETS))
-VPATH += lv_examples/assets
+VPATH += lv_demos/assets
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_BENCHMARK),)
CSRCS += lv_demo_benchmark.c
-VPATH += lv_examples/src/lv_demo_benchmark
+VPATH += lv_demos/src/lv_demo_benchmark
endif
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_PRINTER),)
-LV_PRINTER_IMAGES = $(wildcard ./lv_examples/src/lv_demo_printer/images/*.c)
+LV_PRINTER_IMAGES = $(wildcard ./lv_demos/src/lv_demo_printer/images/*.c)
CSRCS += lv_demo_printer.c lv_demo_printer_theme.c
CSRCS += $(notdir $(LV_PRINTER_IMAGES))
-VPATH += lv_examples/src/lv_demo_printer
-VPATH += lv_examples/src/lv_demo_printer/images
+VPATH += lv_demos/src/lv_demo_printer
+VPATH += lv_demos/src/lv_demo_printer/images
endif
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_STRESS),)
CSRCS += lv_demo_stress.c
-VPATH += lv_examples/src/lv_demo_stress
+VPATH += lv_demos/src/lv_demo_stress
endif
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_WIDGETS),)
CSRCS += lv_demo_widgets.c
-VPATH += lv_examples/src/lv_demo_widgets
+VPATH += lv_demos/src/lv_demo_widgets
endif
MAINSRC = lvgldemo.c
@@ -99,7 +99,7 @@ $(LVGL_EXAMPLES_TARBALL):
$(LVGL_EXAMPLES_UNPACKNAME): $(LVGL_EXAMPLES_TARBALL)
@echo "Unpacking: $(LVGL_EXAMPLES_TARBALL) -> $(LVGL_EXAMPLES_UNPACKNAME)"
$(Q) $(UNPACK) $(LVGL_EXAMPLES_TARBALL)
- $(Q) mv lv_examples-$(LVGL_EXAMPLES_VERSION) $(LVGL_EXAMPLES_UNPACKNAME)
+ $(Q) mv lv_demos-$(LVGL_EXAMPLES_VERSION) $(LVGL_EXAMPLES_UNPACKNAME)
$(Q) touch $(LVGL_EXAMPLES_UNPACKNAME)
context:: $(LVGL_EXAMPLES_UNPACKNAME)