diff --git a/keilp/cc_as_stc02_ps5ws.uvprojx b/keilp/cc_as_stc02_ps5ws.uvprojx index f2b8cc1..e9447bf 100644 --- a/keilp/cc_as_stc02_ps5ws.uvprojx +++ b/keilp/cc_as_stc02_ps5ws.uvprojx @@ -10,6 +10,7 @@ STC8F2K16S2 0x0 MCS-51 + 8 STC8H8K64U Series @@ -123,47 +124,6 @@ 0 16 - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - - - 0 - 1 - 0 - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - 0 - -1 - - - - - - - - - - - - - - - @@ -217,12 +177,14 @@ 0 0 0 + 0 0 0 0 0 0 0 + 0 0 0 0 @@ -292,6 +254,16 @@ 0x0 0x0 + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + diff --git a/source/app/task_game.c b/source/app/task_game.c index c8a1052..c8a61bb 100644 --- a/source/app/task_game.c +++ b/source/app/task_game.c @@ -547,16 +547,186 @@ void L3_task_game_init(void) _s_task_game.game_info[41].game_timeout_seconds = 60; _s_task_game.game_info[41].game_score = 0; /***************************************PAGE3******************************************* */ -/****************************************24个******************************************* */ - +/****************************************19个******************************************* */ + // // 有序排列，1星 + // _s_task_game.game_info[42].game_oid = GAME_OID_YXPLL_1; + // _s_task_game.game_info[42].game_audio = &audio_game_yxpll_1; + // _s_task_game.game_info[42].game_supported_oid = pointbuf.yxpll_1; + // _s_task_game.game_info[42].game_oid_num = 1; + // _s_task_game.game_info[42].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[42].game_order = 0; + // _s_task_game.game_info[42].game_timeout_seconds = 60; + // _s_task_game.game_info[42].game_score = 0; + // // 复制图形，2星 + // _s_task_game.game_info[43].game_oid = GAME_OID_FZTP_2; + // _s_task_game.game_info[43].game_audio = &audio_game_yxpl_2; + // _s_task_game.game_info[43].game_supported_oid = pointbuf.yxpl_2; + // _s_task_game.game_info[43].game_oid_num = 1; + // _s_task_game.game_info[43].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[43].game_order = 0; + // _s_task_game.game_info[43].game_timeout_seconds = 60; + // _s_task_game.game_info[43].game_score = 0; + // // 复制图形，3星 + // _s_task_game.game_info[44].game_oid = GAME_OID_YDSD_1; + // _s_task_game.game_info[44].game_audio = &audio_game_ydsd_1; + // _s_task_game.game_info[44].game_supported_oid = pointbuf.ydsd_1; + // _s_task_game.game_info[44].game_oid_num = 1; + // _s_task_game.game_info[44].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[44].game_order = 0; + // _s_task_game.game_info[44].game_timeout_seconds = 60; + // _s_task_game.game_info[44].game_score = 0; + // // 复制图形，4星 + // _s_task_game.game_info[45].game_oid = GAME_OID_YDSD_2; + // _s_task_game.game_info[45].game_audio = &audio_game_ydsd_2; + // _s_task_game.game_info[45].game_supported_oid = pointbuf.ydsd_2; + // _s_task_game.game_info[45].game_oid_num = 1; + // _s_task_game.game_info[45].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[45].game_order = 0; + // _s_task_game.game_info[45].game_timeout_seconds = 60; + // _s_task_game.game_info[45].game_score = 0; + // // 复制图形，5星 + // _s_task_game.game_info[46].game_oid = GAME_OID_YDSD_SZDD_1; + // _s_task_game.game_info[46].game_audio = &audio_game_ydsd_szdd_1; + // _s_task_game.game_info[46].game_supported_oid = pointbuf.ydsd_szdd_1; + // _s_task_game.game_info[46].game_oid_num = 1; + // _s_task_game.game_info[46].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[46].game_order = 0; + // _s_task_game.game_info[46].game_timeout_seconds = 60; + // _s_task_game.game_info[46].game_score = 0; + // // 慧眼“挑刺”，3星 + // _s_task_game.game_info[47].game_oid = GAME_OID_YDSD_SZDD_2; + // _s_task_game.game_info[47].game_audio = &audio_game_ydsd_szdd_2; + // _s_task_game.game_info[47].game_supported_oid = pointbuf.ydsd_szdd_2; + // _s_task_game.game_info[47].game_oid_num = 1; + // _s_task_game.game_info[47].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[47].game_order = 0; + // _s_task_game.game_info[47].game_timeout_seconds = 60; + // _s_task_game.game_info[47].game_score = 0; + // // 慧眼“挑刺”，4星 + // _s_task_game.game_info[48].game_oid = GAME_OID_BBDX_1; + // _s_task_game.game_info[48].game_audio = &audio_game_bbdx_1; + // _s_task_game.game_info[48].game_supported_oid = pointbuf.bbdx_1; + // _s_task_game.game_info[48].game_oid_num = 1; + // _s_task_game.game_info[48].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[48].game_order = 0; + // _s_task_game.game_info[48].game_timeout_seconds = 60; + // _s_task_game.game_info[48].game_score = 0; + // // 手眼协调，3星 + // _s_task_game.game_info[49].game_oid = GAME_OID_BBDX_2; + // _s_task_game.game_info[49].game_audio = &audio_game_bbdx_2; + // _s_task_game.game_info[49].game_supported_oid = pointbuf.bbdx_2; + // _s_task_game.game_info[49].game_oid_num = 1; + // _s_task_game.game_info[49].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[49].game_order = 0; + // _s_task_game.game_info[49].game_timeout_seconds = 60; + // _s_task_game.game_info[49].game_score = 0; + // // 手眼协调，4星 + // _s_task_game.game_info[50].game_oid = GAME_OID_BBDX_3; + // _s_task_game.game_info[50].game_audio = &audio_game_bbdx_3; + // _s_task_game.game_info[50].game_supported_oid = pointbuf.bbdx_3; + // _s_task_game.game_info[50].game_oid_num = 1; + // _s_task_game.game_info[50].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[50].game_order = 0; + // _s_task_game.game_info[50].game_timeout_seconds = 60; + // _s_task_game.game_info[50].game_score = 0; + // // 听1拍1，3星 + // _s_task_game.game_info[51].game_oid = GAME_OID_BBDX_4; + // _s_task_game.game_info[51].game_audio = &audio_game_bbdx_4; + // _s_task_game.game_info[51].game_supported_oid = pointbuf.bbdx_4; + // _s_task_game.game_info[51].game_oid_num = 1; + // _s_task_game.game_info[51].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[51].game_order = 0; + // _s_task_game.game_info[51].game_timeout_seconds = 60; + // _s_task_game.game_info[51].game_score = 0; + // // 数字顺背，3星 + // _s_task_game.game_info[52].game_oid = GAME_OID_CSCD_2; + // _s_task_game.game_info[52].game_audio = &audio_game_cscd_2; + // _s_task_game.game_info[52].game_supported_oid = pointbuf.cscd_2; + // _s_task_game.game_info[52].game_oid_num = 1; + // _s_task_game.game_info[52].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[52].game_order = 0; + // _s_task_game.game_info[52].game_timeout_seconds = 60; + // _s_task_game.game_info[52].game_score = 0; + // // 数字顺背，4星 + // _s_task_game.game_info[53].game_oid = GAME_OID_CSCD_3; + // _s_task_game.game_info[53].game_audio = &audio_game_cscd_3; + // _s_task_game.game_info[53].game_supported_oid = pointbuf.cscd_3; + // _s_task_game.game_info[53].game_oid_num = 1; + // _s_task_game.game_info[53].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[53].game_order = 0; + // _s_task_game.game_info[53].game_timeout_seconds = 60; + // _s_task_game.game_info[53].game_score = 0; + // // 数字倒背，3星 + // _s_task_game.game_info[54].game_oid = GAME_OID_DQPM_2; + // _s_task_game.game_info[54].game_audio = &audio_game_dqpm_2; + // _s_task_game.game_info[54].game_supported_oid = pointbuf.dqpm_2; + // _s_task_game.game_info[54].game_oid_num = 1; + // _s_task_game.game_info[54].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[54].game_order = 0; + // _s_task_game.game_info[54].game_timeout_seconds = 60; + // _s_task_game.game_info[54].game_score = 0; + // // “火柴算数”，4星 + // _s_task_game.game_info[55].game_oid = GAME_OID_DQPM_3; + // _s_task_game.game_info[55].game_audio = &audio_game_dqpm_3; + // _s_task_game.game_info[55].game_supported_oid = pointbuf.dqpm_3; + // _s_task_game.game_info[55].game_oid_num = 1; + // _s_task_game.game_info[55].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[55].game_order = 0; + // _s_task_game.game_info[55].game_timeout_seconds = 60; + // _s_task_game.game_info[55].game_score = 0; + // // “火柴算数”，5星 + // _s_task_game.game_info[56].game_oid = GAME_OID_SZSB_2; + // _s_task_game.game_info[56].game_audio = &audio_game_szsb_2; + // _s_task_game.game_info[56].game_supported_oid = pointbuf.szsb_2; + // _s_task_game.game_info[56].game_oid_num = 1; + // _s_task_game.game_info[56].game_supported_oid[0].oid = 0xA0FE; + // _s_task_game.game_info[56].game_order = 0; + // _s_task_game.game_info[56].game_timeout_seconds = 60; + // _s_task_game.game_info[56].game_score = 0; + // // 正方体拼图，2星 + // _s_task_game.game_info[57].game_oid = GAME_OID_SZSB_3; + // _s_task_game.game_info[57].game_audio = &audio_game_szsb_3; + // _s_task_game.game_info[57].game_supported_oid = pointbuf.szsb_3; + // _s_task_game.game_info[57].game_oid_num = 1; + // _s_task_game.game_info[57].game_supported_oid[0].oid = 0x50FE; + // _s_task_game.game_info[57].game_order = 0; + // _s_task_game.game_info[57].game_timeout_seconds = 60; + // _s_task_game.game_info[57].game_score = 0; + // // 正方体拼图，3星 + // _s_task_game.game_info[58].game_oid = GAME_OID_SZDB_2; + // _s_task_game.game_info[58].game_audio = &audio_game_szdb_2; + // _s_task_game.game_info[58].game_supported_oid = pointbuf.szdb_2; + // _s_task_game.game_info[58].game_oid_num = 1; + // _s_task_game.game_info[58].game_supported_oid[0].oid = 0x50FE; + // _s_task_game.game_info[58].game_order = 0; + // _s_task_game.game_info[58].game_timeout_seconds = 60; + // _s_task_game.game_info[58].game_score = 0; + // // 正方体拼图，4星 + // _s_task_game.game_info[59].game_oid = GAME_OID_SZDB_3; + // _s_task_game.game_info[59].game_audio = &audio_game_szdb_3; + // _s_task_game.game_info[59].game_supported_oid = pointbuf.szdb_3; + // _s_task_game.game_info[59].game_oid_num = 1; + // _s_task_game.game_info[59].game_supported_oid[0].oid = 0x50FE; + // _s_task_game.game_info[59].game_order = 0; + // _s_task_game.game_info[59].game_timeout_seconds = 60; + // _s_task_game.game_info[59].game_score = 0; + // // 正方体拼图，5星 + // _s_task_game.game_info[60].game_oid = GAME_OID_SZDB_3; + // _s_task_game.game_info[60].game_audio = &audio_game_szdb_3; + // _s_task_game.game_info[60].game_supported_oid = pointbuf.szdb_3; + // _s_task_game.game_info[60].game_oid_num = 1; + // _s_task_game.game_info[60].game_supported_oid[0].oid = 0x50FE; + // _s_task_game.game_info[60].game_order = 0; + // _s_task_game.game_info[60].game_timeout_seconds = 60; + // _s_task_game.game_info[60].game_score = 0; /***************************************PAGE4******************************************* */ -/****************************************24个******************************************* */ +/****************************************15个******************************************* */ /***************************************PAGE5******************************************* */ -/****************************************24个******************************************* */ +/****************************************14个******************************************* */ /***************************************PAGE6******************************************* */ -/****************************************24个******************************************* */ +/****************************************15个******************************************* */ } diff --git a/source/app/task_game.h b/source/app/task_game.h index 5206a06..88876c3 100644 --- a/source/app/task_game.h +++ b/source/app/task_game.h @@ -20,7 +20,7 @@ // #define game_supported_oid_max 32 -#define game_num_max 20 +#define game_num_max 50 #define zbt_1_num 4 diff --git a/source/bsp/bsp_WT2605B.h b/source/bsp/bsp_WT2605B.h index 8658e0f..9a90891 100644 --- a/source/bsp/bsp_WT2605B.h +++ b/source/bsp/bsp_WT2605B.h @@ -74,7 +74,7 @@ extern TS_SPEECH_AUDIO audio_game_szsb_2; //T052 数字顺背，2星 extern TS_SPEECH_AUDIO audio_game_szsb_3; //T053 数字顺背，3星 extern TS_SPEECH_AUDIO audio_game_szdb_2; //T054 数字倒背，2星 extern TS_SPEECH_AUDIO audio_game_szdb_3; //T055 数字倒背，3星 -extern TS_SPEECH_AUDIO audio_game_setfg_; //T056 舒尔特方格，3星 +extern TS_SPEECH_AUDIO audio_game_setfg_3; //T056 舒尔特方格，3星 extern TS_SPEECH_AUDIO audio_game_setfg_szxz_3; //T057 舒尔特方格，4星 extern TS_SPEECH_AUDIO audio_game_setfg_4; //T058 舒尔特方格，5星 extern TS_SPEECH_AUDIO audio_game_setfg_5; //T059 舒尔特方格（数字旋转），3星