From bdac1914756836ec54ccaf8b01269bc1d8b10ef3 Mon Sep 17 00:00:00 2001 From: Zhangwen <13970730+mkc46119@user.noreply.gitee.com> Date: Fri, 16 May 2025 10:25:02 +0800 Subject: [PATCH] =?UTF-8?q?featuer:=201.=E4=BF=AE=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98P-2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/app/task_game.c | 35 +++++++++++++++++------------------ source/bsp/bsp_WT2605B.c | 8 ++++---- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/source/app/task_game.c b/source/app/task_game.c index c8a61bb..bc1a696 100644 --- a/source/app/task_game.c +++ b/source/app/task_game.c @@ -135,23 +135,6 @@ void L3_task_game_init(void) _s_task_game.game_info[0].game_timeout_seconds = 60; _s_task_game.game_info[0].game_score = 0; - - // 走迷宫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 = pointbuf.zmg_1; - _s_task_game.game_info[2].game_oid_num = zmg_1_num; - _s_task_game.game_info[2].game_supported_oid[0].oid = 0xC001; - _s_task_game.game_info[2].game_supported_oid[1].oid = 0xC002; - _s_task_game.game_info[2].game_supported_oid[2].oid = 0xC003; - _s_task_game.game_info[2].game_supported_oid[3].oid = 0xC004; - _s_task_game.game_info[2].game_supported_oid[4].oid = 0xC005; - _s_task_game.game_info[2].game_supported_oid[5].oid = 0xC0FF; //错误码 - _s_task_game.game_info[2].game_supported_oid[5].yes_or_no = 1; - _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_3; @@ -188,6 +171,22 @@ void L3_task_game_init(void) _s_task_game.game_info[1].game_timeout_seconds = 120; _s_task_game.game_info[1].game_score = 0; + // 走迷宫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 = pointbuf.zmg_1; + // _s_task_game.game_info[2].game_oid_num = zmg_1_num; + // _s_task_game.game_info[2].game_supported_oid[0].oid = 0xC001; + // _s_task_game.game_info[2].game_supported_oid[1].oid = 0xC002; + // _s_task_game.game_info[2].game_supported_oid[2].oid = 0xC003; + // _s_task_game.game_info[2].game_supported_oid[3].oid = 0xC004; + // _s_task_game.game_info[2].game_supported_oid[4].oid = 0xC005; + // _s_task_game.game_info[2].game_supported_oid[5].oid = 0xC0FF; //错误码 + // _s_task_game.game_info[2].game_supported_oid[5].yes_or_no = 1; + // _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; + /*************************************************************************************** */ /***************************************PAGE1******************************************* */ /****************************************15个******************************************* */ @@ -493,7 +492,7 @@ void L3_task_game_init(void) _s_task_game.game_info[35].game_timeout_seconds = 60; _s_task_game.game_info[35].game_score = 0; // 舒尔特方格，3星 - // _s_task_game.game_info[36].game_oid = GAME_OID_SETFG_3; + _s_task_game.game_info[36].game_oid = GAME_OID_SETFG_3; // _s_task_game.game_info[36].game_audio = &audio_game_setfg_3; // _s_task_game.game_info[36].game_supported_oid = pointbuf.setfg_3; // _s_task_game.game_info[36].game_oid_num = setfg_3_num; diff --git a/source/bsp/bsp_WT2605B.c b/source/bsp/bsp_WT2605B.c index a0869b6..3c70aba 100644 --- a/source/bsp/bsp_WT2605B.c +++ b/source/bsp/bsp_WT2605B.c @@ -74,10 +74,10 @@ TS_SPEECH_AUDIO audio_game_szsb_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x33,0x9 TS_SPEECH_AUDIO audio_game_szdb_2 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x34,0x97,0xEF}; //T054 数字倒背，2星。请按照任务要求，进行训练 TS_SPEECH_AUDIO audio_game_szdb_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x35,0x98,0xEF}; //T055 数字倒背，3星。请按照任务要求，进行训练 TS_SPEECH_AUDIO audio_game_setfg_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x36,0x99,0xEF}; //T056 舒尔特方格，3星。请按照从小到大的顺序依次指出1到25 -TS_SPEECH_AUDIO audio_game_setfg_szxz_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x37,0x9A,0xEF}; //T057 舒尔特方格，4星。请按照从小到大的顺序依次指出1到25 -TS_SPEECH_AUDIO audio_game_setfg_4 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x38,0x9B,0xEF}; //T058 舒尔特方格，5星。请按照从小到大的顺序依次指出1到25 -TS_SPEECH_AUDIO audio_game_setfg_5 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x39,0x9C,0xEF}; //T059 舒尔特方格（数字旋转），3星。请按照从小到大的顺序依次指出1到25 -TS_SPEECH_AUDIO audio_game_setfg_szdd_5 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x30,0x94,0xEF}; //T060 舒尔特方格（数字颠倒），5星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_4 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x37,0x9A,0xEF}; //T057 舒尔特方格，4星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_5 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x38,0x9B,0xEF}; //T058 舒尔特方格，5星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_szxz_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x39,0x9C,0xEF}; //T059 舒尔特方格（数字旋转），3星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_szdd_5 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x30,0x94,0xEF}; //T060 舒尔特方格（数字颠倒），5星。请按照从小到大的顺序依次指出1到25 TS_SPEECH_AUDIO audio_game_zlxs_3 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x31,0x95,0xEF}; //T061 众里寻三，3星。请按顺序逐行依次指出3和3的倍数 TS_SPEECH_VOLUME volume_control = {0x7E,0x04,0xAE,0x1E,0xD0,0xEF}; //音量控制