diff --git a/source/app/task_game.c b/source/app/task_game.c index bc1a696..a7a087d 100644 --- a/source/app/task_game.c +++ b/source/app/task_game.c @@ -75,7 +75,28 @@ #define GAME_OID_ZLXS_3 0x2700 - +/*************************************游戏标识码***************************************** */ +/***************************************PAGE3******************************************* */ +/****************************************19个******************************************* */ +#define GAME_OID_YXLP_1 0xA000 +#define GAME_OID_FZTP_2 0xA100 +#define GAME_OID_FZTP_3 0xA200 +#define GAME_OID_FZTP_4 0xA300 +#define GAME_OID_FZTP_5 0xA400 +#define GAME_OID_HYTC_3 0xA500 +#define GAME_OID_HYTC_4 0xA600 +#define GAME_OID_SYXT_3 0xA700 +#define GAME_OID_SYXT_4 0xA800 +#define GAME_OID_TYPY_3 0xA900 +#define GAME_OID_SZBS_3 0xAA00 +#define GAME_OID_SZBS_4 0xAB00 +#define GAME_OID_SZBD_3 0xAC00 +#define GAME_OID_HCSS_4 0xAD00 +#define GAME_OID_HCSS_5 0xAE00 +#define GAME_OID_ZFTPT_2 0x5000 +#define GAME_OID_ZFTPT_3 0x5100 +#define GAME_OID_ZFTPT_4 0x5200 +#define GAME_OID_ZFTPT_5 0x5300 /*************************************************************************************** */ @@ -547,177 +568,177 @@ void L3_task_game_init(void) _s_task_game.game_info[41].game_score = 0; /***************************************PAGE3******************************************* */ /****************************************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; + // 有序排列，1星 + _s_task_game.game_info[42].game_oid = GAME_OID_YXLP_1; + _s_task_game.game_info[42].game_audio = &audio_game_yxlp_1; + _s_task_game.game_info[42].game_supported_oid = pointbuf.yxlp_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 = 300; + _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_fztp_2; + _s_task_game.game_info[43].game_supported_oid = pointbuf.fztp_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 = 300; + _s_task_game.game_info[43].game_score = 0; + // 复制图形，3星 + _s_task_game.game_info[44].game_oid = GAME_OID_FZTP_3; + _s_task_game.game_info[44].game_audio = &audio_game_fztp_3; + _s_task_game.game_info[44].game_supported_oid = pointbuf.fztp_3; + _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 = 300; + _s_task_game.game_info[44].game_score = 0; + // 复制图形，4星 + _s_task_game.game_info[45].game_oid = GAME_OID_FZTP_4; + _s_task_game.game_info[45].game_audio = &audio_game_fztp_4; + _s_task_game.game_info[45].game_supported_oid = pointbuf.fztp_4; + _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 = 300; + _s_task_game.game_info[45].game_score = 0; + // 复制图形，5星 + _s_task_game.game_info[46].game_oid = GAME_OID_FZTP_5; + _s_task_game.game_info[46].game_audio = &audio_game_fztp_5; + _s_task_game.game_info[46].game_supported_oid = pointbuf.fztp_5; + _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 = 300; + _s_task_game.game_info[46].game_score = 0; + // 慧眼“挑刺”，3星 + _s_task_game.game_info[47].game_oid = GAME_OID_HYTC_3; + _s_task_game.game_info[47].game_audio = &audio_game_hytc_3; + _s_task_game.game_info[47].game_supported_oid = pointbuf.hytc_3; + _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 = 300; + _s_task_game.game_info[47].game_score = 0; + // 慧眼“挑刺”，4星 + _s_task_game.game_info[48].game_oid = GAME_OID_HYTC_4; + _s_task_game.game_info[48].game_audio = &audio_game_hytc_4; + _s_task_game.game_info[48].game_supported_oid = pointbuf.hytc_4; + _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 = 300; + _s_task_game.game_info[48].game_score = 0; + // 手眼协调，3星 + _s_task_game.game_info[49].game_oid = GAME_OID_SYXT_3; + _s_task_game.game_info[49].game_audio = &audio_game_syxt_3; + _s_task_game.game_info[49].game_supported_oid = pointbuf.syxt_3; + _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 = 300; + _s_task_game.game_info[49].game_score = 0; + // 手眼协调，4星 + _s_task_game.game_info[50].game_oid = GAME_OID_SYXT_4; + _s_task_game.game_info[50].game_audio = &audio_game_syxt_4; + _s_task_game.game_info[50].game_supported_oid = pointbuf.syxt_4; + _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 = 300; + _s_task_game.game_info[50].game_score = 0; + // 听1拍1，3星 + _s_task_game.game_info[51].game_oid = GAME_OID_TYPY_3; + _s_task_game.game_info[51].game_audio = &audio_game_typy_3; + _s_task_game.game_info[51].game_supported_oid = pointbuf.typy_3; + _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 = 300; + _s_task_game.game_info[51].game_score = 0; + // 数字顺背，3星 + _s_task_game.game_info[52].game_oid = GAME_OID_SZBS_3; + _s_task_game.game_info[52].game_audio = &audio_game_szbs_3; + _s_task_game.game_info[52].game_supported_oid = pointbuf.szbs_3; + _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 = 300; + _s_task_game.game_info[52].game_score = 0; + // 数字顺背，4星 + _s_task_game.game_info[53].game_oid = GAME_OID_SZBS_4; + _s_task_game.game_info[53].game_audio = &audio_game_szbs_4; + _s_task_game.game_info[53].game_supported_oid = pointbuf.szbs_4; + _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 = 300; + _s_task_game.game_info[53].game_score = 0; + // 数字倒背，3星 + _s_task_game.game_info[54].game_oid = GAME_OID_SZBD_3; + _s_task_game.game_info[54].game_audio = &audio_game_szbd_3; + _s_task_game.game_info[54].game_supported_oid = pointbuf.szbd_3; + _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 = 300; + _s_task_game.game_info[54].game_score = 0; + // “火柴算数”，4星 + _s_task_game.game_info[55].game_oid = GAME_OID_HCSS_4; + _s_task_game.game_info[55].game_audio = &audio_game_hcss_4; + _s_task_game.game_info[55].game_supported_oid = pointbuf.hcss_4; + _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 = 300; + _s_task_game.game_info[55].game_score = 0; + // “火柴算数”，5星 + _s_task_game.game_info[56].game_oid = GAME_OID_HCSS_5; + _s_task_game.game_info[56].game_audio = &audio_game_hcss_5; + _s_task_game.game_info[56].game_supported_oid = pointbuf.hcss_5; + _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 = 300; + _s_task_game.game_info[56].game_score = 0; + // 正方体拼图，2星 + _s_task_game.game_info[57].game_oid = GAME_OID_ZFTPT_2; + _s_task_game.game_info[57].game_audio = &audio_game_zftpt_2; + _s_task_game.game_info[57].game_supported_oid = pointbuf.zftpt_2; + _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 = 300; + _s_task_game.game_info[57].game_score = 0; + // 正方体拼图，3星 + _s_task_game.game_info[58].game_oid = GAME_OID_ZFTPT_3; + _s_task_game.game_info[58].game_audio = &audio_game_zftpt_3; + _s_task_game.game_info[58].game_supported_oid = pointbuf.zftpt_3; + _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 = 300; + _s_task_game.game_info[58].game_score = 0; + // 正方体拼图，4星 + _s_task_game.game_info[59].game_oid = GAME_OID_ZFTPT_4; + _s_task_game.game_info[59].game_audio = &audio_game_zftpt_4; + _s_task_game.game_info[59].game_supported_oid = pointbuf.zftpt_4; + _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 = 300; + _s_task_game.game_info[59].game_score = 0; + // 正方体拼图，5星 + _s_task_game.game_info[60].game_oid = GAME_OID_ZFTPT_5; + _s_task_game.game_info[60].game_audio = &audio_game_zftpt_5; + _s_task_game.game_info[60].game_supported_oid = pointbuf.zftpt_5; + _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 = 300; + _s_task_game.game_info[60].game_score = 0; /***************************************PAGE4******************************************* */ /****************************************15个******************************************* */ diff --git a/source/app/task_game.h b/source/app/task_game.h index 88876c3..c036be5 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 50 +#define game_num_max 70 #define zbt_1_num 4 @@ -68,9 +68,26 @@ #define setfg_5_num 1 #define setfg_szdd_5_num 1 #define zlxs_3_num 1 - - /********PAGE3*******/ +#define yxlp_1_num 1 +#define fztp_2_num 1 +#define fztp_3_num 1 +#define fztp_4_num 1 +#define fztp_5_num 1 +#define hytc_3_num 1 +#define hytc_4_num 1 +#define syxt_3_num 1 +#define syxt_4_num 1 +#define typy_3_num 1 +#define szbs_3_num 1 +#define szbs_4_num 1 +#define szbd_3_num 1 +#define hcss_4_num 1 +#define hcss_5_num 1 +#define zftpt_2_num 1 +#define zftpt_3_num 1 +#define zftpt_4_num 1 +#define zftpt_5_num 1 /********PAGE4*******/ /********PAGE5*******/ /********PAGE6*******/ @@ -134,7 +151,28 @@ typedef struct _point_buf POINT_INFO zlxs_3[zlxs_3_num]; /************PAGE3***********/ + POINT_INFO yxlp_1[yxlp_1_num]; + POINT_INFO fztp_2[fztp_2_num]; + POINT_INFO fztp_3[fztp_3_num]; + POINT_INFO fztp_4[fztp_4_num]; + POINT_INFO fztp_5[fztp_5_num]; + POINT_INFO hytc_3[hytc_3_num]; + POINT_INFO hytc_4[hytc_4_num]; + POINT_INFO syxt_3[syxt_3_num]; + POINT_INFO syxt_4[syxt_4_num]; + POINT_INFO typy_3[typy_3_num]; + POINT_INFO szbs_3[szbs_3_num]; + POINT_INFO szbs_4[szbs_4_num]; + POINT_INFO szbd_3[szbd_3_num]; + POINT_INFO hcss_4[hcss_4_num]; + POINT_INFO hcss_5[hcss_5_num]; + POINT_INFO zftpt_2[zftpt_2_num]; + POINT_INFO zftpt_3[zftpt_3_num]; + POINT_INFO zftpt_4[zftpt_4_num]; + POINT_INFO zftpt_5[zftpt_5_num]; + /************PAGE4***********/ + /************PAGE5***********/ /************PAGE6***********/ diff --git a/source/bsp/bsp_WT2605B.c b/source/bsp/bsp_WT2605B.c index 3c70aba..bec7782 100644 --- a/source/bsp/bsp_WT2605B.c +++ b/source/bsp/bsp_WT2605B.c @@ -80,6 +80,30 @@ TS_SPEECH_AUDIO audio_game_setfg_szxz_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x39,0x 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的倍数 +/*****************************************************************PAGE3************************************************************************* */ +/******************************************************************19个************************************************************************* */ +TS_SPEECH_AUDIO audio_game_yxlp_1 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x32,0x96,0xEF}; //T062 有序排列，1星。请将数字1-9按照指定方式进行排列或连线 +TS_SPEECH_AUDIO audio_game_fztp_2 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x33,0x97,0xEF}; //T063 复制图形，2星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_fztp_3 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x34,0x98,0xEF}; //T064 复制图形，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_fztp_4 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x35,0x99,0xEF}; //T065 复制图形，4星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_fztp_5 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x36,0x9A,0xEF}; //T066 复制图形，5星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_hytc_3 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x37,0x9B,0xEF}; //T067 慧眼“挑刺”，3星。请快速依次找出指定的数字 +TS_SPEECH_AUDIO audio_game_hytc_4 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x38,0x9C,0xEF}; //T068 慧眼“挑刺”，4星。请快速依次找出指定的数字 +TS_SPEECH_AUDIO audio_game_syxt_3 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x39,0x9D,0xEF}; //T069 手眼协调，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_syxt_4 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x30,0x95,0xEF}; //T070 手眼协调，4星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_typy_3 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x31,0x96,0xEF}; //T071 听1拍1，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_szbs_3 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x32,0x97,0xEF}; //T072 数字顺背，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_szbs_4 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x33,0x98,0xEF}; //T073 数字顺背，4星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_szbd_3 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x34,0x99,0xEF}; //T074 数字倒背，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_hcss_4 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x35,0x9A,0xEF}; //T075 “火柴算数”，4星。请移动一根磁条，使等式成立。 +TS_SPEECH_AUDIO audio_game_hcss_5 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x36,0x9B,0xEF}; //T076 “火柴算数”，5星。请移动一根磁条，使等式成立。 +TS_SPEECH_AUDIO audio_game_zftpt_2 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x37,0x9C,0xEF}; //T077 正方体拼图，2星。请按参照图片拼出图形 +TS_SPEECH_AUDIO audio_game_zftpt_3 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x38,0x9D,0xEF}; //T078 正方体拼图，3星。请按参照图片拼出图形 +TS_SPEECH_AUDIO audio_game_zftpt_4 = {0x7E,0x07,0xA3,0x54,0x30,0x37,0x39,0x9E,0xEF}; //T079 正方体拼图，4星。请按参照图片拼出图形 +TS_SPEECH_AUDIO audio_game_zftpt_5 = {0x7E,0x07,0xA3,0x54,0x30,0x38,0x30,0x96,0xEF}; //T080 正方体拼图，5星。请按参照图片拼出图形 + + + TS_SPEECH_VOLUME volume_control = {0x7E,0x04,0xAE,0x1E,0xD0,0xEF}; //音量控制 diff --git a/source/bsp/bsp_WT2605B.h b/source/bsp/bsp_WT2605B.h index 9a90891..db1108b 100644 --- a/source/bsp/bsp_WT2605B.h +++ b/source/bsp/bsp_WT2605B.h @@ -82,6 +82,26 @@ extern TS_SPEECH_AUDIO audio_game_setfg_szdd_5; //T060 舒尔特方格（数字 extern TS_SPEECH_AUDIO audio_game_zlxs_3; //T061 众里寻三，3星 /****************************PAGE3****************************/ +extern TS_SPEECH_AUDIO audio_game_yxlp_1; //T062 有序排列，1星 +extern TS_SPEECH_AUDIO audio_game_fztp_2; //T063 复制图形，2星 +extern TS_SPEECH_AUDIO audio_game_fztp_3; //T064 复制图形，3星 +extern TS_SPEECH_AUDIO audio_game_fztp_4; //T065 复制图形，4星 +extern TS_SPEECH_AUDIO audio_game_fztp_5; //T066 复制图形，5星 +extern TS_SPEECH_AUDIO audio_game_hytc_3; //T067 慧眼“挑刺”，3星 +extern TS_SPEECH_AUDIO audio_game_hytc_4; //T068 慧眼“挑刺”，4星 +extern TS_SPEECH_AUDIO audio_game_syxt_3; //T069 手眼协调，3星 +extern TS_SPEECH_AUDIO audio_game_syxt_4; //T070 手眼协调，4星 +extern TS_SPEECH_AUDIO audio_game_typy_3; //T071 听1拍1，3星 +extern TS_SPEECH_AUDIO audio_game_szbs_3; //T072 数字顺背，3星 +extern TS_SPEECH_AUDIO audio_game_szbs_4; //T073 数字顺背，4星 +extern TS_SPEECH_AUDIO audio_game_szbd_3; //T074 数字倒背，3星 +extern TS_SPEECH_AUDIO audio_game_hcss_4; //T075 “火柴算数”，4星 +extern TS_SPEECH_AUDIO audio_game_hcss_5; //T076 “火柴算数”，5星 +extern TS_SPEECH_AUDIO audio_game_zftpt_2; //T077 正方体拼图，2星 +extern TS_SPEECH_AUDIO audio_game_zftpt_3; //T078 正方体拼图，3星 +extern TS_SPEECH_AUDIO audio_game_zftpt_4; //T079 正方体拼图，4星 +extern TS_SPEECH_AUDIO audio_game_zftpt_5; //T080 正方体拼图，5星 + /****************************PAGE4****************************/ /****************************PAGE5****************************/ /****************************PAGE6****************************/