Browse Source

fix: 1.修正bug

pcb_v4_issue
Zhangwen 2 months ago
parent
commit
07164124bb
  1. 12
      source/app/task_game.c

12
source/app/task_game.c

@ -62,6 +62,7 @@ POINT_BUF pointbuf;
void L3_task_game_init(void) void L3_task_game_init(void)
{ {
U8 i = 0; U8 i = 0;
U16 k = 0;
U8 j = 0; U8 j = 0;
U8 *p = (U8*)&pointbuf; U8 *p = (U8*)&pointbuf;
L1_task_init(&_s_task_game.task); L1_task_init(&_s_task_game.task);
@ -70,11 +71,13 @@ void L3_task_game_init(void)
_s_task_game.error_oid = EEROR_OID; _s_task_game.error_oid = EEROR_OID;
_s_task_game.game_maxseconds = GAME_MAX_SECONDS; _s_task_game.game_maxseconds = GAME_MAX_SECONDS;
for (i = 0; i < sizeof(pointbuf); i++) L0_uart0_0d0a();
L0_uart0_ushex(sizeof(pointbuf));
for (k = 0; k < sizeof(pointbuf); k++)
{ {
*p++ = 0; *p++ = 0;
} }
p = (U8*)&pointbuf; // p = (U8*)&pointbuf;
// 找不同1星 // 找不同1星
@ -176,7 +179,7 @@ void L3_task_game_init(void)
// 火眼金晶5星 // 火眼金晶5星
_s_task_game.game_info[6].game_oid = GAME_OID_HYJJ_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_audio = &audio_game_hyjj_5;
_s_task_game.game_info[0].game_supported_oid = pointbuf.hyjj_5; _s_task_game.game_info[6].game_supported_oid = pointbuf.hyjj_5;
_s_task_game.game_info[6].game_oid_num = hyjj_5_num; _s_task_game.game_info[6].game_oid_num = hyjj_5_num;
_s_task_game.game_info[6].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[6].game_supported_oid[0].oid = 0x10FE;
_s_task_game.game_info[6].game_order = 0; _s_task_game.game_info[6].game_order = 0;
@ -329,6 +332,7 @@ void L3_task_game_handler(S_TASK_GAME *s)
{ {
ts_oid.ok = 0; ts_oid.ok = 0;
s->read_oid = ts_oid.rec.d16[3]; s->read_oid = ts_oid.rec.d16[3];
L0_uart0_ushex(s->read_oid);
if (s->read_oid != EEROR_OID && s->read_oid != 0x0000) if (s->read_oid != EEROR_OID && s->read_oid != 0x0000)
{ {
L2_task_go_Tdelay(D_task_GAME_SWITCH,D_Tdelay_100ms); L2_task_go_Tdelay(D_task_GAME_SWITCH,D_Tdelay_100ms);
@ -380,6 +384,8 @@ void L3_task_game_handler(S_TASK_GAME *s)
{ {
GAME_INF* g = &s->game_info[_s_task_game.game_info_index]; GAME_INF* g = &s->game_info[_s_task_game.game_info_index];
POINT_INFO* p = &s->game_info[_s_task_game.game_info_index].game_supported_oid[i]; POINT_INFO* p = &s->game_info[_s_task_game.game_info_index].game_supported_oid[i];
// L0_uart0_ushex(s->read_oid);
// L0_uart0_ushex(p->oid);
if (p->oid == 0) if (p->oid == 0)
{ {
break; break;

Loading…
Cancel
Save