Th3maz1ng/W800_Smart_Watch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Th3maz1ng:ebbd72aebf90d65ea502ee521bee924c5d400ac3
Branches Tags
Th3maz1ng:master
Th3maz1ng:wip
Th3maz1ng:splash_screen_dev
Th3maz1ng:register_dump_BLE
..
compare: Th3maz1ng:ba831fa04042b7456d5464594f36680042863bec
Branches Tags
Th3maz1ng:wip
Th3maz1ng:master
Th3maz1ng:splash_screen_dev
Th3maz1ng:register_dump_BLE

No commits in common. "ebbd72aebf90d65ea502ee521bee924c5d400ac3" and "ba831fa04042b7456d5464594f36680042863bec" have entirely different histories.
ebbd72aebf ... ba831fa040

3 changed files with 8 additions and 10 deletions
Show Stats Expand all files Collapse all files

15
src/W800_SDK_v1.00.10/Makefile
View File

@ -5,7 +5,8 @@ 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 # {
@ -17,8 +18,7 @@ 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,7 +35,8 @@ 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) += \
@ -44,8 +45,7 @@ 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,8 +76,7 @@ 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) \

2
src/W800_SDK_v1.00.10/app/gfx/watch_face.c
View File

@ -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_white(), LV_PART_MAIN); lv_obj_set_style_bg_color(watchFace->display, lv_color_black(), 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

1
src/W800_SDK_v1.00.10/tools/w800/rules.mk
View File

@ -154,7 +154,6 @@ 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: