Skip to content

Commit 0e168f6

Browse files
PeterJhonPeterJhon
committed
Update XiaoZhi Project
1 parent d7cb71f commit 0e168f6

Some content is hidden

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

85 files changed

+10692
-190
lines changed

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/.config‎

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y
9393
CONFIG_RT_USING_USER_MAIN=y
9494
CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
9595
CONFIG_RT_MAIN_THREAD_PRIORITY=10
96-
# CONFIG_RT_USING_LEGACY is not set
96+
CONFIG_RT_USING_LEGACY=y
9797
CONFIG_RT_USING_MSH=y
9898
CONFIG_RT_USING_FINSH=y
9999
CONFIG_FINSH_USING_MSH=y
@@ -125,7 +125,7 @@ CONFIG_DFS_FILESYSTEMS_MAX=4
125125
CONFIG_DFS_FILESYSTEM_TYPES_MAX=4
126126
# CONFIG_RT_USING_DFS_ELMFAT is not set
127127
CONFIG_RT_USING_DFS_DEVFS=y
128-
# CONFIG_RT_USING_DFS_ROMFS is not set
128+
CONFIG_RT_USING_DFS_ROMFS=y
129129
# CONFIG_RT_USING_DFS_CROMFS is not set
130130
# CONFIG_RT_USING_DFS_RAMFS is not set
131131
# CONFIG_RT_USING_DFS_TMPFS is not set
@@ -363,7 +363,10 @@ CONFIG_LWIP_NETIF_LOOPBACK=0
363363
# CONFIG_RT_LWIP_STATS is not set
364364
# CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set
365365
CONFIG_RT_LWIP_USING_PING=y
366-
# CONFIG_LWIP_USING_DHCPD is not set
366+
CONFIG_LWIP_USING_DHCPD=y
367+
CONFIG_DHCPD_SERVER_IP="192.168.169.1"
368+
CONFIG_DHCPD_USING_ROUTER=y
369+
# CONFIG_LWIP_USING_CUSTOMER_DNS_SERVER is not set
367370
# CONFIG_RT_LWIP_DEBUG is not set
368371
# CONFIG_RT_USING_AT is not set
369372
# end of Network
@@ -417,7 +420,36 @@ CONFIG_PKG_USING_WEBCLIENT_V220=y
417420
# CONFIG_PKG_USING_WEBCLIENT_LATEST_VERSION is not set
418421
CONFIG_PKG_WEBCLIENT_VER="v2.2.0"
419422
CONFIG_PKG_WEBCLIENT_VER_NUM=0x20200
420-
# CONFIG_PKG_USING_WEBNET is not set
423+
CONFIG_PKG_USING_WEBNET=y
424+
CONFIG_PKG_WEBNET_PATH="/packages/iot/webnet"
425+
CONFIG_WEBNET_PORT=80
426+
CONFIG_WEBNET_CONN_MAX=16
427+
CONFIG_WEBNET_ROOT="/webnet"
428+
429+
#
430+
# Select supported modules
431+
#
432+
# CONFIG_WEBNET_USING_LOG is not set
433+
# CONFIG_WEBNET_USING_AUTH is not set
434+
CONFIG_WEBNET_USING_CGI=y
435+
# CONFIG_WEBNET_USING_ASP is not set
436+
# CONFIG_WEBNET_USING_SSI is not set
437+
CONFIG_WEBNET_USING_INDEX=y
438+
# CONFIG_WEBNET_USING_ALIAS is not set
439+
# CONFIG_WEBNET_USING_DAV is not set
440+
# CONFIG_WEBNET_USING_UPLOAD is not set
441+
# CONFIG_WEBNET_USING_GZIP is not set
442+
CONFIG_WEBNET_CACHE_LEVEL=0
443+
# end of Select supported modules
444+
445+
# CONFIG_WEBNET_USING_SAMPLES is not set
446+
CONFIG_PKG_USING_WEBNET_V203=y
447+
# CONFIG_PKG_USING_WEBNET_V202 is not set
448+
# CONFIG_PKG_USING_WEBNET_V201 is not set
449+
# CONFIG_PKG_USING_WEBNET_V200 is not set
450+
# CONFIG_PKG_USING_WEBNET_LATEST_VERSION is not set
451+
CONFIG_PKG_WEBNET_VER="v2.0.3"
452+
CONFIG_PKG_WEBNET_VER_NUM=0x20003
421453
# CONFIG_PKG_USING_MONGOOSE is not set
422454
# CONFIG_PKG_USING_MYMQTT is not set
423455
# CONFIG_PKG_USING_KAWAII_MQTT is not set
@@ -664,7 +696,14 @@ CONFIG_PKG_CJSON_VER="v1.7.17"
664696
# CONFIG_PKG_USING_OPENMV is not set
665697
# CONFIG_PKG_USING_MUPDF is not set
666698
# CONFIG_PKG_USING_STEMWIN is not set
667-
# CONFIG_PKG_USING_WAVPLAYER is not set
699+
CONFIG_PKG_USING_WAVPLAYER=y
700+
CONFIG_PKG_WAVPLAYER_PATH="/packages/multimedia/wavplayer"
701+
CONFIG_PKG_WP_USING_PLAY=y
702+
CONFIG_PKG_WP_PLAY_DEVICE="sound0"
703+
# CONFIG_PKG_WP_USING_RECORD is not set
704+
# CONFIG_PKG_USING_WAVPLAYER_V020 is not set
705+
CONFIG_PKG_USING_WAVPLAYER_LATEST_VERSION=y
706+
CONFIG_PKG_WAVPLAYER_VER="latest"
668707
# CONFIG_PKG_USING_TJPGD is not set
669708
# CONFIG_PKG_USING_PDFGEN is not set
670709
# CONFIG_PKG_USING_HELIX is not set
@@ -1244,7 +1283,11 @@ CONFIG_PKG_FREERTOS_WRAPPER_VER="latest"
12441283
# end of entertainment: terminal games and other interesting software packages
12451284

12461285
# CONFIG_PKG_USING_LIBCSV is not set
1247-
# CONFIG_PKG_USING_OPTPARSE is not set
1286+
CONFIG_PKG_USING_OPTPARSE=y
1287+
CONFIG_PKG_OPTPARSE_PATH="/packages/misc/optparse"
1288+
CONFIG_PKG_USING_OPTPARSE_LATEST_VERSION=y
1289+
CONFIG_PKG_OPTPARSE_VER="latest"
1290+
# CONFIG_OPTPARSE_USING_DEMO is not set
12481291
# CONFIG_PKG_USING_FASTLZ is not set
12491292
# CONFIG_PKG_USING_MINILZO is not set
12501293
# CONFIG_PKG_USING_QUICKLZ is not set
@@ -1542,7 +1585,9 @@ CONFIG_BSP_USING_ADC=y
15421585
CONFIG_BSP_USING_ADC1=y
15431586
CONFIG_BSP_USING_I2C=y
15441587
CONFIG_BSP_USING_HW_I2C0=y
1545-
# CONFIG_BSP_USING_SOFT_I2C1 is not set
1588+
CONFIG_BSP_USING_SOFT_I2C1=y
1589+
CONFIG_BSP_SOFT_I2C1_SCL_PIN=105
1590+
CONFIG_BSP_SOFT_I2C1_SDA_PIN=106
15461591
CONFIG_BSP_USING_UART=y
15471592
# CONFIG_BSP_USING_UART1 is not set
15481593
CONFIG_BSP_USING_UART2=y

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/.cproject‎

Lines changed: 17 additions & 1 deletion
Large diffs are not rendered by default.

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/.settings/language.settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="325121961286097360" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="322554494955639460" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/applications/main.c‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,19 @@
11
#include <rtthread.h>
22
#include <rtdevice.h>
33
#include <board.h>
4-
#include <wlan_mgnt.h>
5-
#include "xiaozhi.h"
6-
7-
static void wifi_ready_handler(int event, struct rt_wlan_buff *buff, void *parameter)
8-
{
9-
ws_xiaozhi_init();
10-
}
11-
12-
static void wifi_disconnected_handler(int event, struct rt_wlan_buff *buff, void *parameter)
13-
{
14-
do
15-
{
16-
rt_thread_mdelay(500);
17-
rt_kprintf("WiFi connecting...\n");
18-
}
19-
while (rt_wlan_connect("TEST", "88888888"));
20-
}
214

225
#define LED_PIN_G GET_PIN(16, 6)
236
int main(void)
247
{
258
rt_kprintf("It's cortex-m55\r\n");
269
rt_pin_mode(LED_PIN_G, PIN_MODE_OUTPUT);
2710

11+
rt_thread_mdelay(2000);
12+
extern void wifi_init(void);
13+
wifi_init();
2814
extern void init_ui(void);
2915
init_ui();
3016

31-
do
32-
{
33-
rt_thread_mdelay(500);
34-
rt_kprintf("WiFi connecting...\n");
35-
}
36-
while (rt_wlan_connect("TEST", "88888888"));
37-
38-
rt_wlan_register_event_handler(RT_WLAN_EVT_READY, wifi_ready_handler, NULL);
39-
rt_wlan_register_event_handler(RT_WLAN_EVT_STA_DISCONNECTED, wifi_disconnected_handler, NULL);
4017
while (1)
4118
{
4219
rt_pin_write(LED_PIN_G, PIN_LOW);
@@ -75,4 +52,4 @@ int en_gpio(void)
7552

7653
return 0;
7754
}
78-
INIT_BOARD_EXPORT(en_gpio);
55+
INIT_BOARD_EXPORT(en_gpio);

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/applications/xiaozhi/adc/adc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ static int adc_check_entry_init(void)
142142
return RT_EOK;
143143
}
144144

145-
INIT_APP_EXPORT(adc_check_entry_init);
145+
//INIT_APP_EXPORT(adc_check_entry_init);

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/applications/xiaozhi/ui/xiaozhi_ui.c‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ extern const int xiaozhi_font_size;
2727
static lv_obj_t *global_label1;
2828
static lv_obj_t *global_label2;
2929
static lv_obj_t *global_label3;
30+
static lv_obj_t *global_label4;
3031
static lv_style_t style;
3132
static lv_style_t style24;
3233
#define EMOJI_NUM 18
@@ -90,6 +91,13 @@ rt_err_t xiaozhi_ui_obj_init(void)
9091
lv_obj_set_style_text_color(global_label3, lv_color_hex(0xFF0000), 0); // 红色
9192
lv_obj_set_style_transform_angle(global_label3, 900, LV_PART_MAIN | LV_STATE_DEFAULT);
9293

94+
global_label4 = lv_label_create(lv_screen_active());
95+
lv_obj_set_x(global_label4, 40);
96+
lv_obj_set_y(global_label4, 20);
97+
lv_obj_add_style(global_label4, &style24, 0);
98+
// lv_obj_set_style_text_color(global_label4, lv_color_hex(0xFF0000), 0); // 红色
99+
lv_obj_set_style_transform_angle(global_label4, 900, LV_PART_MAIN | LV_STATE_DEFAULT);
100+
93101
for (int i = 0; i < EMOJI_NUM; i++)
94102
{
95103
emoji_objs[i] = lv_img_create(lv_screen_active());
@@ -182,9 +190,10 @@ void xiaozhi_ui_task(void *args)
182190

183191
if (xiaozhi_ui_obj_init() != RT_EOK) return;
184192

185-
lv_label_set_text(global_label1, " 连接中...");
186-
lv_label_set_text(global_label2, " ");
193+
lv_label_set_text(global_label1, " Connecting");
194+
lv_label_set_text(global_label2, "Use a Phone or Computer to connect to the Hotspot");
187195
lv_label_set_text(global_label3, " ");
196+
lv_label_set_text(global_label4, "SSID: RT-Thread-AP Password: 123456789 IP:192.168.169.1");
188197
lv_obj_clear_flag(emoji_objs[0], LV_OBJ_FLAG_HIDDEN);
189198
lv_task_handler();
190199
while (1)
@@ -197,7 +206,7 @@ void xiaozhi_ui_task(void *args)
197206
lv_label_set_text(global_label1, msg.data);
198207
break;
199208
case UI_CMD_SET_OUTPUT:
200-
lv_label_set_text(global_label2, msg.data);
209+
lv_label_set_text(global_label4, msg.data);
201210
break;
202211
case UI_CMD_SET_ADC:
203212
lv_label_set_text(global_label3, msg.data);
@@ -236,3 +245,7 @@ void init_ui(void)
236245
rt_thread_t tid = rt_thread_create("xz_ui", xiaozhi_ui_task, NULL, 1024 * 10, 25, 10);
237246
if (tid) rt_thread_startup(tid);
238247
}
248+
249+
void clean_info(void){
250+
lv_label_set_text(global_label2, " ");
251+
}

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/applications/xiaozhi/webnet/SConscript‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import os
2+
from building import *
3+
4+
# Add source code
5+
src = Glob('*.c')
6+
group = DefineGroup('Applications', src, depend = [''])
7+
8+
Return('group')

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/applications/xiaozhi/webnet/mnt.c‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#include <rtthread.h>
2+
3+
#ifdef RT_USING_DFS
4+
#include <dfs_fs.h>
5+
#include "dfs_romfs.h"
6+
7+
int mnt_init(void)
8+
{
9+
if (dfs_mount(RT_NULL, "/", "rom", 0, &(romfs_root)) == 0)
10+
{
11+
rt_kprintf("ROM file system initializated!\n");
12+
}
13+
else
14+
{
15+
rt_kprintf("ROM file system initializate failed!\n");
16+
}
17+
18+
return 0;
19+
}
20+
INIT_ENV_EXPORT(mnt_init);
21+
#endif

‎projects/Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi/applications/xiaozhi/webnet/romfs.c‎

Lines changed: 34 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)