ccsens_hardware
/
DDB
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

featuer: 1.修复问题P-2的问题

v4-temp
Zhangwen 1 month ago
parent
58b1095836
commit
bdac191475
2 changed files with 21 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      source/app/task_game.c
  2. 6
      source/bsp/bsp_WT2605B.c

35
source/app/task_game.c
View File

@ -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;

6
source/bsp/bsp_WT2605B.c
View File

@ -74,9 +74,9 @@ 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_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的倍数

Write Preview
Loading…
Cancel
Save