Compare commits
2 Commits
ba831fa040
...
ebbd72aebf
Author | SHA1 | Date | |
---|---|---|---|
|
ebbd72aebf | ||
|
c6abbf0305 |
@ -5,8 +5,7 @@ ifndef PDIR # {
|
|||||||
GEN_IMAGES= $(TARGET).elf
|
GEN_IMAGES= $(TARGET).elf
|
||||||
GEN_BINS = $(TARGET).bin
|
GEN_BINS = $(TARGET).bin
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
$(TOP_DIR)/app \
|
$(TOP_DIR)/app
|
||||||
$(TOP_DIR)/lvgl
|
|
||||||
endif # } PDIR
|
endif # } PDIR
|
||||||
|
|
||||||
ifndef PDIR # {
|
ifndef PDIR # {
|
||||||
@ -18,7 +17,8 @@ SUBDIRS += \
|
|||||||
$(TOP_DIR)/platform/sys \
|
$(TOP_DIR)/platform/sys \
|
||||||
$(TOP_DIR)/src/network \
|
$(TOP_DIR)/src/network \
|
||||||
$(TOP_DIR)/src/os \
|
$(TOP_DIR)/src/os \
|
||||||
$(TOP_DIR)/src/app
|
$(TOP_DIR)/src/app \
|
||||||
|
$(TOP_DIR)/lvgl
|
||||||
ifeq ($(USE_NIMBLE), 1)
|
ifeq ($(USE_NIMBLE), 1)
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
$(TOP_DIR)/src/bt/blehost
|
$(TOP_DIR)/src/bt/blehost
|
||||||
@ -35,8 +35,7 @@ COMPONENTS_$(TARGET) = \
|
|||||||
$(TOP_DIR)/app/persistency/libpersistency$(LIB_EXT) \
|
$(TOP_DIR)/app/persistency/libpersistency$(LIB_EXT) \
|
||||||
$(TOP_DIR)/app/translation/libtranslation$(LIB_EXT) \
|
$(TOP_DIR)/app/translation/libtranslation$(LIB_EXT) \
|
||||||
$(TOP_DIR)/app/ble/libble$(LIB_EXT) \
|
$(TOP_DIR)/app/ble/libble$(LIB_EXT) \
|
||||||
$(TOP_DIR)/app/app_utils/libapputils$(LIB_EXT) \
|
$(TOP_DIR)/app/app_utils/libapputils$(LIB_EXT)
|
||||||
$(TOP_DIR)/lvgl/liblvgl$(LIB_EXT)
|
|
||||||
|
|
||||||
ifeq ($(USE_LIB), 0)
|
ifeq ($(USE_LIB), 0)
|
||||||
COMPONENTS_$(TARGET) += \
|
COMPONENTS_$(TARGET) += \
|
||||||
@ -45,7 +44,8 @@ COMPONENTS_$(TARGET) += \
|
|||||||
$(TOP_DIR)/platform/drivers/libdrivers$(LIB_EXT) \
|
$(TOP_DIR)/platform/drivers/libdrivers$(LIB_EXT) \
|
||||||
$(TOP_DIR)/platform/sys/libwmsys$(LIB_EXT) \
|
$(TOP_DIR)/platform/sys/libwmsys$(LIB_EXT) \
|
||||||
$(TOP_DIR)/src/network/libnetwork$(LIB_EXT) \
|
$(TOP_DIR)/src/network/libnetwork$(LIB_EXT) \
|
||||||
$(TOP_DIR)/src/os/libos$(LIB_EXT)
|
$(TOP_DIR)/src/os/libos$(LIB_EXT) \
|
||||||
|
$(TOP_DIR)/lvgl/liblvgl$(LIB_EXT)
|
||||||
ifeq ($(USE_NIMBLE), 1)
|
ifeq ($(USE_NIMBLE), 1)
|
||||||
COMPONENTS_$(TARGET) += \
|
COMPONENTS_$(TARGET) += \
|
||||||
$(TOP_DIR)/src/bt/libblehost$(LIB_EXT) \
|
$(TOP_DIR)/src/bt/libblehost$(LIB_EXT) \
|
||||||
@ -76,7 +76,8 @@ LINKLIB += \
|
|||||||
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libdrivers$(LIB_EXT) \
|
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libdrivers$(LIB_EXT) \
|
||||||
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libnetwork$(LIB_EXT) \
|
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libnetwork$(LIB_EXT) \
|
||||||
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libos$(LIB_EXT) \
|
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libos$(LIB_EXT) \
|
||||||
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmsys$(LIB_EXT)
|
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmsys$(LIB_EXT) \
|
||||||
|
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/liblvgl$(LIB_EXT)
|
||||||
ifeq ($(USE_NIMBLE), 1)
|
ifeq ($(USE_NIMBLE), 1)
|
||||||
LINKLIB += \
|
LINKLIB += \
|
||||||
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libblehost$(LIB_EXT) \
|
$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libblehost$(LIB_EXT) \
|
||||||
|
@ -309,7 +309,7 @@ void watch_face_create(WatchFace_t * const watchFace)
|
|||||||
//Our display is the watch face image :
|
//Our display is the watch face image :
|
||||||
watchFace->display = lv_img_create(NULL);
|
watchFace->display = lv_img_create(NULL);
|
||||||
lv_img_set_src(watchFace->display, watch_face_img);
|
lv_img_set_src(watchFace->display, watch_face_img);
|
||||||
lv_obj_set_style_bg_color(watchFace->display, lv_color_black(), LV_PART_MAIN);
|
lv_obj_set_style_bg_color(watchFace->display, lv_color_white(), LV_PART_MAIN);
|
||||||
lv_obj_add_event_cb(watchFace->display, &(hide_hour_and_minutes_hand_cb), LV_EVENT_LONG_PRESSED, watchFace);
|
lv_obj_add_event_cb(watchFace->display, &(hide_hour_and_minutes_hand_cb), LV_EVENT_LONG_PRESSED, watchFace);
|
||||||
|
|
||||||
//Battery arc is created here
|
//Battery arc is created here
|
||||||
|
@ -154,6 +154,7 @@ endif
|
|||||||
@cp $(LIBODIR)/libnetwork$(LIB_EXT) $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)
|
@cp $(LIBODIR)/libnetwork$(LIB_EXT) $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)
|
||||||
@cp $(LIBODIR)/libos$(LIB_EXT) $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)
|
@cp $(LIBODIR)/libos$(LIB_EXT) $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)
|
||||||
@cp $(LIBODIR)/libwmsys$(LIB_EXT) $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)
|
@cp $(LIBODIR)/libwmsys$(LIB_EXT) $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)
|
||||||
|
@cp $(LIBODIR)/liblvgl$(LIB_EXT) $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)
|
||||||
@echo "libs has been updated."
|
@echo "libs has been updated."
|
||||||
|
|
||||||
menuconfig:
|
menuconfig:
|
||||||
|
Loading…
Reference in New Issue
Block a user