feat: change icon and display, add time
This commit is contained in:
@ -651,14 +651,14 @@ elseif(CONFIG_BOARD_TYPE_ZHENGCHEN_1_54TFT_ML307)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_ZHENGCHEN_CAM)
|
||||
set(BOARD_TYPE "zhengchen-cam")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
|
||||
set(BUILTIN_TEXT_FONT font_puhui_20_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_20_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
set(DEFAULT_EMOJI_COLLECTION main/boards/zhengchen-cam/custom-emojis)
|
||||
elseif(CONFIG_BOARD_TYPE_ZHENGCHEN_CAM_ML307)
|
||||
set(BOARD_TYPE "zhengchen-cam-ml307")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
|
||||
set(BUILTIN_TEXT_FONT font_puhui_20_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_20_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
set(DEFAULT_EMOJI_COLLECTION main/boards/zhengchen-cam/custom-emojis)
|
||||
elseif(CONFIG_BOARD_TYPE_SPOTPEAR_ESP32_S3_1_54_MUMA)
|
||||
set(BOARD_TYPE "sp-esp32-s3-1.54-muma")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
@ -912,6 +912,7 @@ idf_component_register(SRCS ${SOURCES}
|
||||
efuse
|
||||
bt
|
||||
fatfs
|
||||
lwip
|
||||
)
|
||||
|
||||
# Use target_compile_definitions to define BOARD_TYPE, BOARD_NAME
|
||||
@ -1016,6 +1017,25 @@ function(build_default_assets_bin)
|
||||
if(DEFAULT_ASSETS_EXTRA_FILES)
|
||||
list(APPEND BUILD_ARGS "--extra_files" "${DEFAULT_ASSETS_EXTRA_FILES}")
|
||||
endif()
|
||||
|
||||
set(DEFAULT_ASSETS_DEPENDS
|
||||
${SDKCONFIG}
|
||||
${PROJECT_DIR}/scripts/build_default_assets.py
|
||||
)
|
||||
if(DEFAULT_EMOJI_COLLECTION)
|
||||
if(IS_ABSOLUTE "${DEFAULT_EMOJI_COLLECTION}")
|
||||
set(DEFAULT_EMOJI_COLLECTION_PATH "${DEFAULT_EMOJI_COLLECTION}")
|
||||
else()
|
||||
set(DEFAULT_EMOJI_COLLECTION_PATH "${PROJECT_DIR}/${DEFAULT_EMOJI_COLLECTION}")
|
||||
endif()
|
||||
if(IS_DIRECTORY "${DEFAULT_EMOJI_COLLECTION_PATH}")
|
||||
file(GLOB_RECURSE DEFAULT_EMOJI_COLLECTION_FILES CONFIGURE_DEPENDS
|
||||
"${DEFAULT_EMOJI_COLLECTION_PATH}/*.png"
|
||||
"${DEFAULT_EMOJI_COLLECTION_PATH}/*.gif"
|
||||
)
|
||||
list(APPEND DEFAULT_ASSETS_DEPENDS ${DEFAULT_EMOJI_COLLECTION_FILES})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
list(APPEND BUILD_ARGS "--esp_sr_model_path" "${ESP_SR_MODEL_PATH}")
|
||||
list(APPEND BUILD_ARGS "--xiaozhi_fonts_path" "${XIAOZHI_FONTS_PATH}")
|
||||
@ -1024,9 +1044,7 @@ function(build_default_assets_bin)
|
||||
add_custom_command(
|
||||
OUTPUT ${GENERATED_ASSETS_BIN}
|
||||
COMMAND python ${PROJECT_DIR}/scripts/build_default_assets.py ${BUILD_ARGS}
|
||||
DEPENDS
|
||||
${SDKCONFIG}
|
||||
${PROJECT_DIR}/scripts/build_default_assets.py
|
||||
DEPENDS ${DEFAULT_ASSETS_DEPENDS}
|
||||
COMMENT "Building default assets.bin based on configuration"
|
||||
VERBATIM
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user