From 02885dc488c6679dc42bc8b19f4baeda74800ef9 Mon Sep 17 00:00:00 2001 From: Zhangwen <13970730+mkc46119@user.noreply.gitee.com> Date: Wed, 23 Jul 2025 17:24:28 +0800 Subject: [PATCH] =?UTF-8?q?feature:=201.=E5=BC=80=E5=90=AF=E7=94=B5?= =?UTF-8?q?=E9=87=8F=E8=B0=83=E8=AF=95=E6=89=93=E5=8D=B0=202.=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E9=93=BA=E7=A0=81=E7=9A=84=E4=B8=80=E5=A4=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9=E7=A8=8B=E5=BA=8F=E4=B8=AD=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E7=9A=84oid=E9=85=8D=E7=BD=AE=203.=E4=B8=8A=E7=94=B5?= =?UTF-8?q?=E4=B8=8D=E5=BC=80=E5=90=AFwifi=E5=92=8C=E7=AC=94=E5=A4=B4?= =?UTF-8?q?=EF=BC=8C=E5=BC=80=E6=9C=BA=E5=90=8E=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/app/main.c | 18 +++++++++--------- source/app/task_appstatus.c | 6 ++++++ source/app/task_game.c | 2 +- source/bsp/bsp_wifi.c | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/source/app/main.c b/source/app/main.c index 6d8934a..1775455 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -88,10 +88,10 @@ void main(void) L0_uart0_sendArrayHex(G.mcu_id, MSP_ID_LEN); L0_uart0_0d0a(); - // //版本信息 - // L0_uart0_sendstr("Version info : "); - // L0_uart0_sendArray("PEN_V4_8k",9); - // L0_uart0_0d0a(); + //版本信息 + L0_uart0_sendstr("Version info : "); + L0_uart0_sendArray("PEN_V4_8k_Fixed",15); + L0_uart0_0d0a(); while(1) { @@ -100,11 +100,11 @@ void main(void) { s_nos_tick.t1s_heartbeat = 0;//置0清空 L0_uart0_uc('.'); - // L0_uart0_sendstr("ADC = "); - // L0_uart0_ushex(_s_task_adc.adc_val[_s_task_adc.index]); - // L0_uart0_0d0a(); - // L0_uart0_sendstr("Vin = "); - // L0_uart0_ushex(G.Vin); + L0_uart0_sendstr("ADC = "); + L0_uart0_ushex(_s_task_adc.adc_val[_s_task_adc.index]); + L0_uart0_0d0a(); + L0_uart0_sendstr("Vin = "); + L0_uart0_ushex(G.Vin); // i++; // if (i == 3) // { diff --git a/source/app/task_appstatus.c b/source/app/task_appstatus.c index 2f7069f..426ff95 100644 --- a/source/app/task_appstatus.c +++ b/source/app/task_appstatus.c @@ -68,6 +68,9 @@ void L3_task_appstatus_handler(S_TASK_APPSTATUS *s) L2_WT2605B_Broadcast(&audio_powerdown); // OID、WIFI关闭 L2_OID_WIFI_Close(); + Lc_delay_ms(5000); + // 语音模块关闭 + L2_WT2605B_OFF(); } else if (s->status == POW_ON_WAIT) { @@ -75,6 +78,9 @@ void L3_task_appstatus_handler(S_TASK_APPSTATUS *s) L2_RED_LED_ON(); // OID、WIFI开启 L2_OID_WIFI_Open(); + // 语音模块开启 + L2_WT2605B_ON(); + Lc_delay_ms(4000); // 通电后播放开机语音 L2_WT2605B_Broadcast(&audio_poweron); //wifi任务初始化 diff --git a/source/app/task_game.c b/source/app/task_game.c index 9b7137c..2d218f3 100644 --- a/source/app/task_game.c +++ b/source/app/task_game.c @@ -1327,7 +1327,7 @@ void L3_task_game_init(void) _s_task_game.game_info[102].game_supported_oid[2].oid = 0xC203; _s_task_game.game_info[102].game_supported_oid[3].oid = 0xC204; _s_task_game.game_info[102].game_supported_oid[4].oid = 0xC205; - _s_task_game.game_info[102].game_supported_oid[5].oid = 0xC206; + _s_task_game.game_info[102].game_supported_oid[5].oid = 0xC26A; _s_task_game.game_info[102].game_supported_oid[6].oid = 0xC2FF; //错误码 _s_task_game.game_info[102].game_supported_oid[6].yes_or_no = 1; _s_task_game.game_info[102].game_order = 1; diff --git a/source/bsp/bsp_wifi.c b/source/bsp/bsp_wifi.c index 801f908..b02efde 100644 --- a/source/bsp/bsp_wifi.c +++ b/source/bsp/bsp_wifi.c @@ -5,7 +5,7 @@ void L2_Wifi_init() D_stdIO_P1(BITN0); D_stdIO_P1(BITN1); D_stdIO_P5(BITN2); - L2_OID_WIFI_Open(); + L2_OID_WIFI_Close(); } void L2_OID_WIFI_Open()