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

feature: 1.添加走迷宫和找不同子游戏OID信息，测试游戏正常 2.MCUid打印出错

v4-temp-lowpower
Zhangwen 2 months ago
parent
bcc5f1386c
commit
b3d910b987
3 changed files with 181 additions and 86 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. 54
      keilp/cc_as_stc02_ps5ws.uvprojx
  2. 194
      source/app/task_game.c
  3. 19
      source/app/task_game.h

54
keilp/cc_as_stc02_ps5ws.uvprojx
View File

@ -10,7 +10,6 @@
<TargetName>STC8F2K16S2</TargetName>
<ToolsetNumber>0x0</ToolsetNumber>
<ToolsetName>MCS-51</ToolsetName>
<uAC6>8</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STC8H8K64U Series</Device>
@ -124,6 +123,47 @@
<HexOffset>0</HexOffset>
<Oh166RecLen>16</Oh166RecLen>
</OPTHX>
<Simulator>
<UseSimulator>1</UseSimulator>
<LoadApplicationAtStartup>1</LoadApplicationAtStartup>
<RunToMain>1</RunToMain>
<RestoreBreakpoints>1</RestoreBreakpoints>
<RestoreWatchpoints>1</RestoreWatchpoints>
<RestoreMemoryDisplay>1</RestoreMemoryDisplay>
<RestoreFunctions>1</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<LimitSpeedToRealTime>0</LimitSpeedToRealTime>
<RestoreSysVw>1</RestoreSysVw>
</Simulator>
<Target>
<UseTarget>0</UseTarget>
<LoadApplicationAtStartup>1</LoadApplicationAtStartup>
<RunToMain>0</RunToMain>
<RestoreBreakpoints>1</RestoreBreakpoints>
<RestoreWatchpoints>1</RestoreWatchpoints>
<RestoreMemoryDisplay>1</RestoreMemoryDisplay>
<RestoreFunctions>0</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreSysVw>1</RestoreSysVw>
</Target>
<RunDebugAfterBuild>0</RunDebugAfterBuild>
<TargetSelection>-1</TargetSelection>
<SimDlls>
<CpuDll></CpuDll>
<CpuDllArguments></CpuDllArguments>
<PeripheralDll></PeripheralDll>
<PeripheralDllArguments></PeripheralDllArguments>
<InitializationFile></InitializationFile>
</SimDlls>
<TargetDlls>
<CpuDll></CpuDll>
<CpuDllArguments></CpuDllArguments>
<PeripheralDll></PeripheralDll>
<PeripheralDllArguments></PeripheralDllArguments>
<InitializationFile></InitializationFile>
<Driver></Driver>
</TargetDlls>
</DebugOption>
<Utilities>
<Flash1>
@ -177,14 +217,12 @@
<Mx51P>0</Mx51P>
<hadXRAM2>0</hadXRAM2>
<uocXram2>0</uocXram2>
<hadXRAM3>0</hadXRAM3>
<ModC2>0</ModC2>
<ModH2>0</ModH2>
<Mdu_R515>0</Mdu_R515>
<Mdu_F120>0</Mdu_F120>
<Psoc>0</Psoc>
<hadIROM2>0</hadIROM2>
<hadIROM3>0</hadIROM3>
<ModSmx2>0</ModSmx2>
<cBanks>0</cBanks>
<xBanks>0</xBanks>
@ -254,16 +292,6 @@
<StartAddress>0x0</StartAddress>
<Size>0x0</Size>
</IROM512>
<XRA513>
<Type>0</Type>
<StartAddress>0x0</StartAddress>
<Size>0x0</Size>
</XRA513>
<IROM513>
<Type>0</Type>
<StartAddress>0x0</StartAddress>
<Size>0x0</Size>
</IROM513>
</OnChipMemories>
</Target51Misc>
<C51>

194
source/app/task_game.c
View File

@ -130,9 +130,9 @@
#define GAME_OID_ZMGO_5 0xC400
// 点读类游戏
#define GAME_OID_ZBT_1 0xB000
#define GAME_OID_ZBT_1 0xB900
#define GAME_OID_SHERT_1 0x2200
#define GAME_OID_ZMG_1 0xC000
#define GAME_OID_ZMG_1 0xC900
// 无效码
#define INVALID_OID 0x3FFF
@ -173,17 +173,17 @@ void L3_task_game_init(void)
// 找不同1星
_s_task_game.game_info[0].game_oid = GAME_OID_ZBT_1;
_s_task_game.game_info[0].game_audio = &audio_game_different_1;
_s_task_game.game_info[0].game_supported_oid = pointbuf.zbt_1;
_s_task_game.game_info[0].game_oid_num = zbt_1_num;
_s_task_game.game_info[0].game_supported_oid[0].oid = 0xB001;
_s_task_game.game_info[0].game_supported_oid[1].oid = 0xB002;
_s_task_game.game_info[0].game_supported_oid[2].oid = 0xB003;
_s_task_game.game_info[0].game_supported_oid[3].oid = 0xB0FF; //错误码
_s_task_game.game_info[0].game_supported_oid[3].yes_or_no = 1;
_s_task_game.game_info[0].game_order = 0;
_s_task_game.game_info[0].game_timeout_seconds = 60;
_s_task_game.game_info[0].game_score = 0;
// _s_task_game.game_info[0].game_audio = &audio_game_different_1;
// _s_task_game.game_info[0].game_supported_oid = pointbuf.zbt_1;
// _s_task_game.game_info[0].game_oid_num = zbt_1_num;
// _s_task_game.game_info[0].game_supported_oid[0].oid = 0xB001;
// _s_task_game.game_info[0].game_supported_oid[1].oid = 0xB002;
// _s_task_game.game_info[0].game_supported_oid[2].oid = 0xB003;
// _s_task_game.game_info[0].game_supported_oid[3].oid = 0xB0FF; //错误码
// _s_task_game.game_info[0].game_supported_oid[3].yes_or_no = 1;
// _s_task_game.game_info[0].game_order = 0;
// _s_task_game.game_info[0].game_timeout_seconds = 60;
// _s_task_game.game_info[0].game_score = 0;
// 舒尔特方格3星
_s_task_game.game_info[1].game_oid = GAME_OID_SHERT_1;
@ -223,19 +223,19 @@ void L3_task_game_init(void)
// 走迷宫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;
// _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个******************************************* */
@ -989,48 +989,79 @@ void L3_task_game_init(void)
_s_task_game.game_info[84].game_score = 0;
//找不同，1星
_s_task_game.game_info[85].game_oid = GAME_OID_ZBTO_1;
// _s_task_game.game_info[85].game_audio = &audio_game_zbto_1;
// _s_task_game.game_info[85].game_supported_oid = pointbuf.zbto_1;
// _s_task_game.game_info[85].game_oid_num = 1;
// _s_task_game.game_info[85].game_supported_oid[0].oid = 0xB0FE;
// _s_task_game.game_info[85].game_order = 0;
// _s_task_game.game_info[85].game_timeout_seconds = 300;
// _s_task_game.game_info[85].game_score = 0;
_s_task_game.game_info[85].game_audio = &audio_game_zbto_1;
_s_task_game.game_info[85].game_supported_oid = pointbuf.zbto_1;
_s_task_game.game_info[85].game_oid_num = zbto_1_num;
_s_task_game.game_info[85].game_supported_oid[0].oid = 0xB001;
_s_task_game.game_info[85].game_supported_oid[1].oid = 0xB002;
_s_task_game.game_info[85].game_supported_oid[2].oid = 0xB003;
_s_task_game.game_info[85].game_supported_oid[3].oid = 0xB0FF; //错误码
_s_task_game.game_info[85].game_supported_oid[3].yes_or_no = 1;
_s_task_game.game_info[85].game_order = 0;
_s_task_game.game_info[85].game_timeout_seconds = 120;
_s_task_game.game_info[85].game_score = 0;
// 找不同，2星
_s_task_game.game_info[86].game_oid = GAME_OID_ZBTO_2;
_s_task_game.game_info[86].game_audio = &audio_game_zbto_2;
_s_task_game.game_info[86].game_supported_oid = pointbuf.zbto_2;
_s_task_game.game_info[86].game_oid_num = 1;
_s_task_game.game_info[86].game_supported_oid[0].oid = 0xB0FE;
_s_task_game.game_info[86].game_oid_num = zbto_2_num;
_s_task_game.game_info[86].game_supported_oid[0].oid = 0xB101;
_s_task_game.game_info[86].game_supported_oid[1].oid = 0xB102;
_s_task_game.game_info[86].game_supported_oid[2].oid = 0xB103;
_s_task_game.game_info[86].game_supported_oid[3].oid = 0xB104;
_s_task_game.game_info[86].game_supported_oid[4].oid = 0xB1FF; //错误码
_s_task_game.game_info[86].game_supported_oid[4].yes_or_no = 1;
_s_task_game.game_info[86].game_order = 0;
_s_task_game.game_info[86].game_timeout_seconds = 300;
_s_task_game.game_info[86].game_timeout_seconds = 120;
_s_task_game.game_info[86].game_score = 0;
// 找不同，3星
_s_task_game.game_info[87].game_oid = GAME_OID_ZBTO_3;
_s_task_game.game_info[87].game_audio = &audio_game_zbto_3;
_s_task_game.game_info[87].game_supported_oid = pointbuf.zbto_3;
_s_task_game.game_info[87].game_oid_num = 1;
_s_task_game.game_info[87].game_supported_oid[0].oid = 0xB0FE;
_s_task_game.game_info[87].game_oid_num = zbto_3_num;
_s_task_game.game_info[87].game_supported_oid[0].oid = 0xB201;
_s_task_game.game_info[87].game_supported_oid[1].oid = 0xB202;
_s_task_game.game_info[87].game_supported_oid[2].oid = 0xB203;
_s_task_game.game_info[87].game_supported_oid[3].oid = 0xB204;
_s_task_game.game_info[87].game_supported_oid[4].oid = 0xB205;
_s_task_game.game_info[87].game_supported_oid[5].oid = 0xB2FF; //错误码
_s_task_game.game_info[87].game_supported_oid[5].yes_or_no = 1;
_s_task_game.game_info[87].game_order = 0;
_s_task_game.game_info[87].game_timeout_seconds = 300;
_s_task_game.game_info[87].game_timeout_seconds = 120;
_s_task_game.game_info[87].game_score = 0;
// 找不同，4星
_s_task_game.game_info[88].game_oid = GAME_OID_ZBTO_4;
_s_task_game.game_info[88].game_audio = &audio_game_zbto_4;
_s_task_game.game_info[88].game_supported_oid = pointbuf.zbto_4;
_s_task_game.game_info[88].game_oid_num = 1;
_s_task_game.game_info[88].game_supported_oid[0].oid = 0xB0FE;
_s_task_game.game_info[88].game_oid_num = zbto_4_num;
_s_task_game.game_info[88].game_supported_oid[0].oid = 0xB301;
_s_task_game.game_info[88].game_supported_oid[1].oid = 0xB302;
_s_task_game.game_info[88].game_supported_oid[2].oid = 0xB303;
_s_task_game.game_info[88].game_supported_oid[3].oid = 0xB304;
_s_task_game.game_info[88].game_supported_oid[4].oid = 0xB305;
_s_task_game.game_info[88].game_supported_oid[5].oid = 0xB306;
_s_task_game.game_info[88].game_supported_oid[6].oid = 0xB3FF; //错误码
_s_task_game.game_info[88].game_supported_oid[6].yes_or_no = 1;
_s_task_game.game_info[88].game_order = 0;
_s_task_game.game_info[88].game_timeout_seconds = 300;
_s_task_game.game_info[88].game_timeout_seconds = 120;
_s_task_game.game_info[88].game_score = 0;
// 找不同，5星
_s_task_game.game_info[89].game_oid = GAME_OID_ZBTO_5;
_s_task_game.game_info[89].game_audio = &audio_game_zbto_5;
_s_task_game.game_info[89].game_supported_oid = pointbuf.zbto_5;
_s_task_game.game_info[89].game_oid_num = 1;
_s_task_game.game_info[89].game_supported_oid[0].oid = 0xB0FE;
_s_task_game.game_info[89].game_oid_num = zbto_5_num;
_s_task_game.game_info[89].game_supported_oid[0].oid = 0xB401;
_s_task_game.game_info[89].game_supported_oid[1].oid = 0xB402;
_s_task_game.game_info[89].game_supported_oid[2].oid = 0xB403;
_s_task_game.game_info[89].game_supported_oid[3].oid = 0xB404;
_s_task_game.game_info[89].game_supported_oid[4].oid = 0xB405;
_s_task_game.game_info[89].game_supported_oid[5].oid = 0xB406;
_s_task_game.game_info[89].game_supported_oid[6].oid = 0xB407;
_s_task_game.game_info[89].game_supported_oid[7].oid = 0xB4FF; //错误码
_s_task_game.game_info[89].game_supported_oid[7].yes_or_no = 1;
_s_task_game.game_info[89].game_order = 0;
_s_task_game.game_info[89].game_timeout_seconds = 300;
_s_task_game.game_info[89].game_timeout_seconds = 120;
_s_task_game.game_info[89].game_score = 0;
/***************************************PAGE6******************************************* */
/****************************************15个******************************************* */
@ -1126,39 +1157,76 @@ void L3_task_game_init(void)
_s_task_game.game_info[99].game_score = 0;
// 走迷宫，1星
_s_task_game.game_info[100].game_oid = GAME_OID_ZMGO_1;
// _s_task_game.game_info[100].game_audio = &audio_game_zmgo_1;
// _s_task_game.game_info[100].game_supported_oid = pointbuf.zmgo_1;
// _s_task_game.game_info[100].game_oid_num = 1;
// _s_task_game.game_info[100].game_supported_oid[0].oid = 0xA0FE;
// _s_task_game.game_info[100].game_order = 0;
// _s_task_game.game_info[100].game_timeout_seconds = 300;
// _s_task_game.game_info[100].game_score = 0;
_s_task_game.game_info[100].game_audio = &audio_game_zmgo_1;
_s_task_game.game_info[100].game_supported_oid = pointbuf.zmgo_1;
_s_task_game.game_info[100].game_oid_num = zmgo_1_num;
_s_task_game.game_info[100].game_supported_oid[0].oid = 0xC001;
_s_task_game.game_info[100].game_supported_oid[1].oid = 0xC002;
_s_task_game.game_info[100].game_supported_oid[2].oid = 0xC003;
_s_task_game.game_info[100].game_supported_oid[3].oid = 0xC004;
_s_task_game.game_info[100].game_supported_oid[4].oid = 0xC005;
_s_task_game.game_info[100].game_supported_oid[5].oid = 0xC006;
_s_task_game.game_info[100].game_supported_oid[6].oid = 0xC0FF; //错误码
_s_task_game.game_info[100].game_supported_oid[6].yes_or_no = 1;
_s_task_game.game_info[100].game_order = 1;
_s_task_game.game_info[100].game_timeout_seconds = 120;
_s_task_game.game_info[100].game_score = 0;
// 走迷宫，2星
_s_task_game.game_info[101].game_oid = GAME_OID_ZMGO_2;
_s_task_game.game_info[101].game_audio = &audio_game_zmgo_2;
_s_task_game.game_info[101].game_supported_oid = pointbuf.zmgo_2;
_s_task_game.game_info[101].game_oid_num = 1;
_s_task_game.game_info[101].game_supported_oid[0].oid = 0xC0FE;
_s_task_game.game_info[101].game_order = 0;
_s_task_game.game_info[101].game_timeout_seconds = 300;
_s_task_game.game_info[101].game_oid_num = zmgo_2_num;
_s_task_game.game_info[101].game_supported_oid[0].oid = 0xC101;
_s_task_game.game_info[101].game_supported_oid[1].oid = 0xC102;
_s_task_game.game_info[101].game_supported_oid[2].oid = 0xC103;
_s_task_game.game_info[101].game_supported_oid[3].oid = 0xC104;
_s_task_game.game_info[101].game_supported_oid[4].oid = 0xC105;
_s_task_game.game_info[101].game_supported_oid[5].oid = 0xC106;
_s_task_game.game_info[101].game_supported_oid[6].oid = 0xC1FF; //错误码
_s_task_game.game_info[101].game_supported_oid[6].yes_or_no = 1;
_s_task_game.game_info[101].game_order = 1;
_s_task_game.game_info[101].game_timeout_seconds = 120;
_s_task_game.game_info[101].game_score = 0;
// 走迷宫，3星
_s_task_game.game_info[102].game_oid = GAME_OID_ZMGO_3;
_s_task_game.game_info[102].game_audio = &audio_game_zmgo_3;
_s_task_game.game_info[102].game_supported_oid = pointbuf.zmgo_3;
_s_task_game.game_info[102].game_oid_num = 1;
_s_task_game.game_info[102].game_supported_oid[0].oid = 0xC0FE;
_s_task_game.game_info[102].game_order = 0;
_s_task_game.game_info[102].game_timeout_seconds = 300;
_s_task_game.game_info[102].game_oid_num = zmgo_3_num;
_s_task_game.game_info[102].game_supported_oid[0].oid = 0xC201;
_s_task_game.game_info[102].game_supported_oid[1].oid = 0xC202;
_s_task_game.game_info[102].game_supported_oid[2].oid = 0xC203;
_s_task_game.game_info[102].game_supported_oid[3].oid = 0xC204;
_s_task_game.game_info[102].game_supported_oid[4].oid = 0xC205;
_s_task_game.game_info[102].game_supported_oid[5].oid = 0xC206;
_s_task_game.game_info[102].game_supported_oid[6].oid = 0xC2FF; //错误码
_s_task_game.game_info[102].game_supported_oid[6].yes_or_no = 1;
_s_task_game.game_info[102].game_order = 1;
_s_task_game.game_info[102].game_timeout_seconds = 120;
_s_task_game.game_info[102].game_score = 0;
// 走迷宫，4星
_s_task_game.game_info[103].game_oid = GAME_OID_ZMGO_4;
_s_task_game.game_info[103].game_audio = &audio_game_zmgo_4;
_s_task_game.game_info[103].game_supported_oid = pointbuf.zmgo_4;
_s_task_game.game_info[103].game_oid_num = 1;
_s_task_game.game_info[103].game_supported_oid[0].oid = 0xC0FE;
_s_task_game.game_info[103].game_order = 0;
_s_task_game.game_info[103].game_timeout_seconds = 300;
_s_task_game.game_info[103].game_oid_num = zmgo_4_num;
_s_task_game.game_info[103].game_supported_oid[0].oid = 0xC301;
_s_task_game.game_info[103].game_supported_oid[1].oid = 0xC302;
_s_task_game.game_info[103].game_supported_oid[2].oid = 0xC303;
_s_task_game.game_info[103].game_supported_oid[3].oid = 0xC304;
_s_task_game.game_info[103].game_supported_oid[4].oid = 0xC305;
_s_task_game.game_info[103].game_supported_oid[5].oid = 0xC306;
_s_task_game.game_info[103].game_supported_oid[6].oid = 0xC307;
_s_task_game.game_info[103].game_supported_oid[7].oid = 0xC308;
_s_task_game.game_info[103].game_supported_oid[8].oid = 0xC309;
_s_task_game.game_info[103].game_supported_oid[9].oid = 0xC30A;
_s_task_game.game_info[103].game_supported_oid[10].oid = 0xC30B;
_s_task_game.game_info[103].game_supported_oid[11].oid = 0xC30C;
_s_task_game.game_info[103].game_supported_oid[12].oid = 0xC30D;
_s_task_game.game_info[103].game_supported_oid[13].oid = 0xC30E;
_s_task_game.game_info[103].game_supported_oid[14].oid = 0xC30F;
_s_task_game.game_info[103].game_supported_oid[15].oid = 0xC3FF; //错误码
_s_task_game.game_info[103].game_supported_oid[15].yes_or_no = 1;
_s_task_game.game_info[103].game_order = 1;
_s_task_game.game_info[103].game_timeout_seconds = 120;
_s_task_game.game_info[103].game_score = 0;
// 走迷宫，5星
_s_task_game.game_info[104].game_oid = GAME_OID_ZMGO_5;

19
source/app/task_game.h
View File

@ -6,7 +6,6 @@
#include "../bsp/bsp_WT2605B.h"
// #define game_supported_oid_max 32
#define game_num_max 110
@ -101,11 +100,11 @@
#define llka_3_num 1
#define llka_4_num 1
#define llka_5_num 1
#define zbto_1_num 1
#define zbto_2_num 1
#define zbto_3_num 1
#define zbto_4_num 1
#define zbto_5_num 1
#define zbto_1_num 4
#define zbto_2_num 5
#define zbto_3_num 6
#define zbto_4_num 7
#define zbto_5_num 8
/********PAGE6*******/
#define ascz_1_num 1
#define ascz_2_num 1
@ -117,10 +116,10 @@
#define qjjm_bhsl_4_num 1
#define qjjm_5_num 1
#define qjjm_bhys_5_num 1
#define zmgo_1_num 1
#define zmgo_2_num 1
#define zmgo_3_num 1
#define zmgo_4_num 1
#define zmgo_1_num 7
#define zmgo_2_num 7
#define zmgo_3_num 7
#define zmgo_4_num 16
#define zmgo_5_num 1

Write Preview
Loading…
Cancel
Save