Skip to content

Commit c27c144

Browse files
V1.2.0 release (#35)
* feat: update nertc sdk - update nertcsdk to v1.2.0
1 parent eb5c9ba commit c27c144

File tree

291 files changed

+23668
-18883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+23668
-18883
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
# CMakeLists in this exact order for cmake to work correctly
55
cmake_minimum_required(VERSION 3.16)
66

7-
set(PROJECT_VER "1.1.6")
7+
set(PROJECT_VER "1.2.0")
88

99
# Add this line to disable the specific warning
1010
add_compile_options(-Wno-missing-field-initializers)
1111

1212
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
1313
project(xiaozhi)
14-
Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# GIF表情组件
22

33
# 收集所有GIF源文件
4-
if (CONFIG_USE_ANIM_EMOJI_NERTC)
5-
file(GLOB GIF_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/nertc/*.c")
4+
if (CONFIG_USE_ANIM_EMOJI_NERTC1)
5+
file(GLOB LZ4_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/lz4/eye1/*.lz4")
6+
elseif (CONFIG_USE_ANIM_EMOJI_NERTC2)
7+
file(GLOB LZ4_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/lz4/eye2/*.lz4")
8+
elseif (CONFIG_USE_ANIM_EMOJI_NERTC3)
9+
file(GLOB LZ4_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/lz4/eye3/*.lz4")
10+
elseif (CONFIG_USE_ANIM_EMOJI_NERTC2_160)
11+
file(GLOB LZ4_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/lz4/eye2_160/*.lz4")
12+
elseif (CONFIG_USE_ANIM_EMOJI_NERTC3_160)
13+
file(GLOB LZ4_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/lz4/eye3_160/*.lz4")
614
elseif (CONFIG_USE_ANIM_EMOJI_OTTO)
7-
file(GLOB GIF_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/otto/*.c")
8-
elseif (CONFIG_USE_ANIM_EYE_240X240_GIF1)
9-
file(GLOB GIF_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/eye/gif1_240/*.c")
10-
elseif (CONFIG_USE_ANIM_EYE_240X240_GIF2)
11-
file(GLOB GIF_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/eye/gif2_240/*.c")
12-
elseif (CONFIG_USE_ANIM_EYE_160X160_GIF1)
13-
file(GLOB GIF_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/eye/gif1_160/*.c")
14-
elseif (CONFIG_USE_ANIM_EYE_160X160_GIF2)
15-
file(GLOB GIF_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/eye/gif2_160/*.c")
15+
file(GLOB LZ4_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/lz4/otto/*.lz4")
1616
endif()
1717

1818
# 检查是否找到GIF源文件
19-
list(LENGTH GIF_SOURCES GIF_COUNT)
19+
list(LENGTH LZ4_FILES GIF_COUNT)
2020
if(GIF_COUNT EQUAL 0)
2121
message(WARNING "未找到GIF源文件,请确保src目录中包含对应资源的.c文件")
2222
endif()
@@ -31,4 +31,5 @@ idf_component_register(
3131
SRCS ${GIF_SOURCES}
3232
INCLUDE_DIRS "include"
3333
REQUIRES "lvgl"
34+
EMBED_FILES ${LZ4_FILES}
3435
)

components/anim-emoji-gif/include/anim_emoji_gif.h

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#pragma once
2+
#include <stdint.h>
3+
4+
#ifdef __cplusplus
5+
extern "C" {
6+
#endif
7+
8+
typedef struct {
9+
const char *name;
10+
const uint8_t *start;
11+
const uint8_t *end;
12+
uint32_t size;
13+
uint8_t *psram;
14+
} lz4_res_t;
15+
16+
#define LZ4_RES_END {NULL, NULL, 0, NULL}
17+
18+
extern lz4_res_t lz4_res_list[];
19+
extern const int lz4_res_count;
20+
21+
const char* lz4_get_gif_name_get_by_name(const char* emotion);
22+
23+
#ifdef __cplusplus
24+
}
25+
#endif

components/anim-emoji-gif/src/anim_emoji_gif_utils.c

Lines changed: 0 additions & 143 deletions
This file was deleted.

components/anim-emoji-gif/src/eye/gif1_160/angry.c

Lines changed: 0 additions & 33 deletions
This file was deleted.

components/anim-emoji-gif/src/eye/gif1_160/confused.c

Lines changed: 0 additions & 33 deletions
This file was deleted.

components/anim-emoji-gif/src/eye/gif1_160/cool.c

Lines changed: 0 additions & 33 deletions
This file was deleted.

components/anim-emoji-gif/src/eye/gif1_160/delicious.c

Lines changed: 0 additions & 33 deletions
This file was deleted.

components/anim-emoji-gif/src/eye/gif1_160/happy.c

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)