From 37ca4b7d5e4f1161ed4b1a94a93d70ec9655882d Mon Sep 17 00:00:00 2001 From: Alex xu Date: Fri, 20 Dec 2024 17:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=86=85=E5=AE=B9=EF=BC=9A1?= =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=8F=8C=E5=90=91=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B2=E3=80=81=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=85=B3=E7=9B=96=E7=8A=B6=E6=80=81=E4=B8=8B=EF=BC=8C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=8D=E4=BC=91=E7=9C=A0=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Out/8837_EVB_241220_1136.hex | 814 ----------------- ...1220_1136.bin => 8837_EVB_241220_1744.bin} | Bin 12288 -> 12288 bytes Out/8837_EVB_241220_1744.hex | 821 ++++++++++++++++++ ...n => 8837_EVB_241220_1744_B159_010102.bin} | Bin 12290 -> 12290 bytes Project/SY8837_Demo.uvgui.GH | 14 +- .../SY8837_Demo.SearchResults | 16 +- SY8837_Demo.si4project/SY8837_Demo.sip_sym | Bin 351512 -> 351512 bytes UsrInc/inc/define.h | 4 +- UsrSrc/key/key.c | 2 +- UsrSrc/userapp/userapp.c | 5 +- UsrSrc/vox/vox_module.c | 132 +-- 11 files changed, 915 insertions(+), 893 deletions(-) delete mode 100644 Out/8837_EVB_241220_1136.hex rename Out/{8837_EVB_241220_1136.bin => 8837_EVB_241220_1744.bin} (55%) create mode 100644 Out/8837_EVB_241220_1744.hex rename Out/{8837_EVB_241220_1136_8789_010102.bin => 8837_EVB_241220_1744_B159_010102.bin} (55%) diff --git a/Out/8837_EVB_241220_1136.hex b/Out/8837_EVB_241220_1136.hex deleted file mode 100644 index 12deb09..0000000 --- a/Out/8837_EVB_241220_1136.hex +++ /dev/null @@ -1,814 +0,0 @@ -:0300000002266372 -:10266300758E3075D20078FFE4F6D8FD9000007FB8 -:10267300007E01E4F0A3DFFCDEFA75819D0226BE35 -:0F2E200053797374656D20496E69742E0D0A0025 -:102D88001229A37BFF7A2E792012137FD2AED2BEEE -:082D9800122815122C1980F419 -:101F1C00010D00011300011200011100011000411C -:101F2C0000D800020E00004200D200004200D60091 -:101F3C00004200CB00004200CD00004200D4000063 -:0D1F4C004200D000004100CF004100D9004C -:102DA00075FE0F43FF8075FE2975FFB575A551753A -:082DB000FE1E43FF01D2BD220B -:102DB8009000CFEFF0C454F04401F5A5E49000D2A0 -:082DC800F0A3F09000D9F02205 -:03006B00021B3E37 -:101B3E00C0E0C0F0C083C082C0D075D000C000C06D -:101B4E0001C002C003C004C005C006C007E5F320F3 -:101B5E00E003021D3AAFA1780E760008A607E5A2B3 -:101B6E0054031846F608E6F69000D9E0C3940850E0 -:101B7E001818E6FE08E6FF9000D2EE8FF01209AEBE -:101B8E009000D9E004F0021D3A9000D2E0FEA3E0EE -:101B9E007803CEC313CE13D8F9F0EE9000D2F090A6 -:101BAE0000CFE024FE6019146030147003021C553F -:101BBE00147003021CC624FE7003021CFA021D30B0 -:101BCE00780DE6FF3395E0FEC39000D3E09FFF90C3 -:101BDE0000D2E09E9000D6021CC09000D2E0FEA380 -:101BEE00E0FF7C097DC4120B89780A120B27900046 -:101BFE00D2EEF0A3EFF07812E6FF3395E0FE7C0014 -:101C0E007D03120947EF2488FFEE3413FE3395E06F -:101C1E00FDFCE47BE87A03F9F8120A84C004A905F6 -:101C2E00AA06AB077810E6FF3395E0FEC39000D30B -:101C3E00E09FFF9000D2E09EFEE4FCFDD000120A71 -:101C4E00849000CBEE806B9000D2E0FEA3E0FF7C90 -:101C5E00097DC4120B89780A120B279000D2EEF080 -:101C6E00A3EFF07813E6FF3395E0FE7C007D0312C0 -:101C7E000947EF2488FFEE3413FE3395E0FDFCE4B4 -:101C8E007BE87A03F9F8120A84C004A905AA06AB08 -:101C9E00077811E6FF3395E0FEC39000D3E09FFF77 -:101CAE009000D2E09EFEE4FCFDD000120A8490006B -:101CBE00CDEEF0A3EFF0806A780DE6FF3395E0FEEF -:101CCE00C39000D3E09FFF9000D2E09EFE7C097D82 -:101CDE00C4120B89780A120B27EEF0A3EFF0E02561 -:101CEE00E0FE9000D2E0339000D48032780DE6FF13 -:101CFE003395E0FEC39000D3E09FFF9000D2E09EAC -:101D0E00FE7C097DC4120B89780A120B27EEF0A314 -:101D1E00EFF0E025E0FE9000D2E0339000D0F0A38B -:101D2E00CEF09000D2E4F0A3F053A5FE75F301D0EF -:101D3E0007D006D005D004D003D002D001D000D0F9 -:0A1D4E00D0D082D083D0F0D0E03274 -:071F5900C11FC120011403A8 -:102CE400E47816F67818F67814E67817F6781976F4 -:0E2CF400017916E718461846F5B175B20122AF -:1020D400E4FE9000D6E0FCA3E0FDC394D8EC9403A6 -:1020E40040037F0022EF70030221EDD3ED940FEC47 -:1020F400940340030221CBED94CBEC9400500302F3 -:1021040021CBD3ED94AAEC94024022D21D7814E69C -:10211400FF137817F6301E11D3ED94BFEC940240F0 -:1021240004C21E80047817A607E4FE8070D3ED94E1 -:10213400AAEC94025043ED9437EC9401403BD21E38 -:102144007814E6FF7817F6301D13D3ED9493EC94CE -:10215400025004C21D8006EFC3137817F67819766F -:1021640001301011D3ED9451EC94015004C210804D -:1021740004E47819F6E4FE8024D3ED9437EC94015A -:10218400501BD210E47819F6301E10ED9426EC940E -:10219400015004C21E800478197601E4FE301B113C -:1021A400C3ED94F3EC94025006C21BE4FE80027E5D -:1021B40001301C2FD3ED94DDEC94004006C21CE4E6 -:1021C400FE80207E01801CD3ED940FEC9403400626 -:1021D400D21B7E01800DD3ED94CBEC94005004D23D -:1021E4001C7E01C219C21A8058C21BC21CD3ED94B2 -:1021F4009FEC94035031ED9471EC94004029301914 -:1022040010ED9484EC94035006C219E4FE80027E1F -:1022140001301A2DD3ED9482EC94004006C21AE4E6 -:10222400FE801E7E01801AD3ED949FEC940340043B -:10223400D219800BC3ED9471EC94005002D21A7E33 -:0322440001AF06E1 -:012247002274 -:10250900E5E65480FFE4FCFDFEEF700953B3FE7865 -:1025190015F6C21F2278157601E5E830E50575E85C -:1025290020800FE5E530E1028008E5F230E5077526 -:10253900F22053B3FE22E5F2540C601053B3FEE5CA -:10254900F354C0607375F20C75F3C02275F3C07F44 -:10255900011220D4EF600653B3FED22022C220E537 -:10256900F230E423C39000D5E094D29000D4E094F3 -:102579000F500575F210800353B3FE201F3AD21F86 -:1025890078157603D236227916E77818461846F573 -:10259900B17819E6F5B275FE7043FF1843B31178A7 -:1025A9001CE6FFD394014002C23FEFD394034002DB -:0925B900C23E78157602C21F2211 -:041F6000C13AC13B86 -:10000E00303A10EFB4010475B5C02253B5BFED44BC -:04001E0080F5B52292 -:102E0F00E5B55480FFEF6008303A05E4F5B5C23AF6 -:012E1F002290 -:1028E100E5E530E103C23A22E5E230E705C23AD23A -:1028F1003B22E5E830E00FC23A302A4575E8017D18 -:1029010038E4FF02000EE4FF1220D4EF6008C23A5F -:10291100122E0FD22022C220303F02801FD23A3025 -:102921003B1F7815E6B40219C39000D5E0941090CE -:1029310000D4E0940E4005D23AC23B22122E0FC2BF -:022941003A2238 -:102D6F00426F78204F70656E2E0D0A00426F7820EB -:092D7F00436C6F73652E0D0A0010 -:081F6400C13CC13D4100F1FF49 -:102A9C00E4900000F0E5E25408F09000F1E0FF90C3 -:102AAC000000E06F6031E5E230E30E9000F074015D -:102ABC00F07BFF7A2D796F800BE49000F0F07BFFB8 -:102ACC007A2D797B12137FD23CD23DD236D24190F3 -:072ADC000000E09000F1F0A2 -:012AE30022D0 -:101F6C00C128C127C126011D004100EA004100E93A -:061F7C00004200EB000032 -:10224800E5E25402FFE4FCFDFEEF70369000EB750A -:10225800F0011209AE9000EBE0FEA3E0FFC3946426 -:10226800EE94004007202414D2248010C3EF9490E9 -:10227800EE94014007202504D225D226D221C2227D -:10228800803A302130D241C221D222C2259000EBBF -:10229800E0FEA3E0FFD39419EE94005008D228D2B0 -:1022A80023D2368010C3EF94FAEE940050073024FE -:1022B80004C224D227E49000EBF0A3F0302224C219 -:1022C8002230270BC227781D7602E49000EAF0300E -:1022D8002606C226781D760330230CC223781D7685 -:1022E800018004E4781DF69000F0E06401600302C8 -:1022F80023BB781DE6640260030223829000EAE0B3 -:10230800C3940150107D017F01121D58E4900071A3 -:10231800F0A3F080529000E9E0D394054004E4F083 -:102328008039900072E0B4010FE4FD7F02121D585D -:102338009000727402F0802F900072E0640270279F -:10234800900071E0601A7D017F02121D58E4900030 -:1023580071F0A3F09000EAF0781DF67F030229FAE5 -:10236800E4FD7F01121D589000EAE0D39414403434 -:102378009000E9E004F0E4A3F022781DE66403701D -:10238800329000EAE0FFC3941E5020EF540125E08C -:1023980060047D0180099000EAE030E007E4FD7FF9 -:1023A80003121D589000EAE004F022E4781DF6902C -:0323B80000EAF048 -:0123BB0022FF -:101F8200410079004100780041007A004100770069 -:102D200075FE0675FF3C75FE0E53FF0F75FE0F53C3 -:0B2D3000FFF0C282C283C285C2842271 -:102D3B00EF14600D14600D14600D2403700BD28220 -:0A2D4B0022D28322D28422D28522F4 -:052CC500900000E0FF9B -:102CCA00EF14600D14600D14600D2403700BC282A2 -:0A2CDA0022C28322C28422C2852296 -:10294300E4FF747B2FF582E43400F583E4F0747FB5 -:102953002FF582E43400F583E4F0EF25E02483F5DA -:1029630082E43400F583E4F0A3F0EF25E0248BF553 -:1029730082E43400F583E4F0A3F0EF25E02493F53B -:1029830082E43400F583E4F0A3F0EF25E0249BF523 -:0F29930082E43400F583E4F0A3F00FEFB404A363 -:0129A2002212 -:10287E00AC07747B2CF582E43400F583EDF0EAC3EB -:10288E0013FEEB13FFEC25E02483F582E43400F510 -:10289E0083EEF0A3EFF0AF03EC25E0248BF582E49A -:1028AE003400F583EAF0A3EFF0900005E0FEA3E01C -:1028BE00FFEC25E02493F582E43400F583EEF0A3DB -:1028CE00EFF0EC25E0249BF582E43400F583E4F090 -:0328DE00A3F02242 -:102BAB00747B2FF582E43400F583EDF0747F2FF501 -:102BBB0082E43400F583EBF0EF25E02483F582E427 -:102BCB003400F583E4F0A37469F0EF25E0249BF562 -:0B2BDB0082E43400F583E4F0A3F02254 -:100FA700E4900000F0F0900000E0FFC394044003D9 -:100FB7000212E9747B2FF582E43400F583E06022A6 -:100FC70024FE60241470030210B114700302112868 -:100FD70024036003021285900000E0FF122D3B02FC -:100FE7001285122CC5021285900000E0FF25E0242F -:100FF70083F582E43400F583E0FCA3E0FDEF25E010 -:10100700249BF582E43400F583E0FEA3E0C39DEE64 -:101017009C5005122D3B8003122CC5900000E0FF69 -:1010270025E0248BF582E43400F583E0FCA3E0FDA2 -:10103700EF25E0249BF582E43400F583E0FEA3E08E -:10104700C39DEE9C5003021285900000E025E0242A -:101057009BF582E43400F583E4F0A3F0EF25E02468 -:1010670093F582E43400F583E0FEA3E0D39400EE29 -:1010770094004016900000E025E02493F582E434C4 -:1010870000F58374FFF5F01209AE900000E0FF252C -:10109700E02493F582E43400F583E0FCA3E04C60A0 -:1010A70003021285747B2F021144900000E0FF2594 -:1010B700E02483F582E43400F583E0FCA3E0FDEF50 -:1010C70025E0249BF582E43400F583E0FEA3E0D31A -:1010D7009DEE9C5005122D3B8003122CC5900000FD -:1010E700E0FF25E0248BF582E43400F583E0FCA3E0 -:1010F700E0FDEF25E0249BF582E43400F583E0FE74 -:10110700A3E0C39DEE9C5003021285900000E025EA -:10111700E0249BF582E43400F583E4F0A3F00212A7 -:1011270085900000E0FF247FF582E43400F583E03A -:101137007017122AE4C240900000E0247BF582E495 -:101147003400F583E4F0021285900000E0FF247F6D -:10115700F582E43400F583E0FE6402704B2040140E -:10116700D240EF25E02483F582E43400F583E4F0F0 -:10117700A37469F0900000E0FF25E02483F582E482 -:101187003400F583E475F0011209AEEF25E02483FE -:10119700F582E43400F583E0FCA3E0C394FEEC940D -:1011A70000500302126F804EEE6401705A20401700 -:1011B700D240900000E025E02483F582E43400F576 -:1011C70083E4F0A374FEF0900000E0FF25E02483A1 -:1011D700F582E43400F58374FFF5F01209AEEF25CC -:1011E700E02483F582E43400F583E0FEA3E0D394A2 -:1011F70069EE94005072900000E0247FF582E43499 -:1012070000F583E4F08061900000E0FF247FF58221 -:10121700E43400F583E06403704EEF25E02483F5A2 -:1012270082E43400F583E0FEA3E0FFC394FEEE946E -:10123700004004D240800BD3EF946AEE9400500232 -:10124700C240900000E025E0248330400DF582E4A1 -:101257003400F58374FFF5F0800BF582E43400F574 -:1012670083E475F0011209AE900000E0FF25E02449 -:1012770083F582E43400F583A3E0FD122A4B900046 -:1012870000E0FF7011747B2FF582E43400F583E0F2 -:10129700900079F08043900000E0B40110247BF5C2 -:1012A70082E43400F583E0900078F0802C90000011 -:1012B700E0B40210247BF582E43400F583E090006B -:1012C7007AF08015900000E0B4030E247BF582E4E9 -:1012D7003400F583E0900077F0900000E004F0021E -:1012E7000FADE4900000F0900000E0FFC3940450BD -:1012F7001BEF25E0249BF582E43400F583E475F0C9 -:0C130700011209AE900000E004F080DB51 -:0113130022B7 -:0B1F92004200ED00004100EF0FC141D4 -:102C4B0075FE1E43FF0275FE2143FF0875D4877581 -:102C5B00FE2143FF0475FE2143FF02300D0775FE75 -:0C2C6B002453FFC32275FE2443FF3C22CB -:10005600D2AC759A01D2B9D2BDD2A9D2AB75FE295E -:0400660043FFB02282 -:10006E00C2ACE4F59AD2B9C2BDC2A9C2AB75FE2923 -:04007E0053FF4F22BB -:092E650012006E438702020056C0 -:102DFC007815E664026006200F03304104C241C31B -:032E0C0022D322AC -:1029A30075FE01E4F5FF122D55122E58122E3DE44B -:1029B300F58675B7C375FE6A75FF0475FE6C43FF34 -:1029C3000A122DA075FE8043FF0275FE0E53FFFC15 -:1029D30043FF0175FE1775FF3CD2A8D2AF122CE45A -:1029E3007D697F03122DE6122D20122943122C4BF1 -:0729F3009000DE7401F022E8 -:03000300020006F2 -:03000600D24132B2 -:03004B00022E760C -:062E760075EB3CD2413275 -:03005300022E7CFE -:062E7C0075F302D24132A1 -:101F9D0020402900000000000000000000000000AB -:101FAD000000000000000000000000000000000024 -:101FBD000000000000000000000000000000000014 -:101FCD000000000000000000000000000000000004 -:0F1FDD00000000C139C1384100F2004100F3009B -:0E2E2F00900029EFF0122E6E900029E0FF2295 -:082E6E002037FDD2378F9922B5 -:102D550075FE0E53FFF343FF04D2DF43878075BA38 -:0A2D65000375AAFD759852D2AC2246 -:03002300022E4B5F -:0D2E4B00309904C299C237309802C2983203 -:0D2E580075BB03759DDC759B92439A0122AA -:062BE600900043120B5A9F -:102BEC00E4900046F0F0900046E0C39FE49E501C39 -:102BFC002038FDD238900043E475F001120B4312DB -:0C2C0C0008ACF59C900046E004F080DA73 -:012C18002299 -:030083000227034E -:10270300C0E0C083C082C0D075D000C000C006C086 -:1027130007E59B30E105539BFDC238E59B30E06D37 -:10272300539BFED2419000F2E014601914603424EC -:1027330002705AE59C9000F2B455087401F0A3E4CA -:10274300F0800E8018E59C9000F2B4AA107402F099 -:10275300A3E0FF04F074292FF8A69C8030E4F0A3D3 -:10276300F0802A9000F3E0FF04F074292FF8A69C70 -:10277300782BE62404FFE433FEE0C39FEE6480F885 -:102783007480984008E4F09000F2F0D239D007D07A -:0C27930006D000D0D0D082D083D0E0323D -:1023BC00506F776572204F6E20537461746521489D -:1023CC00616C6C28307825782920286C696E653A08 -:1023DC002564290D0A004177616B6520536F757276 -:1023EC0063653A57505F466C6167303A30782578B0 -:1023FC002C57505F466C6167313A307825782C57F2 -:10240C00505F466C6167333A307825782E286C69BA -:10241C006E653A2564290D0A004E6F726D616C2051 -:10242C00537461746520286C696E653A2564290DB6 -:10243C000A00536C65657020537461746520286CB8 -:10244C00696E653A2564290D0A00535441303A30BF -:10245C007825782C535441313A307825782C5354C4 -:10246C0041323A307825782C535441333A30782520 -:10247C00782C535441343A307825782E4465635F78 -:10248C00536C6565703A25640D0A006164632063C2 -:10249C00686E3A25642C4176675F4164633A256423 -:1024AC002C49766F6C3A25642C566261743A25641B -:1024BC002C566F75743A25642C49766F723A2564E4 -:1024CC002C566E74633A25642E0D0A004465636EB7 -:1024DC00745F536C65657044656C61792052656CF2 -:1024EC006F61642E0D0A00456E7465722053746121 -:0D24FC006E646279204D6F6465210D0A0049 -:101FEC004300DE0402024100DB004100DC00C1368C -:0E1FFC00C1354100DD004100E1004100DA0086 -:10002600E4FB7D04FF122BABE4FB7D047F01122B66 -:10003600ABE4FB7D047F02122BABE4FB7D047F0364 -:03004600022BABDF -:100BC800303656C236E49000DCF0900005F0A3F011 -:100BD800FBFAFDFF12287EE4900005F0A3F0FBFA73 -:100BE800FD7F0112287EE4900005F0A3F0FBFAFDDA -:100BF8007F0212287EE4900005F0A3F0FBFAFD7F47 -:100C08000312287E9000797402F0900078F090002A -:100C18007AF0900077F0D2412220200C200B0302BA -:100C28000CCF300D03020CCF203105D231D2362241 -:100C3800900079E06403601A900005E4F0A3740A58 -:100C4800F07B147A007D02E4FF12287E900079740C -:100C580003F0900078E06403601A900005E4F0A3C4 -:100C6800740AF07B147A007D027F0112287E9000BE -:100C7800787403F090007AE06403601A900005E449 -:100C8800F0A3740AF07B147A007D027F0212287E9A -:100C980090007A7403F0900077E06403601A900083 -:100CA80005E4F0A3740AF07B147A007D027F031236 -:100CB800287E9000777403F09000DCE0C3942850FD -:100CC80003020E06D20D2230310CC231C233C232B9 -:100CD800C23DC20CD2357815E664026003020DE00D -:100CE800301F5C203305D233120026E4900005F053 -:100CF800A3F0FBFA7D01FF12287EE4900005F0A323 -:100D0800F0FBFA7D017F0112287EE4900005F0A334 -:100D1800F0FBFA7D017F0212287EE4900005F0A323 -:100D2800F0FBFA7D017F0312287E9000797401F0B0 -:100D3800900078F090007AF0900077F0020DD720BC -:100D4800320CD232D236E49000E1F0020DD7900096 -:100D5800DCE0C394015057E004F09000E1E0146037 -:100D68001A14602714603424037064900079E064D6 -:100D780004605C7B017D04E4FF802E900078E064D1 -:100D880004604C7B017D047F01801E90007AE06442 -:100D980004603C7B017D047F02800E900077E06454 -:100DA80004602C7B017D047F03122BAB8021900013 -:100DB800DCE0C3940F5005E004F08013E49000DCFD -:100DC800F09000E1E004F0E0C394044002E4F0C2D3 -:100DD8003DC20CC228D2342230320AC23212002656 -:100DE800D236D23522203D0C203409200C0620288A -:100DF80003020FA69000DCE0FFC394015004E00456 -:100E0800F022EFC394644003020F519000DCE00429 -:100E1800F0781BE6C394195037900079E0640370AA -:100E280003020FA6E4900005F0A3F07B64FA7D03AB -:100E3800FF12287E9000797404F0E4900005F0A376 -:100E4800F0FBFAFD7F0112287E9000787402803250 -:100E5800781BE6C394325041E4900005F0A3F0FB00 -:100E6800FA7D01FF12287E9000797401F0E4900069 -:100E780005F0A3F0FBFA7D017F0112287E9000782F -:100E88007401F0E4900005F0A3F0FBFAFD7F021274 -:100E9800287E90007A74028048781BE6C3944B50F1 -:100EA80057E4900005F0A3F0FBFA7D01FF12287EBD -:100EB8009000797401F0E4900005F0A3F0FBFA7D4E -:100EC800017F0112287E9000787401F0E4900005FB -:100ED800F0A3F0FBFA7D017F0212287E90007A745D -:100EE80001F0E4900005F0A3F0FBFAFD7F0312285F -:100EF8007E9000777402F022781BE6C39464400366 -:100F0800020FA6E4900005F0A3F0FBFA7D01FF12A2 -:100F1800287EE4900005F0A3F0FBFA7D017F011222 -:100F2800287EE4900005F0A3F0FBFA7D017F021211 -:100F3800287EE4900005F0A3F0FBFA7D017F031200 -:100F4800287E90007974018048C23DC234C20CC228 -:100F580028E4900005F0A3F0FBFAFDFF12287EE4D8 -:100F6800900005F0A3F0FBFAFD7F0112287EE490C3 -:100F78000005F0A3F0FBFAFD7F0212287EE4900042 -:100F880005F0A3F0FBFAFD7F0312287E9000797428 -:0E0F980002F0900078F090007AF0900077F070 -:010FA6002228 -:102DD0009000D8E0FF04F0122DB89000D8E0C39422 -:062DE000084002E4F022AD -:102D02001225091228E1122A9C122248122C77302D -:0E2D1200290BC2291225C2120BC812167922F3 -:1018E900E4900000F09000DEE0FFA3E0FE6F7003DB -:1018F9000219BEA3EEF09000DEE0A3F024FE6057CB -:101909001470030219951470030219AB24036003C0 -:10191900021B3D900005E4F0A37403F07B647A0098 -:101929007D02E4FF12287E900005E4F0A37403F021 -:101939007B647A007D027F0112287E7BFF7A2379FE -:10194900BC9000F0E0FF900004E4F0A3EFF0A37472 -:1019590001F0A374DE805A300D09D23C75E80CC23F -:101969000BC20D7BFF7A2379E2AFF6900004E4F015 -:10197900A3EFF0AFF8A3E4F0A3EFF0AFFAA3E4F01C -:10198900A3EFF0A37401F0A374F380259000EF7422 -:101999000FF07BFF7A2479259000047402F0A3E408 -:1019A900800F7BFF7A24793E9000047402F0A374BF -:1019B9000BF0021B119000DFE024FE603514607605 -:1019C900147003021B2424036003021B3D9000DAF8 -:1019D900E004F0E0C394085003021B3D9000DE745C -:1019E90002F0E49000DAF0781CE66003021B3D0285 -:1019F9001B1DE5F6700CE5F87008E5FA7004E5E1E1 -:101A0900602D9000DE7403F0E5F6540FFFE4FCFD51 -:101A1900FE7B08FAF9F8C3120B1670069000DE7403 -:101A290004F075E11F75F60F75F8FC75FABC229084 -:101A390000DE7403F022202D03021B3DC22D7BFF23 -:101A49007A247956AFE2900004E4F0A3EFF0AFE313 -:101A5900A3E4F0A3EFF0AFE4A3E4F0A3EFF0AFE564 -:101A6900A3E4F0A3EFF0AFE6A3E4F0A3EFF0900056 -:101A7900EFE0FF90000EE4F0A3EFF012137F7BFF7D -:101A89007A2479979000D8E0FF900004E4F0A3EF5E -:101A9900F09000D2E0FFA3E0900006CFF0A3EFF0B2 -:101AA9009000CBE0FFA3E0900008CFF0A3EFF09007 -:101AB90000D4E0FFA3E090000ACFF0A3EFF090007C -:101AC900D0E0FFA3E090000CCFF0A3EFF09000CDA1 -:101AD900E0FFA3E090000ECFF0A3EFF09000D6E076 -:101AE900FFA3E0900010CFF0A3EFF012137F900056 -:101AF900EFE0D394004014E014F0304137C2417450 -:101B09000FF07BFF7A2479D802137F7BFF7A24793F -:101B1900F312137F9000DE7404F022122DFC500E94 -:101B2900122C4B7F041229FA122E0F022E659000F7 -:041B3900DE7402F064 -:011B3D002285 -:102C1900302C26C22C9000DBE0FF04F0EF14600C8E -:102C290014600E24027012122DD0800D122D028014 -:102C3900081218E9E49000DBF0302E05C22E120FBD -:022C4900A722C0 -:102B6B00000000000000000000000000000000005A -:102B7B00000000000000000000000000000000004A -:102B8B00000000000000000000000000000000003A -:102B9B00000000000000000000000000000000002A -:10200A00C10FC10CC10E410073FFC10B42004D004C -:10201A000042004B0000420071000042006E0000C6 -:10202A004200740000C10D019D001069000000000B -:10203A0000000000000000000000000020247900D9 -:10204A000000000000000000000000000000000086 -:10205A000000000000000000000000000000000076 -:07206A0000000041007000BE -:1029FA00EF24FE601E14602814602F24FE60352424 -:102A0A0005703D43BD8853BDBB75FE6F53FFF2434E -:102A1A00FF092243BDCC75FE6F53FFFE43FF0C2214 -:102A2A0053BD7753B7CF43B7302253B7CF43B7031A -:102A3A0053BD772253B7CC53BD7775FE6A43FF3037 -:012A4A002269 -:10167900203A030218B0303C57200E0A7D3FE4FFA0 -:1016890012000ED20E227F031229FAE490004AF0CA -:10169900900048F0A3F0C2009000F0E07024C20C62 -:1016A900D201D202C203C207C208C209900071F076 -:1016B900A3F0D20FC23590006CF0A3F0900076F041 -:1016C9008008C201C202D203C205C20BC20DC23CCC -:1016D90020030302176F900048E0C39405500302EA -:1016E9001855900049E0C3940550077F061229FA5E -:1016F900802A20004090004AE0FFD3940B5022EF4B -:1017090075F00384E5F07003FD800990004AE0203C -:10171900E0077D017F06121D5890004AE004F08021 -:10172900457F041229FAE490004AF0D200D204C29B -:101739000EC20F8031300404C2048022E5E354A0B4 -:10174900FBE4FAF9F8900047E0FFE4FCFDFEC31260 -:101759000B166012E5E354A06004D20CD236E5E31F -:1017690054A0900047F02001030218AD3035312014 -:101779000E257D3FE4FF12000ED20ED20FE4900039 -:101789006CF0A3F0900076F0900049F0900048F0DA -:1017990090004AF0C207227F031229FAC235803528 -:1017A900900048E0D394035003021855900049E093 -:1017B900FFD3940B501FEF75F00384E5F07003FD20 -:1017C9008009900049E020E0077D017F81121D58C2 -:1017D900900049807790004AE0FFD39432501FEF80 -:1017E90075F00384E5F07003FD800990004AE0205C -:1017F900E0077D017F07121D5890004A804E300294 -:10180900077F031229FAC202E5E8540C6026200D6D -:101819001E90004AE004F0E0C3940550030218E862 -:10182900E4F075E80C7F031229FAD20BC20F227F6C -:10183900040229FAC20BC20D200731E5E320E003B7 -:10184900303E18900048E0C394325004E004F0227E -:10185900D207C20E7F041229FA804990006DE07008 -:10186900437B017A00794F120086803890004AE064 -:10187900FFD3940B5022EF75F00384E5F07003FD5C -:10188900800990004AE020E0077D017F80121D5801 -:1018990090004AE004F0800C200809D2087F041265 -:1018A90029FAC20FC2062220060BD2067F0412298A -:1018B900FAC20F8022E5E354A0FBE4FAF9F890009C -:1018C90047E0FFE4FCFDFEC3120B166012E5E3548A -:0F18D900A06004D20CD236E5E354A0900047F093 -:0118E80022DD -:06008600900000120B5A6D -:10008C00900076E0147003020163147003020242C4 -:10009C001470030202B314700302041F24046003DF -:1000AC0002059F900000120B3A90001E1208C560CA -:1000BC000302059F789DE6D3940A50260690001AF9 -:1000CC00743F120925300A0302059F900000120BA1 -:1000DC003A90001A1208C5FDE4FF12000ED20A0273 -:1000EC00059FE4789DF6C20A900000120B3A90002E -:1000FC0016E4120925900015E4120925900013E46A -:10010C00120925900012E4120925900011E412093D -:10011C0025900010E4120925900018E4120925908E -:10012C000017E412092590000EE4F5F0120A1B905A -:10013C00000CE4F5F0120A1B900019E4120925904A -:10014C00001B743F1209259000767401F0E49000B6 -:10015C004DF0A3F002059FE5E35408FFE4FCEF60CB -:10016C001CE5E354046016900000120B3A90001E3C -:10017C007401120925E4900076F002059FE5E35422 -:10018C0008FFE4FCEF704A9000CDE0FEA3E0FF9086 -:10019C000000120B3A900002EE8FF0120A1B7D0544 -:1001AC00120959EF7802C333CE33CED8F9FF900041 -:1001BC0000120B3A900006EE8FF0120A1B9000CE44 -:1001CC00E025E0FF9000CDE03390000A8FF0120A9A -:1001DC001BE5E35404FFE4FCEF704F9000CBE0FE12 -:1001EC00A3E0FF900000120B3AEE8FF01209FC9086 -:1001FC0000CBE0FEA3E0FF7D05120959EF7802C3A6 -:10020C0033CE33CED8F9FF900000120B3A90000495 -:10021C00EE8FF0120A1B9000CCE025E0FF9000CB93 -:10022C00E0339000088FF0120A1B900000120B3A7A -:10023C0090001D020594D390004EE0940590004D63 -:10024C00E094005002806FE490004DF0A3F0E5E3E1 -:10025C005408FFEF701F9000CDE0FEA3E0FF90006C -:10026C0000120B3A90000EEE8FF0120A1B90001841 -:10027C007401120925E5E35404FFE4FCEF701F90B0 -:10028C0000CBE0FEA3E0FF900000120B3A90000CB4 -:10029C00EE8FF0120A1B90001774011209259000C2 -:1002AC00767403F002059FD390004EE09402900008 -:1002BC004DE09400500AE475F0011209AE02059F5E -:1002CC00E490004DF0A3F0900000120B3A90000A5D -:1002DC001209C4FFAEF090000E1209C4D39FE5F0D2 -:1002EC009E501C900000120B3A9000081209C4FF9B -:1002FC00AEF090000C1209C4D39FE5F09E4011E4BF -:10030C00900076F0900000120B3A90001D0203E171 -:10031C00900000120B3A9000181208C56401706D21 -:10032C0090000E1209C4FFAEF0D39414EE9400505A -:10033C0031E5E330E31F900016740112092590009B -:10034C001A1208C5C3943F4044900000120B3A9017 -:10035C000018E48035900000120B3A9000137401E1 -:10036C008028900000120B3A9000061209C4FDD3AD -:10037C00EF9DEE95F09000004008120B3A900013A0 -:10038C008006120B3A900016740112092590000099 -:10039C00120B3A9000171208C56401600302059F06 -:1003AC0090000C1209C4FFAEF0D39414EE940050DC -:1003BC0034E5E330E2229000157401120925900017 -:1003CC001A1208C5C3943F500302059F90000012F7 -:1003DC000B3A900017E48035900000120B3A900015 -:1003EC001274018028900000120B3A90000412093C -:1003FC00C4FDD3EF9DEE95F09000004008120B3A2F -:10040C009000128006120B3A900015740112092507 -:10041C0002059FD390004EE0941490004DE09400A0 -:10042C005031E475F0011209AE9000CDE0FEA3E06E -:10043C00FF900000120B3A90000EEE8FF0120A1B88 -:10044C009000CBE0FFA3E090000CCF8FF0120A1BC2 -:10045C0002059FE490004DF0A3F0900000120B3ABF -:10046C009000181208C5640160030204FD90001787 -:10047C001208C56401707A9000061209C4FFAEF030 -:10048C0090000E1209C4FDACF0C39FEC9E40189076 -:10049C000000120B3A90000A1209C4FFD3ED9FEC36 -:1004AC0095F0500302059F900000120B3A90000447 -:1004BC001209C4FFAEF090000C1209C4FDACF0C3DD -:1004CC009FEC9E4018900000120B3A900008120905 -:1004DC00C4FFD3ED9FEC95F0500302059F900000F4 -:1004EC00120B3A90001674011209259000150205A2 -:1004FC0094900000120B3A9000181208C564017019 -:10050C00419000061209C4FFAEF090000E1209C40F -:10051C00FDACF0C39FEC9E4015900000120B3A907E -:10052C00000A1209C4FFD3ED9FEC95F04014900023 -:10053C0000120B3A90001674011209259000767483 -:10054C0002F0900000120B3A9000171208C56401DB -:10055C0070419000081209C4FFAEF090000C120913 -:10056C00C4FDACF0D39FEC9E5015900000120B3ADA -:10057C009000041209C4FFC3ED9FEC95F050149049 -:10058C000000120B3A9000157401120925900076A8 -:10059C007402F0900000120B3A9000181208C5FF7C -:1005AC006401600D9000171208C564016003020716 -:1005BC009C9000131208C5FE6401600D900012128D -:1005CC0008C564016003020716EFB4011E90001702 -:1005DC001208C5B40115EEB401119000131208C530 -:1005EC00B401089000147401120925900018120827 -:1005FC00C5FFB401189000171208C57010900013B5 -:10060C001208C56401702390001404801AEF701A4C -:10061C009000171208C5B401119000121208C5B44D -:10062C0001089000147401120925900013E41209BA -:10063C0025900012E41209259000141208C56401DB -:10064C0060030207B5900000120B3A90001A1208D2 -:10065C00C5D39400400890001A74FE1208F2900062 -:10066C00191208C5FF90001A1208C5D39F401B90A1 -:10067C0000D5E024C8FF9000D4E03400FEC3900005 -:10068C00D1E09F9000D0E09E5048900000120B3AB1 -:10069C009000191208C5FF90001A1208C5D39F903C -:1006AC0000005013120B3A90001AEF12092590001B -:1006BC001CE41209258013120B3A90001C740112D1 -:1006CC00092590001A74021208F29000767404F056 -:1006DC0080139000767402F0900000120B3A900098 -:1006EC001CE4120925E490004DF0A3F090000012D8 -:1006FC000B3A900014E412092590001C1208C5FF57 -:10070C0090001A1208C5FD020799900000120B3ACE -:10071C009000161208C56401600D9000151208C5F2 -:10072C00640160030207B5900016E41209259000DD -:10073C0015E412092590001A1208C5C3943F500EF7 -:10074C00900000120B3A90001A74021208F29000FA -:10075C00767404F0900000120B3A90001B1208C53E -:10076C00FF90001A1208C5C39F4013900000120B93 -:10077C003A90001AEF1209259000767401F090005F -:10078C0000120B3A90001A1208C5FDE4FF02000E8D -:10079C00900076E0D394024010E4F0900000120B2D -:0907AC003A90001E7401120925A7 -:0107B5002221 -:0B2B2800900043120B5A900046EDF0A5 -:102B3300E4FE900046E0FD14F0ED6029900043E4CC -:102B430075F001120B431208AC6EFEE4FFEFC39461 -:102B53000850DFEE30E007C313648CFE8004EEC33D -:072B630013FE0F80E8AF062E -:012B6A002248 -:081D5800900000EFF0A3EDF094 -:101D6000E4A3F078037C007D017BFF7A2B796BFE86 -:101D70007F40120886E4900003F0A37455F0A3742A -:101D8000AAF0900000E0FE900007F0900001E0FD56 -:101D9000900073F0EE120B631DB1011DE0021E2FC7 -:101DA000031E3C061E3C071E81801E898100001E0A -:101DB000979000067402F0ED700E9000087402F027 -:101DC000E4900071F0021E97900001E0640160034E -:101DD000021E9790000804F0E4900072F0021E9733 -:101DE000900006741BF07F05900001E075F012A4CE -:101DF00024792FF8E6FE74032FF582E43400F5838E -:101E0000EEF00FEFB412E17F17EFC3940840030226 -:101E10001E97900001E075F008A424692FF8E6FEF3 -:101E200074032FF582E43400F583EEF00F80DA902E -:101E300000067402F090000804F0805B90000674C5 -:101E400005F09000087401F0781BE6A3F0A374205D -:101E5000F0900001E0FF700D90006EE07002800FC6 -:101E600090006F8015EFB4012E90006FE070089025 -:101E7000000B74FFF0802090006EE090000BF0806B -:101E8000169000067401F0800E9000067402F09027 -:101E90000070E0900008F0900006E02404FF90003D -:101EA00002F0FD7B017A007903122B28900002E0FA -:101EB0002403F582E43400F583EFF07F011229FA60 -:101EC000900001E0FF700843BD0253BDFE8016EF95 -:101ED000B4010843BD2053BDEF800AEFB4FF0643B1 -:101EE000BD2253BDEE900002E02402FFE433FE7BEE -:101EF000017A007903122BE6900001E0FF7007538E -:101F0000BDFD43BD0122EFB4010753BDDF43BD104A -:0B1F100022EFB4FF0653BDDF43BD11FC -:011F1B0022A3 -:10279F00EF24FA605014604D24067069E4FE742D26 -:1027AF002EF8E6FF900073E075F012A424792EF84E -:1027BF00A6070EEEB412E7E4FE743F2EF8E6FF9084 -:1027CF000073E075F008A424692EF8A6070EEEB486 -:1027DF0008E7900073E0700690007104F0229000FB -:1027EF00727401F022782DE6B4E30D90004B740162 -:1027FF00F008E690006EF02290004C7401F0782EF5 -:05280F00E690006FF0EF -:0128140022A1 -:102C7700E4FF900000F0303921C239FB7A0079294E -:102C8700782BE62403FD122B28782BE6242CF8E674 -:0A2C9700B50707782CE6FF12279F0F -:012CA1002210 -:10207100011C00011B00C13EC13F011A5060280034 -:10208100A30BB80BEA0C1C0C800CB20CE40D160D62 -:10209100480D7A0DAC0DF70E420E880ED80F0A0FBF -:0920A1003C0F870FD2101D1068DE -:1025C200E4FF7815E6B40225EF25E024A3F582E4C2 -:1025D2003400F583E0FCA3E02432FDE43CFCC3902C -:1025E20000D5E09D9000D4E09C50208023EF25E0B0 -:1025F20024A3F582E43400F583E0FCA3E0FDC3905C -:1026020000D5E09D9000D4E09C40050FEFB414B2D9 -:10261200781CE6FEEFD39E781A400306800116E589 -:10262200E1600DE4F5E1781CEFF675F005A418F60B -:10263200781AE6FED394965006EEC3940A500D78AB -:102642001CEFF675F005A418F6187650781CE6FF14 -:10265200D394005003D23F22EFD394015002D23ED2 -:012662002255 -:1020AA004100E5004100E8004100E4004200E2008E -:1020BA00004100E600C12BC12CC12EC12AC129C191 -:0920CA002D4100E700C12FC130D7 -:102815009000E7E06062E4F0D22B9000E5E004F080 -:10282500E0C394054004E4F0D22C9000E8E004F005 -:10283500E0C3940A4004E4F0D22E9000E2E475F07F -:10284500011209AEC39000E3E094649000E2E094C5 -:10285500004006E4F0A3F0D2299000E4E004F0E0A3 -:10286500C394FA4013E4F0D22A9000E6E004F0E0C5 -:0928750094044004E4F0D22D2289 -:03000B00022CA222 -:102CA200C0E0C083C082C0D074FC258CF58C7466F1 -:102CB200258AF58A9000E77401F0D0D0D082D083C3 -:032CC200D0E0322D -:0E2E3D00758901758CFC758A66D2A9D28C222B -:102AE400EFD39401501675FE0EEF25E02404FE7416 -:102AF40003A806088002C333D8FC801475FE0FEFC8 -:102B040024FE25E0FE7403A806088002C333D8FC23 -:102B1400F452FFEFB4040C75FE0F53FFF075FE0E74 -:042B240053FF0F222A -:102DE60075FE54EF5407F5FF75FE56AF058FFF7558 -:062DF600FE5375FF0122EF -:102A4B00EFD39401501875FE0EEF25E02404FE74AD -:102A5B0003A806088002C333D8FC42FF801675FE1C -:102A6B000FEF24FE25E0FE7403A806088002C33393 -:102A7B00D8FC42FFEF70038DCE22EFB401038DCF54 -:102A8B0022EFB402038DDE22EFB40304AF058FDF18 -:012A9B002218 -:032FFD00010102CD -:10268300022D88E493A3F8E493A34003F68001F2B8 -:1026930008DFF48029E493A3F85407240CC8C33358 -:1026A300C4540F4420C8834004F456800146F6DF27 -:1026B300E4800B0102040810204080901F1CE47E7C -:1026C300019360BCA3FF543F30E509541FFEE4931C -:1026D300A360010ECF54C025E060A840B8E493A3E3 -:1026E300FAE493A3F8E493A3C8C582C8CAC583CA0E -:1026F300F0A3C8C582C8CAC583CADFE9DEE780BEC6 -:0120D300000C -:1007B600E709F608DFFA8046E709F208DFFA803E25 -:1007C60088828C83E709F0A3DFFA8032E309F60812 -:1007D600DFFA8078E309F208DFFA807088828C837A -:1007E600E309F0A3DFFA806489828A83E0A3F6082E -:1007F600DFFA805889828A83E0A3F208DFFA804C08 -:1008060080D280FA80C680D4806980F280338010DE -:1008160080A680EA809A80A880DA80E280CA803347 -:1008260089828A83ECFAE493A3C8C582C8CCC583BF -:10083600CCF0A3C8C582C8CCC583CCDFE9DEE7808F -:100846000D89828A83E493A3F608DFF9ECFAA9F00E -:10085600EDFB2289828A83ECFAE0A3C8C582C8CC64 -:10086600C583CCF0A3C8C582C8CCC583CCDFEADE7D -:10087600E880DB89828A83E493A3F208DFF980CCDF -:1008860088F0EF60010E4E60C388F0ED2402B404D8 -:100896000050B9F582EB2402B4040050AF2323457F -:0608A60082239008067396 -:1008AC00BB010689828A83E0225002E722BBFE024A -:0908BC00E32289828A83E493227D -:1008C500BB010CE58229F582E5833AF583E02250E8 -:1008D50006E92582F8E622BBFE06E92582F8E22232 -:0D08E500E58229F582E5833AF583E493224C -:1008F200BB010FF8E58229F582E5833AF583E0280A -:10090200F0225009C58229F8E58226F622BBFE09AB -:10091200C58229F8E22582F222F8EA2583F583E9E5 -:03092200932822F5 -:10092500F8BB010DE58229F582E5833AF583E8F008 -:10093500225006E92582C8F622BBFE05E92582C8B4 -:02094500F2229C -:10094700EF8DF0A4A8F0CF8CF0A428CE8DF0A42EC4 -:02095700FE227E -:10095900BC000BBE0029EF8DF084FFADF022E4CC82 -:10096900F875F008EF2FFFEE33FEEC33FCEE9DEC4B -:10097900984005FCEE9DFE0FD5F0E9E4CEFD22ED91 -:10098900F8F5F0EE8420D21CFEADF075F008EF2FDB -:10099900FFED33FD4007985006D5F0F222C398FDCC -:0509A9000FD5F0EA2269 -:1009AE00C5F0F8A3E028F0C5F0F8E58215827002D4 -:0609BE001583E038F02271 -:1009C400BB0110E58229F582E5833AF583E0F5F071 -:1009D400A3E0225009E92582F886F008E622BBFE4E -:1009E4000AE92582F8E2F5F008E222E5832AF58394 -:0809F400E993F5F0A3E9932259 -:1009FC00BB010A89828A83F0E5F0A3F0225006F746 -:0F0A0C0009A7F01922BBFE06F3E5F009F3192242 -:100A1B00F8BB0111E58229F582E5833AF583E8F00D -:100A2B00E5F0A3F0225009E92582C8F608A6F022CA -:0D0A3B00BBFE09E92582C8F2E5F008F222B1 -:100A480075F008758200EF2FFFEE33FECD33CDCC65 -:100A580033CCC58233C5829BED9AEC99E5829840E8 -:100A68000CF582EE9BFEED9AFDEC99FC0FD5F0D6C5 -:100A7800E4CEFBE4CDFAE4CCF9A88222B800C1B9EF -:100A88000059BA002DEC8BF084CFCECDFCE5F0CB2D -:100A9800F97818EF2FFFEE33FEED33FDEC33FCEB66 -:100AA80033FB10D703994004EB99FB0FD8E5E4F921 -:100AB800FA227818EF2FFFEE33FEED33FDEC33FC0E -:100AC800C933C910D7059BE99A4007EC9BFCE99A02 -:100AD800F90FD8E0E4C9FAE4CCFB2275F010EF2F47 -:100AE800FFEE33FEED33FDCC33CCC833C810D70747 -:100AF8009BEC9AE899400AED9BFDEC9AFCE899F882 -:0E0B08000FD5F0DAE4CDFBE4CCFAE4C8F92214 -:100B1600EB9FF5F0EA9E42F0E99D42F0E89C45F035 -:010B260022AC -:100B2700E8600FECC313FCED13FDEE13FEEF13FFAC -:030B3700D8F122D0 -:090B3A00E0FBA3E0FAA3E0F922BC -:100B4300F8E0FBA3A3E0F925F0F0E582158270023B -:070B53001583E0FA38F022DF -:090B5A00EBF0A3EAF0A3E9F0229C -:100B6300D083D082F8E4937012740193700DA3A321 -:100B730093F8740193F5828883E473740293686035 -:060B8300EFA3A3A380DF35 -:100B8900EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02DF9 -:100B9900FDE43CFCE8A42EC8C5F03DFDE43CFCEFB7 -:0D0BA900A4FFE5F028FEE43DFDE43CFC2245 -:10131400E5082404F582E43400F583E0050822900E -:101324000001301703900004E475F001120B43022E -:1013340008AC2010E97F2ED2108018EF540F2490AF -:10134400D43440D4FF30140BEF24BFB41A0050033C -:101354002461FFE50960021509050CE50C7002051E -:101364000B30170E900001E475F001120B43EF02ED -:101374000BB6022E2F7403D2178003E4C217F508AC -:10138400900001120B5AE4F509F50BF50CE5096020 -:10139400077F2012135780F5750AFFC211C210C2CD -:1013A40012C213C215C216C218121323FF700D30D5 -:1013B40017057F00121368AF0CAE0B22B4255FC271 -:1013C400D5C214121323FF24D0B40A00501A75F0A6 -:1013D4000A780930D50508B6FF0106C6A426F6200A -:1013E400D5047002D21380D924CFB41A00EF50046C -:1013F400C2E5D214021569D21180C6D21080C0D2BF -:101404001280BCD2D580BAD21580B47F2012135773 -:101414002012077401B5090040F1121314FF1213CE -:1014240057021391D218D2168095121314FB12137B -:1014340014FA121314F94A4B7006793A7A167BFFA0 -:1014440020122EE509602A7E008E82758300120820 -:10145400C560060EEE650A70F0C2D5EBC0E0EAC0C6 -:10146400E0E9C0E0EE1215B0D0E0F9D0E0FAD0E047 -:10147400FB1208ACFF60AAEBC0E0EAC0E0E9C0E000 -:10148400121357D0E02401F9D0E03400FAD0E0FB85 -:10149400E50A0460DCD50AD980877BFF7A1579AC2C -:1014A400D212809C791080027908C216C218800872 -:1014B400D2D5790A8004790AC2D5E50A047002F506 -:1014C4000AE4FAFDFEFF121314FC7B082011131228 -:1014D4001314FD7B1030100A121314FE121314FFA0 -:1014E4007B20EC3382D592D55013C3E43010069F91 -:1014F400FFE49EFEE42011039DFDE49CFCE4CBF894 -:10150400C211EC700CCFCECDCCE824F8F870F38087 -:1015140017C3EF33FFEE33FEED33FDEC33FCEB3357 -:10152400FB994002FB0FD8E9EB301105F8D0E0C479 -:1015340048B211C0E00AEC4D4E4F78207B0070C2D7 -:10154400EAB50A0040BCC0E01215B2D0F0D0E020E9 -:101554001104C4C0E0C4B211C0F0121340D0F0D5DD -:10156400F0EB021391120B63142E5314A85813FFBB -:101574004C13FB4214AC4F14B44414B44914144334 -:0815840014BA55149E46149E92 -:10158C0045149E47165A5014032D14072E142A2B5B -:10159C00140B2314282016432A13C34800001422CA -:1015AC003F3F3F00790AA2D5201314301509B9101A -:1015BC00020404B9080104A2D5201602500104202B -:1015CC0012689212B509005034C0E07F2030131914 -:1015DC007F30A21272167215500F121609C212C267 -:1015EC0016C215C2187F30800F301503E9C0E01207 -:1015FC001357301503D0E0F9D0E0B509CC301517EE -:10160C007F30B9100C1213577F583014077F788035 -:10161C0003B908031213573012057F2D0213577F9D -:10162C00202018F87F2B2016F322921280CF286EE0 -:10163C00756C6C2900D2111213143011F8C2117888 -:10164C000930D50108F60213C32D50434958121323 -:10165C00142403B405004001E4901655931213486A -:0D166C00743A121348D2137509040214A831 -:100BB600BB010689828A83F0225002F722BBFE011E -:020BC600F32218 -:00000001FF diff --git a/Out/8837_EVB_241220_1136.bin b/Out/8837_EVB_241220_1744.bin similarity index 55% rename from Out/8837_EVB_241220_1136.bin rename to Out/8837_EVB_241220_1744.bin index 549e002278bc632d761af53ac4a845ab7e5d24b2..d3c0623f1538faef2442fef52022931c99113efd 100644 GIT binary patch delta 2239 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 ..\UsrSrc\main.c - 0 - 1 - 30 + 49 + 16 + 31 1 0 ..\UsrSrc\vox\vox_module.c - 26 - 1503 - 1532 + 5 + 1505 + 1539 1 0 @@ -3633,7 +3633,7 @@ ..\UsrSrc\userapp\userapp.c - 8 + 18 543 563 1 diff --git a/SY8837_Demo.si4project/SY8837_Demo.SearchResults b/SY8837_Demo.si4project/SY8837_Demo.SearchResults index 4069da4..ff371bf 100644 --- a/SY8837_Demo.si4project/SY8837_Demo.SearchResults +++ b/SY8837_Demo.si4project/SY8837_Demo.SearchResults @@ -1,7 +1,9 @@ ----- CHIP_STA0 Matches (6 in 5 files) ---- -DisCharge_Handler in discharge_module.c (UsrSrc\discharge) : if( (CHIP_STA0 & 0x80) ) //用于清软件标志位。 -Hall_Handler in hall.c (UsrSrc\hall) : Hall_Sta = CHIP_STA0 & HALL_STAT; -Hall_Handler in hall.c (UsrSrc\hall) : if( CHIP_STA0 & HALL_STAT ) //Hall 高电平 -Key_Handler in key.c (UsrSrc\key) : if( !(CHIP_STA0 & KEY_STAT) ) //CHIP_STA0 的bit1为Key的状态值：0：按下； -reg883x.h (UsrInc\inc) line 159 : sfr CHIP_STA0 = 0xE2; -SysTem_State_Machine in userapp.c (UsrSrc\userapp) : printf("STA0:0x%x,STA1:0x%x,STA2:0x%x,STA3:0x%x,STA4:0x%x.Dec_Sleep:%d\r\n",(uint16_t)(CHIP_STA0),(uint16_t)(CHIP_STA1),(uint16_t)(CHIP_STA2),(uint16_t)(CHIP_STA3),(uint16_t)(CHIP_STA4),(uint16_t)Decnt_SleepDelay); +---- Vox_Follow_Stop Matches (8 in 2 files) ---- +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Vox_Fllow_Chg.Vox_Follow_Stop = OFF; +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Vox_Fllow_Chg.Vox_Follow_Stop = OFF; +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Vox_Fllow_Chg.Vox_Follow_Stop == ON +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : if ( Vox_Fllow_Chg.Vox_Follow_Stop == OFF ) +Vox_Follow_Chg in vox_module.c (UsrSrc\vox) : if( (n_Vox_Fllow_Chg->Vox_Follow_Stop == OFF) ) //启动跟随充 +Vox_Follow_Chg in vox_module.c (UsrSrc\vox) : n_Vox_Fllow_Chg->Vox_Follow_Stop = ON; +Vox_Follow_Chg in vox_module.c (UsrSrc\vox) : n_Vox_Fllow_Chg->Vox_Follow_Stop = ON; +{anong_Vox_Fllow_Chg_Cfg} in vox_module.h (UsrInc\vox) : uint8_t Vox_Follow_Stop; //跟随充结束标志 diff --git a/SY8837_Demo.si4project/SY8837_Demo.sip_sym b/SY8837_Demo.si4project/SY8837_Demo.sip_sym index 4181f80e744be5183b01cd65a3bd6930e6d71944..8a2ac12cc45da8e4d77b35089b1770e8edd4b11f 100644 GIT binary patch delta 426 zcmbQSOLWFA(G5SUr(eisV&UauU|`5)W?%r*lR0aSPxWDRnD&{Ob@JZM{LL-38H|%3 zbct-L-^n%k=Ktc!Z|WQ-=X8}!*69+Nyr4yAvqCoq`*ZA6M7u7k@C?Pc&ei zJVAkl6J%lv5VK8gyd=)JVe-Oy`^|SI{mGduP+Kznz)D7k=^Hp1S*Jg8WAvK7elj!b z)(4CaR!p8V$)Rl(W7{gGZL65?xH2Bze)m0dv!GxcD+2>3&@d3q2&9X)7c#PhGYWPC z`5Zt#oZfzuiG`a<(1(qI0Vu@)qCud0`d1c~#e)4nF_18b1_86_D_L082A_%7~u3|&YI&)nT(U))!9wH@xNqqOKk?@WSuUD%{ukH zT$2TBizh$m5}EAKwP5m_I+4i>T68umbaSwCamBm1I)%E&JGxA6%yyf+!G?vG8)$4I z5Cd&sNSyqUM|k>ym5dIX?@aoWGkHg6$>a+)4%0VqGO|v8<R&L0psy3Mn9PXn!fdvi+q1tG*8aow8@P diff --git a/UsrInc/inc/define.h b/UsrInc/inc/define.h index 574b2c3..1611d8e 100644 --- a/UsrInc/inc/define.h +++ b/UsrInc/inc/define.h @@ -95,10 +95,10 @@ // #define _DEBUG_KEY // #define _DEBUG_VOX #define _DEBUG_HALL - #define _DEBUG_ADC +// #define _DEBUG_ADC // #define _DEBUG_DISCHARGE // #define _DEBUG_CHARGER -// #define _DEBUG_SLEEP + #define _DEBUG_SLEEP // #define _DEBUG_BAT //#define TEST_MODE diff --git a/UsrSrc/key/key.c b/UsrSrc/key/key.c index 46aeed0..5325429 100644 --- a/UsrSrc/key/key.c +++ b/UsrSrc/key/key.c @@ -284,7 +284,7 @@ uint16_t Key_Press_Debounce = 0; { if( Key_TWS_Pair_Tim < KEY_TWS_PAIR_CLEAR_CNT ) //ÿ200msһΣʱ3s { - if( Key_TWS_Pair_Tim % 2*Vox_TX_Interval ) + if( Key_TWS_Pair_Tim % ( Vox_TX_Interval + 2 ) ) { #ifdef VOX_TX HandleTxCommand(VHOUSE_CMD_CLEAR_PAIR,VOR_CHAN); diff --git a/UsrSrc/userapp/userapp.c b/UsrSrc/userapp/userapp.c index 002e684..b06084a 100644 --- a/UsrSrc/userapp/userapp.c +++ b/UsrSrc/userapp/userapp.c @@ -509,7 +509,7 @@ void SysTem_State_Machine(void) #endif #ifdef _DEBUG_MAIN - printf("Normal State (line:%d)\r\n", (uint16_t)__LINE__); + // printf("Normal State (line:%d)\r\n", (uint16_t)__LINE__); #endif break; @@ -700,8 +700,9 @@ void UserAPP(void) if ( F_sys_tim_10ms ) { F_sys_tim_10ms = 0; - +#ifdef LED_DISPLAY LED_Drv(); +#endif } } diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index 365845b..8c59521 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -70,7 +70,7 @@ bit Vox_Output_Short_Flag = 0; #define Vox_TX_Interval 2 //Voxʱָʱ -#define Vox_TX_Interval_2 3 +#define Vox_TX_Interval_2 4 #define VOX_IOFF_HOLD_CNT 50 @@ -707,14 +707,6 @@ void Vox_Det_Machine(void) return; } - /* ظ󣬿VOX VOUT 5V */ - if( Cover_Close_Flag1 ) - { - VOX_EN_Type(VOX_VOUT_Mode); //VOX Enable 5V - - Cover_Close_Flag1 = 0; - } - /*Vox ֻÿ500msһ*/ if( IRQ_FLAG0 & ( VOR_OutPut_Short | VOL_OutPut_Short ) ) { @@ -746,70 +738,88 @@ void Vox_Det_Machine(void) Vox_Ocp_Flag = 0; - if( !Vox_Chg_Full_Flag ) + /* ظ󣬿VOX VOUT 5V */ + if( Cover_Close_Flag1 ) { - if( ( CHIP_STA1 & ( VOR_Ioff | VOL_Ioff | VOL_LoadOn | VOR_LoadOn ) == ( VOR_Ioff | VOL_Ioff | VOL_LoadOn | VOR_LoadOn ) ) || F_batlevel_low ) //VOX޸ءӵ͵磬رVoutͨ·رBoost - { - if( Vox_Voltage_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //תʱ5sرBoost - { - Vox_Voltage_Hold_Timer++; - - return; - } + VOX_EN_Type(VOX_VOUT_Mode); //VOX Enable 5V #ifdef _DEBUG_VOX - printf("VOX CHG Full.\r\n"); + printf("VOX Vout 5V(STA1:0x%x,line:%d).\r\n",(uint16_t)CHIP_STA1, (uint16_t)__LINE__); +#endif + Cover_Close_Flag1 = 0; + } + else + { + if( !Vox_Chg_Full_Flag ) + { + // if( ( CHIP_STA1 & ( VOR_Ioff | VOL_Ioff | VOL_LoadOn | VOR_LoadOn ) == ( VOR_Ioff | VOL_Ioff | VOL_LoadOn | VOR_LoadOn ) ) || F_batlevel_low ) //VOX޸ءӵ͵磬رVoutͨ·رBoost + if( ( (CHIP_STA1 & 0xAC) == 0xAC ) || F_batlevel_low ) + { + if( Vox_Voltage_Hold_Timer <= VOX_VOUT_5V_LEAST_CNT ) //תʱ5sرBoost + { + Vox_Voltage_Hold_Timer++; + + return; + } +#ifdef _DEBUG_VOX + printf("VOX CHG Full.\r\n"); #endif - Vox_Chg_Full_Flag = 1; + Vox_Chg_Full_Flag = 1; - Boost_Open_Flag = 0; - - VOX_EN_Type(VOX_ADT_Mode); //VOX Enable ADT + Vox_Output_Debounce = 0; + + Vox_Voltage_Hold_Timer = 0; + + Vox_Getinto_Sleep_Flag = 0; + + Boost_Open_Flag = 0; + + VOX_EN_Type(VOX_ADT_Mode); //VOX Enable ADT + } + else + { +#if VOX_FOLLOW_CHG + if ( Vox_Fllow_Chg.Vox_Follow_Stop == OFF ) + { + Vox_Follow_Chg( &Vox_Fllow_Chg ); //䴦 + } +#endif + } } else { -#if VOX_FOLLOW_CHG - if ( Vox_Fllow_Chg.Vox_Follow_Stop == OFF ) - { - Vox_Follow_Chg( &Vox_Fllow_Chg ); //䴦 - } -#endif - } - } - else - { - - if( Vox_Output_Debounce <= Vox_TX_Pattern_Tim ) - { - if( (Vox_Output_Debounce % Vox_TX_Interval_2) == 0 ) //200msһ - { + if( Vox_Output_Debounce <= Vox_TX_Pattern_Tim ) + { + if( (Vox_Output_Debounce % Vox_TX_Interval_2) == 0 ) //200msһ + { #ifdef VOX_TX - HandleTxCommand(VHOUSE_CMD_PWROFF,VOL_CHAN); //ָֶͨ + HandleTxCommand(VHOUSE_CMD_PWROFF,VOL_CHAN); //ָֶͨ #endif - } + } + else + if( (Vox_Output_Debounce % Vox_TX_Interval) == 0 ) //200msһ + { +#ifdef VOX_TX + HandleTxCommand(VHOUSE_CMD_PWROFF,VOR_CHAN); //Ҷָֶͨ +#endif + } + + Vox_Output_Debounce++; + } else - if( (Vox_Output_Debounce % Vox_TX_Interval) == 0 ) //200msһ - { -#ifdef VOX_TX - HandleTxCommand(VHOUSE_CMD_PWROFF,VOR_CHAN); //Ҷָֶͨ -#endif - } - - Vox_Output_Debounce++; - } - else - { - if( !Vox_Getinto_Sleep_Flag ) - { - Vox_Getinto_Sleep_Flag = 1; - - VOX_EN_Type(VOX_ADT_Mode); - - Vox_Vout_Enable = OFF; + { + if( !Vox_Getinto_Sleep_Flag ) + { + Vox_Getinto_Sleep_Flag = 1; + + VOX_EN_Type(VOX_ADT_Mode); + + Vox_Vout_Enable = OFF; #ifdef _DEBUG_VOX - printf("VOX Get Into Sleep.\r\n"); + printf("VOX Get Into Sleep.\r\n"); #endif + } } } } @@ -1689,7 +1699,9 @@ void HandleVoxCommMsg(void) if( Uart1_RX_Finish_Flag ) { Uart1_RX_Finish_Flag = 0; - +//#ifdef _DEBUG_VOX + printf("RX1_Buffer[0]:0x%x,RX1_Buffer[1]:0x%x,RX1_Buffer[2]:0x%x,RX1_Buffer[3]:0x%x,RX1_Buffer[4]:0x%x,RX1_Buffer[5]:0x%x,RX1_Buffer[6]:0x%x,line:%d\r\n",(u16)RX1_Buffer[0],(u16)RX1_Buffer[1],(u16)RX1_Buffer[2],(u16)RX1_Buffer[3],(u16)RX1_Buffer[4],(u16)RX1_Buffer[5],(u16)RX1_Buffer[6],(u16)__LINE__); +//#endif CrcCheckSum = Crc8Maxim(RX1_Buffer, RX1_Buffer[2] + 3); //У if( CrcCheckSum == RX1_Buffer[RX1_Buffer[2] + 3] )