From 6e0dc0bdc9a1f471e6cb2ca3777690fc9e8b35de Mon Sep 17 00:00:00 2001 From: Zhangwen <13970730+mkc46119@user.noreply.gitee.com> Date: Thu, 3 Apr 2025 15:25:47 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A1.=E9=92=88=E5=AF=B9=E6=94=B9?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E7=AE=A1?= =?UTF-8?q?=E8=84=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/app/task_SmartConfig.c | 78 --------------- source/app/task_SmartConfig.h | 34 ------- source/app/task_adc.c | 2 +- source/app/task_adc.h | 2 +- source/app/task_game.c | 183 ++++++++++++++++++++++++++++------ source/app/task_keystatus.c | 4 +- source/bsp/bsp_WT2605B.c | 80 +++++++++------ source/bsp/bsp_WT2605B.h | 23 ++++- source/bsp/bsp_key.c | 6 +- source/bsp/bsp_key.h | 7 +- source/bsp/bsp_led.c | 4 +- source/bsp/bsp_led.h | 4 +- source/bsp/bsp_wifi.c | 6 +- 13 files changed, 243 insertions(+), 190 deletions(-) delete mode 100644 source/app/task_SmartConfig.c delete mode 100644 source/app/task_SmartConfig.h diff --git a/source/app/task_SmartConfig.c b/source/app/task_SmartConfig.c deleted file mode 100644 index b751dd1..0000000 --- a/source/app/task_SmartConfig.c +++ /dev/null @@ -1,78 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -///@copyright Copyright (c) 2018, 传控科技 All rights reserved. -///------------------------------------------------------------------------- -/// @file bsp_drv.c -/// @brief bsp @ driver config -///------------------------------------------------------------------------- -/// @version 1.0 -/// @author CC -/// @date 20180331 -/// @note cc_AS_stc02 -////////////////////////////////////////////////////////////////////////////// - -#include "../app/task_smartconfig.h" -#include "../app/app_config.h" -#include "../app/task_w600.h" -#include "../msp/uartx.h" -#include "../msp/uart0.h" -#include "../msp/uart2.h" -#include "../clib/clib.h" - - -S_TASK_SMART_CONFIG task_smartconfig; - - -void L3_task_SmartConfig_init(void) -{ - L1_task_init(&task_smartconfig.task); - task_smartconfig.status = 0; - L3_task_s_go(task_smartconfig,D_task_init); -} - -#define D_task_SAMRTCONFIG 0x50 -#define D_task_SMARTCSUCCESS 0x52 -#define D_task_SAMRTCSTOP 0x53 -#define D_task_SAMRTCSTOPPED 0x54 - - -void L3_task_SmartConfig_handler(S_TASK_SMART_CONFIG *s) -{ - // TTSS_Task_init() - // L2_task_go(D_task_SAMRTCONFIG); - // // L0_uart0_uc('*'); - // // L0_uart0_uchex(task_smartconfig.status); - // // L0_uart0_uchex(s->status); - // // L0_uart0_0d0a(); - // // L0_uart0_ulhex((U32)s); - - // TTSS_Task_step(D_task_SAMRTCONFIG) - // L3_gm35_send_str(AT_INS_ST_STARTSMART); //开启SmartC - // L2_task_go_Tdelay(D_task_SAMRTCONFIG,D_Tdelay_500ms); - // TTSS_Task_step(D_task_SAMRTCONFIG) - // if(Lc_strStartsWith(ts_uart[uNum2].r.buf,"\r\nOK")) - // { - // L0_uart0_sendstr("SmartConfig Enter-->"); - // // 语音输出：进入配网模式，请配合手机 - // L2_task_go_Tdelay(D_task_SMARTCSUCCESS,D_Tdelay_300ms); - // } - // TTSS_Task_step(D_task_SMARTCSUCCESS) - // if(Lc_strStartsWith(ts_uart[uNum2].r.buf,"\r\nsmartconfig type")) - // { - // L0_uart0_sendstr("SmartConfig Success!"); - // // 语音输出：配网模式成功，请重启设备 - // L2_task_go_Tdelay(D_task_SAMRTCSTOP,D_Tdelay_300ms); - // } - // TTSS_Task_step(D_task_SAMRTCSTOP) - // L3_gm35_send_str(AT_INS_ST_STOPSMART); - // L2_task_go_Tdelay(D_task_SAMRTCSTOPPED,D_Tdelay_300ms); - - // TTSS_Task_step(D_task_SAMRTCSTOPPED) - // if (Lc_strStartsWith(ts_uart[uNum2].r.buf,"\r\nOK")) - // { - // L0_uart0_sendstr("SmartConfig Stop!"); - // R.app_status = WIFI_CONNECTED; - // L2_task_go_Tdelay(D_task_DETECTCHANGE,D_Tdelay_300ms); - // } - - // TTSS_Task_end(); -} \ No newline at end of file diff --git a/source/app/task_SmartConfig.h b/source/app/task_SmartConfig.h deleted file mode 100644 index 39fdb99..0000000 --- a/source/app/task_SmartConfig.h +++ /dev/null @@ -1,34 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -///@copyright Copyright (c) 2018, 传控科技 All rights reserved. -///------------------------------------------------------------------------- -/// @file bsp_drv.h -/// @brief bsp @ driver config -///------------------------------------------------------------------------- -/// @version 1.0 -/// @author CC -/// @date 20180331 -/// @note cc_AS_stc02 - -////////////////////////////////////////////////////////////////////////////// - -#ifndef _TASK_SMARTC_H -#define _TASK_SMARTC_H - -#include "../ctask/task.h" -#include "../app/app_config.h" -#include "../clib/type.h" - - - -typedef struct _s_task_smartc -{ - TS_task task; - APP_STATUS status; -}S_TASK_SMART_CONFIG; - -extern S_TASK_SMART_CONFIG task_smartconfig; - -extern void L3_task_SmartConfig_init(void); -extern void L3_task_SmartConfig_handler(S_TASK_SMART_CONFIG *s); - -#endif // #ifndef diff --git a/source/app/task_adc.c b/source/app/task_adc.c index f57adcb..22d22c4 100644 --- a/source/app/task_adc.c +++ b/source/app/task_adc.c @@ -64,7 +64,7 @@ void L3_task_Adc_handler(S_TASK_ADC *s) // s->Vin = (s->Aver / 0x1000) * 33; // } // 分压 0.5 - s->Vin = (s->Aver * 33 * 2) / 0x1000; + s->Vin = (s->Aver * 330 * 2) / 0x1000; G.Vin = s->Vin; L2_task_go_Tdelay(D_task_LOWPOWER_DETECT,D_Tdelay_100ms); diff --git a/source/app/task_adc.h b/source/app/task_adc.h index fcbf8e7..519e07e 100644 --- a/source/app/task_adc.h +++ b/source/app/task_adc.h @@ -18,7 +18,7 @@ #define ADC_NUM 10 //电压:3.65v 剩余容量:10% -#define Alarm_Vol 45 +#define Alarm_Vol 365 // 最大次数 #define Count_Max 5 diff --git a/source/app/task_game.c b/source/app/task_game.c index 86a70cd..7ae5a93 100644 --- a/source/app/task_game.c +++ b/source/app/task_game.c @@ -30,12 +30,31 @@ S_TASK_GAME _s_task_game; +// 非点读类游戏 +#define GAME_OID_ZLXS_4 0x2800 +#define GAME_OID_HYJJ_3 0x2900 +#define GAME_OID_HYJJ_4 0x2A00 +#define GAME_OID_HYJJ_5 0x2B00 +#define GAME_OID_CXDD_4 0x2C00 +#define GAME_OID_MCQH_4 0x2D00 +#define GAME_OID_MCQH_5 0x2E00 +#define GAME_OID_JMZX_3 0x2F00 +#define GAME_OID_JMZX_4 0x3000 +#define GAME_OID_JMZX_5 0x3100 +#define GAME_OID_HYZB_1 0x4000 +#define GAME_OID_HYZB_2 0x4100 +#define GAME_OID_SJGH_3 0x4200 +#define GAME_OID_JSSJ_4 0x4300 +#define GAME_OID_JSSJ_5 0x4400 -#define GAME_OID_ZBT 0x3133 -#define GAME_OID_SHERT 0x3142 -#define GAME_OID_ZMG 0x3152 +// 点读类游戏 +#define GAME_OID_ZBT_1 0xB000 +#define GAME_OID_SHERT_1 0x2200 +#define GAME_OID_ZMG_1 0xC000 -#define EEROR_OID 0x3FFF //无效码 +// 无效码 +#define EEROR_OID 0x3FFF +// 游戏最大时长 #define GAME_MAX_SECONDS 600 @@ -60,21 +79,37 @@ void L3_task_game_init(void) _s_task_game.game_info[i].game_supported_oid[j].handled = 0; } } - _s_task_game.game_info[0].game_oid = GAME_OID_ZBT; - _s_task_game.game_info[0].game_audio = &audio_game_different; - _s_task_game.game_info[0].game_supported_oid[0].oid = 0x3135; - _s_task_game.game_info[0].game_supported_oid[1].oid = 0x3136; - _s_task_game.game_info[0].game_supported_oid[2].oid = 0x3137; - _s_task_game.game_info[0].game_supported_oid[3].oid = 0x3138; - _s_task_game.game_info[0].game_supported_oid[4].oid = 0x3178; //错误码 - _s_task_game.game_info[0].game_supported_oid[4].yes_or_no = 0; - + // 找不同1星 + _s_task_game.game_info[0].game_oid = GAME_OID_ZBT_1; + _s_task_game.game_info[0].game_audio = &audio_game_different_1; + _s_task_game.game_info[0].game_supported_oid[0].oid = 0xB001; + _s_task_game.game_info[0].game_supported_oid[1].oid = 0xB002; + _s_task_game.game_info[0].game_supported_oid[2].oid = 0xB003; + // _s_task_game.game_info[0].game_supported_oid[3].oid = 0xB004; + _s_task_game.game_info[0].game_supported_oid[3].oid = 0xB0FF; //错误码 + _s_task_game.game_info[0].game_supported_oid[3].yes_or_no = 0; _s_task_game.game_info[0].game_order = 0; _s_task_game.game_info[0].game_timeout_seconds = 60; _s_task_game.game_info[0].game_score = 0; - _s_task_game.game_info[1].game_oid = GAME_OID_SHERT; - _s_task_game.game_info[1].game_audio = &audio_game_shulte; + // 走迷宫1星 + _s_task_game.game_info[2].game_oid = GAME_OID_ZMG_1; + _s_task_game.game_info[2].game_audio = &audio_game_maze_1; + _s_task_game.game_info[2].game_supported_oid[0].oid = 0x4E85; + _s_task_game.game_info[2].game_supported_oid[1].oid = 0x4E86; + _s_task_game.game_info[2].game_supported_oid[2].oid = 0x4E87; + _s_task_game.game_info[2].game_supported_oid[3].oid = 0x4E88; + _s_task_game.game_info[2].game_supported_oid[4].oid = 0x4E89; + _s_task_game.game_info[2].game_supported_oid[5].oid = 0x4E8A; + _s_task_game.game_info[2].game_supported_oid[6].oid = 0x317A; //错误码 + _s_task_game.game_info[2].game_supported_oid[6].yes_or_no = 0; + _s_task_game.game_info[2].game_order = 1; + _s_task_game.game_info[2].game_timeout_seconds = 60; + _s_task_game.game_info[2].game_score = 0; + + // 舒尔特方格3星 + _s_task_game.game_info[1].game_oid = GAME_OID_SHERT_1; + _s_task_game.game_info[1].game_audio = &audio_game_shulte_1; _s_task_game.game_info[1].game_supported_oid[0].oid = 0x3144; _s_task_game.game_info[1].game_supported_oid[1].oid = 0x3145; _s_task_game.game_info[1].game_supported_oid[2].oid = 0x3146; @@ -106,19 +141,111 @@ void L3_task_game_init(void) _s_task_game.game_info[1].game_timeout_seconds = 60; _s_task_game.game_info[1].game_score = 0; - _s_task_game.game_info[2].game_oid = GAME_OID_ZMG; - _s_task_game.game_info[2].game_audio = &audio_game_maze; - _s_task_game.game_info[2].game_supported_oid[0].oid = 0x4E85; - _s_task_game.game_info[2].game_supported_oid[1].oid = 0x4E86; - _s_task_game.game_info[2].game_supported_oid[2].oid = 0x4E87; - _s_task_game.game_info[2].game_supported_oid[3].oid = 0x4E88; - _s_task_game.game_info[2].game_supported_oid[4].oid = 0x4E89; - _s_task_game.game_info[2].game_supported_oid[5].oid = 0x4E8A; - _s_task_game.game_info[2].game_supported_oid[6].oid = 0x317A; //错误码 - _s_task_game.game_info[2].game_supported_oid[6].yes_or_no = 0; - _s_task_game.game_info[2].game_order = 1; - _s_task_game.game_info[2].game_timeout_seconds = 60; - _s_task_game.game_info[2].game_score = 0; + // 众里寻三3星 + _s_task_game.game_info[3].game_oid = GAME_OID_ZLXS_4; + _s_task_game.game_info[3].game_audio = &audio_game_zlxs_4; + _s_task_game.game_info[3].game_supported_oid[0].oid = 0x28EF; + _s_task_game.game_info[3].game_order = 0; + _s_task_game.game_info[3].game_timeout_seconds = 60; + _s_task_game.game_info[3].game_score = 0; + // 火眼金晶3星 + _s_task_game.game_info[4].game_oid = GAME_OID_HYJJ_3; + _s_task_game.game_info[4].game_audio = &audio_game_hyjj_3; + _s_task_game.game_info[4].game_supported_oid[0].oid = 0x29EF; + _s_task_game.game_info[4].game_order = 0; + _s_task_game.game_info[4].game_timeout_seconds = 60; + _s_task_game.game_info[4].game_score = 0; + // 火眼金晶4星 + _s_task_game.game_info[5].game_oid = GAME_OID_HYJJ_4; + _s_task_game.game_info[5].game_audio = &audio_game_hyjj_4; + _s_task_game.game_info[5].game_supported_oid[0].oid = 0x2AEF; + _s_task_game.game_info[5].game_order = 0; + _s_task_game.game_info[5].game_timeout_seconds = 60; + _s_task_game.game_info[5].game_score = 0; + // 火眼金晶5星 + _s_task_game.game_info[6].game_oid = GAME_OID_HYJJ_5; + _s_task_game.game_info[6].game_audio = &audio_game_hyjj_5; + _s_task_game.game_info[6].game_supported_oid[0].oid = 0x2BEF; + _s_task_game.game_info[6].game_order = 0; + _s_task_game.game_info[6].game_timeout_seconds = 60; + _s_task_game.game_info[6].game_score = 0; + // 从小到大4星 + _s_task_game.game_info[7].game_oid = GAME_OID_CXDD_4; + _s_task_game.game_info[7].game_audio = &audio_game_cxdd_4; + _s_task_game.game_info[7].game_supported_oid[0].oid = 0x2CEF; + _s_task_game.game_info[7].game_order = 0; + _s_task_game.game_info[7].game_timeout_seconds = 60; + _s_task_game.game_info[7].game_score = 0; + // 明察秋毫4星 + _s_task_game.game_info[8].game_oid = GAME_OID_MCQH_4; + _s_task_game.game_info[8].game_audio = &audio_game_mcqh_4; + _s_task_game.game_info[8].game_supported_oid[0].oid = 0x2DEF; + _s_task_game.game_info[8].game_order = 0; + _s_task_game.game_info[8].game_timeout_seconds = 60; + _s_task_game.game_info[8].game_score = 0; + // 明察秋毫5星 + _s_task_game.game_info[9].game_oid = GAME_OID_MCQH_5; + _s_task_game.game_info[9].game_audio = &audio_game_mcqh_5; + _s_task_game.game_info[9].game_supported_oid[0].oid = 0x2EEF; + _s_task_game.game_info[9].game_order = 0; + _s_task_game.game_info[9].game_timeout_seconds = 60; + _s_task_game.game_info[9].game_score = 0; + // 积木再现3星 + _s_task_game.game_info[10].game_oid = GAME_OID_JMZX_3; + _s_task_game.game_info[10].game_audio = &audio_game_jmzx_3; + _s_task_game.game_info[10].game_supported_oid[0].oid = 0x2FEF; + _s_task_game.game_info[10].game_order = 0; + _s_task_game.game_info[10].game_timeout_seconds = 60; + _s_task_game.game_info[10].game_score = 0; + // 积木再现4星 + _s_task_game.game_info[11].game_oid = GAME_OID_JMZX_4; + _s_task_game.game_info[11].game_audio = &audio_game_jmzx_4; + _s_task_game.game_info[11].game_supported_oid[0].oid = 0x30EF; + _s_task_game.game_info[11].game_order = 0; + _s_task_game.game_info[11].game_timeout_seconds = 60; + _s_task_game.game_info[11].game_score = 0; + // 积木再现5星 + _s_task_game.game_info[12].game_oid = GAME_OID_JMZX_5; + _s_task_game.game_info[12].game_audio = &audio_game_jmzx_5; + _s_task_game.game_info[12].game_supported_oid[0].oid = 0x31EF; + _s_task_game.game_info[12].game_order = 0; + _s_task_game.game_info[12].game_timeout_seconds = 60; + _s_task_game.game_info[12].game_score = 0; + // 还原钟表1星 + _s_task_game.game_info[13].game_oid = GAME_OID_HYZB_1; + _s_task_game.game_info[13].game_audio = &audio_game_hyzb_1; + _s_task_game.game_info[13].game_supported_oid[0].oid = 0x40EF; + _s_task_game.game_info[13].game_order = 0; + _s_task_game.game_info[13].game_timeout_seconds = 60; + _s_task_game.game_info[13].game_score = 0; + // 还原钟表2星 + _s_task_game.game_info[14].game_oid = GAME_OID_HYZB_2; + _s_task_game.game_info[14].game_audio = &audio_game_hyzb_2; + _s_task_game.game_info[14].game_supported_oid[0].oid = 0x41EF; + _s_task_game.game_info[14].game_order = 0; + _s_task_game.game_info[14].game_timeout_seconds = 60; + _s_task_game.game_info[14].game_score = 0; + // 时间规划3星 + _s_task_game.game_info[15].game_oid = GAME_OID_SJGH_3; + _s_task_game.game_info[15].game_audio = &audio_game_sjgh_3; + _s_task_game.game_info[15].game_supported_oid[0].oid = 0x42EF; + _s_task_game.game_info[15].game_order = 0; + _s_task_game.game_info[15].game_timeout_seconds = 60; + _s_task_game.game_info[15].game_score = 0; + // 计算时间4星 + _s_task_game.game_info[16].game_oid = GAME_OID_JSSJ_4; + _s_task_game.game_info[16].game_audio = &audio_game_jssj_4; + _s_task_game.game_info[16].game_supported_oid[0].oid = 0x43EF; + _s_task_game.game_info[16].game_order = 0; + _s_task_game.game_info[16].game_timeout_seconds = 60; + _s_task_game.game_info[16].game_score = 0; + // 计算时间5星 + _s_task_game.game_info[17].game_oid = GAME_OID_JSSJ_5; + _s_task_game.game_info[17].game_audio = &audio_game_jssj_5; + _s_task_game.game_info[17].game_supported_oid[0].oid = 0x44EF; + _s_task_game.game_info[17].game_order = 0; + _s_task_game.game_info[17].game_timeout_seconds = 60; + _s_task_game.game_info[17].game_score = 0; _s_task_game.game_info_index = -1; diff --git a/source/app/task_keystatus.c b/source/app/task_keystatus.c index 597fd9d..e7c30e0 100644 --- a/source/app/task_keystatus.c +++ b/source/app/task_keystatus.c @@ -82,7 +82,7 @@ void L3_task_keystatus_handler(S_TASK_KEYSTATUS *s) } else if (L2_ReadKey1() == Key_Down) { - if (s->Key1_handled == 0) + if (s->Key1_handled == 0 && R.app_status != POW_OFF) { s->Key1_handled = 1; L0_uart0_uc('1'); @@ -91,7 +91,7 @@ void L3_task_keystatus_handler(S_TASK_KEYSTATUS *s) } else if (L2_ReadKey2() == Key_Down) { - if (s->Key2_handled == 0) + if (s->Key2_handled == 0 && R.app_status != POW_OFF) { s->Key2_handled = 1; L0_uart0_uc('2'); diff --git a/source/bsp/bsp_WT2605B.c b/source/bsp/bsp_WT2605B.c index 4c9401f..8d55ae8 100644 --- a/source/bsp/bsp_WT2605B.c +++ b/source/bsp/bsp_WT2605B.c @@ -4,33 +4,49 @@ #include "../msp/UART0.h" #include "../msp/msp_eeprom.h" - -TS_SPEECH_AUDIO audio_powerdown = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x31,0x8F,0xEF}; //T001电源关闭 -TS_SPEECH_AUDIO audio_poweron = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x32,0x90,0xEF}; //T002电源开启 -TS_SPEECH_AUDIO audio_wifi_connected = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x33,0x91,0xEF}; //T003WIFI连接成功 -TS_SPEECH_AUDIO audio_TCP_connected = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x34,0x92,0xEF}; //T004TCP连接成功 -TS_SPEECH_AUDIO audio_config_mode = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x35,0x93,0xEF}; //T005配置模式 -TS_SPEECH_AUDIO audio_config_complete = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x36,0x94,0xEF}; //T006配置完成 -TS_SPEECH_AUDIO audio_config_phone = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x37,0x95,0xEF}; //T007手机APP配置 -TS_SPEECH_AUDIO audio_volume_up = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x38,0x96,0xEF}; //T008音量增加 -TS_SPEECH_AUDIO audio_volume_down = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x39,0x97,0xEF}; //T009音量减少 - -TS_SPEECH_AUDIO audio_game_maze = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x30,0x8F,0xEF}; //T010迷宫 -TS_SPEECH_AUDIO audio_game_different = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x31,0x90,0xEF}; //T011找不同 -TS_SPEECH_AUDIO audio_game_shulte = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x32,0x91,0xEF}; //T012舒尔特方格 -TS_SPEECH_AUDIO audio_game_error = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x33,0x92,0xEF}; //T013错误 -TS_SPEECH_AUDIO audio_game_correct = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x34,0x93,0xEF}; //T014正确提示音 -TS_SPEECH_AUDIO audio_game_overtime = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x35,0x94,0xEF}; //T015训练时间到 -TS_SPEECH_AUDIO audio_game_complete = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x36,0x95,0xEF}; //T016训练完成 - -TS_SPEECH_AUDIO audio_tcp_maze = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x37,0x96,0xEF}; //T017请进行走迷宫游戏训练 -TS_SPEECH_AUDIO audio_tcp_different = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x38,0x97,0xEF}; //T018请进行找不同游戏训练 -TS_SPEECH_AUDIO audio_tcp_shulte = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x39,0x98,0xEF}; //T019请进行舒尔特方格游戏训练 -TS_SPEECH_AUDIO audio_tcp_complete = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x30,0x90,0xEF}; //T020恭喜你，今天所有训练任务已完成 -TS_SPEECH_AUDIO audio_tcp_noplan = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x31,0x91,0xEF}; //T021今天暂无训练任务，可以进行自由训练哦 - -TS_SPEECH_AUDIO audio_low_power = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x32,0x92,0xEF}; //T022 - +/****************************************系统提示音****************************************/ +TS_SPEECH_AUDIO audio_powerdown = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x31,0x8F,0xEF}; //T001 谢谢使用，再见 +TS_SPEECH_AUDIO audio_poweron = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x32,0x90,0xEF}; //T002 欢迎使用睿思认知训练系统 +TS_SPEECH_AUDIO audio_wifi_connected = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x33,0x91,0xEF}; //T003 WIFI链接成功 +TS_SPEECH_AUDIO audio_TCP_connected = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x34,0x92,0xEF}; //T004 服务器连接成功 +TS_SPEECH_AUDIO audio_config_mode = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x35,0x93,0xEF}; //T005 进入配网模式 +TS_SPEECH_AUDIO audio_config_complete = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x36,0x94,0xEF}; //T006 配网成功，请重启设备 +TS_SPEECH_AUDIO audio_config_phone = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x37,0x95,0xEF}; //T007 进入配网模式,请打开APP进行配置 +TS_SPEECH_AUDIO audio_volume_up = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x38,0x96,0xEF}; //T008 音量增大 +TS_SPEECH_AUDIO audio_volume_down = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x39,0x97,0xEF}; //T009 音量减小 +TS_SPEECH_AUDIO audio_low_power = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x32,0x92,0xEF}; //T022 电池电量低，请及时充电 +/****************************************训练提示音****************************************/ +TS_SPEECH_AUDIO audio_game_maze_1 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x30,0x8F,0xEF}; //T010 走迷宫，一星。请按照要求画出一条从入口到出口的线，不能跨越实线 +TS_SPEECH_AUDIO audio_game_different_1 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x31,0x90,0xEF}; //T011 找不同，一星。请找出两张图片中不同的地方 +TS_SPEECH_AUDIO audio_game_shulte_1 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x32,0x91,0xEF}; //T012 舒尔特方格，一星。请按照从小到大的顺序依次指出1-25 + +TS_SPEECH_AUDIO audio_game_zlxs_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x33,0x93,0xEF}; //T023 众里寻3，四星。请按顺序逐行依次指出3和3的倍数，以及含3的数字方块 +TS_SPEECH_AUDIO audio_game_hyjj_3 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x34,0x94,0xEF}; //T024 火眼金晶，三星。请快速找出顺时针旋转90度的数字方块 +TS_SPEECH_AUDIO audio_game_hyjj_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x35,0x95,0xEF}; //T025 火眼金晶，四星。请快速找出顺时针旋转180度的数字方块 +TS_SPEECH_AUDIO audio_game_hyjj_5 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x36,0x96,0xEF}; //T026 火眼金晶，五星。请快速找出顺时针旋转270度的数字方块 +TS_SPEECH_AUDIO audio_game_cxdd_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x34,0x94,0xEF}; //T027 从小到大，四星。请按照从小到大的顺序依次指出刚才出现的数字 +TS_SPEECH_AUDIO audio_game_mcqh_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x35,0x95,0xEF}; //T028 明察秋毫，四星。请按顺序指出数字积木的位置 +TS_SPEECH_AUDIO audio_game_mcqh_5 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x36,0x96,0xEF}; //T029 明察秋毫，五星。请按顺序指出数字积木的位置 +TS_SPEECH_AUDIO audio_game_jmzx_3 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x34,0x94,0xEF}; //T030 积木再现，三星。请回忆数字积木的位置并指出 +TS_SPEECH_AUDIO audio_game_jmzx_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x35,0x95,0xEF}; //T031 积木再现，四星。请回忆数字积木的位置并指出 +TS_SPEECH_AUDIO audio_game_jmzx_5 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x36,0x96,0xEF}; //T032 积木再现，五星。请回忆数字积木的位置并指出 +TS_SPEECH_AUDIO audio_game_hyzb_1 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x34,0x94,0xEF}; //T033 还原钟表，一星。请将数字摆放在钟表合适的位置上 +TS_SPEECH_AUDIO audio_game_hyzb_2 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x35,0x95,0xEF}; //T034 还原钟表，二星。请将数字摆放在钟表合适的位置上 +TS_SPEECH_AUDIO audio_game_sjgh_3 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x36,0x96,0xEF}; //T035 时间规划，三星。请按提示将指针指向相应的时间 +TS_SPEECH_AUDIO audio_game_jssj_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x34,0x94,0xEF}; //T036 计算时间，四星。计算并将钟表拨动至相应的位置 +TS_SPEECH_AUDIO audio_game_jssj_5 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x35,0x95,0xEF}; //T037 计算时间，五星。计算并将钟表拨动至相应的位置 + + +TS_SPEECH_AUDIO audio_game_error = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x33,0x92,0xEF}; //T013 错误 +TS_SPEECH_AUDIO audio_game_correct = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x34,0x93,0xEF}; //T014 “正确提示音” +TS_SPEECH_AUDIO audio_game_overtime = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x35,0x94,0xEF}; //T015 超时结束，再接再励 +TS_SPEECH_AUDIO audio_game_complete = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x36,0x95,0xEF}; //T016 恭喜你，任务完成 +/****************************************服务器下发任务************************************/ +TS_SPEECH_AUDIO audio_tcp_maze = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x37,0x96,0xEF}; //T017 请进行走迷宫游戏训练 +TS_SPEECH_AUDIO audio_tcp_different = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x38,0x97,0xEF}; //T018 请进行找不同游戏训练 +TS_SPEECH_AUDIO audio_tcp_shulte = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x39,0x98,0xEF}; //T019 请进行舒尔特方格游戏训练 +TS_SPEECH_AUDIO audio_tcp_complete = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x30,0x90,0xEF}; //T020 恭喜你，今天所有训练任务已完成 +TS_SPEECH_AUDIO audio_tcp_noplan = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x31,0x91,0xEF}; //T021 今天暂无训练任务，可以进行自由训练哦 TS_SPEECH_VOLUME volume_control = {0x7E,0x04,0xAE,0x1E,0xD0,0xEF}; //音量控制 @@ -39,11 +55,15 @@ void L2_WT2605B_init() { D_stdIO_P0(BITN0); D_stdIO_P0(BITN1); - //电源控制引脚 - D_HighI_P0(BITN5); - L2_WT2605B_PWRON(); + // 电源控制引脚 + // D_HighI_P0(BITN5); + // L2_WT2605B_PWRON(); // 初始化音量 L2_WT2605B_VolumeControl(G.volume); + // 功放控制引脚P26 0 开启 1 关闭 + D_HighI_P2(BITN6); + P26 = 0; + } void L2_WT2605B_PWRON() diff --git a/source/bsp/bsp_WT2605B.h b/source/bsp/bsp_WT2605B.h index 9669276..98f6307 100644 --- a/source/bsp/bsp_WT2605B.h +++ b/source/bsp/bsp_WT2605B.h @@ -35,9 +35,26 @@ extern TS_SPEECH_AUDIO audio_config_phone; extern TS_SPEECH_AUDIO audio_volume_up; extern TS_SPEECH_AUDIO audio_volume_down; -extern TS_SPEECH_AUDIO audio_game_maze; //迷宫 -extern TS_SPEECH_AUDIO audio_game_different; //找不同 -extern TS_SPEECH_AUDIO audio_game_shulte; //舒尔特方格 +extern TS_SPEECH_AUDIO audio_game_maze_1; //迷宫，一星 +extern TS_SPEECH_AUDIO audio_game_different_1; //找不同，一星 +extern TS_SPEECH_AUDIO audio_game_shulte_1; //舒尔特方格，三星 + +extern TS_SPEECH_AUDIO audio_game_zlxs_4; //众里寻3，四星 +extern TS_SPEECH_AUDIO audio_game_hyjj_3; //火眼金晶，三星 +extern TS_SPEECH_AUDIO audio_game_hyjj_4; //火眼金晶，四星 +extern TS_SPEECH_AUDIO audio_game_hyjj_5; //火眼金晶，五星 +extern TS_SPEECH_AUDIO audio_game_cxdd_4; //从小到大，四星 +extern TS_SPEECH_AUDIO audio_game_mcqh_4; //明察秋毫，四星 +extern TS_SPEECH_AUDIO audio_game_mcqh_5; //明察秋毫，五星 +extern TS_SPEECH_AUDIO audio_game_jmzx_3; //积木再现，三星 +extern TS_SPEECH_AUDIO audio_game_jmzx_4; //积木再现，四星 +extern TS_SPEECH_AUDIO audio_game_jmzx_5; //积木再现，五星 +extern TS_SPEECH_AUDIO audio_game_hyzb_1; //还原钟表，一星 +extern TS_SPEECH_AUDIO audio_game_hyzb_2; //还原钟表，二星 +extern TS_SPEECH_AUDIO audio_game_sjgh_3; //时间规划，三星 +extern TS_SPEECH_AUDIO audio_game_jssj_4; //计算时间，四星 +extern TS_SPEECH_AUDIO audio_game_jssj_5; //计算时间，五星 + extern TS_SPEECH_AUDIO audio_game_error; //错误 extern TS_SPEECH_AUDIO audio_game_correct; //正确 extern TS_SPEECH_AUDIO audio_game_overtime; //训练时间到 diff --git a/source/bsp/bsp_key.c b/source/bsp/bsp_key.c index 63243b9..79fd341 100644 --- a/source/bsp/bsp_key.c +++ b/source/bsp/bsp_key.c @@ -2,9 +2,9 @@ void L2_key_init() { - D_stdIO_P3(BITN2); - D_stdIO_P3(BITN3);//准双向口 - D_stdIO_P4(BITN0); + D_stdIO_P2(BITN1); + D_stdIO_P2(BITN0);//准双向口 + D_stdIO_P0(BITN2); //初始化为高电平 Key1 = Key2 = Key3 = 1; diff --git a/source/bsp/bsp_key.h b/source/bsp/bsp_key.h index 6ee35ac..2a99538 100644 --- a/source/bsp/bsp_key.h +++ b/source/bsp/bsp_key.h @@ -7,9 +7,10 @@ #define Key_Down 0 #define Key_Up 1 -#define Key1 P32 //音量增大 -#define Key2 P33 //音量减小 -#define Key3 P40 //开关机 +#define Key1 P21 //音量增大 +#define Key2 P20 //音量减小 +#define Key3 P02 //开关机 + // #define Key (key1 && key2 && key3) diff --git a/source/bsp/bsp_led.c b/source/bsp/bsp_led.c index cf4790f..99b11de 100644 --- a/source/bsp/bsp_led.c +++ b/source/bsp/bsp_led.c @@ -2,8 +2,8 @@ void L2_led_init() { - D_HighI_P2(BITN6); - D_HighI_P2(BITN7); + D_HighI_P1(BITN2); + D_HighI_P4(BITN7); GREEN_LED = LED_OFF; RED_LED = LED_OFF; diff --git a/source/bsp/bsp_led.h b/source/bsp/bsp_led.h index d2b8855..2b67abc 100644 --- a/source/bsp/bsp_led.h +++ b/source/bsp/bsp_led.h @@ -4,8 +4,8 @@ #include "bsp_config.h" -#define RED_LED P27 //双色红灯 -#define GREEN_LED P26 //双色绿灯 +#define RED_LED P12 //双色红灯 +#define GREEN_LED P47 //双色绿灯 #define LED_ON 0 #define LED_OFF 1 diff --git a/source/bsp/bsp_wifi.c b/source/bsp/bsp_wifi.c index 079015d..801f908 100644 --- a/source/bsp/bsp_wifi.c +++ b/source/bsp/bsp_wifi.c @@ -4,17 +4,17 @@ void L2_Wifi_init() { D_stdIO_P1(BITN0); D_stdIO_P1(BITN1); - D_stdIO_P5(BITN3); + D_stdIO_P5(BITN2); L2_OID_WIFI_Open(); } void L2_OID_WIFI_Open() { - D_P53_OFF(); + D_P52_OFF(); } void L2_OID_WIFI_Close() { - D_P53_ON(); + D_P52_ON(); }