Skip to content

Commit e90d43d

Browse files
committed
xiaozhi更新表情包资源,优化网络连接
1 parent 3dedcb9 commit e90d43d

32 files changed

+49584
-141
lines changed

libraries/components/lvgl_9.2.0/lvgl.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,10 @@ extern "C" {
127127
/*********************
128128
* DEFINES
129129
*********************/
130-
130+
//LITEGFX_VGLITE_ENABLE start
131+
#define LX_LITEGFX_VGLITE_ENABLE 1
132+
#define LX_ENABLE_RESOURCE_COMPRESS 1
133+
//LITEGFX_VGLITE_ENABLE end
131134
/**********************
132135
* TYPEDEFS
133136
**********************/

libraries/components/wifi-host-driver/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ menuconfig RT_USING_WIFI_HOST_DRIVER
2626
select RT_USING_SAL
2727
select RT_USING_SDIO
2828
select BSP_USING_SDIO
29+
select BSP_USING_SDIO0
2930
default n
3031

3132
if RT_USING_WIFI_HOST_DRIVER
@@ -102,15 +103,15 @@ menuconfig RT_USING_WIFI_HOST_DRIVER
102103
if WHD_RESOURCES_IN_EXTERNAL_STORAGE_FS
103104
config WHD_RESOURCES_FIRMWARE_PATH_NAME
104105
string "Set the file path of the firmware files"
105-
default "/sdcard/whd/43438A1.bin"
106+
default "/sdcard/55500A1.trxcse"
106107

107108
config WHD_RESOURCES_CLM_PATH_NAME
108109
string "Set the file path of the clm files"
109-
default "/sdcard/whd/43438A1.clm_blob"
110+
default "/sdcard/55500A1.clm_blob"
110111

111112
config WHD_RESOURCES_NVRAM_PATH_NAME
112113
string "Set the file path of the nvram files"
113-
default "/sdcard/whd/nvram.txt"
114+
default "/sdcard/cyw55513modpse84som_rev3.txt"
114115
endif # WHD_RESOURCES_IN_EXTERNAL_STORAGE_FS
115116

116117
if WHD_RESOURCES_IN_EXTERNAL_STORAGE_FAL

projects/Edgi_Talk_M55_WIFI/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ Each command switches to YMODEM mode. Use a terminal that supports YMODEM upload
5858
- Wait for the `Download … success` message before moving to the next partition.
5959
- Power-cycle or reset the board after the three transfers so Wi-Fi starts with the freshly stored blobs. Re-run the command whenever you update the firmware/CLM/NVRAM bundle.
6060

61+
![wifi](figures/wifi.gif)
62+
6163
### Running Result
6264

6365
* After power-on, the system initializes the Wi-Fi device.

projects/Edgi_Talk_M55_WIFI/README_zh.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ whd_res_download whd_nvram
5252
- 每次收到 `Download ... success` 提示后再进行下一项
5353
- 三者写入完成后重启开发板即可让 WiFi 读取新的资源;若后续更新固件包,同样需要重新执行 `whd_res_download`
5454

55+
![wifi](figures/wifi.gif)
56+
5557
### 运行效果
5658

5759
* 烧录完成后,开发板上电即可运行示例工程。
1.49 MB
Loading

projects/Edgi_Talk_M55_XiaoZhi/.config

Lines changed: 84 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,9 @@ CONFIG_DHCPD_USING_ROUTER=y
407407
#
408408
# Utilities
409409
#
410-
# CONFIG_RT_USING_RYM is not set
410+
CONFIG_RT_USING_RYM=y
411+
# CONFIG_YMODEM_USING_CRC_TABLE is not set
412+
CONFIG_YMODEM_USING_FILE_TRANSFER=y
411413
# CONFIG_RT_USING_ULOG is not set
412414
# CONFIG_RT_USING_UTEST is not set
413415
# CONFIG_RT_USING_VAR_EXPORT is not set
@@ -490,30 +492,86 @@ CONFIG_PKG_WEBNET_VER_NUM=0x20003
490492
# CONFIG_PKG_USING_WEBTERMINAL is not set
491493
# CONFIG_PKG_USING_FREEMODBUS is not set
492494
# CONFIG_PKG_USING_NANOPB is not set
493-
# CONFIG_PKG_USING_WIFI_HOST_DRIVER is not set
495+
CONFIG_PKG_USING_WIFI_HOST_DRIVER=y
496+
497+
#
498+
# WHD Configuration
499+
#
500+
CONFIG_WHD_SET_COUNTRY_FROM_HOST=y
501+
CONFIG_WHD_COUNTRY_CODE="AU"
502+
CONFIG_WHD_COUNTRY_CODE_REVISION=0
503+
# CONFIG_CY_WIFI_DEFAULT_ENABLE_POWERSAVE_MODE is not set
504+
CONFIG_CY_WIFI_USING_THREAD_INIT=y
505+
CONFIG_CY_WIFI_INIT_THREAD_PRIORITY=10
506+
CONFIG_CY_WIFI_INIT_THREAD_STACK_SIZE=2048
507+
508+
#
509+
# WHD Thread Configuration
510+
#
511+
CONFIG_CY_WIFI_WHD_THREAD_PRIORITY=6
512+
CONFIG_CY_WIFI_WHD_THREAD_STACK_SIZE=5120
513+
# end of WHD Thread Configuration
514+
515+
#
516+
# WHD Resources Configuration
517+
#
518+
# CONFIG_WHD_RESOURCES_IN_EXTERNAL_STORAGE_FS is not set
519+
CONFIG_WHD_RESOURCES_IN_EXTERNAL_STORAGE_FAL=y
520+
CONFIG_WHD_RESOURCES_FIRMWARE_PART_NAME="whd_firmware"
521+
CONFIG_WHD_RESOURCES_CLM_PART_NAME="whd_clm"
522+
CONFIG_WHD_RESOURCES_NVRAM_PART_NAME="whd_nvram"
523+
CONFIG_WHD_RESOURCES_BLOCK_SIZE=1024
524+
# end of WHD Resources Configuration
525+
# end of WHD Configuration
526+
527+
#
528+
# Hardware Configuration
529+
#
494530
# CONFIG_WHD_USING_CHIP_CYW43438 is not set
495531
# CONFIG_WHD_USING_CHIP_CYW4373 is not set
496532
# CONFIG_WHD_USING_CHIP_CYW43012 is not set
497533
# CONFIG_WHD_USING_CHIP_CYW43439 is not set
498534
# CONFIG_WHD_USING_CHIP_CYW43022 is not set
499535
# CONFIG_WHD_USING_CHIP_CYW4343W is not set
500-
# CONFIG_WHD_RESOURCES_IN_EXTERNAL_STORAGE_FS is not set
501-
CONFIG_WHD_RESOURCES_IN_EXTERNAL_STORAGE_FAL=y
502-
CONFIG_WHD_RESOURCES_FIRMWARE_PART_NAME="whd_firmware"
503-
CONFIG_WHD_RESOURCES_CLM_PART_NAME="whd_clm"
504-
CONFIG_WHD_RESOURCES_BLOCK_SIZE=1024
505-
# CONFIG_CY_WIFI_DEFAULT_ENABLE_POWERSAVE_MODE is not set
506-
CONFIG_CY_WIFI_WHD_THREAD_PRIORITY=10
507-
CONFIG_CY_WIFI_WHD_THREAD_STACK_SIZE=5120
536+
CONFIG_WHD_USING_CHIP_CYW55500=y
537+
# CONFIG_WHD_USING_CHIP_CYW55572 is not set
538+
CONFIG_WHD_USING_WIFI6=y
539+
540+
#
541+
# Pin Configuration
542+
#
508543
# CONFIG_CYBSP_USING_PIN_NAME is not set
509544
CONFIG_CYBSP_USING_PIN_NUMBER=y
545+
# CONFIG_CYBSP_USING_OOB_INTR is not set
510546
CONFIG_CYBSP_REG_ON_PIN=94
511547
CONFIG_CYBSP_HOST_WAKE_IRQ_PIN=-1
512548
CONFIG_CYBSP_HOST_WAKE_IRQ_EVENT_FALL=y
513549
# CONFIG_CYBSP_HOST_WAKE_IRQ_EVENT_RISE is not set
514550
CONFIG_CYBSP_OOB_INTR_PRIORITY=2
515-
CONFIG_CY_WIFI_USING_THREAD_INIT=y
516-
CONFIG_CY_WIFI_INIT_THREAD_STACK_SIZE=2048
551+
# end of Pin Configuration
552+
# end of Hardware Configuration
553+
554+
#
555+
# Porting options
556+
#
557+
CONFIG_WHD_PORTING_BSP=y
558+
CONFIG_WHD_PORTING_HAL=y
559+
# CONFIG_WHD_PORTING_RTOS is not set
560+
# end of Porting options
561+
562+
# CONFIG_WHD_LOG_LEVEL_NONE is not set
563+
CONFIG_WHD_LOG_LEVEL_ERROR=y
564+
# CONFIG_WHD_LOG_LEVEL_INFO is not set
565+
# CONFIG_WHD_LOG_LEVEL_DEBUG is not set
566+
# CONFIG_WHD_LOG_LEVEL_DATA_TRACE is not set
567+
CONFIG_PKG_WIFI_HOST_DRIVER_PATH="/packages/iot/wifi-host-driver"
568+
# CONFIG_PKG_USING_WIFI_HOST_DRIVER_V110 is not set
569+
# CONFIG_PKG_USING_WIFI_HOST_DRIVER_V120 is not set
570+
# CONFIG_PKG_USING_WIFI_HOST_DRIVER_V121 is not set
571+
# CONFIG_PKG_USING_WIFI_HOST_DRIVER_V131 is not set
572+
CONFIG_PKG_USING_WIFI_HOST_DRIVER_LATEST_VERSION=y
573+
CONFIG_PKG_WIFI_HOST_DRIVER_VER="latest"
574+
CONFIG_PKG_WIFI_HOST_DRIVER_VER_NUM=0x99999
517575
# CONFIG_PKG_USING_ESP_HOSTED is not set
518576

519577
#
@@ -742,6 +800,7 @@ CONFIG_PKG_CJSON_VER="v1.7.17"
742800
# CONFIG_PKG_USING_U8G2 is not set
743801
# end of u8g2: a monochrome graphic library
744802

803+
# CONFIG_PKG_USING_NES_SIMULATOR is not set
745804
# CONFIG_PKG_USING_OPENMV is not set
746805
# CONFIG_PKG_USING_MUPDF is not set
747806
# CONFIG_PKG_USING_STEMWIN is not set
@@ -773,6 +832,7 @@ CONFIG_PKG_WAVPLAYER_VER="latest"
773832
#
774833
# tools packages
775834
#
835+
# CONFIG_PKG_USING_VECTOR is not set
776836
# CONFIG_PKG_USING_CMBACKTRACE is not set
777837
# CONFIG_PKG_USING_MCOREDUMP is not set
778838
# CONFIG_PKG_USING_EASYFLASH is not set
@@ -1122,6 +1182,15 @@ CONFIG_RT_DEF_LFS_DRIVERS=1
11221182
#
11231183
# CONFIG_PKG_USING_HPM_SDK is not set
11241184
# end of HPMicro SDK
1185+
1186+
#
1187+
# FT32 HAL & SDK Drivers
1188+
#
1189+
# CONFIG_PKG_USING_FT32F0_STD_DRIVER is not set
1190+
# CONFIG_PKG_USING_FT32F0_CMSIS_DRIVER is not set
1191+
# CONFIG_PKG_USING_FT32F4_STD_DRIVER is not set
1192+
# CONFIG_PKG_USING_FT32F4_CMSIS_DRIVER is not set
1193+
# end of FT32 HAL & SDK Drivers
11251194
# end of HAL & SDK Drivers
11261195

11271196
#
@@ -1296,7 +1365,10 @@ CONFIG_RT_DEF_LFS_DRIVERS=1
12961365
# CONFIG_PKG_USING_IC74HC165 is not set
12971366
# CONFIG_PKG_USING_IST8310 is not set
12981367
# CONFIG_PKG_USING_ST7789_SPI is not set
1368+
# CONFIG_PKG_USING_CAN_UDS is not set
12991369
# CONFIG_PKG_USING_ISOTP_C is not set
1370+
# CONFIG_PKG_USING_IKUNLED is not set
1371+
# CONFIG_PKG_USING_INS5T8025 is not set
13001372
# CONFIG_PKG_USING_SPI_TOOLS is not set
13011373
# end of peripheral libraries and drivers
13021374

@@ -1712,10 +1784,6 @@ CONFIG_RT_USING_WIFI_HOST_DRIVER=y
17121784
#
17131785
# WHD Configuration
17141786
#
1715-
CONFIG_WHD_SET_COUNTRY_FROM_HOST=y
1716-
CONFIG_WHD_COUNTRY_CODE="AU"
1717-
CONFIG_WHD_COUNTRY_CODE_REVISION=0
1718-
CONFIG_CY_WIFI_INIT_THREAD_PRIORITY=10
17191787

17201788
#
17211789
# WHD Thread Configuration
@@ -1725,16 +1793,12 @@ CONFIG_CY_WIFI_INIT_THREAD_PRIORITY=10
17251793
#
17261794
# WHD Resources Configuration
17271795
#
1728-
CONFIG_WHD_RESOURCES_NVRAM_PART_NAME="whd_nvram"
17291796
# end of WHD Resources Configuration
17301797
# end of WHD Configuration
17311798

17321799
#
17331800
# Hardware Configuration
17341801
#
1735-
CONFIG_WHD_USING_CHIP_CYW55500=y
1736-
# CONFIG_WHD_USING_CHIP_CYW55572 is not set
1737-
CONFIG_WHD_USING_WIFI6=y
17381802

17391803
#
17401804
# Pin Configuration
@@ -1745,16 +1809,6 @@ CONFIG_WHD_USING_WIFI6=y
17451809
#
17461810
# Porting options
17471811
#
1748-
# CONFIG_WHD_PORTING_BSP is not set
1749-
CONFIG_WHD_PORTING_HAL=y
1750-
# CONFIG_WHD_PORTING_RTOS is not set
17511812
# end of Porting options
1752-
1753-
# CONFIG_WHD_LOG_LEVEL_NONE is not set
1754-
# CONFIG_WHD_LOG_LEVEL_ERROR is not set
1755-
CONFIG_WHD_LOG_LEVEL_INFO=y
1756-
# CONFIG_WHD_LOG_LEVEL_DEBUG is not set
1757-
# CONFIG_WHD_LOG_LEVEL_DATA_TRACE is not set
1758-
CONFIG_WPRINT_ENABLE_WHD_INFO=y
17591813
# end of Board extended module Drivers
17601814
# end of Hardware Drivers Config

projects/Edgi_Talk_M55_XiaoZhi/README.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@ With this project, users can quickly verify the device’s **WiFi connection**,
1818

1919
## Usage
2020

21+
### Prepare Wi-Fi resources (first-time setup)
22+
23+
The Wi-Fi host driver loads three blobs (firmware `.bin`, regulatory `.clm_blob`, and board-specific `nvram.txt`) from FAL before it can power up the radio. These files live outside the application image, so flashing a new binary will not refresh them automatically. The default bundles for Edgi-Talk live in the workspace root under `resources/`.
24+
25+
- Keep `WHD_RESOURCES_IN_EXTERNAL_STORAGE_FAL` enabled in menuconfig and make sure the FAL table provides the `whd_firmware`, `whd_clm`, and `whd_nvram` partitions (the defaults reserve 512 KB + 32 KB + 32 KB of on-chip flash).
26+
- Attach a serial terminal, reboot into the `msh` prompt, and run the download helper for each partition:
27+
28+
```
29+
whd_res_download whd_firmware
30+
whd_res_download whd_clm
31+
whd_res_download whd_nvram
32+
```
33+
34+
Each command switches to YMODEM mode. Use a terminal that supports YMODEM upload (Xshell) to send the matching files from the top-level `resources/` directory .
35+
- Wait for the `Download … success` message before moving to the next partition.
36+
- Power-cycle or reset the board after the three transfers so Wi-Fi starts with the freshly stored blobs. Re-run the command whenever you update the firmware/CLM/NVRAM bundle.
37+
38+
![wifi](figures/wifi.gif)
39+
2140
### 1. First-time setup (AP configuration)
2241

2342
1. When the development board starts, it will enter **AP mode**.

projects/Edgi_Talk_M55_XiaoZhi/README_zh.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,26 @@
1818

1919
## 使用方法
2020

21+
### 准备 WiFi 资源(首次必做)
22+
23+
WHD 在启动时需要从 FAL 读取三个外部资源文件:`firmware`(二进制固件)、`clm_blob`(射频法规表)以及 `nvram.txt`(模组校准参数)。这些文件独立于应用固件,重新烧录应用不会自动更新它们,因此首次使用或更换固件包时必须手动写入。Edgi-Talk 默认提供的资源文件位于工程根目录的 `resources/` 文件夹中。
24+
25+
- 在 menuconfig 中保持 `WHD_RESOURCES_IN_EXTERNAL_STORAGE_FAL` 选项开启,并在 FAL 分区表中保留默认的 `whd_firmware``whd_clm``whd_nvram` 分区(默认分别占用 512 KB + 32 KB + 32 KB 的片上 Flash)。
26+
- 打开串口终端,复位进入 `msh` 命令行,依次执行以下命令:
27+
28+
```
29+
whd_res_download whd_firmware
30+
whd_res_download whd_clm
31+
whd_res_download whd_nvram
32+
```
33+
34+
命令会切换到 YMODEM 传输模式,请使用支持 YMODEM 上传的终端软件(如 Xshell)选择根目录 `resources/` 下对应芯片的文件并发送。
35+
36+
- 每次收到 `Download ... success` 提示后再进行下一项
37+
- 三者写入完成后重启开发板即可让 WiFi 读取新的资源;若后续更新固件包,同样需要重新执行 `whd_res_download`
38+
39+
![wifi](figures/wifi.gif)
40+
2141
### 1. 初次使用(AP 配网)
2242

2343
1. 开发板启动会进入 **AP 模式**

projects/Edgi_Talk_M55_XiaoZhi/applications/xiaozhi/iot/speaker.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
extern "C" {
55
#include "drv_es8388.h"
66
#include <rtdevice.h>
7+
8+
void qday_show_emoji_by_rtt_info(int index);
79
}
810

911
/* Device name configurations */
@@ -34,12 +36,22 @@ class Speaker : public Thing {
3436
if(volume > 100) {
3537
volume = 100;
3638
}
39+
40+
if(volume < current_volume_)
41+
{
42+
qday_show_emoji_by_rtt_info(111);
43+
}
44+
else
45+
{
46+
qday_show_emoji_by_rtt_info(110);
47+
}
48+
49+
current_volume_ = volume;
3750
struct rt_audio_caps caps;
3851
caps.main_type = AUDIO_TYPE_MIXER;
3952
caps.sub_type = AUDIO_MIXER_VOLUME;
4053
caps.udata.value = volume;
4154
rt_device_control(sound_dev_, AUDIO_CTL_CONFIGURE, &caps);
42-
current_volume_ = volume;
4355
});
4456

4557
// 新增方法:GetVolume(获取音量)

projects/Edgi_Talk_M55_XiaoZhi/applications/xiaozhi/ui/3d_demo/litegfx/plat/lx_platform_log.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/*********************
2424
* DEFINES
2525
*********************/
26-
const uint8_t lx_log_level = LX_LOG_LEVEL_INFO;
26+
const uint8_t lx_log_level = LX_LOG_LEVEL_USER;
2727

2828
/**********************
2929
* TYPEDEFS

0 commit comments

Comments
 (0)