diff --git a/Out/8835_EVB_250109_1723.bin b/Out/8835_EVB_250109_1723.bin deleted file mode 100644 index 64b7f7a..0000000 Binary files a/Out/8835_EVB_250109_1723.bin and /dev/null differ diff --git a/Out/8835_EVB_250109_1723.hex b/Out/8835_EVB_250109_1723.hex deleted file mode 100644 index 1d9bb8f..0000000 --- a/Out/8835_EVB_250109_1723.hex +++ /dev/null @@ -1,1006 +0,0 @@ -:03000000022E0BC2 -:102E0B0075FE7275FF00758E009000007F007E03CB -:0D2E1B00E4F0A3DFFCDEFA75817D022E637A -:0F39180053797374656D20496E69742E0D0A0022 -:103872001235447BFF7A397918120F6CD2AED2BE60 -:083882001231B212344780F448 -:102238004101310041013200027C000002780000B7 -:102248000276000041013300026A000002700000BB -:10225800027A00000274000002720000026C0000A2 -:04226800026E000002 -:09398D007878E6FE08E6780222D3 -:10379D0075FE3175FF8175FE0E43FF107DAB7F30D9 -:0D37AD001239AF75FE59900131E5FFF02291 -:102B6C00900066EFF0E5A420E003022C5F75A40151 -:102B7C007F351239B67878760008A6077F36123979 -:102B8C00B6EF5403787846F608E6F6900066E04413 -:102B9C0008FD7F31123607900131E0FF3395E0FEDE -:102BAC00C37879E69FFF18E69EFE7C097DC412155A -:102BBC0062780A1215007878A60608A607900133E9 -:102BCC00E012153C2BEC002BFA012C03022C160303 -:102BDC002C24042C32052C40062C4F0700002C5FB3 -:102BEC0012398DCEC313CE13D8F9796B80617879F5 -:102BFC00E625E0797D80447878E6FE08E67803C324 -:102C0C0033CE33CED8F97971804512398DC333CE9A -:102C1C0033CED8F9797B803712398DC333CE33CE8E -:102C2C00D8F97975802912398DC333CE33CED8F9C2 -:102C3C007973801B7879E625E0796DF718E63319FE -:102C4C00F7801012398DCEC313CE13D8F9796FF7E4 -:0F2C5C00EE19F7900066E0900133F075A3812226 -:10348900E5A430E13675A4027F371239B67876762D -:103499000008A6077F381239B6EF5403787646FE3E -:1034A90008E6FF18EEF608EFF6FF900131E0FD336C -:0F34B90095E0FCC3EF9DF6EE9C18F675A38222FA -:05226C00C125010D0376 -:1038E400E4780FF67811F6780DE67810F67812760B -:0238F4000422AC -:1027AF00E4FE7876E6FC08E6FDC394D8EC9403408B -:1027BF00037F0022EF70030228C7D3ED940FEC9430 -:1027CF000340030228A5ED94CBEC9400500302289C -:1027DF00A5D3ED94AAEC94024022D223780DE6FF04 -:1027EF00137810F6302411D3ED94BFEC940240040B -:1027FF00C22480047810A607E4FE8070D3ED94AA5B -:10280F00EC94025043ED9437EC9401403BD2247882 -:10281F000DE6FF7810F6302313D3ED9493EC94026A -:10282F005004C2238006EFC3137810F67812760493 -:10283F00301E11D3ED9451EC94015004C21E80044C -:10284F0078127601E4FE8024D3ED9437EC94015096 -:10285F001BD21E78127601302410ED9426EC9401D1 -:10286F005004C224800478127604E4FE302111C390 -:10287F00ED94F3EC94025006C221E4FE80027E0137 -:10288F0030222FD3ED94DDEC94004006C222E4FEFB -:10289F0080207E01801CD3ED940FEC94034006D270 -:1028AF00217E01800DD3ED94CBEC94005004D22205 -:1028BF007E01C21FC2208058C221C222D3ED949F35 -:1028CF00EC94035031ED9471EC94004029301F10BB -:1028DF00ED9484EC94035006C21FE4FE80027E0147 -:1028EF0030202DD3ED9482EC94004006C220E4FEFC -:1028FF00801E7E01801AD3ED949FEC94034004D286 -:10290F001F800BC3ED9471EC94005002D2207E0116 -:02291F00AF0601 -:012921002293 -:102F440090012AE05463600AE4FF12369BE4780E91 -:102F5400F622780E76017F011227AFEF6008E4FFB6 -:102F640012369BD22522C22590012BE05407FFBFC5 -:102F74000605780E7603227810E6FD7F22123607C6 -:102F84007812E6FD7F21123607780FE6C454F078F4 -:102F94001146FD7F231236077F0112369B7814E613 -:102FA400FFD394014002C23FEFD394034002C23BDB -:102FB400EFD394074002C23DEFD3940C4002C23CCD -:0D2FC400EFD394114002C23E780E76022237 -:06227100C140C141C14261 -:10327700C24190012AE020E65130E203D2422230D7 -:103287003F04E4FF801190012AE030E50D30273A32 -:103297007F3C12383F7F010236BDE4FF1227AFEFB4 -:1032A7006008E4FF1236BDD24022C240D24130420C -:1032B70019780EE6B40213C3787DE6941018E694E5 -:0B32C7000E4005D241C24222C241224B -:10385900426F78204F70656E2E0D0A00426F7820F6 -:09386900436C6F73652E0D0A001B -:08227700C146C147410135FFDA -:10332D00E4900066F090012BE0FF5420FE900066C3 -:10333D00F0900135E06E6032EF30E50E900134749F -:10334D0001F07BFF7A387959800BE4900134F07BE2 -:10335D00FF7A387965120F6CD246C210D247D23A35 -:0A336D00900066E0900135F0D248B0 -:013377002233 -:102A5200737570706572206C6F6E672038732070AA -:102A6200726573732E286C696E653A2564290D0AA6 -:102A7200004B6579206C696674286C696E653A252D -:102A820064292E0D0A00426F6F7374204F70656EB9 -:102A9200204B65792E286C696E653A2564290D0AEA -:102AA200006C6F6E672032732070726573730D0A4B -:102AB2000073686F72742070726573730D0A004B35 -:102AC2006579205061697220545820564F52286C03 -:102AD200696E653A2564292E0D0A004B65792050EE -:102AE2006169722054696D654F7574286C696E65F1 -:102AF2003A2564292E0D0A004B65792050616972CE -:102B02002047657420564F52286C696E653A2564D9 -:102B1200292E0D0A004B65792050616972204765A4 -:102B22007420564F4C286C696E653A2564292E0D27 -:102B32000A004B6579205061697220545820564F23 -:102B42004C286C696E653A2564292E0D0A004B6586 -:102B520079205061697220436E743A25642E286C84 -:0A2B6200696E653A2564290D0A002A -:10227F00C134C133C13201170041011E0041012297 -:0E228F000041011D0042011F0000410121001D -:10000E007BFF90006CE4F0A3227BFF90006C7401E8 -:03001E00F0A3222A -:101B6C0090012BE030E44490011FE475F001121455 -:101B7C005EC3900120E0944090011FE0940140115D -:101B8C00D2327A2A795212000E7471F0120F6C80D4 -:101B9C0014C3900120E0945090011FE09400400584 -:101BAC00203102D231D22EC22F804D302E43D2485A -:101BBC00E47817F6C22ED22F900121F090011FE08D -:101BCC00FEA3E0FFD39414EE94005008D234D2302C -:101BDC00D23A800EC3EF94C8EE9400500530310217 -:101BEC00D233C2317A2A797312000E74A7F0120F15 -:101BFC006CE490011FF0A3F0302F77304174303338 -:101C0C002D201008121DAE74BA021D65121DD45081 -:101C1C0003021D9AC23378177602E490011EF090ED -:101C2C000045F0A3F07BFF7A2A79A3120F6C3032B7 -:101C3C002F201008121DAE74E3021D65121DD45026 -:101C4C0003021D9AC232E4900122F0781776037BCE -:101C5C00FF7A2A795290006CF0A374F8F0120F6C92 -:101C6C0030300BC2307BFF7A2A79B3120F6CC22F43 -:101C7C00C210900134E064016003021DAD7817E6D8 -:101C8C0064026003021D6E90011EE0C394015016A5 -:101C9C007F37121DC77BFF7A2A79C190006C04F044 -:101CAC00A37422021D3890011DE0D394054020E45A -:101CBC00F07D257F11121DEC7D247F11121DECE4AB -:101CCC00121DE17A2A79DD1200177438021D659015 -:101CDC000045E0B4011D7D257F0A121DEC900045E6 -:101CEC007402F07BFF7A2A79FA90006C14F0A374DA -:101CFC004E8039900045E064027035A3E0601B7F94 -:101D0C000A121DC790011EF090011DF0121DE17A00 -:101D1C002B7917120017746F803F7D257F37121DAA -:101D2C00EC7BFF7A2B7934120019747FF0120F6C54 -:101D3C0090011EE0D39414402490011DE004F0E4C3 -:101D4C00A3F07BFF7A2B795090011DE0FF1200105D -:101D5C00EFF0A37401F0A3748DF0020F6C90011ED0 -:101D6C00802C7817E664037038900122E0FFC3944E -:101D7C0064501FEF540770047D25800A900122E007 -:101D8C00540370077D247F0B121DEC900122E0049C -:101D9C00F022E47817F6D213900122F07F0412306F -:011DAC004EE8 -:101DAD00227F3C12383F7F011236BDD2107BFF7A65 -:101DBD002A798890006CE4F0A3227D24121DECE4B6 -:101DCD00900045F0A3F0227F0312304E900121E0E8 -:0F1DDD00D39414227817F6D2137F0412304E22BB -:10229D004100BA004100B9004100BB004100B80047 -:10313F00900066E0FF25E024C4F582E43400F583B7 -:10314F0022900066E0FF25E024CCF582E43400F500 -:10315F0083E0FCA3E0FDEF25E024DCF582E43400FE -:10316F00F5832274BC2FF582E43400F58322E4F05A -:10317F00A3F0EF25E024D4F582E43400F583229008 -:10318F000066E0FF24C0F582E43400F58322E0FE00 -:10319F00A3E0C39DEE9C2225E024CCF582E434000D -:0331AF00F5832283 -:1037BA0075FE0B75FF0F75FE1375FF0F75FE0C7501 -:0B37CA00FF55C290C291C293C2922230 -:10380B00EF14600D14600D14600D2403700BD29037 -:0A381B0022D29122D29222D29322EF -:05372200900066E0FFCD -:10372700EF14600D14600D14600D2403700BC2902C -:0A37370022C29122C29222C2932204 -:1035AB00E4FF123172E4F074C02F123195E4F0EFA6 -:1035BB00123144E4F0A3F0EF1231A612317DE4F0A6 -:0E35CB00A3F0123165E4F0A3F00FEFB404D4C6 -:0135D90022CF -:1034C800AC0774BC2C123175EDF0EAC313FEEB1394 -:1034D800FFEC123144EEF0A3EFF0AF03EC1231A68B -:1034E800EAF0A3EFF090006BE0FEA3E0FFEC1231EE -:0F34F80082EEF0A3EFF0EC123166E4F0A3F022C5 -:10374100123172EDF074C02F123195EBF0EF12319E -:0F37510044E4F0A37469F0123165E4F0A3F022B0 -:10202100E4900066F0F0900066E0FFC39404400382 -:10203100022216123172E0601F24FE6021146078C2 -:102041001470030220EA240360030221C590006694 -:10205100E0FF12380B0221C51237220221C51231CD -:102061003F12316012319D500512380B8003123737 -:102071002212315012319D50030221C5900066E0B9 -:1020810012316612317DE0FEA3E0D39400EE94009C -:10209100400E900066E012318274FFF5F012145E7A -:1020A100900066E0FF123182E0FCA3E04C60030285 -:1020B10021C574BC2F0220FB12313F123160E0FEBA -:1020C100A3E0D39DEE9C500512380B8003123722FA -:1020D10012315012319D50030221C5900066E01269 -:1020E1003166E4F0A3F00221C512318EE0701312C3 -:1020F10038A1C24A900066E024BC123175E4F002B6 -:1021010021C512318EE0FE6402702E204A0CD24AA3 -:10211100EF123144E4F0A37469F012313FE475F039 -:102121000112145EEF123144E0FCA3E0C394FEEC13 -:10213100940050030221BC8031EE64017037204AC3 -:102141000FD24A900066E0123144E4F0A374FEF02D -:1021510012313F74FFF5F012145EEF123144E0FECC -:10216100A3E0D39469EE94005051900066E01231DF -:1021710093E4F0804612318EE06403703EEF123139 -:1021810044E0FEA3E0FFC394FEEE94004004D24A73 -:10219100800BD3EF946AEE94005002C24A9000661D -:1021A100E025E024C4304A0912314874FFF5F0807B -:1021B10007123148E475F00112145E12313FA3E0B9 -:1021C100FD123378900066E0FF700A123172E090E0 -:1021D10000BAF08037900066E0B4010C24BC1231E3 -:1021E10075E09000B9F08024900066E0B4020C2400 -:1021F100BC123175E09000BBF08011900066E0B434 -:10220100030A24BC123175E09000B8F0900066E03A -:1022110004F0022027E4900066F0900066E0FFC31E -:1022210094045012123165E475F00112145E9000AD -:0622310066E004F080E409 -:012237002284 -:1032D200456E74657220536869704D6F646521286C -:1032E2006C696E653A2564290D0A004E6F74204799 -:1032F200657420496E746F20536C6565702843684D -:10330200675374617475733A25642C566F785F56EF -:103312006F75743A25642C526573746172745F46DA -:0B3322006C61673A2564292E0D0A003B -:1022AD00C1494101240042012500004101270F4190 -:0522BD00012300C148EF -:0A398300E4FF33A3CFF0A3EFF0221E -:10382500D2AC759A03D2BCD2BDD2A9D2AB75FE314A -:0A38350075FF8175FE3043FF80220D -:10376000C2ACE4F59AC2BCC2BDC2A9C2AB75FE31FF -:0F37700053FF7E75FE3053FF7FFD7F310236071A -:10340300304937302A3DC22A900123E004F0E0C35B -:1034130094054010E4A3F07DAA7F4F123607E49091 -:103423000123F022900123E0B404187BFF7A327960 -:10343300D290006C74E0F0020F6C12376043870285 -:0434430012382522F4 -:10357B00780EE6FFD39401500620140330481F7BCE -:10358B00FF7A3279ED90006CE4F0A3EFF0A2141205 -:10359B003983A248123983120F6CC248C322D3223B -:103544001237D5123908123944E4F5861235DA12E5 -:10355400379D7D087F761239AFD2A8D2AF1238E4F6 -:103564007D697F031238CE1237BA1235AB12395245 -:073574009001127401F02226 -:030003000239BD02 -:0639BD00D24875E20F3252 -:1022C20020402A0000000000000000000000000082 -:1022D20000000000000000000000000000000000FC -:1022E20000000000000000000000000000000000EC -:1022F20000000000000000000000000000000000DC -:10230200000000C14541012D0041012E0042012F74 -:042312000000C144C2 -:0B396D00E0FF04F0742A2FF8A6992256 -:1037D50075FE0443FF0CD2DF43878075BA0375AAD3 -:0B37E500DC759852D299D298D2AC2229 -:0633BE009000AC12153373 -:1033C400E49000AFF075FE0443FF0C75FE0353FF59 -:1033D400F3F09000AFE0C39FE49E501C2043FDD265 -:1033E400439000ACE475F00112151C12135CF599BE -:0E33F4009000AFE004F080DA75FE0453FFF3A2 -:0134020022A7 -:03002300022EA802 -:102EA800C0E0C083C082C0D075D000C000C003C0DD -:102EB80005C006C007309904C299C24330986AC257 -:102EC80098D24890012DE014601C04705CE599903C -:102ED800012DB4AA0B7401F0A3E4F012396D8049F6 -:102EE800E4F0A3F0804390012E12396DE0FDB407A1 -:102EF800177830E6FEE42409FFE43EFE18E6FBEF0F -:102F08004BFFA3EEF0A3EFF0EDFF90012FE070036D -:102F1800A3E06F600990012EE0D39440400B90012C -:102F28002EE4F090012DF0D245D007D006D005D080 -:0C2F380003D000D0D0D082D083D0E03293 -:0E393600900091EFF012399F900091E0FF2277 -:1039080075F10A759F03759EFD759692759A022248 -:08399F002044FDD2448F972261 -:03008B0002388AAE -:10388A00C0E0E59630E1055396FDC244E59630E086 -:07389A00035396FED0E0325B -:10292200506F776572204F6E205374617465214831 -:10293200616C6C28307825782920286C696E653A9C -:102942002564290D0A004177616B65205374617417 -:102952006520286C696E653A2564290D0A004E6F60 -:10296200726D616C20537461746520286C696E65A8 -:102972003A2564290D0A00536C6565702053746111 -:10298200746520286C696E653A2564290D0A005326 -:102992005441303A307825782C535441313A3078CA -:1029A20025782C535441323A307825782C43686983 -:1029B200705F5354413A307825782C564F585F5304 -:1029C20054413A307825782E4465635F536C6565CF -:1029D200703A25640D0A00566E74633A25642C49D8 -:1029E200766F6C3A25642C566261743A25642C56D3 -:1029F200696E3A25642C56706D69643A25642C56CA -:102A02006F723A25642C566F6C3A25642C566464B6 -:102A12003A25642C49766F723A25642E0D0A0044D9 -:102A220065636E745F536C65657044656C61792093 -:102A320052656C6F61642E0D0A00456E74657220DA -:102A42005374616E646279204D6F6465210D0A00D2 -:1023160043011204020241010F0041011000C13ABB -:0E232600C139410111004101150041010E00B5 -:10002600E6FF08A3E6CFF0A3EFF02290006BE4F022 -:10003600A3740AF07B147A007D02227BFFE0900015 -:100046006CFFE4F0A3EFF0229000BAF09000B9F054 -:100056009000BBF09000B8F022F0E490006BF0A3A3 -:10006600F0FBFA2290006BE4F0A37403F07B647A51 -:10007600007D0222FFE4F0A3EFF0227BFF90006CEC -:050086007402F0A3224A -:10370100E4FBFF1237187F01123741E4FB7F0212FD -:1037110037187F030237417D04123741E4FB7D04F2 -:013721002285 -:10189700303A1BC23AE4900110F07813F6121AFF9F -:1018A700FD7F031234C8740212004ED2482220254D -:1018B70006204003300D5F203505D235D23A2290FD -:1018C70000BAE06402600E120031E4FF1234C890DF -:1018D70000BA7403F09000B9E06402600E120031A0 -:1018E7007F011234C89000B97403F09000BBE06424 -:1018F700026009120031121B637403F09000B8E014 -:1019070064027003021AC91200317F031234C890AF -:1019170000B87403F02230350CC235C237C236C264 -:1019270047C20ED239780EE6FF70030219F464033A -:101937007020203707D237C236023701E490006B98 -:10194700121ACA7D017F031234C8740112004E02B5 -:1019570019EB20360ED236C237D23AE4900115F091 -:101967000219EB900110E0C394015057E004F09086 -:101977000115E014601A146027146034240370649E -:101987009000BAE06404605C7B017D04E4FF802E74 -:101997009000B9E06404604C7B017D047F01801EE8 -:1019A7009000BBE06404603C7B017D047F02800EF5 -:1019B7009000B8E06404602C7B017D047F0312373C -:1019C700418021900110E0C3940F5005E004F0809E -:1019D70013E4900110F0900115E004F0E0C39404C3 -:1019E7004002E4F0C247C20EC234D2382230360A6F -:1019F700C236123701D23AD2392220470C20380991 -:101A0700200E06203403021AC9900110E0FFC39488 -:101A1700015004E004F022EFC394644003021AB4B7 -:101A2700900110E004F0303D309000BAE06403709C -:101A370003021AC9E490006BF0A3F07B64FA7D03FC -:101A4700FF1234C89000BA740412005FFD7F0112C0 -:101A570034C89000B97402800F303C17E490006BD3 -:101A6700121B34121B4F740112005FFD121B6374AB -:101A770002801EE490006B303E27121B34121B4F6E -:101A8700740112005F7D017F021234C89000BB749D -:101A97000112005FFD7F031234C89000B87402F092 -:101AA70022121ACA7D01121B5A74018012C247C240 -:101AB70038C20EC234E4121AFFFD121B5A74021206 -:021AC7000051CC -:101AC90022F0A3F0FBFA7D01FF1234C8E490006B09 -:101AD900F0A3F0FBFA7D017F011234C8E490006B9A -:101AE900F0A3F0FBFA7D017F021234C8E490006B89 -:101AF900F0A3F0FBFA2290006BF0A3F0FBFAFDFFD4 -:101B09001234C8E490006BF0A3F0FBFAFD7F0112D8 -:101B190034C8E490006BF0A3F0FBFAFD7F021234A5 -:101B2900C8E490006BF0A3F0FBFA22F0A3F0FBFAF3 -:101B39007D01FF1234C89000BA7401F0E490006B83 -:101B4900F0A3F0FBFA227D017F011234C89000B99D -:101B5900227F031234C89000BA227F021234C8903F -:031B690000BB229C -:1038B800900132E0FF04F0122B6C900132E0C394C7 -:0638C800084002E4F022BA -:10377F0012332D121B6C1230C8302611C226122F95 -:0E378F0044123277122FD112189712158F2282 -:093996007B017A01792802321B41 -:10260F00E4900066F0900112E0FFA3E0FE6F606FB0 -:10261F00A3EEF0900112E0A3F024FE6030146041AD -:10262F0014604F240360030227AE12006AE4FF1206 -:10263F0034C812006A7F011234C87A2979229001B6 -:10264F0034120041A37401F0A374F6802E7F01129F -:10265F0036DF7BFF7A297948740290006CF0A380F3 -:10266F001A900127740FF07A297960120081740E85 -:10267F0080097A2979791200817419F002277990EB -:10268F000113E024FE603914603D1470030227919A -:10269F00240360030227AE90010EE004F0E0C39420 -:1026AF000850030227AE9001127402F0E490010E5D -:1026BF00F07814E660030227AE9001127404F02242 -:1026CF009001127403F022202A030227AEC22A7A45 -:1026DF00297991900128120041900129E090006E14 -:1026EF0012004790012AE090007012007A90012B9F -:1026FF00E090007212007A90012CE0FF900074E4D9 -:10270F00F0A3EFF0900127E0FF900076E4F0A3EF45 -:10271F00F0120F6C7BFF7A2979D97876E6FF089053 -:10272F00006C12002A786A120026787C1200267834 -:10273F0070120026787A12002678741200267872AA -:10274F00120026786C120026786E120026120F6C7B -:10275F00900127E0D394004014E014F0304840C2B9 -:10276F0048740FF07BFF7A2A7921020F6C7BFF7A76 -:10277F002A793C120F6C9001127404F0E49001233B -:10278F00F02212357B50127F0412304EE4FF1236C6 -:0F279F00BDE4FF1236DF0234039001127402F022 -:0127AE002208 -:10344700302936C22990010FE0FF04F0EF14601213 -:103457001460141460161460182404701C1238B811 -:1034670080171239968012123489800D12377F80A7 -:103477000812260FE490010FF0302B05C22B122003 -:02348700212200 -:10008E00426F6F7374204F70656E2E286C696E65AB -:10009E003A2564290D0A00426F7820436C6F736510 -:1000AE002E286C696E653A2564290D0A00426F7818 -:1000BE00204F70656E2E286C696E653A2564290D89 -:1000CE000A004F70656E2F436C6F736520426F7818 -:1000DE002C45617270686F6E657320496E20426F99 -:1000EE0078284E756D3A25642928566F78537461B9 -:1000FE003A30782578292E0D0A004F70656E204211 -:10010E006F7820434D44205458204F7665722E0D43 -:10011E000A004F70656E20426F7820416E64204554 -:10012E00617270686F6E6520476574496E284E75F2 -:10013E006D3A25642928566F785374613A307825C4 -:10014E0078292E0D0A00436C6F736520426F78205C -:10015E00416E6420466F72636520566F6C746167E2 -:10016E00652055702E0D0A2000564F5820566F757B -:10017E007420355628564F585F5354413A307825DF -:10018E00782C6C696E653A2564292E0D0A00564F3F -:10019E0058204348472046756C6C2E0D0A00564F6A -:1001AE00582047657420496E746F20536C656570D6 -:1001BE002E0D0A00466F6C6C6F772043484720491E -:1001CE006E697453746120536574204D61782056A6 -:1001DE00706D69642E28566F785F7374613A30784B -:1001EE00257829286C696E653A2564290D0A004622 -:1001FE006F6C6C6F772043484720496E6974537457 -:10020E00612E28566F785F7374613A30782578299D -:10021E00286C696E653A2564290D0A00466F6C6C70 -:10022E006F772043484720537461312C4E6F204521 -:10023E00617250686F6E6520496E20426F782E286D -:10024E006C696E653A2564290D0A00466F6C6C6FF9 -:10025E00772043484720537461312C564F52204328 -:10026E006867696E672849766F723A25646D412911 -:10027E002E286C696E653A2564290D0A00466F6C4E -:10028E006C6F772043484720537461312C564F4C86 -:10029E0020436867696E672849766F6C3A25646DEE -:1002AE0041292E286C696E653A2564290D0A00468F -:1002BE006F6C6C6F772043484720537461322C4724 -:1002CE0065742049564F523A25646D412E286C694B -:1002DE006E653A2564290D0A00466F6C6C6F7720A7 -:1002EE0043484720537461322C4765742049564F5A -:1002FE004C3A25646D412E286C696E653A25642949 -:10030E000D0A00466F6C6C6F77204348472053747C -:10031E0061332C564F5820436867205265496E69E9 -:10032E00742E286C696E653A2564290D0A00466F95 -:10033E006C6C6F77204348472053746133284356C3 -:10034E00292C564F522056706D69642041646453B7 -:10035E0074612849766F723A25646D41292E286C96 -:10036E00696E653A2564290D0A00466F6C6C6F77CD -:10037E00204348472053746133284356292C564F47 -:10038E00522056706D69642053756253746128490A -:10039E00766F723A25646D41292E286C696E653A26 -:1003AE002564290D0A00466F6C6C6F772043484711 -:1003BE002053746133284343292C564F52205670D4 -:1003CE006D6964205375625374612849766F723A71 -:1003DE0025646D41292E286C696E653A2564290DB8 -:1003EE000A00466F6C6C6F77204348472053746148 -:1003FE0033284343292C564F522056706D69642082 -:10040E004164645374612849766F723A25646D4174 -:10041E00292E286C696E653A2564290D0A00466FEF -:10042E006C6C6F77204348472053746133284356D2 -:10043E00292C564F4C2056706D69642041646453CC -:10044E0074612849766F6C3A25646D41292E286CAB -:10045E00696E653A2564290D0A00466F6C6C6F77DC -:10046E00204348472053746133284356292C564F56 -:10047E004C2056706D69642053756253746128491F -:10048E00766F6C3A25646D41292E286C696E653A3B -:10049E002564290D0A00466F6C6C6F772043484720 -:1004AE002053746133284343292C564F4C205670E9 -:1004BE006D6964205375625374612849766F6C3A86 -:1004CE0025646D41292E286C696E653A2564290DC7 -:1004DE000A00466F6C6C6F77204348472053746157 -:1004EE0033284343292C564F4C2056706D69642097 -:1004FE004164645374612849766F6C3A25646D418A -:10050E00292E286C696E653A2564290D0A00466FFE -:10051E006C6C6F772043484720537461342C564FD0 -:10052E00782056706D696420416464537461285656 -:10053E006F75743A307825782C49766F6C3A25644D -:10054E006D412C49766F723A25646D4129286C698C -:10055E006E653A2564292E0D0A00466F6C6C6F7716 -:10056E002043484720537461342C564F78204368FB -:10057E00696E6728566F75743A307825782C4976EF -:10058E006F6C3A25646D412C49766F723A25646D15 -:10059E004129286C696E653A2564292E0D0A00469C -:1005AE006F6C6C6F772043484720537461342C5620 -:1005BE004F522056706D69642041646453746128F3 -:1005CE00566F75743A307825782C49766F723A25C5 -:1005DE00646D4129286C696E653A2564292E0D0AD1 -:1005EE0000466F6C6C6F772043484720537461341C -:1005FE002C564F52204368696E6728566F75743AB1 -:10060E00307825782C49766F723A25646D41292809 -:10061E006C696E653A2564292E0D0A00466F6C6C66 -:10062E006F772043484720537461342C564F4C202B -:10063E0056706D69642041646453746128566F75F9 -:10064E00743A307825782C49766F6C3A25646D4172 -:10065E0029286C696E653A2564292E0D0A00466FAD -:10066E006C6C6F772043484720537461342C564F7F -:10067E004C204368696E6728566F75743A3078253A -:10068E00782C49766F6C3A25646D4129286C696E19 -:10069E00653A2564292E0D0A00466F6C6C6F772023 -:1006AE00434847205375625374612C564F4C2F5656 -:1006BE004F52286C696E653A2564292E0D0A004644 -:1006CE006F6C6C6F7720434847205375625374618B -:1006DE002C564F52286C696E653A2564292E0D0AE8 -:1006EE0000466F6C6C6F77204348472053756253FA -:1006FE0074612C564F4C286C696E653A2564292E10 -:10070E000D0A00466F6C6C6F772043484720537577 -:10071E00625374612C285354413A307825782C5604 -:10072E00706D69643A3078257829286C696E653A5F -:10073E002564290D0A00466F6C6C6F77204348477D -:10074E00204164645374612C285354413A30782507 -:10075E00782C56706D69643A3078257829286C6942 -:10076E006E653A2564290D0A005258305F4275664F -:10077E006665725B305D3A307825782C5258305F62 -:10078E004275666665725B315D3A307825782C521B -:10079E0058305F4275666665725B325D3A30782519 -:1007AE00782C5258305F4275666665725B335D3ADF -:1007BE00307825782C5258305F4275666665725BCC -:1007CE00345D3A307825782C5258305F4275666623 -:1007DE0065725B355D3A307825782C5258305F4221 -:1007EE0075666665725B365D3A307825782C5258A0 -:1007FE00305F4275666665725B375D3A3078257894 -:10080E002C6C696E653A25640D0A0000000000002C -:10081E0000000000000000000000000000000000CA -:10082E0000000000000000000000000000000000BA -:10083E0000000000000000000000000000000000AA -:0B084E0000000000000000000000009F -:10233400C114C10EC110410059FFC10D42000D006E -:10234400004200090000420045000041002E00C187 -:102354001342005C000042005700004600470000A2 -:102364000000000048004F00000000000000004290 -:1023740000600000420005000042004D00004200E1 -:1023840064000042005A000042000B0000420007B3 -:10239400000042005E0000C111C11256002F00006F -:1023A4000000000000000000000000000000000029 -:0E23B4000000000041002D00C10F4100630039 -:1024300090003974011213E77402900062F090006A -:102440006602151390005612148AFFE5F090006C96 -:10245000F0EFA3F0A37404F0A322E6FFE4F0A3EFEF -:10246000F008E6FFA3E4F0A3EFF008E6FFA3E4F032 -:10247000A3EFF008E6A3FFE4F0A3EFF02290001A28 -:1024800012137590006CF0786AE6FF08E6A3CFF0AF -:10249000A3EFF0786EE6FF08E6A3CFF0A3EFF0A37A -:1024A0007405F0A3229000391213E790001A02136A -:1024B0007590004E12148A900056FFAEF002148AF6 -:1024C0007BFF90006C7405F0A3229000548FF00203 -:1024D00014C290004C12148AFFAEF0900054021403 -:1024E0008A7BFF90006C7402F0A32290012CE054D0 -:1024F0000CFBE4FAF9F8900000E0FFE4FCFDFEC3F9 -:102500000214EFEE8FF09000560214C290005212A7 -:10251000148AD3FFED9FEC95F02290003B021375D7 -:10252000740190006FF0E4A3F022900037E41213DE -:10253000E7E49000360213E790001AEF1213E790D9 -:1025400000622290003C0213757BFF90012CE0FF9B -:1025500090006CE4227BFF90006C7404F022E6FC97 -:1025600008E6FD25E0FFEC338FF01214C27BFF225A -:10257000EEC41313135401F008E62290012CE0542A -:102580000C22E490000DF0A322E475F00102145E29 -:10259000EE8FF01214C27D05121409EF7802227436 -:1025A0000190003A0213E7C3FDACF09FEC9E22E4D9 -:1025B000FCFDFEFAF9F8C30214EF786EE6FE08E6B9 -:1025C000FF2290012CE05410FFE4FCFDEF22740187 -:1025D0001213E77BFF2208E6FE5401F0EEC313540A -:1025E000012290002BF0A3F0900062F02274722B75 -:1025F000F582E43400F5832290012CE05420FFE4BE -:0F260000FC2290000DE094002290003702137529 -:05304E009000ACEFF062 -:10305300E4A3F0A3F07F271235079000ADEFF07FD4 -:10306300371235079000AEEFF09000ACE024FD601E -:103073001B14602424FE6028240570359000AEE004 -:103083004494F09000ADE04498F080259000ADE0CA -:103093004406F054E7F080199000AEE054FD800937 -:1030A3009000AEE04402F054FEF09000ADE054E135 -:1030B300F09000ADE0FD7F271236079000AEE0FDF3 -:0530C3007F3702360713 -:10158F0090012AE054186003D20D22C20D204103AE -:10159F0002186130466F20101A12188A7BFF7A00EA -:1015AF00798E90006C7401F0A374D8F0120F6C7FD9 -:1015BF00038065E4900003F0900001F0A3F0C200F7 -:1015CF00C201D20B900134E07022C20ED202D203BC -:1015DF00C205C208C204C209C20AD214C2391225F6 -:1015EF00E27A0079A51224E174098011C202C203C4 -:1015FF00D205C2067A0079BB1224E17416F0120FDD -:10160F006CC210C246900001E0C39405500302174C -:10161F00EE300B07C20B7F0402304E200041D20088 -:10162F0012257BFF60147B0C1225AF90002E7005E6 -:10163F007402F0800A7401F08005E490002EF07BB4 -:10164F00FF7A0079D090002EE090006C12247690F3 -:10165F00012CE0FF90006EE4F0A3EFF0120F6C206E -:10166F00050302170F900002E0C39405500A7F068E -:10167F0012304E9000028027200144900003E0FFBB -:10168F00D39414501FEF540370047D2480099000ED -:10169F0003E020E0077D257F0D121DEC900003E095 -:1016AF0004F0805C7F0412304EE4900003F0D2010E -:1016BF00D213C2147BFF7A017908120F6C80417824 -:1016CF0017E6703C301304C213802E1224EB6030E7 -:1016DF0090012CE0FF540C6004D20ED23A7BFF7ABB -:1016EF0001792090002EE0FD90006CE4F0A3EDF066 -:1016FF00A3E4F0A3EFF0120F6C12257B900000F023 -:10170F0020020302185E30393B20101612188AD2BD -:10171F0014E41225E2900001F0C208D20BC200D2ED -:10172F0004227F0312304E7BFF7A017954120F6C23 -:10173F00C210D203900001E0D3940350030217EEBE -:10174F00C239805020044D900002E0FFD394145012 -:10175F001DEF540370047D248009900002E020E007 -:10176F00077D257F0D121DEC9000020217EE9000F1 -:10177F0003E0FFD39414501CEF540370047D2480B6 -:10178F0009900003E020E0077D257F37121DEC90C4 -:10179F000003804B3003207F0312304E7A0179779C -:1017AF00122549F0A3EFF0A37403F0A37456F012BF -:1017BF000F6CC20302185E20085790012CE05430C2 -:1017CF00FF7B301225AF600E12257BFFE4FCFDFE80 -:1017DF00EF6003303B2A900001E0D394285004E0DF -:1017EF0004F0227BFF7A01799C120F6CD208E490EF -:1017FF000004F0900001F0C2097F0412304E804FB8 -:10180F0090002CE070497B017A00790F1208598003 -:10181F003E900004E0FFD39414501FEF5403700464 -:10182F007D248009900004E020E0077D257F0512CC -:10183F001DEC900004E004F08015200912D2097FFE -:10184F000412304EC2147BFF7A0179AC120F6CC2B6 -:10185F000722200711D2077F0412304EC21412251F -:10186F007B900000F0221224EB600F12257BFF60AB -:0A187F0004D20ED23A900000EFF000 -:0E188900227F3C12383F7F011236BDD2102262 -:0608590090006612153349 -:10085F00900062E01470030209361470030209FF5E -:10086F00147003020A6C147003020C232404600337 -:10087F00020D5812243E90001D1213756003020DD5 -:10088F0058900063E0D3940A5035E004F090001ABA -:10089F00743C1213E7300C03020D5812243E12243D -:1008AF00ABFF12383F7BFF7A0179C290012CE0FF3A -:1008BF00E412244D7401F0120F6CD20C020D58E4A7 -:1008CF00900063F0C20C12243EE41225A19000396F -:1008DF00E41213E712252A900035E41213E7900073 -:1008EF0034E41213E790003CE41213E790003BE46A -:1008FF001213E7E4F5F0122506900054E4F5F01218 -:10090F0014C2900019E41213E790001B743C1225D7 -:10091F003C7401F0122582F07A0179FD12254912FB -:10092F0024507428020ABC90012CE0FB5420FFE4F1 -:10093F00FCFDFEEF6023EB5410FF601D12243E9070 -:10094F00001D74011213E7E4900062F07A02792A15 -:10095F00122555A37437020ABC1225F8EF703B120B -:10096F0025BA12243E90004A122590C333CE33CEBF -:10097F00D8F9FF12243E90004EEE8FF01214C27879 -:10098F006E90005212255E7A02795990006CECF04D -:10099F00ED1224527445F0120F6C1225C27040787C -:1009AF006AE6FE08E6FF12243E900048122590C327 -:1009BF0033CE33CED8F9FF12243E90004CEE8FF099 -:1009CF001214C2786A90005012255E7A02798B90C9 -:1009DF00006CECF0A3ED1224537452F0120F6C1252 -:1009EF00243E90001C740112253C7402F0020D5835 -:1009FF00D390000EE094051226025003020A7812DB -:100A0F002582F01225F8FDEF70201225BA12243E30 -:100A1F0012250390003C1225CE7A0279BD90006C0E -:100A2F00EE122450746EF0120F6C1225C2702578DE -:100A3F006AE6FE08E6FF12243EEE1224CA90003B3F -:100A4F001225CE7A0279E790006CEE12245074785A -:100A5F00F0120F6C9000627403F0020D58D39000E7 -:100A6F000EE094021226025006122589020D58122A -:100A7F00258212243D9000521224B4D39FE5F09E9C -:100A8F00501612243E90005012148A9000541224D3 -:100A9F00BAD39FE5F09E4019E412243A90001CE46B -:100AAF001213E77A037911122555A37492F0020DF0 -:100ABF005512243E12254364016003020B6D900012 -:100ACF005612148AD39414E5F09400504D90012CD3 -:100ADF00E030E52990003A74011224A8C3943C40F9 -:100AEF000A12243E90003CE41213E712243E122413 -:100AFF004474A4F07BFF7A03793C020B6A12243E04 -:100B0F0090003774011213E712243E12244474AB81 -:100B1F00F07BFF7A037978020B6A12243E1224B11C -:100B2F00D39FE5F09E900066401C1215139000377E -:100B3F0074011213E712243E12244474B5F07BFFA4 -:100B4F007A0379B4801512151312259F12243E12C1 -:100B5F00244474BCF07BFF7A0379F0120F6C1224DB -:100B6F003E12251A64016003020D581224DBD39440 -:100B7F0014E5F09400504D90012CE030E4297401FD -:100B8F001224A5C3943C400A12243E90003BE41269 -:100B9F0013E712243E90005412244774CFF07BFFCA -:100BAF007A04792C020D5512243E7401122532124B -:100BBF00243E90005412244774D6F07BFF7A0479B8 -:100BCF0068020D5512243E1224D2D39FE5F09E9059 -:100BDF000066402012151390003674011213E712AD -:100BEF00243E90005412244774E0F07BFF7A04797E -:100BFF00A4020D5512151390003974011213E71248 -:100C0F00243E90005412244774E7F07BFF7A047956 -:100C1F00E0020D55D390000EE094141226025019E5 -:100C2F001225891225BA12243E122503786AE6FF8F -:100C3F0008E6CF1224CA020D5812258212243D1243 -:100C4F0025436401705712251A640170501224B1A4 -:100C5F001225A7400812243E12250C402E12243EC6 -:100C6F001224D21225A7400B12243E9000501225B9 -:100C7F000F401812243E12259F12243012247D7427 -:100C8F000EF07BFF7A05791C020D5512243E1224BB -:100C9F007D7415F07BFF7A057968020D5512243E9D -:100CAF00122543640170451224B11225A740081282 -:100CBF00243E12250C401D12243E90003A1224337C -:100CCF001224AB90006C1224927428F07BFF7A05EB -:100CDF0079AD801512243E1224AB90006C12249231 -:100CEF00742EF07BFF7A0579EF120F6C12243E12EF -:100CFF00251A640170539000501224D5D31225A8E1 -:100D0F00500F12243E90004C12148AC31225135018 -:100D1F001D12243E1224301224AB90006CF0786A1E -:100D2F00122495743CF07BFF7A06792A80181224DE -:100D3F003E1224AB90006CF0786A1224957442F046 -:100D4F007BFF7A06796C120F6C12243E122543FF3B -:100D5F006401600A12251A64016003020EEB122669 -:100D6F0009FE6401600D9000361213756401600373 -:100D7F00020E70EF6401702512251AB4011FEEB434 -:100D8F00011B122609B4011590001474011213E708 -:100D9F007A0679A71224C0745AF0120F6C12243EEF -:100DAF001225436401701E12251A70191226096448 -:100DBF0001703C900014041213E77A0679CD1224C7 -:100DCF00C07464802612243E122543702212251A05 -:100DDF00B4011C900036121375B401139000141255 -:100DEF0025CE7A0679EF1224C2746FF0120F6C12AF -:100DFF00243E12252A900014121375640160030219 -:100E0F000F0012243E1224ABD39400400890001A16 -:100E1F0074FE1213A2900019121375FF1224ABD394 -:100E2F009F500B12243E1225387404F08006900058 -:100E3F00627402F012258212243D900014E41225F0 -:100E4F003C12254EF0A3EF12243D1224ABFF90006D -:100E5F006EE412249B748EF07BFF7A077911020ED9 -:100E6F00DE12243E90003A1213756401600A90005E -:100E7F00391213756401707990003AE41213E7E4A4 -:100E8F001224A5C3943C500B12243E90001A7402F6 -:100E9F001213A2740412243A90001B121375FF123E -:100EAF0024ABC39F400912243E1225387401F090E1 -:100EBF00006212254EF0A3EF12243D1224ABFF90D7 -:100ECF00006EE412249B74ABF07BFF7A0779441217 -:100EDF000F6C12243E1224ABFF02383F900062E0E9 -:100EEF00D39402400CE412243D90001D74011213A0 -:010EFF00E70B -:010F000022CE -:0E2D69009000AC1215339000AFECF0A3EDF02B -:102D770074FFA3F0A3F0A37410F0A37421F0E4A3ED -:102D8700F09000AF74FFF5F012147445F0606C908A -:102D970000ACE475F00112151C12135C9000B5F03D -:102DA700E0FE9000B1E06EF0A3E0F0E49000B6F032 -:102DB700A3F0C39000B7E094089000B6E0940050E9 -:102DC700C09000B1E0FEA3E0FFEE30E719EF25E089 -:102DD700FFEE33FEA3E06EFEA3E06FFF9000B1EEBF -:102DE700F0A3EFF0800D9000B2E025E0F09000B185 -:102DF700E033F09000B612258980B79000B1E0FE6D -:032E0700A3E0FF46 -:012E0A0022A5 -:081DEC00900066EFF0A3EDF09A -:101DF400E4A3F0A3F0786A7C007D017BFF7A087984 -:101E040019FE7F40121336E49000AAF0A3F090006C -:101E14006A74AAF0900067E0FE90006BF090006690 -:101E2400E090006CF0A3E4F0900134E090006EF0D8 -:101E3400900066E012153C1EB3051E6E0A1EBE0B12 -:101E44001EC80D1F120E1F640F1EBE112020121E6D -:101E54005A3700001F6AE490006FF0A3F07B0690ED -:101E64000047E4F0A3DBFC021F6A740E122522FB78 -:101E740074472BF582E43400F583E0FD74712BF58F -:101E840082E43400F583EDF00BEBB406E3E4FB7479 -:101E94004F2BF582E43400F583E0FD74772BF58253 -:101EA400E43400F583EDF00BEBB408E3021F6A128F -:101EB4002520A20F33A3F0021F6AE490006FF0A361 -:101EC400F0021F6A90006F7405F0E4A3F0A374108D -:101ED400F0F0A37401F0780EE65402C4333354C016 -:101EE400FD7814E675F005A44DA3F0EEB424059036 -:101EF4000060800A900067E0B42508900061E090DB -:101F04000074F090007474FFF0E4A3F08058900023 -:101F14006F740AF0E4A3F090002DE0900071F0E4F7 -:101F2400FBEBFF90002DE0FD2FFFE433FED3EF9495 -:101F340016EE6480948040081225ED74FFF0801240 -:101F4400ED2B242FF582E43400F583E0FF1225ED18 -:101F5400EFF00BEBB409CA90002DE02409F08006E1 -:101F6400122520A304F0900070E0FE90006FE0FDC5 -:101F7400ED2407FFE43EFE900068F0FCA3EFF0FDC3 -:101F84007B017A00796A122D699000AAEEF0A3EF22 -:101F9400F09000AAE0FEA3E0FD900068E0FAA3E060 -:101FA400246AF58274003AF583EDF0EEFF90006840 -:101FB400122589FC746A25F0F58274003CF583EFE0 -:101FC400F07F0112304E900067E0FFB4250B75FEE0 -:101FD4000E53FFF043FF08800DEFB4240975FE0E85 -:101FE40053FFF043FF01900069E02402FF90006872 -:101FF400E03400FE7B017A00796A1233BE900067F8 -:10200400E0FFB4250A75FE0353FFF343FF0822EFF4 -:0C201400B4240975FE0353FFF343FF04DE -:01202000229D -:102C6B00782BE6C4540FFD54036003022D68EF125A -:102C7B00153C2CC60A2CD80B2CE80D2D350E2D47E8 -:102C8B000F2D59112C963700002D68E4FE782FE696 -:102C9B00FFEEC39F501574312EF8E6FF74472EF5E7 -:102CAB0082E43400F583EFF00E80E2EDB40406907D -:102CBB000045022D65900046022D65ED7831B40478 -:102CCB0006E6900057F022E6900058F022EDB4048F -:102CDB000690005E022D6590005F022D65ED640489 -:102CEB0078337023E6FE547F900060F0900005125D -:102CFB00257090005CF090004D1225D6900064F08A -:102D0B0008E690005AF022E6FE547F900061F090A6 -:102D1B00000612257090005DF090004E1225D690A3 -:102D2B000065F008E690005BF022ED7831B4040604 -:102D3B00E690000BF022E690000CF022ED7831B417 -:102D4B000406E6900007F022E6900008F022EDB4AE -:0D2D5B00040590000780039000087401F04B -:012D68002248 -:1030C800E4FDFC900066F0A3F0A3F0304568C2452B -:1030D8007BFF7A077977782A90006C12245A08A324 -:1030E80012245AA37408F0A374DAF0120F6C783023 -:1030F800E6FEE42407FFE43EFE18E6FDEF4DFF90F0 -:103108000067EEF0FCA3EFF0FD7B007A00792A124D -:103118002D69AC06AD07900067A3E0FB242CF8E608 -:10312800FE742B2BF8E6FBEBB5050BEEB504077820 -:063138002CE6FF122C6BD7 -:01313E00226E -:1023C200011400C13BC13FC13DC13CC13E01136983 -:1023D200602A00E40BB80BEA0C1C0C800CB20CE473 -:1023E2000D160D480D7A0DAC0E100E420E740EA68F -:0E23F2000ED80F0A0F3C0F870FD2101D106877 -:102FD100E4FFEF25E024E4F582E43400F583E0FC2E -:102FE100A3E0D3787D96EC189650050FEFB415E267 -:102FF1007814E6FEEFD39E4004180680037813167A -:1030010090012BE030E3047814A6077813E6FED391 -:1030110094C85006EEC3940A50077814A607187690 -:10302100697814E6FFD394005002D23FEFD39401A4 -:103031005002D23BEFD394055002D23DEFD3940A14 -:0C3041005002D23CEFD3940F5002D23E5C -:01304D002260 -:102400004101190041011C00410118004201160060 -:102410000041011A00C128C129C12BC127C126C111 -:092420002A41011B00C12CC12D51 -:1031B20090011BE06062E4F0D228900119E004F073 -:1031C200E0C394054004E4F0D22990011CE004F02D -:1031D200E0C3940A4004E4F0D22B900116E475F0A7 -:1031E2000112145EC3900117E09464900116E094FA -:1031F200004006E4F0A3F0D226900118E004F0E0CB -:10320200C394FA4013E4F0D22790011AE004F0E0EC -:0932120094044004E4F0D22A22E5 -:03000B0002363387 -:10363300C0E0C083C082C0D074FC258CF58C746656 -:10364300258AF58A90011B7401F0D0D0D082D083F3 -:03365300D0E03292 -:0E394400758901758CFC758A66D2A9D28C2219 -:0D39600075FE0FEF25E0FE7403A806082297 -:1038A1001239608002C333D8FCF452FFEFB404062E -:0738B10075FE0FE4F5FF2294 -:1038CE0075FE11EF5407F5FF75FE12AF058FFF75EC -:0638DE00FE1075FF01223F -:103378001239608002C333D8FCF452FF7401A806E6 -:10338800088002C333D8FC42FF75FE0B7401A807FE -:10339800088002C333D8FC42FFEF70038DCE22EFC2 -:1033A800B401038DCF22EFB402038DDE22EFB40304 -:0633B80004AF058FDF22C7 -:033FFD00010102BD -:0624290001150001160080 -:1035DA00D28075FE0443FF0175FE0343FF0175FEA9 -:1035EA000243FF01D28175FE0443FF0275FE0343C5 -:0D35FA00FF0275FE0243FF027815760122E4 -:0C38F600C280123902D281123902D28045 -:05390200E4FF0FDFFEF1 -:01390700229D -:1037F000D281D2801239022081037F0022C281123D -:0B38000039023081037F00227F01228B -:0F392700C280C2811238FDD281123902023902E8 -:0839A7001238F6C28002390259 -:0B3978001238F6123902C28002390238 -:02367900AE079A -:10367B007D08AF051DEF6015C280EE30E704D281E7 -:0F368B008002C281EE25E0FE1238FD80E5C2808C -:01369A00220D -:103656007E08E4FDD281AF061EEF6012ED25E0FD87 -:10366600C2801238FD3081EEED4401FD80E8C28053 -:02367600AF059E -:01367800222F -:0E3952007D087F351236077D0A7F760239AF79 -:10321B009000661215337F10123263EF1213D57FB5 -:10322B0011123263900001EF1213E77F1212326D0D -:10323B00900002EF1213E77F1312326D900003EF31 -:10324B001213E77F141235079000661215139000C6 -:10325B0004EF1213E77F0022123507900066121558 -:0C326B0013221235079000661215132282 -:05369B00900066EFF055 -:1036A000E47F20123507900066E06006EF4401FFDA -:0D36B0008004EF54FEFFAD077F20023607B7 -:0536BD00900067EFF032 -:1036C200E47F27123507900067E06006EF4401FFB0 -:0D36D2008004EF54FEFFAD077F270236078E -:05383F00900069EFF0AC -:10384400E47F25123507EF54C0FF900069E04FFD77 -:053854007F250236078C -:0536DF00900067EFF010 -:1036E400E47F20123507900067E06006EF54FBFF8B -:0D36F4008004EF4404FFAD077F200236077D -:0739AF008FFEAF058FFF2220 -:0639B6008FFEAEFFAF061C -:0139BC0022E8 -:103607009000AFEFF0A3EDF01237F07F0C12367990 -:103617001239789000AFE0FF1236791239789000AE -:0C362700B0E0FF12367912397802392722 -:053507009000AFEFF0A1 -:10350C00E4A3F01237F07F0C123679123978900060 -:10351C00AFE0FF1236791239781237F07F0D123680 -:10352C00791239781236569000B0EFF01239A71292 -:07353C0039279000B0E0FF09 -:013543002265 -:102E2800023872E493A3F8E493A34003F68001F216 -:102E380008DFF48029E493A3F85407240CC8C333AB -:102E4800C4540F4420C8834004F456800146F6DF7A -:102E5800E4800B0102040810204080902238E47EB0 -:102E6800019360BCA3FF543F30E509541FFEE4936F -:102E7800A360010ECF54C025E060A840B8E493A336 -:102E8800FAE493A3F8E493A3C8C582C8CAC583CA61 -:102E9800F0A3C8C582C8CAC583CADFE9DEE780BE19 -:01242F0000AC -:10126600E709F608DFFA8046E709F208DFFA803E6A -:1012760088828C83E709F0A3DFFA8032E309F60857 -:10128600DFFA8078E309F208DFFA807088828C83BF -:10129600E309F0A3DFFA806489828A83E0A3F60873 -:1012A600DFFA805889828A83E0A3F208DFFA804C4D -:1012B60080D280FA80C680D4806980F28033801024 -:1012C60080A680EA809A80A880DA80E280CA80338D -:1012D60089828A83ECFAE493A3C8C582C8CCC58305 -:1012E600CCF0A3C8C582C8CCC583CCDFE9DEE780D5 -:1012F6000D89828A83E493A3F608DFF9ECFAA9F054 -:10130600EDFB2289828A83ECFAE0A3C8C582C8CCA9 -:10131600C583CCF0A3C8C582C8CCC583CCDFEADEC2 -:10132600E880DB89828A83E493A3F208DFF980CC24 -:1013360088F0EF60010E4E60C388F0ED2402B4041D -:101346000050B9F582EB2402B4040050AF232345C4 -:0613560082239012B67321 -:10135C00BB010689828A83E0225002E722BBFE028F -:09136C00E32289828A83E49322C2 -:10137500BB010CE58229F582E5833AF583E022502D -:1013850006E92582F8E622BBFE06E92582F8E22277 -:0D139500E58229F582E5833AF583E4932291 -:1013A200BB010FF8E58229F582E5833AF583E0284F -:1013B200F0225009C58229F8E58226F622BBFE09F1 -:1013C200C58229F8E22582F222F8EA2583F583E92B -:0313D2009328223B -:1013D500BB010689828A83F0225002F722BBFE01F7 -:0213E500F322F1 -:1013E700F8BB010DE58229F582E5833AF583E8F03C -:1013F700225006E92582C8F622BBFE05E92582C8E8 -:02140700F222CF -:10140900BC000BBE0029EF8DF084FFADF022E4CCC7 -:10141900F875F008EF2FFFEE33FEEC33FCEE9DEC90 -:10142900984005FCEE9DFE0FD5F0E9E4CEFD22EDD6 -:10143900F8F5F0EE8420D21CFEADF075F008EF2F20 -:10144900FFED33FD4007985006D5F0F222C398FD11 -:051459000FD5F0EA22AE -:10145E00C5F0F8A3E028F0C5F0F8E5821582700219 -:06146E001583E038F022B6 -:10147400A3F8E0C5F025F0F0E5821582700215832B -:06148400E0C838F0E82288 -:10148A00BB0110E58229F582E5833AF583E0F5F0A0 -:10149A00A3E0225009E92582F886F008E622BBFE7D -:1014AA000AE92582F8E2F5F008E222E5832AF583C3 -:0814BA00E993F5F0A3E9932288 -:1014C200F8BB0111E58229F582E5833AF583E8F05C -:1014D200E5F0A3F0225009E92582C8F608A6F02219 -:0D14E200BBFE09E92582C8F2E5F008F22200 -:1014EF00EB9FF5F0EA9E42F0E99D42F0E89C45F053 -:0114FF0022CA -:10150000E8600FECC313FCED13FDEE13FEEF13FFC9 -:03151000D8F122ED -:09151300E0FBA3E0FAA3E0F922D9 -:10151C00F8E0FBA3A3E0F925F0F0E5821582700258 -:07152C001583E0FA38F022FC -:09153300EBF0A3EAF0A3E9F022B9 -:10153C00D083D082F8E4937012740193700DA3A33E -:10154C0093F8740193F5828883E473740293686052 -:06155C00EFA3A3A380DF52 -:10156200EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D16 -:10157200FDE43CFCE8A42EC8C5F03DFDE43CFCEFD4 -:0D158200A4FFE5F028FEE43DFDE43CFC2262 -:100F0100E508246CF582E43400F583E005082290BD -:100F11000069301C0390006CE475F00112151C028D -:100F2100135C2015E97F2ED2158018EF540F249001 -:100F3100D43440D4FF30190BEF24BFB41A0050034E -:100F41002461FFE50960021509050CE50C70020535 -:100F51000B301C0E900069E475F00112151CEF02B4 -:100F610013D50239367403D21C8003E4C21CF50880 -:100F7100900069121533E4F509F50BF50CE50960EC -:100F8100077F20120F4480F5750AFFC216C215C2F1 -:100F910017C218C21AC21BC21D120F10FF700D30EA -:100FA1001C057F00120F55AF0CAE0B22B4255FC29A -:100FB100D5C219120F10FF24D0B40A00501A75F0CF -:100FC1000A780930D50508B6FF0106C6A426F62021 -:100FD100D5047002D21880D924CFB41A00EF50047E -:100FE100C2E5D219021156D21680C6D21580C0D2DE -:100FF1001780BCD2D580BAD21A80B47F20120F4498 -:101001002017077401B5090040F1120F01FF120FFB -:1010110044020F7ED21DD21B8095120F01FB120FCD -:1010210001FA120F01F94A4B700679277A127BFFF8 -:1010310020172EE509602A7E008E82758300121327 -:101041007560060EEE650A70F0C2D5EBC0E0EAC02D -:10105100E0E9C0E0EE12119DD0E0F9D0E0FAD0E075 -:10106100FB12135CFF60AAEBC0E0EAC0E0E9C0E05C -:10107100120F44D0E02401F9D0E03400FAD0E0FBB3 -:10108100E50A0460DCD50AD980877BFF7A1179995A -:10109100D217809C791080027908C21BC21D80087A -:1010A100D2D5790A8004790AC2D5E50A047002F51D -:1010B1000AE4FAFDFEFF120F01FC7B082016131251 -:1010C1000F01FD7B1030150A120F01FE120F01FFF7 -:1010D1007B20EC3382D592D55013C3E43015069FA3 -:1010E100FFE49EFEE42016039DFDE49CFCE4CBF8A6 -:1010F100C216EC700CCFCECDCCE824F8F870F3809A -:1011010017C3EF33FFEE33FEED33FDEC33FCEB336E -:10111100FB994002FB0FD8E9EB301605F8D0E0C48B -:1011210048B216C0E00AEC4D4E4F78207B0070C2E9 -:10113100EAB50A0040BCC0E012119FD0F0D0E02017 -:101141001604C4C0E0C4B216C0F0120F2DD0F0D501 -:10115100F0EB020F7E12153C101B531095580FEC4B -:101161004C0FE84210994F10A14410A149100143BE -:0811710010A755108B46108BEE -:1011790045108B471247500FF02D0FF42E10172BE7 -:101189000FF82310152012302A0FB0480000100F55 -:101199003F3F3F00790AA2D5201814301A09B91027 -:1011A900020404B9080104A2D5201B02500104203D -:1011B90017689217B509005034C0E07F203018191C -:1011C9007F30A217721B721A500F1211F6C217C282 -:1011D9001BC21AC21D7F30800F301A03E9C0E0120A -:1011E9000F44301A03D0E0F9D0E0B509CC301A1712 -:1011F9007F30B9100C120F447F583019077F78805F -:1012090003B90803120F443017057F2D020F447FDD -:1012190020201DF87F2B201BF322921780CF286EE8 -:10122900756C6C2900D216120F013016F8C21678A7 -:101239000930D50108F6020FB02D50434958120F55 -:10124900012403B405004001E490124293120F35C2 -:0D125900743A120F35D21875090402109571 -:00000001FF diff --git a/Out/8835_EVB_250109_1723_C981_010102.bin b/Out/8835_EVB_250109_1723_C981_010102.bin deleted file mode 100644 index 3c60b62..0000000 Binary files a/Out/8835_EVB_250109_1723_C981_010102.bin and /dev/null differ diff --git a/Out/8835_EVB_250121_1743.bin b/Out/8835_EVB_250121_1743.bin new file mode 100644 index 0000000..08c6e63 Binary files /dev/null and b/Out/8835_EVB_250121_1743.bin differ diff --git a/Out/8835_EVB_250121_1743.hex b/Out/8835_EVB_250121_1743.hex new file mode 100644 index 0000000..0ccbd6a --- /dev/null +++ b/Out/8835_EVB_250121_1743.hex @@ -0,0 +1,921 @@ +:03000000022924AE +:1029240075FE7275FF00758E009000007F007E03B7 +:0D293400E4F0A3DFFCDEFA75815C02297C73 +:1033090053797374656D20496E69742E5665723AE6 +:0C3319002532782532782532780D0A0024 +:10308400122F407BFF7A33790990009FE4F0A30468 +:10309400F0A3E4F0A304F0A3E4F0A37402F0120F8D +:0D30A40058D2AED2BE122C4D122EBF80F4B9 +:10000E007857E6FE08E6780222F608EFF6C3EE64AD +:04001E008094802228 +:1032EC0075FE3175FF8175FE0E43FF107DAC7F308E +:0D32FC001234E475FE5990010CE5FFF0223C +:10281500900099EFF0E5A420E00302291875A401C2 +:102825007F351234EB7857760008A6077F361234C9 +:10283500EBEF5403785746F608E6F6900099E04426 +:1028450008FD7F3112310A90010CE0FF3395E0FE5F +:10285500C37858E69FFF18E69EFE3395E0FDFCE43D +:102865007BC47A09F9F81214C5780A121525785728 +:10287500EE1200175005E418F608F690010EE01266 +:10288500156228A30028B20128BB0228CE0328DC44 +:102895000428EA0528F80629070700002918120068 +:1028A5000ECEA2E713CE13D8F8794A80627858E69F +:1028B50025E0795C80447857E6FE08E67803C33363 +:1028C500CE33CED8F97950804612000EC333CE33BD +:1028D500CED8F9795A803812000EC333CE33CED80C +:1028E500F97954802A12000EC333CE33CED8F97944 +:1028F50052801C7858E625E0794CF718E63319F72D +:10290500801112000ECEA2E713CE13D8F8794EF738 +:0F291500EE19F7900099E090010EF075A3812262 +:102DA800E5A430E14075A4027F371234EB785576FC +:102DB8000008A6077F381234EBEF5403785546FE17 +:102DC80008E6FF18EEF608EFF6FF90010CE0FD3379 +:102DD80095E0FCC3EF9DFFEE9CFE1812001750050E +:092DE800E418F608F675A3822236 +:10343000780D7603E4780FF67811F6187603781293 +:03344000760422ED +:10233700E4FE7855E6FC08E6FDC394E8EC94034018 +:10234700037F0022EF700302244FD3ED940FEC9428 +:1023570003400302242DED94CBEC94005003022498 +:102367002DD3ED94AAEC94024022D21F780DE6FFFC +:10237700137810F6302011D3ED94BFEC940240048B +:10238700C22080047810A607E4FE8070D3ED94AADB +:10239700EC94025043ED9437EC9401403BD2207803 +:1023A7000DE6FF7810F6301F13D3ED9493EC9402EB +:1023B7005004C21F8006EFC3137810F67812760414 +:1023C700301A11D3ED9451EC94015004C21A8004D1 +:1023D70078127601E4FE8024D3ED9437EC94015013 +:1023E7001BD21A78127601302010ED9426EC940156 +:1023F7005004C220800478127604E4FE301D11C315 +:10240700ED94F3EC94025006C21DE4FE80027E01B7 +:10241700301E2FD3ED94DDEC94004006C21EE4FE7F +:1024270080207E01801CD3ED940FEC94034006D2EC +:102437001D7E01800DD3ED94CBEC94005004D21E89 +:102447007E01C21BC21C8058C21DC21ED3ED949FC1 +:10245700EC94035031ED9471EC94004029301B103B +:10246700ED9484EC94035006C21BE4FE80027E01C7 +:10247700301C2DD3ED9482EC94004006C21CE4FE80 +:10248700801E7E01801AD3ED949FEC94034004D202 +:102497001B800BC3ED9471EC94005002D21C7E019B +:0224A700AF067E +:0124A9002210 +:102A5600900109E05463600AE4FF1231EDE4780E58 +:102A6600F6227F01122337EF600CE4FF1231EDD21C +:102A760021780E760122C22190010AE05407FFBF99 +:102A86000605780E7603227810E6FD7F2212310ABB +:102A96007812E6FD7F2112310A780FE6C454F078E9 +:102AA6001146FD7F2312310A7F011231ED7814E6BB +:102AB600FFD394014002C23CEFD394034002C238D4 +:102AC600EFD394074002C23AEFD3940C4002C239C6 +:0D2AD600EFD394114002C23B780E7602222D +:102CB600C23E900109E020E65130E203D23F2230C5 +:102CC6003C04E4FF8011900109E030E50D30233A21 +:102CD6007F3C12338F7F0102320FE4FF122337EF5E +:102CE6006008E4FF12320FD23D22C23DD23E303F91 +:102CF60019780EE6B40213C3785CE6941018E694CD +:0B2D06000E4005D23EC23F22C23E221A +:1033A900426F78204F70656E2E0D0A00426F7820AB +:0933B900436C6F73652E0D0A00D0 +:102D5D00E4900099F090010AE0FF5420FE90009954 +:102D6D00F0900110E06E6032EF30E50E90010F74BF +:102D7D0001F07BFF7A3379A9800BE490010FF07B92 +:102D8D00FF7A3379B5120F58D245C20ED22ED230FA +:0A2D9D00900099E0900110F0D2437D +:012DA7002209 +:1026FB00737570706572206C6F6E67203873207005 +:10270B00726573732E286C696E653A2564290D0A00 +:10271B00004B6579206C696674286C696E653A2587 +:10272B0064292E0D0A00426F6F7374204F70656E13 +:10273B00204B65792E286C696E653A2564290D0A44 +:10274B00006C6F6E672032732070726573730D0AA5 +:10275B000073686F72742070726573730D0A004B8F +:10276B006579205061697220545820564F52286C5D +:10277B00696E653A2564292E0D0A004B6579205048 +:10278B006169722054696D654F7574286C696E654B +:10279B003A2564292E0D0A004B6579205061697228 +:1027AB002047657420564F52286C696E653A256434 +:1027BB00292E0D0A004B65792050616972204765FF +:1027CB007420564F4C286C696E653A2564292E0D82 +:1027DB000A004B6579205061697220545820564F7E +:1027EB004C286C696E653A2564292E0D0A004B65E1 +:1027FB0079205061697220436E743A25642E286CDF +:0A280B00696E653A2564290D0A0084 +:103443007BFF90009FE4F0A3227BFF90009F740119 +:03345300F0A322C1 +:101B570090010AE030E4449000F8E475F0011214B3 +:101B67004AC39000F9E094409000F8E094014011D6 +:101B7700D2367A2679FB1234437470F0120F5880EC +:101B870014C39000F9E094509000F8E094004005E9 +:101B9700203502D235D232C233804D303243D24360 +:101BA700E47817F6C232D2339000FAF09000F8E0EA +:101BB700FEA3E0FFD39414EE94005008D231D23440 +:101BC700D230800EC3EF94C8EE9400500530350232 +:101BD700D237C2357A27791C12344374A6F0120F14 +:101BE70058E49000F8F0A3F0303377303E74303784 +:101BF7002D200E08121D8874B9021D3F121DAE500C +:101C070003021D74C23778177602E49000F7F0904C +:101C17000068F0A3F07BFF7A27794C120F58303613 +:101C27002F200E08121D8874E2021D3F121DAE50B0 +:101C370003021D74C236E49000FBF0781776037B2D +:101C4700FF7A2679FB90009FF0A374F7F0120F58E4 +:101C570030340BC2347BFF7A27795C120F58C233BA +:101C6700C20E90010FE064016003021D877817E63A +:101C770064026003021D489000F7E0C39401501608 +:101C87007F02121DA17BFF7A27796A90009F04F0DB +:101C9700A37421021D129000F6E0D394054010E4CE +:101CA700121DBB7A27798612344C7437021D3F9078 +:101CB7000068E0B4011D7D227F031225DA900068D9 +:101CC7007402F07BFF7A2779A390009F14F0A37426 +:101CD7004D8038900068E064027034A3E0601A7F9A +:101CE70003121DA19000F7F09000F6121DBB7A2792 +:101CF70079C012344C746E803F7D227F021225DA40 +:101D07007BFF7A2779DD12344E747EF0120F5890DC +:101D170000F7E0D3941440249000F6E004F0E4A325 +:101D2700F07BFF7A2779F99000F6E0FF123445EF50 +:101D3700F0A37401F0A3748CF0020F589000F780A1 +:101D47002C7817E6640370389000FBE0FFC39464B7 +:101D5700501FEF540770047D22800A9000FBE05467 +:101D67000370077D117F041225DA9000FBE004F071 +:101D770022E47817F6D20F9000FBF07F04122B6055 +:101D8700227F3C12338F7F0112320FD20E7BFF7AF4 +:101D970027793190009FE4F0A3227D111225DAE420 +:101DA700900068F0A3F0227F03122B609000FAE006 +:101DB700D3941422F07817F6D20F7F04122B6022E7 +:102BDA00900099E0FF25E02479F582E43400F5833A +:102BEA0022900099E0FF25E02481F582E43400F583 +:102BFA0083E0FCA3E0FDEF25E02491F582E43400B4 +:102C0A00F5832274712FF582E43400F58322E4F00F +:102C1A00A3F0EF25E02489F582E43400F5832290BD +:102C2A000099E0FF2475F582E43400F58322E0FE82 +:102C3A00A3E0C39DEE9C2225E02481F582E43400C2 +:032C4A00F58322ED +:1030DE0075FE0B75FF0F75FE1375FF0F75FE0C75E4 +:1030EE00FF55E490006FF090006EF0900070F0903D +:0C30FE00006DF0C290C291C293C29222F9 +:10335B00EF14600D14600D14600D2403700BD290EC +:0A336B0022D29122D29222D29322A4 +:05325300900099E0FF6E +:10325800EF14600D14600D14600D2403700BC29000 +:0A32680022C29122C29222C29322D8 +:10302700E4FF122C0DE4F074752F122C30E4F0EF4E +:10303700122BDFE4F0A3F0EF122C41122C18E4F06E +:0E304700A3F0122C00E4F0A3F00FEFB404D4B9 +:013055002258 +:102F0100AC0774712C122C10EDF0EAC313FEEB1315 +:102F1100FFEC122BDFEEF0A3EFF0AF03EC122C412C +:102F2100EAF0A3EFF090009EE0FEA3E0FFEC122C8C +:0F2F31001DEEF0A3EFF0EC122C01E4F0A3F02260 +:10327200122C0DEDF074752F122C30EBF0EF122B97 +:0F328200DFE4F0A37469F0122C00E4F0A3F02253 +:101DC700E4900099F0F0900099E0FFC39404400379 +:101DD700021FBC122C0DE0601F24FE6021146078E6 +:101DE700147003021E9024036003021F6B90009976 +:101DF700E0FF12335B021F6B123253021F6B122B71 +:101E0700DA122BFB122C38500512335B8003123287 +:101E170053122BEB122C385003021F6B900099E0E2 +:101E2700122C01122C18E0FEA3E0D39400EE9400CC +:101E3700400E900099E0122C1D74FFF5F012144A21 +:101E4700900099E0FF122C1DE0FCA3E04C60030218 +:101E57001F6B74712F021EA1122BDA122BFBE0FEEF +:101E6700A3E0D39DEE9C500512335B8003123253DF +:101E7700122BEB122C385003021F6B900099E012C3 +:101E87002C01E4F0A3F0021F6B122C29E07013124F +:101E970033D9C246900099E02471122C10E4F00265 +:101EA7001F6B122C29E0FE6402702E20460CD246CE +:101EB700EF122BDFE4F0A37469F0122BDAE475F06C +:101EC7000112144AEF122BDFE0FCA3E0C394FEECEF +:101ED70094005003021F628031EE64017037204680 +:101EE7000FD246900099E0122BDFE4F0A374FEF0C6 +:101EF700122BDA74FFF5F012144AEF122BDFE0FE13 +:101F0700A3E0D39469EE94005051900099E0122C0D +:101F17002EE4F08046122C29E06403703EEF122B6A +:101F2700DFE0FEA3E0FFC394FEEE94004004D24638 +:101F3700800BD3EF946AEE94005002C2469000994A +:101F4700E025E02479304609122BE374FFF5F08091 +:101F570007122BE3E475F00112144A122BDAA3E0FF +:101F6700FD122DF1900099E0FF700A122C0DE09000 +:101F7700006FF08037900099E0B4010C2471122CA7 +:101F870010E090006EF08024900099E0B4020C24D9 +:101F970071122C10E0900070F08011900099E0B45D +:101FA700030A2471122C10E090006DF0900099E064 +:101FB70004F0021DCDE4900099F0900099E0FFC372 +:101FC70094045012122C00E475F00112144A900088 +:061FD70099E004F080E433 +:011FDD0022E1 +:10337500D2AC759A03D2BCD2BDD2A9D2AB75FE31FF +:0A33850075FF8175FE3043FF8022C2 +:10329100C2ACE4F59AC2BCC2BDC2A9C2AB75FE31D3 +:0F32A10053FF7E75FE3053FF7FFD7F3102310AF0 +:10305600304421302627C226900102E004F0E0C366 +:1030660094054019E4A3F07DAA7F4F12310AE4903B +:0E3076000102F02212329143870212337522BA +:10341C00780EE6D394015006201003304304C243C7 +:04342C00C322D322C2 +:102F4000123325123468123495E4F5861230B1122A +:102F500032EC7D087F761234E4D2A8D2AF1234303E +:102F60007D697F031234061230DE1230271234A33B +:0D2F7000900106740FF09000FF7401F02234 +:030003000234F2D2 +:0634F200D24375E20F3227 +:0B34BE00E0FF04F074292FF8A699220B +:1033250075FE0443FF0CD2DF43878075BA0375AA87 +:0B333500DC759852D299D298D2AC22DD +:062E37009000BD121559C8 +:102E3D00E49000C0F075FE0443FF0C75FE0353FFD4 +:102E4D00F3F09000C0E0C39FE49E501C2040FDD2E3 +:102E5D00409000BDE475F001121542121348F5992A +:0E2E6D009000C0E004F080DA75FE0453FFF31D +:012E7B002234 +:030023000229C1EE +:1029C100C0E0C083C082C0D075D000C000C005C0C7 +:1029D10006C007309904C299C240309867C298D2A4 +:1029E10043900111E014601914602D24027055E523 +:1029F10099900111B455087401F0A3E4F0800E80A0 +:102A010011E599900111B4AA097402F0A31234BE20 +:102A11008032E4F0A3F0802C9001121234BE782DA4 +:102A2100E62406FFE433FEE0FDC39FEE6480F87404 +:102A310080985005ED9420400B900112E4F0900134 +:102A410011F0D242D007D006D005D000D0D0D0822C +:052A5100D083D0E0324B +:0E3487009000C4EFF01234D49000C4E0FF2295 +:1034680075F10A759F03759EFD759692759A0222ED +:0834D4002041FDD2418F972237 +:03008B000233C27B +:1033C200C0E0E59630E1055396FDC241E59630E056 +:0733D200035396FED0E03228 +:1024AA00506F776572204F6E2053746174652148AE +:1024BA00616C6C28307825782920286C696E653A19 +:1024CA002564290D0A004177616B65205374617494 +:1024DA006520286C696E653A2564290D0A004E6FDD +:1024EA00726D616C20537461746520286C696E6525 +:1024FA003A2564290D0A00536C656570205374618E +:10250A00746520286C696E653A2564290D0A0053A2 +:10251A005441303A307825782C535441313A307846 +:10252A0025782C535441323A307825782C436869FF +:10253A00705F5354413A307825782C564F585F5380 +:10254A0054413A307825782E4465635F536C65654B +:10255A00703A25640D0A00566E74633A25642C4954 +:10256A00766F6C3A25642C566261743A25642C564F +:10257A00696E3A25642C56706D69643A25642C5646 +:10258A006F723A25642C566F6C3A25642C56646433 +:10259A003A25642C49766F723A25642E0D0A004456 +:1025AA0065636E745F536C65657044656C61792010 +:1025BA0052656C6F61642E0D0A00456E7465722057 +:1025CA005374616E646279204D6F6465210D0A004F +:062FF2004300FF0402028F +:102FBA00E6FF08A3E6CFF0A3EFF0227BFFE0900044 +:102FCA009FFFE4F0A3EFF02290009EE4F0A37403C5 +:102FDA00F07B647A007D02227BFF90009FE4F0A3DD +:082FEA0022FFE4F0A3EFF02246 +:1033F00090010DE0FF04F012281590010DE0C39438 +:06340000084002E4F02286 +:1032B000122D5D121B57122D11302211C222122A1B +:0E32C00056122CB6122AE31218861215882216 +:090082007B017A017907020026D6 +:10219A00E4900099F09000FFE0FFA3E0FE6F606C0E +:1021AA00A3EEF09000FFE0A3F024FE602F14603C41 +:1021BA0014604A24036003022336122FD2E4FF126A +:1021CA002F01122FD27F01122F017A2479AA9001AE +:1021DA000F122FC5A3E4F0A374BB802C7F01123227 +:1021EA00317A2479D0122FE274C7801C90010674C8 +:1021FA000FF07A2479E8122FE274D4800B7BFF7AED +:10220A00257901122FE474DFF0022301900100E026 +:10221A0024FE603914603D147003022319240360FC +:10222A00030223369000FCE004F0E0C39408500354 +:10223A000223369000FF7402F0E49000FCF0781458 +:10224A00E660030223369000FF7404F0229000FF38 +:10225A007403F022202603022336C2267A2579192E +:10226A00900107122FC5900108E09000A1122FCB10 +:10227A00900109E09000A3122FEB90010AE0900070 +:10228A00A5122FEB90010BE0FF9000A7E4F0A3EF5B +:10229A00F0900106E0FF9000A9E4F0A3EFF0120F1E +:1022AA00587BFF7A2579617855E6FF0890009F12DE +:1022BA002FBE7849122FBA785B122FBA784F122F95 +:1022CA00BA7859122FBA7853122FBA7851122FBAF4 +:1022DA00784B122FBA784D122FBA120F5890010666 +:1022EA00E0D394004014E014F0304340C243740F2A +:1022FA00F07BFF7A2579A9020F587BFF7A2579C4EA +:10230A00120F589000FF7404F0E4900102F02212B8 +:10231A00341C50127F04122B60E4FF12320FE4FFC8 +:0C232A001232310230569000FF7402F0B5 +:012336002284 +:102EBF00302536C2259000FDE0FF04F0EF146012BC +:102ECF001460141460161460182404701C1233F06C +:102EDF0080171200828012122DA8800D1232B0803E +:102EEF000812219AE49000FDF0302705C227121D29 +:022EFF00C722E8 +:10008E00426F6F7374204F70656E2E286C696E65AB +:10009E003A2564290D0A00426F7820436C6F736510 +:1000AE002E286C696E653A2564290D0A00426F7818 +:1000BE00204F70656E2E286C696E653A2564290D89 +:1000CE000A004F70656E2F436C6F736520426F7818 +:1000DE002C45617270686F6E657320496E20426F99 +:1000EE0078284E756D3A25642928566F78537461B9 +:1000FE003A30782578292E0D0A004F70656E204211 +:10010E006F7820434D44205458204F7665722E0D43 +:10011E000A004F70656E20426F7820416E64204554 +:10012E00617270686F6E6520476574496E284E75F2 +:10013E006D3A25642928566F785374613A307825C4 +:10014E0078292E0D0A00436C6F736520426F78205C +:10015E00416E6420466F72636520566F6C746167E2 +:10016E00652055702E0D0A2000564F5820566F757B +:10017E007420355628564F585F5354413A307825DF +:10018E00782C6C696E653A2564292E0D0A00564F3F +:10019E0058204348472046756C6C2E0D0A00564F6A +:1001AE00582047657420496E746F20536C656570D6 +:1001BE002E0D0A00466F6C6C6F772043484720491E +:1001CE006E697453746120536574204D61782056A6 +:1001DE00706D69642E28566F785F7374613A30784B +:1001EE00257829286C696E653A2564290D0A004622 +:1001FE006F6C6C6F772043484720496E6974537457 +:10020E00612E28566F785F7374613A30782578299D +:10021E00286C696E653A2564290D0A00466F6C6C70 +:10022E006F772043484720537461312C4E6F204521 +:10023E00617250686F6E6520496E20426F782E286D +:10024E006C696E653A2564290D0A00466F6C6C6FF9 +:10025E00772043484720537461312C564F52204328 +:10026E006867696E672849766F723A25646D412911 +:10027E002E286C696E653A2564290D0A00466F6C4E +:10028E006C6F772043484720537461312C564F4C86 +:10029E0020436867696E672849766F6C3A25646DEE +:1002AE0041292E286C696E653A2564290D0A00468F +:1002BE006F6C6C6F772043484720537461322C4724 +:1002CE0065742049564F523A25646D412E286C694B +:1002DE006E653A2564290D0A00466F6C6C6F7720A7 +:1002EE0043484720537461322C4765742049564F5A +:1002FE004C3A25646D412E286C696E653A25642949 +:10030E000D0A00466F6C6C6F77204348472053747C +:10031E0061332C564F5820436867205265496E69E9 +:10032E00742E286C696E653A2564290D0A00466F95 +:10033E006C6C6F77204348472053746133284356C3 +:10034E00292C564F522056706D69642041646453B7 +:10035E0074612849766F723A25646D41292E286C96 +:10036E00696E653A2564290D0A00466F6C6C6F77CD +:10037E00204348472053746133284356292C564F47 +:10038E00522056706D69642053756253746128490A +:10039E00766F723A25646D41292E286C696E653A26 +:1003AE002564290D0A00466F6C6C6F772043484711 +:1003BE002053746133284343292C564F52205670D4 +:1003CE006D6964205375625374612849766F723A71 +:1003DE0025646D41292E286C696E653A2564290DB8 +:1003EE000A00466F6C6C6F77204348472053746148 +:1003FE0033284343292C564F522056706D69642082 +:10040E004164645374612849766F723A25646D4174 +:10041E00292E286C696E653A2564290D0A00466FEF +:10042E006C6C6F77204348472053746133284356D2 +:10043E00292C564F4C2056706D69642041646453CC +:10044E0074612849766F6C3A25646D41292E286CAB +:10045E00696E653A2564290D0A00466F6C6C6F77DC +:10046E00204348472053746133284356292C564F56 +:10047E004C2056706D69642053756253746128491F +:10048E00766F6C3A25646D41292E286C696E653A3B +:10049E002564290D0A00466F6C6C6F772043484720 +:1004AE002053746133284343292C564F4C205670E9 +:1004BE006D6964205375625374612849766F6C3A86 +:1004CE0025646D41292E286C696E653A2564290DC7 +:1004DE000A00466F6C6C6F77204348472053746157 +:1004EE0033284343292C564F4C2056706D69642097 +:1004FE004164645374612849766F6C3A25646D418A +:10050E00292E286C696E653A2564290D0A00466FFE +:10051E006C6C6F772043484720537461342C564FD0 +:10052E00782056706D696420416464537461285656 +:10053E006F75743A307825782C49766F6C3A25644D +:10054E006D412C49766F723A25646D4129286C698C +:10055E006E653A2564292E0D0A00466F6C6C6F7716 +:10056E002043484720537461342C564F78204368FB +:10057E00696E6728566F75743A307825782C4976EF +:10058E006F6C3A25646D412C49766F723A25646D15 +:10059E004129286C696E653A2564292E0D0A00469C +:1005AE006F6C6C6F772043484720537461342C5620 +:1005BE004F522056706D69642041646453746128F3 +:1005CE00566F75743A307825782C49766F723A25C5 +:1005DE00646D4129286C696E653A2564292E0D0AD1 +:1005EE0000466F6C6C6F772043484720537461341C +:1005FE002C564F52204368696E6728566F75743AB1 +:10060E00307825782C49766F723A25646D41292809 +:10061E006C696E653A2564292E0D0A00466F6C6C66 +:10062E006F772043484720537461342C564F4C202B +:10063E0056706D69642041646453746128566F75F9 +:10064E00743A307825782C49766F6C3A25646D4172 +:10065E0029286C696E653A2564292E0D0A00466FAD +:10066E006C6C6F772043484720537461342C564F7F +:10067E004C204368696E6728566F75743A3078253A +:10068E00782C49766F6C3A25646D4129286C696E19 +:10069E00653A2564292E0D0A00466F6C6C6F772023 +:1006AE00434847205375625374612C564F4C2F5656 +:1006BE004F52286C696E653A2564292E0D0A004644 +:1006CE006F6C6C6F7720434847205375625374618B +:1006DE002C564F52286C696E653A2564292E0D0AE8 +:1006EE0000466F6C6C6F77204348472053756253FA +:1006FE0074612C564F4C286C696E653A2564292E10 +:10070E000D0A00466F6C6C6F772043484720537577 +:10071E00625374612C285354413A307825782C5604 +:10072E00706D69643A3078257829286C696E653A5F +:10073E002564290D0A00466F6C6C6F77204348477D +:10074E00204164645374612C285354413A30782507 +:10075E00782C56706D69643A3078257829286C6942 +:10076E006E653A2564290D0A005258305F4275664F +:10077E006665725B305D3A307825782C5258305F62 +:10078E004275666665725B315D3A307825782C521B +:10079E0058305F4275666665725B325D3A30782519 +:1007AE00782C5258305F4275666665725B335D3ADF +:1007BE00307825782C5258305F4275666665725BCC +:1007CE00345D3A307825782C5258305F4275666623 +:1007DE0065725B355D3A307825782C5258305F4221 +:1007EE0075666665725B365D3A307825782C5258A0 +:1007FE00305F4275666665725B375D3A3078257894 +:10080E002C6C696E653A25640D0A0000000000002C +:10081E0000000000000000000000000000000000CA +:0B082E000000000000000000000000BF +:101FDE0090002674011213D3740290006BF09000DF +:101FEE0099021539900050121460FFE5F090009F91 +:101FFE00F0EFA3F0A37404F0A322E6FFEEF0A3EF3C +:10200E00F008E6FFA3EEF0A3EFF008E6FFA3EEF074 +:10201E00A3EFF008E6FFA3EEF0A3EFF02290001A74 +:10202E0012136190009FFFE4F0A3EFF0229000489E +:10203E00121460900050FFAEF00214607849E6FF73 +:10204E0008E6A3CFF0A3EFF0784DE6FF08E6A3CFA6 +:10205E00229000261213D390001A0213617BFF9078 +:10206E00009F7405F0A32290002E8FF0021498901A +:10207E000026121460FFAEF090002E021460FF9046 +:10208E0000A1E4F0A3EFF0A37405F0A3227BFF9070 +:10209E00009F7402F0A32290010BE0540CFBE4FAB3 +:1020AE00F9F8900000E0FFE4FCFDFEC3021514EE0B +:1020BE008FF090005002149890004C121460D3FFD1 +:1020CE00ED9FEC95F022900028021361900034E40D +:1020DE001213D3E49000230213D390001AEF1213BD +:1020EE00D390006B229000390213617BFF90009F0A +:1020FE007404F022E6FC08E6FD25E0FFEC338FF0D9 +:10210E001214987BFF2290010BE0540C22E49000F5 +:10211E0007F0A322EE8FF01214987D051213F5EF3F +:10212E0078022274019000370213D3C3FDACF09FE6 +:10213E00EC9E22E4FCFDFEFAF9F8C3021514784D6C +:10214E00E6FE08E6FF2290010BE05410FFE4FCFDD2 +:10215E00EF2274011213D37BFF22E0FF90009FE465 +:10216E00F0A32290003FF0A3F090006BF0227BFFD3 +:10217E0090010BE02290010BE05420FFE4FC229032 +:0C218E000007E09400229000340213616E +:052B60009000BDEFF044 +:102B6500E4A3F0A3F07F27122F7D9000BEEFF07F46 +:102B750037122F7D9000BFEFF09000BDE024FD607F +:102B85001B14602424FE6028240570359000BFE0E6 +:102B95004494F09000BEE04498F080259000BEE09B +:102BA5004406F054E7F080199000BFE054FD800919 +:102BB5009000BFE04402F054FEF09000BEE054E106 +:102BC500F09000BEE0FD7F2712310A9000BFE0FDC6 +:052BD5007F3702310A08 +:10158800900109E054186003D20D22C20D203E03D9 +:1015980002185030456F200E1A1218797BFF7A0016 +:1015A800798E90009F7401F0A374D7F0120F587FC2 +:1015B800038065E4900003F0900001F0A3F0C200FE +:1015C800C201D20B90010FE07022C22FD202D203C7 +:1015D800C205C208C204C209C20AD210C2471221F7 +:1015E800717A0079A512209B74088011C202C20387 +:1015F800D205C2067A0079BB12209B7415F0120F2F +:1016080058C20EC245900001E0C39405500302176A +:10161800DD300B07C20B7F04022B6020003BD20099 +:10162800122114FF60147B0C1221419000437005B5 +:101638007402F0800A7401F08005E4900043F07BA6 +:10164800FF7A0079D0900043E012203190010BE03E +:101658009000A1122034120F582005030216FF90A3 +:101668000002E0C39405500A7F06122B6090000226 +:101678008027200144900003E0FFD39414501FEF0B +:10168800540370047D118009900003E020E0077D79 +:10169800227F091225DA900003E004F080597F04C4 +:1016A800122B60E4900003F0D201D20FC2107BFF2E +:1016B8007A017908120F58803E7817E67039300F92 +:1016C80004C20F802B1220A5602D90010BE0FF545F +:1016D8000C6004D22FD2307BFF7A0179209000432E +:1016E800E0FD12216AEDF0A3E4F0A3EFF0120F5829 +:1016F800122114900000F020020302184D30473BDD +:10170800200E16121879D210E4122171900001F0FF +:10171800C208D20BC200D204227F03122B607BFFC7 +:101728007A017954120F58C20ED203900001E0D307 +:10173800940350030217DDC247805020044D9000E7 +:1017480002E0FFD39414501DEF540370047D118000 +:1017580009900002E020E0077D227F081225DA9038 +:1017680000020217DD900003E0FFD39414501CEF31 +:10177800540370047D118009900003E020E0077D88 +:10178800227F0A1225DA900003804A30031F7F0364 +:10179800122B607A01797712217C122031A374030D +:1017A800F0A37438F0120F58C20302184D200857DE +:1017B80090010BE05430FF7B30122141600E122162 +:1017C80014FFE4FCFDFEEF600330382A900001E0CE +:1017D800D394285004E004F0227BFF7A01799C120C +:1017E8000F58D208E4900004F0900001F0C2097F7D +:1017F80004122B60804F900040E070497B017A0012 +:101808007923120839803E900004E0FFD3941450E5 +:101818001FEF540370047D118009900004E020E05C +:10182800077D227F051225DA900004E004F0801578 +:10183800200912D2097F04122B60C2107BFF7A01A3 +:1018480079AC120F58C20722200711D2077F041261 +:101858002B60C210122114900000F0221220A56003 +:101868000F122114FF6004D22FD230900000EFF045 +:0E187800227F3C12338F7F0112320FD20E22DC +:0608390090009912155910 +:10083F0090006BE014700302091E1470030209E7A5 +:10084F00147003020A51147003020C0C2404600389 +:10085F00020D52121FEC90001D1213616003020D66 +:10086F005290006CE0D3940A5035E004F090001AD7 +:10087F00743C1213D3300C03020D52121FEC1220D2 +:10088F0065FF12338F7A0179C212217C122031A3B6 +:10089F007403F0A374D8F0120F58D20C020D52E467 +:1008AF0090006CF0C20C121FECE412213390002662 +:1008BF00E41213D31220DA900032E41213D3900013 +:1008CF0021E41213D3900039E41213D3900028E4DB +:1008DF001213D3E4F5F01220C090002EE4F5F012BD +:1008EF001498900019E41213D390001B743C12203B +:1008FF00EC7401F012211BF07BFF7A0179FD90015E +:10090F000BE0122031A37403F0A374FF020AA59029 +:10091F00010BE0FB5420FFE4FCFDFEEF6023EB54E2 +:10092F0010FF601D121FEC90001D74011213D3E411 +:10093F0090006BF07A02792A1220F9A3740E020A42 +:10094F00A5122183EF703B12214C121FEC90004433 +:10095F00122122C333CE33CED8F9FF121FEC9000F1 +:10096F0048EE8FF0121498784D90004C1221027AB5 +:10097F0002795990009FECF0ED122000741CF012D8 +:10098F000F5812215470407849E6FE08E6FF121FF7 +:10099F00EC900022122122C333CE33CED8F9FF12AE +:1009AF001FEC900026EE8FF0121498784990002AD1 +:1009BF001221027A02798B90009FECF0A3ED1220A6 +:1009CF00017429F0120F58121FEC90001C740112C1 +:1009DF0020EC7402F0020D52D3900008E09405123F +:1009EF00218D5003020A5D12211BF0122183FDEFAE +:1009FF00701D12214C121FEC1220BD9000391221D4 +:100A0F00607A0279BDEE121FFB7445F0120F581277 +:100A1F00215470257849E6FE08E6FF121FECEE120E +:100A2F0020759000281221607A0279E790009FEEDE +:100A3F00121FFE744FF0120F5890006B7403F002E8 +:100A4F000D52D3900008E0940212218D500AE475E4 +:100A5F00F00112144A020D5212211B121FEB9000CB +:100A6F004C12203ED39FE5F09E5016121FEC9000C3 +:100A7F002A12146090002E122044D39FE5F09E405E +:100A8F0019E4121FE890001CE41213D37A037911B2 +:100A9F001220F9A37469F0020D4F121FEC1220F30C +:100AAF0064016003020B56900050121460D394142B +:100ABF00E5F09400504D90010BE030E529900037A0 +:100ACF007401122062C3943C400A121FEC9000394B +:100ADF00E41213D3121FEC121FF2747BF07BFF7A18 +:100AEF0003793C020B53121FEC9000347401121364 +:100AFF00D3121FEC121FF27482F07BFF7A03797806 +:100B0F00020B53121FEC12203BD39FE5F09E900077 +:100B1F0099401C12153990003474011213D3121F0F +:100B2F00EC121FF2748CF07BFF7A0379B4801512EC +:100B3F001539122131121FEC121FF27493F07BFF43 +:100B4F007A0379F0120F58121FEC1220D46401604F +:100B5F0003020D52122086D39414E5F09400504DE9 +:100B6F0090010BE030E429740112205FC3943C40E4 +:100B7F000A121FEC900028E41213D3121FEC9000FE +:100B8F002E121FF574A6F07BFF7A04792C020D4FFD +:100B9F00121FEC74011220E2121FEC90002E121F94 +:100BAF00F574ADF07BFF7A047968020D4F121FECDC +:100BBF0012207DD39FE5F09E9000994020121539A9 +:100BCF0090002374011213D3121FEC90002E121FEA +:100BDF00F574B7F07BFF7A0479A4020D4F12153923 +:100BEF0090002674011213D3121FEC90002E121FC7 +:100BFF00F574BEF07BFF7A0479E0020D4FD39000BD +:100C0F0008E0941412218D501DE475F00112144A5E +:100C1F0012214C121FEC1220BD7849E6FF08E6CFD7 +:100C2F00122075020D5212211B121FEB1220F364BA +:100C3F000170631220D46401705C12203B122139C1 +:100C4F004008121FEC1220C64034121FEC12207DF8 +:100C5F00122139400B121FEC90002A1220C9401E9E +:100C6F00121FEC122131121FDE12202B12204A12FA +:100C7F001FFE74E5F07BFF7A05791C020D4F121FE2 +:100C8F00EC12202B12204A121FFE74ECF07BFF7A1D +:100C9F00057968020D4F121FEC1220F364017048A2 +:100CAF0012203B1221394008121FEC1220C6401CA3 +:100CBF00121FEC900037121FE112202B1220561238 +:100CCF001FFE74FFF0FB7A0579AD8019121FEC122D +:100CDF00202B122056F0A3EFF07405A3F0A3F07BA6 +:100CEF00FF7A0579EF120F58121FEC1220D464010E +:100CFF00705190002A122080D312213A500F121FE8 +:100D0F00EC900026121460C31220CD501C121FEC61 +:100D1F00121FDE12202B78491220581220917413C3 +:100D2F00F07BFF7A06792A8017121FEC12202B789E +:100D3F00491220581220917419F07BFF7A06796CB2 +:100D4F00120F58121FEC1220F3FF6401600A1220D9 +:100D5F00D464016003020ED7122194FE6401600D6A +:100D6F0090002312136164016003020E63EF6401AC +:100D7F0070251220D4B4011FEEB4011B122194B4BC +:100D8F00011590001474011213D37A0679A712205B +:100D9F006B7431F0120F58121FEC1220F3640170B4 +:100DAF001E1220D470191221946401703C9000140B +:100DBF00041213D37A0679CD12206B743B8026125E +:100DCF001FEC1220F370221220D4B4011C900023C8 +:100DDF00121361B401139000141221607A0679EF97 +:100DEF0012206D7446F0120F58121FEC1220DA9079 +:100DFF00001412136164016003020EEC121FEC1257 +:100E0F002065D39400400890001A74FE12138E9040 +:100E1F000019121361FF122065D39F500B121FECA4 +:100E2F001220E87404F0800690006B7402F0122117 +:100E3F001B121FEB900014E41220EC122168EF122A +:100E4F001FEB12206512208C7465F07BFF7A0779F7 +:100E5F0011020ECA121FEC90003712136164016069 +:100E6F000A90002612136164017072900037E41229 +:100E7F0013D3E412205FC3943C500B121FEC90006D +:100E8F001A740212138E7404121FE890001B1213AF +:100E9F0061FF122065C39F4009121FEC1220E874F6 +:100EAF0001F090006B122168EF121FEB12206512F8 +:100EBF00208C7482F07BFF7A077944120F58121F2F +:100ECF00EC122065FF02338F90006BE0D394024049 +:0D0EDF000CE4121FEB90001D74011213D3E0 +:010EEC0022E3 +:0B2E7C009000BD1215599000C0EDF051 +:102E8700E4FE9000C0E0FD14F0ED60299000BDE481 +:102E970075F0011215421213486EFEE4FFEFC3945A +:102EA7000850DFEE30E007C313648CFE8004EEC3E6 +:072EB70013FE0F80E8AF06D7 +:012EBE0022F1 +:0825DA00900099EFF0A3EDF071 +:1025E200E4A3F0A3F0789D7C007D017BFF7A08795B +:1025F20019FE7F2012132290009D7455F0A374AA35 +:10260200F0A374FFF090009AE09000A2F09000997D +:10261200E09000A0F0121562263601266D022652C5 +:1026220003266D04266D05266D0826360926360A10 +:10263200000026739000A17403F0780EE65402C4E1 +:10264200333354C07814469000A3F0E4A3F0802101 +:10265200E4FF74292FF8E6FE749D2FF582E434001E +:10266200F583EEF00FEFB420E980069000A174012B +:10267200F09000A1E02405FFE43390009BF0A3EF6B +:10268200F07B017A00799DFD122E7C90009BE0FC8C +:10269200A3E0249DF58274003CF583EFF07F0112E4 +:1026A2002B6090009AE0FFB4220B75FE0E53FFF0F0 +:1026B20043FF08800DEFB4110975FE0E53FFF0437E +:1026C200FF0190009CE02402FF90009BE03400FE9A +:1026D2007B017A00799D122E3790009AE0FFB42296 +:1026E2000A75FE0353FFF343FF0822EFB411097585 +:0826F200FE0353FFF343FF0454 +:0126FA0022BD +:1032CE00E490009AF0EF24FD60028011782EE6B4AF +:0D32DE00110590006880039000697401F0F4 +:0132EB0022C0 +:102D1100E4FE900099F0304242C2427BFF7A07798B +:102D210077782990009F12200808A3122008A37425 +:102D310008F0A374B1F0120F587B007A007929785A +:102D41002DE62405FD122E7C7E00782DE6242EF83A +:0B2D5100E6B50707782CE6FF1232CE33 +:012D5C002254 +:102FF800602A00C50BB80BEA0C1C0C800CB20CE460 +:103008000D160D480D7A0DAC0E100E420E740EA65C +:0E3018000ED80F0A0F3C0F870FD2101D106844 +:102AE300E4FFEF25E024C5F582E43400F583E0FC40 +:102AF300A3E0D3785C96EC189650050FEFB415E27B +:102B03007814E6FEEFD39E4004180680037813166C +:102B130090010AE030E3047814A6077813E6FED3A5 +:102B230094C85006EEC3940A50077814A607187683 +:102B3300697814E6FFD394005002D23CEFD394019A +:102B43005002D238EFD394055002D23AEFD3940A0D +:0C2B53005002D239EFD3940F5002D23B55 +:012B5F002253 +:102C4D009000F4E06062E4F0D2249000F2E004F031 +:102C5D00E0C394054004E4F0D2259000F5E004F0C3 +:102C6D00E0C3940A4004E4F0D2279000EFE475F03D +:102C7D000112144AC39000F0E094649000EFE094C8 +:102C8D00004006E4F0A3F0D2229000F1E004F0E061 +:102C9D00C394FA4013E4F0D2239000F3E004F0E083 +:092CAD0094044004E4F0D2262254 +:03000B000231625D +:10316200C0E0C083C082C0D074FC258CF58C74662C +:10317200258AF58A9000F47401F0D0D0D082D083F1 +:03318200D0E03268 +:0E349500758901758CFC758A66D2A9D28C22CD +:0D34B10075FE0FEF25E0FE7403A80608224B +:1033D9001234B18002C333D8FCF452FFEFB40406AF +:0733E90075FE0FE4F5FF2261 +:1034060075FE11EF5407F5FF75FE12AF058FFF75B8 +:06341600FE1075FF01220B +:102DF1001234B18002C333D8FCF452FF7401A80627 +:102E0100088002C333D8FC42FF75FE0B7401A8078A +:102E1100088002C333D8FC42FFEF70038DCE22EF4E +:102E2100B401038DCF22EFB402038DDE22EFB40390 +:062E310004AF058FDF2253 +:033FFD00010102BD +:1030B100D28075FE0443FF0175FE0343FF0175FED7 +:1030C1000243FF01D28175FE0443FF0275FE0343F3 +:0D30D100FF0275FE0243FF02781576012212 +:0C345600C280123462D281123462D28033 +:05346200E4FF0FDFFE96 +:013467002242 +:10334000D281D2801234622081037F0022C2811296 +:0B33500034623081037F00227F0122E5 +:0F347800C280C28112345DD2811234620234628A +:0834DC00123456C28002346272 +:0B34C900123456123462C280023462DA +:0231CB00AE074D +:1031CD007D08AF051DEF6015C280EE30E704D2819A +:0F31DD008002C281EE25E0FE12345D80E5C280E3 +:0131EC0022C0 +:103185007E08E4FDD281AF061EEF6012ED25E0FD5D +:10319500C28012345D3081EEED4401FD80E8C280CD +:0231A500AF0574 +:0131A7002205 +:0E34A3007D087F3512310A7D0A7F760234E4FF +:100026009000991215597F1012006EEF1213C17FBE +:100036001112006E900001EF1213D37F1212007896 +:10004600900002EF1213D37F13120078900003EF93 +:100056001213D37F14122F7D900099121539900038 +:1000660004EF1213D37F0022122F7D9000991215F0 +:0C0076003922122F7D90009912153922BA +:0531ED00900099EFF0D5 +:1031F200E47F20122F7D900099E06006EF4401FFEA +:0D3202008004EF54FEFFAD077F2002310A6B +:05320F0090009AEFF0B1 +:10321400E47F27122F7D90009AE06006EF4401FFBF +:0D3224008004EF54FEFFAD077F2702310A42 +:05338F0090009CEFF02E +:10339400E47F25122F7DEF54C0FF90009CE04FFD89 +:0533A4007F2502310A43 +:0532310090009AEFF08F +:10323600E47F20122F7D90009AE06006EF54FBFF9A +:0D3246008004EF4404FFAD077F2002310A31 +:0734E4008FFEAF058FFF22F0 +:0634EB008FFEAEFFAF06EC +:0134F10022B8 +:10310A009000C0EFF0A3EDF01233407F0C1231CBE8 +:10311A001234C99000C0E0FF1231CB1234C99000BA +:0C312A00C1E0FF1231CB1234C90234782E +:052F7D009000C0EFF020 +:102F8200E4A3F01233407F0C1231CB1234C990000B +:102F9200C0E0FF1231CB1234C91233407F0D12311F +:102FA200CB1234C91231859000C1EFF01234DC1219 +:072FB20034789000C1E0FF3C +:012FB90022F5 +:1031360090009EE4F0A3740AF07B147A007D0222CC +:1031460090006FF090006EF0900070F090006DF0BF +:0C31560022F0E490009EF0A3F0FBFA22AF +:1031A800E4FB7D04FF123272E4FB7D047F011232DE +:1031B80072E4FB7D047F02123272E4FB7D047F031C +:0331C8000232725E +:1018860030301BC230E4900113F07813F6121AF3CD +:10189600FD7F03122F017402123146D2432220210A +:1018A60006203D03300D64202A05D22AD23022902C +:1018B600006FE06402600E123136E4FF122F0190D1 +:1018C600006F7403F090006EE06402600E12313611 +:1018D6007F01122F0190006E7403F0900070E06497 +:1018E60002600E1231367F02122F019000707403CF +:1018F600F090006DE064027003021ABD1231367F6B +:1019060003122F0190006D7403F022302A0CC22AB4 +:10191600C22CC22BC22EC22FD247780EE6FF70030E +:101926000219E364037020202C07D22CC22B02314B +:10193600A8E490009E121ABE7D017F03122F017447 +:10194600011231460219DA202B0DD22BC22CD230CD +:10195600E4900114F0807D900113E0C3940150558A +:10196600E004F0A3E014601A146027146034240322 +:10197600706290006FE06404605A7B017D04E4FFAE +:10198600802E90006EE06404604A7B017D047F0136 +:10199600801E900070E06404603A7B017D047F0243 +:1019A600800E90006DE06404602A7B017D047F0355 +:1019B600123272801F900113E0C3940F5005E004A9 +:1019C600F08011E4900113F0A3E004F0E0C3940466 +:1019D6004002E4F0C22EC22FC231D22D22302B0A91 +:1019E600C22B1231A8D230D24722202E0C202D092C +:1019F600202F06203103021ABD900113E0FFC39485 +:101A0600015004E004F022EFC394644003021AA8D4 +:101A1600900113E004F0303A3090006FE0640370F8 +:101A260003021ABDE490009EF0A3F07B64FA7D03E6 +:101A3600FF122F0190006F7404123157FD7F0112BF +:101A46002F0190006E7402800F30391CE490009EC6 +:101A5600121B28121B437401123157FD7F02122FED +:101A6600019000707402801EE490009E303B2712A5 +:101A76001B28121B4374011231577D017F02122F5E +:101A8600019000707401123157FD7F03122F0190EF +:101A9600006D7402F022121ABE7D01121B4E7401F3 +:101AA6008012C22EC22DC22FC231E4121AF3FD12C9 +:071AB6001B4E7402123149BE +:101ABD0022F0A3F0FBFA7D01FF122F01E490009EAE +:101ACD00F0A3F0FBFA7D017F01122F01E490009E3F +:101ADD00F0A3F0FBFA7D017F02122F01E490009E2E +:101AED00F0A3F0FBFA2290009EF0A3F0FBFAFDFFAD +:101AFD00122F01E490009EF0A3F0FBFAFD7F01127E +:101B0D002F01E490009EF0A3F0FBFAFD7F02122F4F +:101B1D0001E490009EF0A3F0FBFA22F0A3F0FBFA93 +:101B2D007D01FF122F0190006F7401F0E490009E73 +:101B3D00F0A3F0FBFA227D017F01122F0190006EC0 +:0A1B4D00227F03122F0190006F2287 +:10294100023084E493A3F8E493A34003F68001F2F8 +:1029510008DFF48029E493A3F85407240CC8C33397 +:10296100C4540F4420C8834004F456800146F6DF66 +:10297100E4800B0102040810204080902FF2E47ED5 +:10298100019360BCA3FF543F30E509541FFEE4935B +:10299100A360010ECF54C025E060A840B8E493A322 +:1029A100FAE493A3F8E493A3C8C582C8CAC583CA4D +:1029B100F0A3C8C582C8CAC583CADFE9DEE780BE05 +:0130260000A9 +:10125200E709F608DFFA8046E709F208DFFA803E7E +:1012620088828C83E709F0A3DFFA8032E309F6086B +:10127200DFFA8078E309F208DFFA807088828C83D3 +:10128200E309F0A3DFFA806489828A83E0A3F60887 +:10129200DFFA805889828A83E0A3F208DFFA804C61 +:1012A20080D280FA80C680D4806980F28033801038 +:1012B20080A680EA809A80A880DA80E280CA8033A1 +:1012C20089828A83ECFAE493A3C8C582C8CCC58319 +:1012D200CCF0A3C8C582C8CCC583CCDFE9DEE780E9 +:1012E2000D89828A83E493A3F608DFF9ECFAA9F068 +:1012F200EDFB2289828A83ECFAE0A3C8C582C8CCBE +:10130200C583CCF0A3C8C582C8CCC583CCDFEADED6 +:10131200E880DB89828A83E493A3F208DFF980CC38 +:1013220088F0EF60010E4E60C388F0ED2402B40431 +:101332000050B9F582EB2402B4040050AF232345D8 +:0613420082239012A27349 +:10134800BB010689828A83E0225002E722BBFE02A3 +:09135800E32289828A83E49322D6 +:10136100BB010CE58229F582E5833AF583E0225041 +:1013710006E92582F8E622BBFE06E92582F8E2228B +:0D138100E58229F582E5833AF583E49322A5 +:10138E00BB010FF8E58229F582E5833AF583E02863 +:10139E00F0225009C58229F8E58226F622BBFE0905 +:1013AE00C58229F8E22582F222F8EA2583F583E93F +:0313BE009328224F +:1013C100BB010689828A83F0225002F722BBFE010B +:0213D100F32205 +:1013D300F8BB010DE58229F582E5833AF583E8F050 +:1013E300225006E92582C8F622BBFE05E92582C8FC +:0213F300F222E4 +:1013F500BC000BBE0029EF8DF084FFADF022E4CCDC +:10140500F875F008EF2FFFEE33FEEC33FCEE9DECA4 +:10141500984005FCEE9DFE0FD5F0E9E4CEFD22EDEA +:10142500F8F5F0EE8420D21CFEADF075F008EF2F34 +:10143500FFED33FD4007985006D5F0F222C398FD25 +:051445000FD5F0EA22C2 +:10144A00C5F0F8A3E028F0C5F0F8E582158270022D +:06145A001583E038F022CA +:10146000BB0110E58229F582E5833AF583E0F5F0CA +:10147000A3E0225009E92582F886F008E622BBFEA7 +:101480000AE92582F8E2F5F008E222E5832AF583ED +:08149000E993F5F0A3E99322B2 +:10149800F8BB0111E58229F582E5833AF583E8F086 +:1014A800E5F0A3F0225009E92582C8F608A6F02243 +:0D14B800BBFE09E92582C8F2E5F008F2222A +:1014C500E88FF0A4CC8BF0A42CFCE98EF0A42CFCC6 +:1014D5008AF0EDA42CFCEA8EF0A4CDA8F08BF0A444 +:1014E5002DCC3825F0FDE98FF0A42CCD35F0FCEBA3 +:1014F5008EF0A4FEA9F0EB8FF0A4CFC5F02ECD3968 +:0F150500FEE43CFCEAA42DCE35F0FDE43CFC22D4 +:10151400EB9FF5F0EA9E42F0E99D42F0E89C45F02D +:0115240022A4 +:10152500E86010ECA2E713FCED13FDEE13FEEF13DC +:04153500FFD8F022C9 +:09153900E0FBA3E0FAA3E0F922B3 +:10154200F8E0FBA3A3E0F925F0F0E5821582700232 +:071552001583E0FA38F022D6 +:09155900EBF0A3EAF0A3E9F02293 +:10156200D083D082F8E4937012740193700DA3A318 +:1015720093F8740193F5828883E47374029368602C +:06158200EFA3A3A380DF2C +:100EED00E508249FF582E43400F583E0050822909F +:100EFD00009C30180390009FE475F001121542021A +:100F0D0013482011E97F2ED2118018EF540F249031 +:100F1D00D43440D4FF30150BEF24BFB41A00500366 +:100F2D002461FFE50960021509050CE50C70020549 +:100F3D000B30180E90009CE475F001121542EF0273 +:100F4D0013C10234877403D2188003E4C218F50864 +:100F5D0090009C121559E4F509F50BF50CE50960A7 +:100F6D00077F20120F3080F5750AFFC212C211C221 +:100F7D0013C214C216C217C219120EFCFF700D3027 +:100F8D0018057F00120F41AF0CAE0B22B4255FC2C6 +:100F9D00D5C215120EFCFF24D0B40A00501A75F0FC +:100FAD000A780930D50508B6FF0106C6A426F62035 +:100FBD00D5047002D21480D924CFB41A00EF500496 +:100FCD00C2E5D215021142D21280C6D21180C0D212 +:100FDD001380BCD2D580BAD21680B47F20120F30C8 +:100FED002013077401B5090040F1120EEDFF120F29 +:100FFD0030020F6AD219D2178095120EEDFB120E28 +:10100D00EDFA120EEDF94A4B700679137A127BFF49 +:10101D0020132EE509602A7E008E8275830012133F +:10102D006160060EEE650A70F0C2D5EBC0E0EAC055 +:10103D00E0E9C0E0EE121189D0E0F9D0E0FAD0E09D +:10104D00FB121348FF60AAEBC0E0EAC0E0E9C0E084 +:10105D00120F30D0E02401F9D0E03400FAD0E0FBDB +:10106D00E50A0460DCD50AD980877BFF7A11798582 +:10107D00D213809C791080027908C217C21980089A +:10108D00D2D5790A8004790AC2D5E50A047002F531 +:10109D000AE4FAFDFEFF120EEDFC7B08201213127E +:1010AD000EEDFD7B1030110A120EEDFE120EEDFF4E +:1010BD007B20EC3382D592D55013C3E43011069FBB +:1010CD00FFE49EFEE42012039DFDE49CFCE4CBF8BE +:1010DD00C212EC700CCFCECDCCE824F8F870F380B2 +:1010ED0017C3EF33FFEE33FEED33FDEC33FCEB3383 +:1010FD00FB994002FB0FD8E9EB301205F8D0E0C4A4 +:10110D0048B212C0E00AEC4D4E4F78207B0070C201 +:10111D00EAB50A0040BCC0E012118BD0F0D0E0203F +:10112D001204C4C0E0C4B212C0F0120F19D0F0D531 +:10113D00F0EB020F6A1215621007531081580FD889 +:10114D004C0FD44210854F108D44108D490FED4337 +:08115D0010935510774610773E +:10116500451077471233500FDC2D0FE02E10032B5F +:101175000FE423100120121C2A0F9C4800000FFBCE +:101185003F3F3F00790AA2D5201414301609B91043 +:10119500020404B9080104A2D52017025001042055 +:1011A50013689213B509005034C0E07F203014193C +:1011B5007F30A21372177216500F1211E2C213C2BA +:1011C50017C216C2197F30800F301603E9C0E0122E +:1011D5000F30301603D0E0F9D0E0B509CC30161742 +:1011E5007F30B9100C120F307F583015077F78808B +:1011F50003B90803120F303013057F2D020F307F1E +:10120500202019F87F2B2017F322921380CF286E08 +:10121500756C6C2900D212120EED3012F8C21278DC +:101225000930D50108F6020F9C2D50434958120E7E +:10123500ED2403B405004001E490122E93120F2112 +:0D124500743A120F21D214750904021081B1 +:00000001FF diff --git a/Out/8835_EVB_250121_1743_349D_010102.bin b/Out/8835_EVB_250121_1743_349D_010102.bin new file mode 100644 index 0000000..31a8d71 Binary files /dev/null and b/Out/8835_EVB_250121_1743_349D_010102.bin differ diff --git a/Project/SY8835_Demo.uvgui.GH b/Project/SY8835_Demo.uvgui.GH index 760704b..05f8316 100644 --- a/Project/SY8835_Demo.uvgui.GH +++ b/Project/SY8835_Demo.uvgui.GH @@ -6,7 +6,7 @@
### uVision Project, (C) Keil Software
- E:\todaywork\20241030_sy8835\Both_Way_Comm_SY8833_XIAOMI\UsrSrc\user + E:\todaywork\20241030_sy8835\SY8835_Demo\UsrSrc\display @@ -93,25 +93,25 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 -1 - 171 - 1799 - 3719 - 1133 + 167 + 2141 + 4061 + 1129 0 1058 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000A000000020000000100000036453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF41453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000FFDC7800FFFFFFFF40453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF4C453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000F0A0A100FFFFFFFF39453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6164635C6164632E6300000000056164632E6300000000BCA8E100FFFFFFFF40453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5372635C737461727475705C535441525455502E413531000000000B535441525455502E413531000000009CC1B600FFFFFFFF40453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C557372496E635C766F785C766F785F6D6F64756C652E68000000000C766F785F6D6F64756C652E6800000000F7B88600FFFFFFFF3B453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C756172745C756172742E630000000006756172742E6300000000D9ADC200FFFFFFFF39453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000A5C2D700FFFFFFFF39453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6261745C6261742E6300000000056261742E6300000000B3A6BE00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F000098020000 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000A000000010000000100000036453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF41453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000FFDC7800FFFFFFFF40453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF4C453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000F0A0A100FFFFFFFF39453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6164635C6164632E6300000000056164632E6300000000BCA8E100FFFFFFFF40453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5372635C737461727475705C535441525455502E413531000000000B535441525455502E413531000000009CC1B600FFFFFFFF40453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C557372496E635C766F785C766F785F6D6F64756C652E68000000000C766F785F6D6F64756C652E6800000000F7B88600FFFFFFFF3B453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C756172745C756172742E630000000006756172742E6300000000D9ADC200FFFFFFFF39453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000A5C2D700FFFFFFFF39453A5C746F646179776F726B5C32303234313033305F7379383833355C5359383833355F44656D6F5C5573725372635C6261745C6261742E6300000000056261742E6300000000B3A6BE00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F000094020000 @@ -134,7 +134,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -150,11 +150,11 @@ 0 16 - 0300000066000000ED00000068020000 + 0300000066000000ED00000064020000 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -170,11 +170,11 @@ 0 16 - 0300000066000000ED00000068020000 + 0300000066000000ED00000064020000 16 - D8000000EF000000F40100002F030000 + 70000000870000008C010000C7020000 @@ -194,7 +194,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -214,7 +214,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -234,7 +234,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -254,7 +254,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -274,7 +274,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -294,7 +294,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -314,7 +314,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -334,7 +334,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -354,7 +354,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -374,7 +374,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -394,7 +394,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -414,7 +414,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -434,7 +434,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -450,11 +450,11 @@ 0 16 - 0300000066000000ED00000068020000 + 0300000066000000ED00000064020000 16 - D8000000EF000000F40100002F030000 + 70000000870000008C010000C7020000 @@ -470,11 +470,11 @@ 0 16 - 0300000066000000ED00000068020000 + 0300000066000000ED00000064020000 16 - D8000000EF000000F40100002F030000 + 70000000870000008C010000C7020000 @@ -490,11 +490,11 @@ 0 16 - 000000009902000080070000E6030000 + 000000009502000080070000E6030000 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -514,7 +514,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -530,11 +530,11 @@ 0 16 - 030000009C0200008D050000FC020000 + 03000000980200008D050000F8020000 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -554,7 +554,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -574,7 +574,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -614,7 +614,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -634,7 +634,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -654,7 +654,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -674,7 +674,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -694,7 +694,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -714,7 +714,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -734,7 +734,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -754,7 +754,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -774,7 +774,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -794,7 +794,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -814,7 +814,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -834,7 +834,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -854,7 +854,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -874,7 +874,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -894,7 +894,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -914,7 +914,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -934,7 +934,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -954,7 +954,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -974,7 +974,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -994,7 +994,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1014,7 +1014,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1034,7 +1034,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1054,7 +1054,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1074,7 +1074,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1094,7 +1094,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1114,7 +1114,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1134,7 +1134,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1154,7 +1154,7 @@ 16 - D8000000EF000000F40100002F030000 + 70000000870000008C010000C7020000 @@ -1170,11 +1170,11 @@ 0 16 - 00000000990200009005000015030000 + 00000000950200009005000011030000 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -1190,11 +1190,11 @@ 0 16 - 030000009C0200008D050000FC020000 + 03000000980200008D050000F8020000 16 - D8000000EF000000F40100002F030000 + 70000000870000008C010000C7020000 @@ -1214,7 +1214,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1234,7 +1234,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1250,11 +1250,11 @@ 0 16 - 030000009C0200008D050000FC020000 + 03000000980200008D050000F8020000 16 - D8000000EF000000F40100002F030000 + 70000000870000008C010000C7020000 @@ -1270,11 +1270,11 @@ 0 16 - 030000009C0200008D050000FC020000 + 03000000980200008D050000F8020000 16 - D8000000EF000000F40100002F030000 + 70000000870000008C010000C7020000 @@ -1294,7 +1294,7 @@ 16 - D8000000EF000000A00300007F010000 + 70000000870000003803000017010000 @@ -1314,7 +1314,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1334,7 +1334,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1354,7 +1354,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1374,7 +1374,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1394,7 +1394,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1414,7 +1414,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1434,7 +1434,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1454,7 +1454,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1474,7 +1474,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1494,7 +1494,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1514,7 +1514,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1534,7 +1534,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1554,7 +1554,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1574,7 +1574,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1594,7 +1594,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1614,7 +1614,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1634,13 +1634,13 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 50017 50017 - 1 + 0 0 0 0 @@ -1650,11 +1650,11 @@ 0 16 - F7000000660000008D05000081000000 + A3040000660000008D0500007C010000 16 - 0A0000000A0000006E0000006E000000 + 70000000870000006001000052010000 @@ -1674,7 +1674,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1694,7 +1694,7 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 @@ -1794,19 +1794,19 @@ 16 - D8000000EF000000C8010000BA010000 + 70000000870000006001000052010000 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000D8000000EF000000A00300007F010000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000D8000000EF000000C8010000BA010000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000081020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000D8000000EF000000C8010000BA010000000000004F000000F0000000810200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000D8000000EF000000C8010000BA010000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000810200008007000085020000010000000100001004000000010000003EFEFFFFCA010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000D8000000EF000000A00300007F010000000000008502000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E65002000000000000070000000870000003803000017010000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000070000000870000006001000052010000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000007D020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000070000000870000006001000052010000000000004F000000F00000007D0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000070000000870000006001000052010000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000007D02000080070000810200000100000001000010040000000100000002FDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000070000000870000003803000017010000000000008102000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2558 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000832303234313031359600000000000000010008323032343130313500000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 + 2914 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000036162739600000000000000140003616273083230323431303135084144435F43544C310F636872675F69635F64697361626C6508636872675F69635F04343235300E496E697469616C5F5354373733350564656275671C4932435F57726974655F4F6E654279746528305844342C307830312C1C4932435F57726974655F4F6E654279746528305844342C307831302C0B536C6565705F64656C61791B4932435F57726974655F4F6E654279746528305844342C307830371B4932435F57726974655F4F6E654279746528305844342C3078313010636872675F63757272656E745F736574174932435F57726974655F4F6E654279746528305844342C1B4932435F57726974655F4F6E654279746528305844342C30783033023033084C444F5F43544C30043437303008766F6C5F766261740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 1423 @@ -3603,7 +3603,7 @@ 0 100 - 2 + 1 ..\UsrSrc\main.c 20 @@ -3615,9 +3615,9 @@ ..\UsrSrc\userapp\userapp.c - 0 - 644 - 670 + 14 + 107 + 135 1 0 @@ -3625,26 +3625,26 @@ ..\UsrSrc\vox\vox_module.c 0 - 2267 - 2291 + 1 + 1 1 0 ..\UsrSrc\discharge\discharge_module.c - 69 - 177 - 196 + 2 + 176 + 198 1 0 ..\UsrSrc\adc\adc.c - 20 - 161 - 185 + 1 + 1 + 1 1 0 @@ -3660,7 +3660,7 @@ ..\UsrInc\vox\vox_module.h - 17 + 20 277 297 1 @@ -3669,9 +3669,9 @@ ..\UsrSrc\uart\uart.c - 8 + 0 193 - 204 + 206 1 0 diff --git a/Project/SY8835_Demo.uvopt b/Project/SY8835_Demo.uvopt index babe443..5010072 100644 --- a/Project/SY8835_Demo.uvopt +++ b/Project/SY8835_Demo.uvopt @@ -504,6 +504,18 @@ 0 0 + + 2 + 23 + 1 + 1 + 0 + 0 + ..\UsrSrc\display\display_ui.c + display_ui.c + 0 + 0 + diff --git a/Project/SY8835_Demo.uvproj b/Project/SY8835_Demo.uvproj index ee0d404..f77f5a0 100644 --- a/Project/SY8835_Demo.uvproj +++ b/Project/SY8835_Demo.uvproj @@ -324,7 +324,7 @@ - ..\UsrInc\adc;..\UsrInc\charger;..\UsrInc\discharge;..\UsrInc\gpio;..\UsrInc\hall;..\UsrInc\i2c_simu;..\UsrInc\inc;..\UsrInc\key;..\UsrInc\led;..\UsrInc\mtp;..\UsrInc\pwm;..\UsrInc\sleep;..\UsrInc\system;..\UsrInc\uart;..\UsrInc\userapp;..\UsrInc\vox;..\UsrInc\vox_comm;..\UsrInc\watchdog;..\UsrInc\bat;..\UsrInc\timer;..\UsrInc\pmu;..\UsrInc\user + ..\UsrInc\adc;..\UsrInc\charger;..\UsrInc\discharge;..\UsrInc\gpio;..\UsrInc\hall;..\UsrInc\i2c_simu;..\UsrInc\inc;..\UsrInc\key;..\UsrInc\led;..\UsrInc\mtp;..\UsrInc\pwm;..\UsrInc\sleep;..\UsrInc\system;..\UsrInc\uart;..\UsrInc\userapp;..\UsrInc\vox;..\UsrInc\vox_comm;..\UsrInc\watchdog;..\UsrInc\bat;..\UsrInc\timer;..\UsrInc\pmu;..\UsrInc\user;..\UsrInc\display @@ -491,6 +491,11 @@ 1 ..\UsrSrc\user\user.c + + display_ui.c + 1 + ..\UsrSrc\display\display_ui.c + diff --git a/UsrInc/adc/adc.h b/UsrInc/adc/adc.h index d995dd1..1e7b8df 100644 --- a/UsrInc/adc/adc.h +++ b/UsrInc/adc/adc.h @@ -38,16 +38,16 @@ extern uint8_t ADC_Chn_Num; extern idata uint16_t Vbat_Adc; -extern idata uint16_t g_Vpmu_Adc; - -extern idata uint16_t g_Vntc_Adc; +extern idata int16 g_Vpmu_Adc; +extern idata int16 g_Vntc_Adc; +#if 0 extern idata uint16_t g_Vbjt_Adc; extern idata uint16_t g_Vp13_Adc; extern idata uint16_t g_Vref_Adc; - +#endif extern uint8_t g_PMU_ADC_Chn; extern idata uint16_t g_pmu_Adc_Ivol; @@ -99,7 +99,84 @@ typedef enum { pmu_ADC_MAX, }PMU_ADC_CHANNELS_E; - + +/* ADC ¿ØÖƼĴæÆ÷0 -- ADC_Ctrl0 */ +#define ADC_EN_Pos (7U) +#define ADC_EN_Pos_Msk (0x1UL << ADC_EN_Pos) +#define ADC_EN ADC_EN_Pos_Msk + +#define ADC_AVG_NUM_Pos (4U) + +#define ADC_AVG_NUM_4_Pos_Msk (0x0UL << ADC_AVG_NUM_Pos) +#define ADC_AVG_NUM_4 ADC_AVG_NUM_4_Pos_Msk + +#define ADC_AVG_NUM_8_Pos_Msk (0x1UL << ADC_AVG_NUM_Pos) +#define ADC_AVG_NUM_8 ADC_AVG_NUM_8_Pos_Msk + +#define ADC_AVG_NUM_16_Pos_Msk (0x2UL << ADC_AVG_NUM_Pos) +#define ADC_AVG_NUM_16 ADC_AVG_NUM_16_Pos_Msk + +#define ADC_AVG_NUM_32_Pos_Msk (0x3UL << ADC_AVG_NUM_Pos) +#define ADC_AVG_NUM_32 ADC_AVG_NUM_32_Pos_Msk + +#define ADC_AVG_NUM_64_Pos_Msk (0x4UL << ADC_AVG_NUM_Pos) +#define ADC_AVG_NUM_64 ADC_AVG_NUM_64_Pos_Msk + +#define ADC_SINGLE_EN_Pos (3U) +#define ADC_SINGLE_EN_Pos_Msk (0x1UL << ADC_SINGLE_EN_Pos) +#define ADC_SINGLE_EN ADC_SINGLE_EN_Pos_Msk + +#define ADC_CLK_DIV_Pos (2U) + +#define ADC_CLK_DIV_16_Pos_Msk (0x0UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_16 ADC_CLK_DIV_16_Pos_Msk + +#define ADC_CLK_DIV_24_Pos_Msk (0x1UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_24 ADC_CLK_DIV_24_Pos_Msk + +#define ADC_CLK_DIV_32_Pos_Msk (0x2UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_32 ADC_CLK_DIV_32_Pos_Msk + +#define ADC_CLK_DIV_48_Pos_Msk (0x3UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_48 ADC_CLK_DIV_48_Pos_Msk + +#define ADC_CLK_DIV_64_Pos_Msk (0x4UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_64 ADC_CLK_DIV_64_Pos_Msk + +#define ADC_CLK_DIV_96_Pos_Msk (0x5UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_96 ADC_CLK_DIV_96_Pos_Msk + +#define ADC_CLK_DIV_128_Pos_Msk (0x6UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_128 ADC_CLK_DIV_128_Pos_Msk + +#define ADC_CLK_DIV_160_Pos_Msk (0x7UL << ADC_CLK_DIV_Pos) +#define ADC_CLK_DIV_160 ADC_CLK_DIV_160_Pos_Msk + +/* ADC¿ØÖƼĴæÆ÷1 -- ADC_Ctrl1 */ +#define ADC_START_Pos (7U) +#define ADC_START_Pos_Msk (0x1UL << ADC_START_Pos) +#define ADC_START ADC_START_Pos_Msk + +#define ADC_CHN_4_Pos (4U) +#define ADC_CHN_4_Pos_Msk (0x1UL << ADC_CHN_4_Pos) +#define ADC_CHN_4 ADC_CHN_4_Pos_Msk + +#define ADC_CHN_3_Pos (3U) +#define ADC_CHN_3_Pos_Msk (0x1UL << ADC_CHN_3_Pos) +#define ADC_CHN_3 ADC_CHN_3_Pos_Msk + +#define ADC_CHN_2_Pos (2U) +#define ADC_CHN_2_Pos_Msk (0x1UL << ADC_CHN_2_Pos) +#define ADC_CHN_2 ADC_CHN_2_Pos_Msk + +#define ADC_CHN_1_Pos (1U) +#define ADC_CHN_1_Pos_Msk (0x1UL << ADC_CHN_1_Pos) +#define ADC_CHN_1 ADC_CHN_1_Pos_Msk + +#define ADC_CHN_0_Pos (0U) +#define ADC_CHN_0_Pos_Msk (0x1UL << ADC_CHN_0_Pos) +#define ADC_CHN_0 ADC_CHN_0_Pos_Msk + /******************************************************************************\ Functions definitions \******************************************************************************/ diff --git a/UsrInc/charger/charger_module.h b/UsrInc/charger/charger_module.h index 0d552e3..985af5a 100644 --- a/UsrInc/charger/charger_module.h +++ b/UsrInc/charger/charger_module.h @@ -23,25 +23,6 @@ #include "define.h" - -#ifdef NTC_ENABLE -extern bit CHG_NTC_Pro_Flag; -#endif -// ³äµç״̬¶¨Òå -typedef enum -{ - CHG_NONE = 0x00, - - CHG_PROTECT, - - CHG_STA_ING, // ³äµçÖÐ - - CHG_STA_COMPLETED, // ³äµçÍê³É - -} TE_CHG_STA; - -extern idata TE_CHG_STA ChgStatus; // ϵͳ״̬¶¨Òå - #if CHARGER_ENABLE /* Charger Current Setting */ @@ -66,10 +47,6 @@ REG_CHG1 = CHG_CURRENT_300MA; #define CHG_CURRENT_450MA 0x06 #define CHG_CURRENT_500MA 0x07 -#define CHG_CONSTANT_CUR_TIM 1 - -#define DIE_OT_RECOVER_TIM 25 //NTC±£»¤ºó£¬»Ö¸´Õý³£ºóµÈ´ý250msÖØÐ¿ªÆô³äµç - extern void Charger_Init(void); extern void Charger_Handler(void); diff --git a/UsrInc/discharge/discharge_module.h b/UsrInc/discharge/discharge_module.h index 1b3d74f..4cae91b 100644 --- a/UsrInc/discharge/discharge_module.h +++ b/UsrInc/discharge/discharge_module.h @@ -23,12 +23,6 @@ #include "define.h" -#ifdef NTC_ENABLE -extern bit Boost_NTC_Pro_Flag; -#endif - -extern bit gBoost_Prepared_Flag; //BoostÂú×㿪ÆôÌõ¼þ¡£ - #if DISCHARGE_ENABLE #define BOOST_OPEN_TIM 10 diff --git a/UsrInc/display/display_ui.h b/UsrInc/display/display_ui.h new file mode 100644 index 0000000..6160038 --- /dev/null +++ b/UsrInc/display/display_ui.h @@ -0,0 +1,44 @@ +/* + ****************************************************************************** + * + * @file display_ui.h + * @brief display ui module + * @ic sy8835 + * + * @version 1.0 + * @date 2025/01/14 09:59:40 + * @author Alex Xu + * + * Copyright (c) 2013-2099,Tkplusemi Technology Co.,Ltd. + * All Rights Reserved + * + * History: + * Revision Date Author Desc + * 1.0.0 2025/01/14 Alex build this file + ****************************************************************************** + */ + +#ifndef __DISPLAY_UI_H__ +#define __DISPLAY_UI_H__ + +/*_____ I N C L U D E S ____________________________________________________*/ + +#include "define.h" + +/******************************************************************************\ + Macro definitions +\******************************************************************************/ + +/******************************************************************************\ + Variables definitions +\******************************************************************************/ +extern uint8_t LED_On_Timer; //ledÁÁʱ¼ä¼ÆÊ± + +/******************************************************************************\ + Functions definitions +\******************************************************************************/ + +extern void LED_Display_App(void); + +#endif + diff --git a/UsrInc/hall/hall.h b/UsrInc/hall/hall.h index 27a9086..fd0b5d9 100644 --- a/UsrInc/hall/hall.h +++ b/UsrInc/hall/hall.h @@ -43,7 +43,7 @@ typedef enum{ extern CoverStatus_E CoverStatus; extern bit CoverEvent_Flg; -extern bit CoverEvent_Flg_led; + #if HALL_ENABLE /******************************************************************************\ diff --git a/UsrInc/inc/config.h b/UsrInc/inc/config.h index ab40602..d252038 100644 --- a/UsrInc/inc/config.h +++ b/UsrInc/inc/config.h @@ -25,7 +25,13 @@ /******************************************************************************\ Macro definitions \******************************************************************************/ -/*Charger Module Config Para Setting*/ +/*³ÌÐò°æ±¾£¬µÚÒ»¸öÊý´ú±íÔÚÓ²¼þ´æÔڸ͝²»ÄܼæÈÝ֮ǰ°æ±¾Ê±¼Ó1£¬ + µÚ¶þ¸öÊýÔÚ¹¦ÄÜ´æÔڸĶ¯Ê±¼Ó1£¬µÚÈý¸öÊýÔÚÈí¼þµ÷ÊÔ³öÏÖ²»Í¬µÄ + ²âÊ԰汾ʱ¸Ä¶¯£»¸ßλÊý×ֱ䶯ʱ£¬µÍλÊý×ÖÇåÁã¡£*/ + +#define FW_VER0 0x01 //³ÌÐò°æ±¾0:´ú±íÔÚÓ²¼þ´æÔڸ͝²»ÄܼæÈÝ֮ǰ°æ±¾Ê±¼Ó1 +#define FW_VER1 0x01 //³ÌÐò°æ±¾1:´ú±íÔÚ¹¦ÄÜ´æÔڸĶ¯Ê±¼Ó1 +#define FW_VER2 0x02 //³ÌÐò°æ±¾2:´ú±íÔÚÈí¼þµ÷ÊÔ³öÏÖ²»Í¬µÄ²âÊ԰汾ʱ¸Ä¶¯Ê±¼Ó1 #if 0 #if 0 @@ -117,7 +123,7 @@ ʹÓÃÂëÖµµÄÔ­Òò£º2.5VµÄÉÏÀ­LDOÓÐÎÂÆ¯Îó²î£¬Ê¹ÓÃÂëÖµ¿ÉÒÔ¹æ±Ü¡£ */ -#define NONE_NTC 984 //NTCÒý½ÅÐü¿ÕÂëÖµ +#define NONE_NTC 1000 //NTCÒý½ÅÐü¿ÕÂëÖµ #define T_N20C 927 //-20¡æ NTC:953K @@ -160,6 +166,8 @@ #define T_80C 113 //80¡æ NTC:12.4K #endif +/* ¹¦ÄÜÑ¡ÔñºÍÅäÖᣠ*/ + /* NTC±£»¤±ê׼ѡÔñ£¬JEITA or IEC.*/ #define NTC_JEITA 1 @@ -179,32 +187,32 @@ #elif NTC_JEITA /* JEITAģʽ£¬NTCζȱ£»¤ÉÏÏÂÏÞãÐÖµºÍ³ÙÖÍζȡ£ */ -#define JEITA_NTC_CHG_PRO_LOW_TMP T_0C //ÅäÖóäµçNTC±£»¤Î¶ÈÏÂÏÞÖµ¡£ +#define JEITA_NTC_CHG_PRO_LOW_TMP T_0C //ÅäÖóäµçNTC±£»¤Î¶ÈÏÂÏÞÖµ¡£ -#define JEITA_NTC_CHG_PRO_HYST_LOW_TMP T_3C //ÅäÖóäµçNTC±£»¤»Ö¸´Î¶ÈÏÂÏÞ³ÙÖÍÖµ¡£ +#define JEITA_NTC_CHG_PRO_HYST_LOW_TMP T_3C //ÅäÖóäµçNTC±£»¤»Ö¸´Î¶ÈÏÂÏÞ³ÙÖÍÖµ¡£ -#define JEITA_NTC_CHG_PRO_HIGH_TMP T_60C //ÅäÖóäµçNTC±£»¤Î¶ÈÉÏÏÞÖµ¡£ +#define JEITA_NTC_CHG_PRO_HIGH_TMP T_60C //ÅäÖóäµçNTC±£»¤Î¶ÈÉÏÏÞÖµ¡£ -#define JEITA_NTC_CHG_PRO_HYST_HIGH_TMP T_57C //ÅäÖóäµçNTC±£»¤»Ö¸´Î¶ÈÉÏÏÞ³ÙÖÍÖµ¡£ +#define JEITA_NTC_CHG_PRO_HYST_HIGH_TMP T_57C //ÅäÖóäµçNTC±£»¤»Ö¸´Î¶ÈÉÏÏÞ³ÙÖÍÖµ¡£ /* JEITAģʽ£¬NTCζÈÀä״̬£¬ÉÏÏÂÏÞãÐÖµºÍ³ÙÖÍζȡ£ */ -#define JEITA_NTC_CHG_COLD_HIGH_TMP T_10C //ÅäÖóäµçNT CÀä״̬ζÈÉÏÏÞÖµ¡£ +#define JEITA_NTC_CHG_COLD_HIGH_TMP T_10C //ÅäÖóäµçNT CÀä״̬ζÈÉÏÏÞÖµ¡£ -#define JEITA_NTC_CHG_COLD_HYST_HIGH_TMP T_8C //ÅäÖóäµçNTCÀä״̬»Ö¸´Î¶ÈÉÏÏÞ³ÙÖÍÖµ¡£ +#define JEITA_NTC_CHG_COLD_HYST_HIGH_TMP T_8C //ÅäÖóäµçNTCÀä״̬»Ö¸´Î¶ÈÉÏÏÞ³ÙÖÍÖµ¡£ /* JEITAģʽ£¬NTCζÈů״̬£¬ÉÏÏÂÏÞãÐÖµºÍ³ÙÖÍζȡ£ */ -#define JEITA_NTC_CHG_WARM_LOW_TMP T_10C //ÅäÖóäµçNTCů״̬ζÈÏÂÏÞÖµ¡£ +#define JEITA_NTC_CHG_WARM_LOW_TMP T_10C //ÅäÖóäµçNTCů״̬ζÈÏÂÏÞÖµ¡£ -#define JEITA_NTC_CHG_WARM_HYST_LOW_TMP T_12C //ÅäÖóäµçNTCů״̬»Ö¸´Î¶ÈÏÂÏÞ³ÙÖÍÖµ¡£ +#define JEITA_NTC_CHG_WARM_HYST_LOW_TMP T_12C //ÅäÖóäµçNTCů״̬»Ö¸´Î¶ÈÏÂÏÞ³ÙÖÍÖµ¡£ -#define JEITA_NTC_CHG_WARM_HIGH_TMP T_45C //ÅäÖóäµçNT Ců״̬ζÈÉÏÏÞÖµ¡£ +#define JEITA_NTC_CHG_WARM_HIGH_TMP T_45C //ÅäÖóäµçNT Ců״̬ζÈÉÏÏÞÖµ¡£ -#define JEITA_NTC_CHG_WARM_HYST_HIGH_TMP T_42C //ÅäÖóäµçNTCů״̬»Ö¸´Î¶ÈÉÏÏÞ³ÙÖÍÖµ¡£ +#define JEITA_NTC_CHG_WARM_HYST_HIGH_TMP T_42C //ÅäÖóäµçNTCů״̬»Ö¸´Î¶ÈÉÏÏÞ³ÙÖÍÖµ¡£ /* JEITAģʽ£¬NTCζÈÈÈ״̬£¬ÉÏÏÂÏÞãÐÖµºÍ³ÙÖÍζȡ£ */ -#define JEITA_NTC_CHG_HOT_LOW_TMP T_45C //ÅäÖóäµçNTCÈÈ״̬ζÈÏÂÏÞÖµ¡£ +#define JEITA_NTC_CHG_HOT_LOW_TMP T_45C //ÅäÖóäµçNTCÈÈ״̬ζÈÏÂÏÞÖµ¡£ -#define JEITA_NTC_CHG_HOT_HYST_LOW_TMP T_47C //ÅäÖóäµçNTCÈÈ״̬»Ö¸´Î¶ÈÏÂÏÞ³ÙÖÍÖµ¡£ +#define JEITA_NTC_CHG_HOT_HYST_LOW_TMP T_47C //ÅäÖóäµçNTCÈÈ״̬»Ö¸´Î¶ÈÏÂÏÞ³ÙÖÍÖµ¡£ #endif @@ -253,7 +261,7 @@ /* LED Çý¶¯Êä³öÏÞÁ÷ÅäÖᣠ*/ -#define LED_DRV_LIMIT_SET P1_DRV_400 //ÅäÖÃP10-P13ÏÞÁ÷Êä³ö£¬2¸öµµÎ»£ºÏÞÁ÷µç×è400¦¸¡¢800¦¸¡£ +#define LED_DRV_LIMIT_SET P1_DRV_400 //ÅäÖÃP10-P13ÏÞÁ÷Êä³ö£¬2¸öµµÎ»£ºÏÞÁ÷µç×èÅäÖãºP1_DRV_400:400¦¸¡¢P1_DRV_800:800¦¸¡£ /* KEY And Hall Module Setting. */ @@ -281,22 +289,24 @@ #define VOX_CHG_FULL_5V_LEAST_CNT 40 //ÅäÖùظÇÌõ¼þÏ£¬VOX ¶ú»ú³äÂúºó£¬VOXÊä³ö5V³ÖÐøÊ±¼ä£¨100ms * 40£© -#define VOX_OPEN_VOUT_5V_DEBOUNCE 5 //ÅäÖÿª¸Ç¶¯×÷ºó£¬VOX Êä³ö5V³ÖÐøÊ±¼ä£¨100ms * 5£©£¬µ¥Î»£ºms¡£ +#define HALL_OPEN_VOX_5V_DEBOUNCE 5 //ÅäÖÿª¸Ç¶¯×÷ºó£¬VOX Êä³ö5V³ÖÐøÊ±¼ä£¨100ms * 5£©£¬µ¥Î»£ºms¡£ -#define VOX_OPEN_VOUT_0V_DEBOUNCE 5 //ÅäÖÿª¸Ç¶¯×÷ºó£¬VOX Êä³ö0V³ÖÐøÊ±¼ä£¨100ms * 5£©£¬µ¥Î»£ºms¡£ +#define HALL_OPEN_VOX_0V_DEBOUNCE 5 //ÅäÖÿª¸Ç¶¯×÷ºó£¬VOX Êä³ö0V³ÖÐøÊ±¼ä£¨100ms * 5£©£¬µ¥Î»£ºms¡£ -#define VOX_CLOSE_5V_HOLD_CNT 3 //ÅäÖùظǶ¯×÷ºó£¬VOX Êä³ö5V³ÖÐøÊ±¼ä£¨100ms * 3£©£¬µ¥Î»£ºms¡£ +#define HALL_CLOSE_VOX_5V_HOLD_CNT 3 //ÅäÖùظǶ¯×÷ºó£¬VOX Êä³ö5V³ÖÐøÊ±¼ä£¨100ms * 3£©£¬µ¥Î»£ºms¡£ /* Ë«ÏòͨѶЭÒéÑ¡Ôñ */ #define JIELI 0 //½ÜÀí¶ú»úоƬ -#define ZHONGKE 0 //ÖпÆÀ¶Ñ¶¶ú»úоƬ +#define ZHONGKE 1 //ÖпÆÀ¶Ñ¶¶ú»úоƬ -#define XUANHENG 1 //Ðþºã¶ú»úоƬ +#define XUANHENG 0 //Ðþºã¶ú»úоƬ /* Vox¸úËæ³ä²ÎÊýÉèÖá£(100msµ÷ÓÃÖÜÆÚ) */ +#define FOLLOW_CHG_EFFICIENCY //ÅäÖøúËæ³äÀàÐÍ£º0¡¢Ð§ÂÊÓÅÏÈ£»1¡¢ËÙ¶ÈÓÅÏÈ¡£ + #define VOX_CV_TC_CURRENT 20 //¶ú»ú³äµç´¦ÓÚCV/TC½×¶ÎµÄµçÁ÷Öµ£¬µ¥Î»mA¡£ #define VOX_FOLLOW_CHG_INIT_CNT 10 //Æô¶¯¸úËæ³äVOX VOUTÊä³ö×î¸ßµçѹ³ÖÐøÊ±¼ä£¬1s£¬µ¥Î»£ºms¡£¡£ @@ -311,6 +321,23 @@ #define VOUT_MIN_THD BOOST_VPMID_3_7V //VOX VOUTÊä³ö×îСãÐÖµ¡£ +#define IVOL_Threshold_Neg(Ivol) ( Ivol / 5 ) << 2 //VOL µ÷ѹÏÂÏÞãÐÖµµçÁ÷£¬80% * Ivol£¬IVOL¡ÝÕâ¸öÖµ£¬Ôò½µÑ¹¡£ + +#define IVOR_Threshold_Neg(Ivor) ( Ivor / 5 ) << 2 //VOR µ÷ѹÏÂÏÞãÐÖµµçÁ÷£¬80% * Ivor£¬IVOR¡ÝÕâ¸öÖµ£¬Ôò½µÑ¹¡£ + +#define IVOL_Threshold_Pos(Ivol) ( Ivol ) << 1 //VOL µ÷ѹÉÏÏÞãÐÖµµçÁ÷£¬2±¶ * Ivol£¬µ±Ivol´óÓÚTHPãÐÖµµçÁ÷£¬Ôò˵Ã÷¶ú»ú״̬·¢Éú¸Ä±ä£¨TCÌø×ªµ½CC»òRecharge¸´³ä£©£¬ÐèÒªÖØÆô¸úËæ³ä¡£ + +#define IVOR_Threshold_Pos(Ivor) ( Ivor ) << 1 //VOR µ÷ѹÉÏÏÞãÐÖµµçÁ÷£¬2±¶ * Ivor£¬µ±Ivor´óÓÚTHPãÐÖµµçÁ÷£¬Ôò˵Ã÷¶ú»ú״̬·¢Éú¸Ä±ä£¨TCÌø×ªµ½CC»òRecharge¸´³ä£©£¬ÐèÒªÖØÆô¸úËæ³ä¡£ + +/* PWM Module Setting */ +/*PWM¼ÆÊýÆ÷ʱÖÓFre(pwm) = Fre(sys)/PWM_PRE = 11.0592M / n^PWM_PRE = 11.0592M / 8 = 1.38MHz, + PWM_REL = 255 - 1.38M / 10K = 255-138 = 117£¬ + nPWM_CMP = 117 + 150 * (1-50%) = 192¡£ +*/ +#define PWM_CLKFRE_SET 3 //ÅäÖÃPWM¼ÆÊýʱÖÓÆµÂÊ£¬¶ÔÓ¦¼Ä´æÆ÷PWM_PRE£»PWM¼ÆÊýÆ÷ʱÖÓFre(pwm) = Fre(sys)/PWM_PRE = 12M / n^PWM_PRE = 12M / 8 = 1.5MHz, + +#define PWM_RELOAD_SET PWM_REL_VALUE //ÅäÖÃPWMÊä³öÕ¼¿Õ±È£¬¶ÔÓ¦¼Ä´æÆ÷PWM_REL£»ÐèºÍPWM_CMPÅäºÏʹÓᣠ+ /*Sleep Module Setting*/ /*Enter Sleep Time Debounce*/ @@ -318,11 +345,44 @@ #define ENTER_SHIPMODE_CNT 5 //½øÈëShipMode ÑÓ³Ùʱ¼ä£¬µ¥Î»£ºÃë - /******************************************************************************\ Variables definitions \******************************************************************************/ +/* ±ê־λºÍ״̬λ¡£ */ +/* NTC³ä·Åµç±£»¤±ê־λ */ +extern bit CHG_NTC_Pro_Flag; //³äµçNTC±£»¤±ê־λ£»TRUE£ºÓÐNTC±£»¤:FAULSE:ÎÞNTC±£»¤ + +extern bit Boost_NTC_Pro_Flag; //·ÅµçµçNTC±£»¤±ê־λ£»TRUE£ºÓÐNTC±£»¤:FAULSE:ÎÞNTC±£»¤ + +/* Charger״̬¶¨Òå */ +// ³äµç״̬¶¨Òå +typedef enum +{ + CHG_NONE = 0x00, + + CHG_PROTECT, + + CHG_STA_ING, // ³äµçÖÐ + + CHG_STA_COMPLETED, // ³äµçÍê³É + +} TE_CHG_STA; + +extern idata TE_CHG_STA ChgStatus; // Charger״̬¶¨Òå + +/* BoostÏà¹Ø±ê־λ */ +extern bit gBoost_Prepared_Flag; //BoostÂú×㿪ÆôÌõ¼þ£¬TRUE:BoostÎÞ±£»¤£¬¿ÉÒÔ¿ªÆô£»FAULSE:BoostÓб£»¤£¬ÎÞ·¨Õý³£¿ªÆô¡£ + +/* LED UIÏÔʾÏà¹Ø±ê־λ */ +extern bit CoverEvent_Flg_led; //Hall¿ª¹Ø¸Ç¶¯×÷±ê־룬ÓÃÓÚLED UIÏÔʾ£¬TRUE:Óпª¹Ø¸Ç¶¯×÷¡£ + +extern bit Earphone_Chg_Flag_led; //¶ú»ú³öÈëºÐ±ê־룬ÓÃÓÚLED UIÏÔʾ£¬TRUE:Óжú»úÈëºÐ¶¯×÷¡£ + +extern bit Key_Press_short_irq_led; //°´¼ü¶Ì°´¶¯×÷±ê־룬ÓÃÓÚLED UIÏÔʾ£¬TRUE:Óа´¼ü¶Ì°´¶¯×÷¡£ + +extern bit LED_On_Flag; //ledÏÔʾ¸´Î»±ê־룬TRUE:µÆÐ§¸´Î»¡£ + /******************************************************************************\ UserCfg.Functions definitions \******************************************************************************/ diff --git a/UsrInc/inc/define.h b/UsrInc/inc/define.h index 444ff06..c2a4282 100644 --- a/UsrInc/inc/define.h +++ b/UsrInc/inc/define.h @@ -52,12 +52,6 @@ #define VOX_FOLLOW_CHG 1 //1701Bytes -#if VOX_FOLLOW_CHG - -#define FOLLOW_CHG_EFFICIENCY //¸úËæ³äÁ½Ö»ÀàÐÍ£º1¡¢Ð§ÂÊÓÅÏÈ£»2¡¢ËÙ¶ÈÓÅÏÈ¡£ - -#endif - #if VOX_ENABLE #define VOX_TX //959Bytes @@ -76,10 +70,6 @@ #if ADC_ENABLE -#define NTC_JEITA 1 - -#define NTC_IEC 0 - #define NTC_ENABLE //513Bytes JEITA #endif @@ -98,10 +88,10 @@ #define _DEBUG_VOX #define _DEBUG_FOLLOW #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 @@ -149,7 +139,7 @@ typedef enum{false = 0, true = !false} bool; #include "stdlib.h" #endif -#include "reg3315.h" +#include "reg8835.h" #include "uart.h" diff --git a/UsrInc/inc/reg3315.h b/UsrInc/inc/reg8835.h similarity index 98% rename from UsrInc/inc/reg3315.h rename to UsrInc/inc/reg8835.h index 23266eb..f3f9fe4 100644 --- a/UsrInc/inc/reg3315.h +++ b/UsrInc/inc/reg8835.h @@ -1,8 +1,8 @@ /* ****************************************************************************** * - * @file reg3315.h - * @brief Header file for TP3315 microcontroller. + * @file reg8835.h + * @brief Header file for sy8835 microcontroller. * @ic sy8835 * * @version 1.0 diff --git a/UsrInc/key/key.h b/UsrInc/key/key.h index 31963f0..a5c6e24 100644 --- a/UsrInc/key/key.h +++ b/UsrInc/key/key.h @@ -35,7 +35,6 @@ #if KEY_ENABLE -extern bit Key_Press_short_irq; extern bit Key_Press_l_irq; extern bit Key_Press_ll_irq; diff --git a/UsrInc/userapp/userapp.h b/UsrInc/userapp/userapp.h index fd25337..ca8012b 100644 --- a/UsrInc/userapp/userapp.h +++ b/UsrInc/userapp/userapp.h @@ -53,6 +53,7 @@ typedef struct { }s_sys_state; extern xdata s_sys_state Systerm_State; + extern bit Wkup_Earphone_Flag; //±£»¤Ïûʧºó£¬ÐèÒªÉýѹ»½ÐѶú»ú±ê־λ /******************************************************************************\ @@ -62,8 +63,6 @@ extern bit Wkup_Earphone_Flag; // extern uint8_t LED_On_Timer; //ledÁÁʱ¼ä¼ÆÊ± -extern bit LED_On_Flag; - extern void UserAPP(void); #endif diff --git a/UsrInc/vox/vox_module.h b/UsrInc/vox/vox_module.h index c908226..96a5942 100644 --- a/UsrInc/vox/vox_module.h +++ b/UsrInc/vox/vox_module.h @@ -36,8 +36,6 @@ extern bit Vox_Vout_Enable; -extern bit Earphone_Chg_Flag; //¶ú»ú³öÈëºÐ±ê־λ - extern bit Vox_Output_Short_Flag; #define IVOX_THN 20 //¶ú»ú¸úËæ³äµçÁ÷ϽµãÐÖµ diff --git a/UsrSrc/InitVars.c b/UsrSrc/InitVars.c index 664cfb9..3321b8e 100644 --- a/UsrSrc/InitVars.c +++ b/UsrSrc/InitVars.c @@ -22,18 +22,11 @@ /******************************************************************************\ Macro definitions \******************************************************************************/ -/*³ÌÐò°æ±¾£¬µÚÒ»¸öÊý´ú±íÔÚÓ²¼þ´æÔڸ͝²»ÄܼæÈÝ֮ǰ°æ±¾Ê±¼Ó1£¬ - µÚ¶þ¸öÊýÔÚ¹¦ÄÜ´æÔڸĶ¯Ê±¼Ó1£¬µÚÈý¸öÊýÔÚÈí¼þµ÷ÊÔ³öÏÖ²»Í¬µÄ - ²âÊ԰汾ʱ¸Ä¶¯£»¸ßλÊý×ֱ䶯ʱ£¬µÍλÊý×ÖÇåÁã¡£*/ - -#define FW_VER0 0x01 //³ÌÐò°æ±¾0:´ú±íÔÚÓ²¼þ´æÔڸ͝²»ÄܼæÈÝ֮ǰ°æ±¾Ê±¼Ó1 -#define FW_VER1 0x01 //³ÌÐò°æ±¾1:´ú±íÔÚ¹¦ÄÜ´æÔڸĶ¯Ê±¼Ó1 -#define FW_VER2 0x02 //³ÌÐò°æ±¾2:´ú±íÔÚÈí¼þµ÷ÊÔ³öÏÖ²»Í¬µÄ²âÊ԰汾ʱ¸Ä¶¯Ê±¼Ó1 /******************************************************************************\ Variables definitions \******************************************************************************/ -char code Version_Addr[3] = {FW_VER0,FW_VER1,FW_VER2}; //ÉèÖÃROM¾ø¶ÔµØÖ·´æ·ÅÈí°æ±¾£¬Á½¸ö²ÎÊý´æÓÚROMµÄ3070¡¢3071¡¢3072λÖô¦£¬Ð¡¶Ëģʽ´æ´¢¡£ +char code Version_Addr[3] = {FW_VER0,FW_VER1,FW_VER2}; //ÉèÖÃROM¾ø¶ÔµØÖ·´æ·ÅÈí°æ±¾£¬Á½¸ö²ÎÊý´æÓÚROMµÄµ¹Êý3BytesλÖô¦£¬Ð¡¶Ëģʽ´æ´¢¡£ diff --git a/UsrSrc/adc/adc.c b/UsrSrc/adc/adc.c index d559966..86b2929 100644 --- a/UsrSrc/adc/adc.c +++ b/UsrSrc/adc/adc.c @@ -3,7 +3,7 @@ * * @file adc.c * @brief adc module - * @ic sy8835 + * @ic sy8835 * * @version 1.0 * @date 2024/11/01 15:00:40 @@ -31,39 +31,31 @@ /******************************************************************************\ Variables definitions \******************************************************************************/ -int8_t ADC_Offset_Error = 0; //ADC Offset Error У׼ֵ¼Ä´æÆ÷ +int8_t ADC_Offset_Error; //ADC Offset Error У׼ֵ¼Ä´æÆ÷ -//int8_t ADC_Gain_Error = 0; //ADC Gain Error У׼ֵ¼Ä´æÆ÷ +uint8_t ADC_Chn_Num; -uint8_t ADC_Chn_Num = 0; +idata uint16_t Vbat_Adc; -idata uint16_t Vbat_Adc = 0; +idata int16 g_Vpmu_Adc; -idata uint16_t g_Vpmu_Adc = 0; +idata int16 g_Vntc_Adc; -idata uint16_t g_Vntc_Adc = 0; -#if 0 -idata uint16_t g_Vbjt_Adc = 0; +uint8_t g_PMU_ADC_Chn; -idata uint16_t g_Vp13_Adc = 0; +idata uint16_t g_pmu_Adc_Ivol; -idata uint16_t g_Vref_Adc = 0; -#endif -uint8_t g_PMU_ADC_Chn = 0; +idata uint16_t g_pmu_Adc_Vin; -idata uint16_t g_pmu_Adc_Ivol = 0; +idata uint16_t g_pmu_Adc_Vpmid; -idata uint16_t g_pmu_Adc_Vin = 0; +idata uint16_t g_pmu_Adc_Vor; -idata uint16_t g_pmu_Adc_Vpmid = 0; +idata uint16_t g_pmu_Adc_Vol; -idata uint16_t g_pmu_Adc_Vor = 0; +idata uint16_t g_pmu_Adc_Vdd; -idata uint16_t g_pmu_Adc_Vol = 0; - -idata uint16_t g_pmu_Adc_Vdd = 0; - -idata uint16_t g_pmu_Adc_Ivor = 0; +idata uint16_t g_pmu_Adc_Ivor; /******************************************************************************\ Functions definitions @@ -90,11 +82,10 @@ void Adc_Init(void) SFRADDR = MFP_CTL0; //Set P14 As ADC1 For NTC SFRDATA |= 0x10; - ExtSfr_Write(ADC_CTL0,0xAB); //0B10101001,0xA9--ADC EN;Average time:16; Single mode; ADC CLK divided by 24=460k - -// SFRADDR = ADC_IntEn; //Enable ADC Interrupt.b[4:0]:ADC4-ADC0 -// SFRDATA |= 0x03; +// ExtSfr_Write(ADC_CTL0,0xAB); //0B10101001,0xA9--ADC EN;Average time:16; Single mode; ADC CLK divided by 24=460k + ExtSfr_Write(ADC_CTL0, ( ADC_EN | ADC_AVG_NUM_16 | ADC_SINGLE_EN | ADC_CLK_DIV_48 ) ); //0B10101001,0xA9--ADC EN;Average time:16; Single mode; ADC CLK divided by 24=460k + SFRADDR = ADC_OFFSET; ADC_Offset_Error = SFRDATA; } @@ -115,16 +106,22 @@ void Adc_Init(void) */ void PMU_ADC_Chn_Data(PMU_ADC_CHANNELS_E pmu_Adc_Chn) { - if( ADC_IntFlag & 0x01 ) + if( ADC_IntFlag & ADC_PMU_CH0 ) { - ADC_IntFlag = 0x01; + ADC_IntFlag = ADC_PMU_CH0; g_Vpmu_Adc = ExtSfr_Read(ADC_CH0_L); + g_Vpmu_Adc |= (uint16_t)( ( ExtSfr_Read(ADC_CH0_H) & 0x03 ) << 8 ); - I2cSfr_Write( XSEN_CTRL , (0x08 | pmu_Adc_Chn) ); //XsenÇл»Í¨µÀºóÐèÒªµÈ´ýÖÁÉÙ100usºóADCÔÙ½øÐвÉÑù¡£ - - g_Vpmu_Adc = ((uint32_t)( g_Vpmu_Adc - ADC_Offset_Error ) * 2500) >> 10 ; //ADCµÄLSB = 2500mV / 1024 = 2.44mV + I2cSfr_Write( XSEN_CTRL , ( 0x08 | pmu_Adc_Chn ) ); //XsenÇл»Í¨µÀºóÐèÒªµÈ´ýÖÁÉÙ100usºóADCÔÙ½øÐвÉÑù¡£ + + g_Vpmu_Adc = ( (int32)( (int16)( g_Vpmu_Adc - ADC_Offset_Error ) ) * 2500 ) >> 10 ; //ADCµÄLSB = 2500mV / 1024 = 2.44mV + + if( g_Vpmu_Adc < 0 ) + { + g_Vpmu_Adc = 0; + } /*»ñÈ¡xSen¶ÔÓ¦µÄADCÖµ*/ switch (g_PMU_ADC_Chn) @@ -146,11 +143,11 @@ void PMU_ADC_Chn_Data(PMU_ADC_CHANNELS_E pmu_Adc_Chn) break; case pmu_ADC_VOR: - g_pmu_Adc_Vor = g_Vpmu_Adc << 2; //vorµÄ4·Öѹ + g_pmu_Adc_Vor = g_Vpmu_Adc << 2; //vorµÄ4·Öѹ break; case pmu_ADC_VOL: - g_pmu_Adc_Vol = g_Vpmu_Adc << 2; //volµÄ4·Öѹ + g_pmu_Adc_Vol = g_Vpmu_Adc << 2; //volµÄ4·Öѹ break; case pmu_ADC_VDD: @@ -160,6 +157,7 @@ void PMU_ADC_Chn_Data(PMU_ADC_CHANNELS_E pmu_Adc_Chn) case pmu_ADC_IVOR: g_pmu_Adc_Ivor = g_Vpmu_Adc >> 2; //²ÉÑù±ÈÀý4mV/mA break; + default: break; } @@ -167,14 +165,14 @@ void PMU_ADC_Chn_Data(PMU_ADC_CHANNELS_E pmu_Adc_Chn) g_PMU_ADC_Chn = pmu_Adc_Chn; - ADC_CTL1 = 0x80 | ( ADC_PMU_CH0 ); //ADC Start Enable,Set Channel N Enabel. + ADC_CTL1 = ADC_START | ( ADC_CHN_0 ); //ADC Start Enable,Set Channel N Enabel. } /* ******************************************************************************* * void ADC_NTC_Data(void) * -* Description : »ñÈ¡NTC ADCÖµ +* Description : »ñÈ¡NTC ADCÖµ£¬ADC1 * * Arguments : NONE @@ -186,18 +184,23 @@ void PMU_ADC_Chn_Data(PMU_ADC_CHANNELS_E pmu_Adc_Chn) */ void ADC_NTC_Data(void) { - if( ADC_IntFlag & 0x02 ) //»ñÈ¡NTC ADC ÂëÖµ + if( ADC_IntFlag & ADC_NTC_CH1 ) //»ñÈ¡NTC ADC ÂëÖµ { - ADC_IntFlag = 0x02; + ADC_IntFlag = ADC_NTC_CH1; g_Vntc_Adc = ExtSfr_Read(ADC_CH1_L); g_Vntc_Adc |= (uint16_t)( ( ExtSfr_Read(ADC_CH1_H) & 0x03 ) << 8 ); g_Vntc_Adc = g_Vntc_Adc - ADC_Offset_Error ; + + if( g_Vntc_Adc < 0 ) + { + g_Vntc_Adc = 0; + } } - ADC_CTL1 = 0x80 | ( ADC_NTC_CH1 ); //ADC Start Enable,Set Channel N Enabel. + ADC_CTL1 = ADC_START | ( ADC_CHN_1 ); //ADC Start Enable,Set Channel N Enabel. } #endif diff --git a/UsrSrc/bat/bat.c b/UsrSrc/bat/bat.c index 414ef6d..797a789 100644 --- a/UsrSrc/bat/bat.c +++ b/UsrSrc/bat/bat.c @@ -21,9 +21,9 @@ #include "adc.h" #include "pmu.h" -idata uint8_t bat_level = 0; +idata uint8_t bat_level; -bit F_batlevel_low = 0; //µç³ØµÍѹ +bit F_batlevel_low; //µç³ØµÍѹ #if 0 @@ -474,15 +474,15 @@ void Bat_Gauge_Handle(void) #define C_offset_bat_level_MAX 200 #define C_offset_bat_level_MIN 10 -bit F_batlevel_protect = 0; //µÍµç±£»¤ +bit F_batlevel_protect; //µÍµç±£»¤ -bit F_batlevel_25p = 0; +bit F_batlevel_25p; -bit F_batlevel_50p = 0; +bit F_batlevel_50p; -bit F_batlevel_75p = 0; +bit F_batlevel_75p; -idata uint8_t offset_bat_level = ( C_offset_bat_level_MAX + C_offset_bat_level_MIN ) / 2; +idata uint8_t offset_bat_level; /*³äµçµç³Øµçѹ»á¸¡¸ß,¾ßÌåµçѹÐèÒª²âÊÔ¡£*/ const uint16_t Boost_batlevel_Threshold[C_batLevel_SetMax] = diff --git a/UsrSrc/charger/charger_module.c b/UsrSrc/charger/charger_module.c index 6a6f98d..dcf0020 100644 --- a/UsrSrc/charger/charger_module.c +++ b/UsrSrc/charger/charger_module.c @@ -3,7 +3,7 @@ * * @file charger_module.c * @brief charger module - * @ic sy8835 + * @ic sy8835 * * @version 1.0 * @date 2024/11/01 17:35:40 @@ -29,7 +29,7 @@ #include "bat.h" #ifdef NTC_ENABLE -bit CHG_NTC_Pro_Flag = 0; +bit CHG_NTC_Pro_Flag; #endif idata TE_CHG_STA ChgStatus; // CHG״̬¶¨Òå @@ -38,7 +38,7 @@ idata TE_CHG_STA ChgStatus; // CHG״̬ /******************************************************************************\ Macro definitions \******************************************************************************/ -#define NTC_PRO_DEBOUNCE_TIM 10 +#define NTC_PRO_DEBOUNCE_TIM 10 /******************************************************************************\ Variables definitions @@ -46,7 +46,7 @@ idata TE_CHG_STA ChgStatus; // CHG״̬ -idata uint8_t gConstant_Cur_Max_Setting = CONSTANT_CUR_SET; //Charge×î´ó³äµçµçÁ÷¡£ +idata uint8_t gConstant_Cur_Max_Setting; //Charge×î´ó³äµçµçÁ÷¡£ idata s_gCharger_Cfg gCharge_Cfg; @@ -71,6 +71,8 @@ idata s_gCharger_Cfg gCharge_Cfg; void Charger_Init(void) { + gConstant_Cur_Max_Setting = CONSTANT_CUR_SET; + gCharge_Cfg.nTrickle_Cur = TRICKLE_CUR_SET; gCharge_Cfg.nIterm_Cur = ITERM_CUR_SET; @@ -78,7 +80,6 @@ void Charger_Init(void) gCharge_Cfg.nConstant_Cur = gConstant_Cur_Max_Setting; gCharge_Cfg.nVFloat = VFLOAT_SET; - } #ifdef NTC_ENABLE @@ -467,9 +468,6 @@ void Charger_Handler(void) return; } - /*¸÷Ïî±£»¤¶¼ÎÞÐèÈí¼þ´¦Àí£¬Ö»´¦Àí³äµç³¬Ê±£¬³¬Ê±ºóÐèÒªµÈVBUSÖØÐ²å°Îºó²ÅÖØÐ¿ªÊ¼ChargerÁ÷³Ì¡£*/ - ChgStatus = CHG_PROTECT; - #ifdef NTC_ENABLE /*NTC Handle*/ //ʹÄÜChargerǰÏȼì²âNTCζȣ¬Òì³£¾Í²»¿ª³äµç¡£(CHIP_STA4 & 0x80):PG @@ -479,6 +477,8 @@ void Charger_Handler(void) CHG_NTC_Pro_Flag = 1; + ChgStatus = CHG_PROTECT; + return; } @@ -486,7 +486,7 @@ void Charger_Handler(void) #endif - if( (pmu_Info.pmu_Chip_STA & ChipSTA_DISCHG) == ChipSTA_CHG_DONE ) //Charg complete interrupt + if( ( pmu_Info.pmu_Chip_STA & ChipSTA_DISCHG ) == ChipSTA_CHG_DONE ) //Charg complete interrupt { #ifdef _DEBUG_CHARGER printf("Chg Done\r\n"); diff --git a/UsrSrc/discharge/discharge_module.c b/UsrSrc/discharge/discharge_module.c index fcc8ce0..a22ac92 100644 --- a/UsrSrc/discharge/discharge_module.c +++ b/UsrSrc/discharge/discharge_module.c @@ -27,10 +27,10 @@ #include "bat.h" #ifdef NTC_ENABLE -bit Boost_NTC_Pro_Flag = 0; +bit Boost_NTC_Pro_Flag; #endif -bit gBoost_Prepared_Flag = 0; //BoostÂú×㿪ÆôÌõ¼þ¡£ +bit gBoost_Prepared_Flag; //BoostÂú×㿪ÆôÌõ¼þ¡£ #if DISCHARGE_ENABLE /******************************************************************************\ @@ -41,9 +41,7 @@ bit gBoost_Prepared_Flag = 0; //Boost Variables definitions \******************************************************************************/ - - -bit gBoost_UVLO_Flag = 0; +bit gBoost_UVLO_Flag; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/display/display_ui.c b/UsrSrc/display/display_ui.c new file mode 100644 index 0000000..fd61eaf --- /dev/null +++ b/UsrSrc/display/display_ui.c @@ -0,0 +1,370 @@ +/******************************************************************************* + * + * @file display_ui.c + * @brief display_ui module + * @ic sy8835 + * + * @version 1.0 + * @date 2025/01/14 15:00:40 + * @author Alex Xu + * + * Copyright (c) 2013-2099,Tkplusemi Technology Co.,Ltd. + * All Rights Reserved + * + * History: + * Revision Date Author Desc + * 1.0.0 2025/01/14 Alex build this file + ******************************************************************************/ + /*_____ I N C L U D E S ____________________________________________________*/ +#include "display_ui.h" +#include "userapp.h" +#include "adc.h" +#include "hall.h" +#include "key.h" +#include "sleep.h" +#include "system.h" +#include "bat.h" +#include "sys_tim.h" +#include "charger_module.h" +#include "discharge_module.h" +#include "led.h" +#include "vox_module.h" + +/******************************************************************************\ + Macro definitions +\******************************************************************************/ +#define LED_ON_CNT 100 //10s£¬µçÁ¿µÆ´¥·¢ºóÁÁµÄʱ¼ä¡£ + +#define LED_PRO_TIM 40 + +#define LED_OFF_CNT 1 + +/******************************************************************************\ + Variables definitions +\******************************************************************************/ +bit Earphone_Chg_Flag_led; //¶ú»ú³öÈëºÐ±ê־λ + +bit CoverEvent_Flg_led; //Hall¿ª¹Ø´¥·¢Ê¼þ±ê־룬ÓÃÓÚµÆÐ§ÏÔʾ¡£ + +bit Key_Press_short_irq_led; //°´¼ü¶Ì°´¶¯×÷±ê־룬ÓÃÓÚLED UIÏÔʾ£¬TRUE:Óа´¼ü¶Ì°´¶¯×÷¡£ + +uint8_t LED_On_Timer; //ledÁÁʱ¼ä¼ÆÊ± + +bit LED_On_Flag; //ledÏÔʾ¸´Î»±ê־룬1£ºµÆÐ§¸´Î»¡£ + +#ifdef PWM_ENABLE +uint8_t Breathing_Light_Cnt; //ºôÎüµÆÁ÷Ë®¼ÆÊýÆ÷ +#endif + +/******************************************************************************\ + Functions definitions +\******************************************************************************/ + +#ifdef LED_DISPLAY + /***************************************************************************** +* Function : void LED_Breating_Light_Off(void) +* Description : ÐèҪʱµ÷ÓÃÖÜÆÚ£¬ºôÎüµÆÈ«Ï¨Ãðº¯Êý¡£ +* Input : None +* Output : None +* Return : None +* Note : None +*****************************************************************************/ + void LED_Breating_Light_Off(void) + { +#ifdef PWM_ENABLE + + LED_R_BREATHING_LIGHT(SHOW_NONE); + + LED_G_BREATHING_LIGHT(SHOW_NONE); + + LED_Y_BREATHING_LIGHT(SHOW_NONE); + + LED_B_BREATHING_LIGHT(SHOW_NONE); + +#endif + } + +/***************************************************************************** +* Function : void LED_Display_App(void) +* Description : 100msµ÷ÓÃÖÜÆÚ +* Input : None +* Output : None +* Return : None +* Note : None +*****************************************************************************/ +/* +³äµç£º +1¡¢³äµçÖУ¬ÎÞÆäËüÐÐΪ´ò¶Ïʱ£¬¿ª¹ØºÐ״̬϶¼ÏÔʾ³äµç³£ÁÁµÆÐ§£¨1HzÉÁ˸£©£» +2¡¢³äÂú£¬³£ÁÁ£»¿É±»ÆäËüµÆÐ§´ò¶Ï£» + +·Ç³äµç£º +1¡¢Ê×´ÎʹÓÿª¸ÇµÆÐ§£º¢Ù¸ßµç£ºÁÁ4sºóÃ𣻢ڵ͵磺1HzÉÁ4sºóÃ𣻠+2¡¢·ÇÊ×´ÎʹÓÿª¸ÇµÆÐ§£º¢Ù¶ú»úÔںУºÁÁ4sºóÃ𣻢ڶú»ú²»ÔںУº£¿£¿£¿£¿ + ¢Û³äµçÖУ¬¿ª¸ÇÉÁһϣ¬ÈçºÎÉÁ£¿ÁÁ¶à¾ÃºóÃ𣿠+3¡¢¹Ø¸ÇµÆÐ§£¬¸ßµç£ºÁÁ4sºóÃ𣻵͵磺1HzÉÁ4sºóÃ𣻠+4¡¢¹ØºÐ״̬ÏÂÎÞµÆÐ§ÏÔʾ£» + +*/ + void LED_Display_App(void) + { +#ifdef NTC_ENABLE + static bit LED_On_Flag1; +#endif + static bit LED_On_Chg_Flag; + + static bit LED_On_ChgDone_Flag; + + static bit Disp_Bat_Lev; + + if( LED_On_Flag ) + { + LED_On_Flag = 0; + + LED_On_Timer = 0; + + offset_bat_level = 0; + + Display_AllOff(); + +#if SLEEP_ENABLE + Enter_Sleep_Cnt_Restart_Flag = 1; +#endif + return; + } + +#ifdef NTC_ENABLE + /*NTC±£»¤£¬4µÆÒ»Ö±¿ìÉÁ(2Hz)*/ + if( CHG_NTC_Pro_Flag || Boost_NTC_Pro_Flag || Vox_Output_Short_Flag ) + { + if( !LED_On_Flag1 ) + { + LED_On_Flag1 = 1; + + LED_On_Flag = 1; + } + else + { + if( Display_RSta != LED_FLASH ) + { + Display_Red_Flash(20,10); + } + + if( Display_GSta != LED_FLASH ) + { + Display_Green_Flash(20,10); + } + + if( Display_YSta != LED_FLASH ) + { + Display_Yellow_Flash(20,10); + } + + if( Display_BSta != LED_FLASH ) + { + Display_Blue_Flash(20,10); + } + } + + return; + } + + /* ±£»¤Ïûʧºó£¬ÐèÒª¿ªÆô5VÉýѹһ¶Îʱ¼ä¡£ */ + if( LED_On_Flag1 ) + { + LED_On_Flag1 = 0; + + LED_On_ChgDone_Flag = 0; + + LED_On_Chg_Flag = 0; + + CoverEvent_Flg_led = 0; + + Earphone_Chg_Flag_led = 0; + + Wkup_Earphone_Flag = 1; + } + +#endif + + if (ChgStatus != CHG_NONE) + { + if ( ChgStatus == CHG_STA_COMPLETED ) // ³äµçÍê³É£¬4¸öLED³£ÁÁ + { + if( !LED_On_ChgDone_Flag ) + { + LED_On_ChgDone_Flag = 1; + + LED_On_Chg_Flag = 0; + + LED_Breating_Light_Off(); + + return; + } + + Display_AllOn(); + } + else + { + if( !LED_On_Chg_Flag ) + { + LED_On_Chg_Flag = 1; + + LED_On_ChgDone_Flag = 0; + + LED_On_Flag = 1; + + Breathing_Light_Cnt = LED_R; + } + else + { +#ifdef PWM_ENABLE + if( LED_On_Timer < LED_OFF_CNT ) + { + LED_On_Timer++; + + switch ( Breathing_Light_Cnt ) + { + case LED_R: + + if( Display_RSta != LED_BREATHING_LIGHT ) + { + LED_R_BREATHING_LIGHT(SLOW_DARK); + } + + break; + case LED_G: + + if( Display_GSta != LED_BREATHING_LIGHT ) + { + LED_G_BREATHING_LIGHT(SLOW_DARK); + } + + break; + + case LED_Y: + + if( Display_YSta != LED_BREATHING_LIGHT ) + { + LED_Y_BREATHING_LIGHT(SLOW_DARK); + } + + break; + + case LED_B: + + if( Display_BSta != LED_BREATHING_LIGHT ) + { + LED_B_BREATHING_LIGHT(SLOW_DARK); + } + + break; + + default: + + break; + } + } + else + if( LED_On_Timer < 15 ) //LEDÏÔʾ1.5s¡£ + { + LED_On_Timer++; + } + else + { + LED_On_Timer = 0; + + Breathing_Light_Cnt++; + + if( Breathing_Light_Cnt >= LED_ID_MAX ) + { + Breathing_Light_Cnt = LED_R; + } + } +#endif + } + } + + CoverEvent_Flg_led = 0; + + Earphone_Chg_Flag_led = 0; + + Key_Press_short_irq_led = 0; + + Disp_Bat_Lev = 1; + } + else + { + if( LED_On_Chg_Flag ) + { + LED_On_Chg_Flag = 0; + + LED_Breating_Light_Off(); + + LED_On_Flag = 1; + + Wkup_Earphone_Flag = 1; + + return; + } + + if( CoverEvent_Flg_led || Disp_Bat_Lev || Earphone_Chg_Flag_led || Key_Press_short_irq_led ) + { + if( LED_On_Timer < LED_OFF_CNT ) + { + LED_On_Timer++; + } + else + if( LED_On_Timer < LED_ON_CNT ) //LEDÏÔʾ10sºóÃð¡£ + { + LED_On_Timer++; + + /*µçÁ¿ÏÔʾ£¬25%µçÁ¿×ó²àµÚ1¸öµÆÉÁ£»25%-50%µçÁ¿2¸öµÆ³£ÁÁ£»50%-75%µçÁ¿3¸öµÆ³£ÁÁ£»75%-100%µçÁ¿4¸öµÆ³£Á¿¡£*/ + if( F_batlevel_25p ) + { + if (Display_RSta != LED_KEEP_FLASHING) + { + Display_Red_KeepFlash(100); + Display_Green_Off(); + Display_Yellow_Off(); + Display_Blue_Off(); + } + } + else + if( F_batlevel_50p ) + { + Display_Red_On(); + Display_Green_On(); + Display_Yellow_Off(); + Display_Blue_Off(); + } + else + if( F_batlevel_75p ) + { + Display_Red_On(); + Display_Green_On(); + Display_Yellow_On(); + Display_Blue_Off(); + } + else + { + Display_AllOn(); + } + } + else + { + CoverEvent_Flg_led = 0; + + Disp_Bat_Lev = 0; + + Earphone_Chg_Flag_led = 0; + + Key_Press_short_irq_led = 0; + + Display_AllOff(); //ÇåLEDÏÔʾ + } + } + } +} + +#endif + diff --git a/UsrSrc/hall/hall.c b/UsrSrc/hall/hall.c index b672be8..ff12027 100644 --- a/UsrSrc/hall/hall.c +++ b/UsrSrc/hall/hall.c @@ -24,8 +24,8 @@ #include "userapp.h" #include "charger_module.h" #include "sleep.h" - - +#include "system.h" +#include "display_ui.h" /******************************************************************************\ Macro definitions @@ -37,13 +37,11 @@ CoverStatus_E CoverStatus; -bit CoverEvent_Flg = 0; //Hall¿ª¹Ø´¥·¢Ê¼þ±ê־룬ÓÃÓÚVOX³äµç¡£ - -bit CoverEvent_Flg_led = 0; //Hall¿ª¹Ø´¥·¢Ê¼þ±ê־룬ÓÃÓÚµÆÐ§ÏÔʾ¡£ +bit CoverEvent_Flg; //Hall¿ª¹Ø´¥·¢Ê¼þ±ê־룬ÓÃÓÚVOX³äµç¡£ #if HALL_ENABLE -uint8_t Hall_Sta_bk = 0xff; +uint8_t Hall_Sta_bk; /******************************************************************************\ Functions definitions @@ -122,7 +120,6 @@ uint8_t Hall_Sta_bk = 0xff; Enter_Sleep_Cnt_Restart_Flag = 1; #endif - } } diff --git a/UsrSrc/i2c_simu/i2c_simu.c b/UsrSrc/i2c_simu/i2c_simu.c index e8d2423..26f742f 100644 --- a/UsrSrc/i2c_simu/i2c_simu.c +++ b/UsrSrc/i2c_simu/i2c_simu.c @@ -3,7 +3,7 @@ * * @file i2c_simu.h * @brief i2c gpio simu module - * @ic sy8835 + * @ic sy8835 * * @version 1.0 * @date 2024/10/31 09:59:40 @@ -29,8 +29,8 @@ Variables definitions \******************************************************************************/ -idata bool F_I2C_SIMU_INIT = false; -idata bool F_I2C_SIMU_ERROR = false; +idata bool F_I2C_SIMU_INIT; +idata bool F_I2C_SIMU_ERROR; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/key/key.c b/UsrSrc/key/key.c index abdc64f..f2c40e2 100644 --- a/UsrSrc/key/key.c +++ b/UsrSrc/key/key.c @@ -56,27 +56,26 @@ Variables definitions \******************************************************************************/ -bit Key_Press_short_irq = 0; -bit Key_Press_l_irq = 0; -bit Key_Press_ll_irq = 0; +bit Key_Press_l_irq; -idata KEY_EVENT_E Event_key = 0; +bit Key_Press_ll_irq; -uint8_t Key_TWS_Pair_Tim = 0; +idata KEY_EVENT_E Event_key; -uint8_t Key_TWS_Clear_Pair_Tim = 0; +uint8_t Key_TWS_Pair_Tim; -uint8_t Key_TWS_Pair_Cnt = 0; +uint8_t Key_TWS_Clear_Pair_Tim; -uint16_t Key_Press_Debounce = 0; +uint8_t Key_TWS_Pair_Cnt; -uint8_t Key_Lift_Debounce = 0; +uint16_t Key_Press_Debounce; + +uint8_t Key_Lift_Debounce; /******************************************************************************\ Functions definitions \******************************************************************************/ - /* ******************************************************************************* * void Key_Handler(void) @@ -145,7 +144,7 @@ uint8_t Key_Lift_Debounce = 0; if( (Key_Press_Debounce <= KEY_PRESS_500MS_CNT) ) //ËÉ¿ª°´¼ü£¬°´ÏÂʱ¼äСÓÚ500ms£¬Ôòʶ±ðΪ¶Ì°´£¬ÏÔʾµçÁ¿ { - Key_Press_short_irq = 1; + Key_Press_short_irq_led = 1; nKey_Press_short_irq = 1; #ifdef LED_DISPLAY diff --git a/UsrSrc/led/led.c b/UsrSrc/led/led.c index 5c0ceeb..3dd44a5 100644 --- a/UsrSrc/led/led.c +++ b/UsrSrc/led/led.c @@ -24,11 +24,10 @@ #ifdef LED_DISPLAY -volatile uint8_t Display_RSta = LED_OFF; // ÏÔʾ״̬ -volatile uint8_t Display_GSta = LED_OFF; // ÏÔʾ״̬ -volatile uint8_t Display_YSta = LED_OFF; // ÏÔʾ״̬ -volatile uint8_t Display_BSta = LED_OFF; // ÏÔʾ״̬ - +volatile uint8_t Display_RSta; // ÏÔʾ״̬ +volatile uint8_t Display_GSta; // ÏÔʾ״̬ +volatile uint8_t Display_YSta; // ÏÔʾ״̬ +volatile uint8_t Display_BSta; // ÏÔʾ״̬ /******************************************************************************\ Macro definitions @@ -60,6 +59,11 @@ void LED_Init(void) SFRADDR = P1_DRV0; //ÅäÖÃP10-P13Êä³öÇý¶¯ÄÜÁ¦£º0:800¦¸£»1:400¦¸ SFRDATA = LED_DRV_LIMIT_SET; + + Display_RSta = LED_OFF; + Display_GSta = LED_OFF; + Display_YSta = LED_OFF; + Display_BSta = LED_OFF; LEDR_OFF(); LEDG_OFF(); diff --git a/UsrSrc/main.c b/UsrSrc/main.c index 7210ed5..0d3e928 100644 --- a/UsrSrc/main.c +++ b/UsrSrc/main.c @@ -3,7 +3,7 @@ * * @file main.c * @brief main module - * @ic sy8835 + * @ic sy8835 * * @version 1.0 * @date 2024/11/01 17:35:40 @@ -48,7 +48,7 @@ void main(void ) #ifdef _DEBUG_MAIN - printf("System Init.\r\n"); + printf("System Init.Ver:%2x%2x%2x\r\n",(uint16_t)FW_VER0, (uint16_t)FW_VER1, (uint16_t)FW_VER2); #endif diff --git a/UsrSrc/pwm/pwm.c b/UsrSrc/pwm/pwm.c index dabe9f1..ed40831 100644 --- a/UsrSrc/pwm/pwm.c +++ b/UsrSrc/pwm/pwm.c @@ -138,57 +138,5 @@ void PWM_Duty_Set(Pwm_Channels_e nPWM_Ch,uint8_t nPWM_CMP) } } -#if 0 - -/* - ******************************************************************************* - * void HuXi_Led(Pwm_Channels_e nPWM_Ch, uint8_t Delay_Timer) - * - * Description : ºôÎüµÆ¹¦Äܺ¯Êý - * - * Arguments : Pwm_Channels_e nPWM_Ch:¶ÔÓ¦µÄPWMͨµÀ - uint8_t Delay_Timer:¸ü¸ÄÒ»´ÎPWMÊä³öÕ¼¿Õ±ÈËùÐèµÄʱ¼ä¡£ - - * Returns : None - - * Notes : ×¢ÒâPWM³õʼ»¯ÉèÖÃÖеÄPWM counter reload value£¬´Ó¶øÏÞ¶¨ÁËPWM compare valueµÄ´óС¡£ - * - ******************************************************************************* - */ -void HuXi_Led(Pwm_Channels_e nPWM_Ch, uint8_t Delay_Timer) -{ - static uint8_t nHuXi_Cnt; - static uint8_t nHuXi_Timer_Cnt; - static bit HuXi_Dir_Flg; - - nHuXi_Timer_Cnt++; - if(nHuXi_Timer_Cnt <= Delay_Timer) - return; - - nHuXi_Timer_Cnt = 0; - if(!HuXi_Dir_Flg) - { - nHuXi_Cnt += 2; - if( nHuXi_Cnt >= 254 ) - { - HuXi_Dir_Flg = 1; - nHuXi_Cnt = 3; - } - } - else - { - nHuXi_Cnt -= 2; - if(nHuXi_Cnt <= 3) - { - HuXi_Dir_Flg = 0; - nHuXi_Cnt = 3; - } - } - - PWM_Duty_Set(nPWM_Ch, nHuXi_Cnt); -} - -#endif - #endif diff --git a/UsrSrc/sleep/sleep.c b/UsrSrc/sleep/sleep.c index 2879957..4ee66e0 100644 --- a/UsrSrc/sleep/sleep.c +++ b/UsrSrc/sleep/sleep.c @@ -31,17 +31,17 @@ /******************************************************************************\ Variables definitions \******************************************************************************/ -bit Enter_Ship_Mode_Flag = 0; //½øshipmode±êÖ¾ +bit Enter_Ship_Mode_Flag; //½øshipmode±êÖ¾ -uint8_t Boot_ShipMode_Flg = 0; //Wake Up From ShipMode +uint8_t Boot_ShipMode_Flg; //Wake Up From ShipMode -uint16_t gAwake_Source = 0; //»½ÐÑÔ´±ê־λ +uint16_t gAwake_Source; //»½ÐÑÔ´±ê־λ -uint8_t Decnt_SleepDelay = ENTER_STANDBYMODE_CNT; +uint8_t Decnt_SleepDelay; -uint8_t Enter_ShipMode_Debounce = 0; +uint8_t Enter_ShipMode_Debounce; -bit Enter_Sleep_Cnt_Restart_Flag = 0; +bit Enter_Sleep_Cnt_Restart_Flag; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/system/system.c b/UsrSrc/system/system.c index 89d7bf1..271b257 100644 --- a/UsrSrc/system/system.c +++ b/UsrSrc/system/system.c @@ -114,7 +114,7 @@ void System_Init(void) #endif #ifdef PWM_ENABLE - PWM_Init_Set(3,PWM_REL_VALUE); + PWM_Init_Set(PWM_CLKFRE_SET,PWM_RELOAD_SET); #endif #ifdef LED_DISPLAY @@ -128,6 +128,8 @@ void System_Init(void) pmu_Init(); + Decnt_SleepDelay = ENTER_STANDBYMODE_CNT; + Systerm_State.Next_State = POWER_ON_STATE; } @@ -148,13 +150,7 @@ void System_Init(void) void EX0_isr(void) interrupt Interrupt_Vector_IE0 { -#if 0 - if( IRQ_FLAG&0x01 ) //pmu irq negtive interrupt. - { - IRQ_FLAG = 0x01; - // Get_PMU_Info(&pmu_Info); //»ñÈ¡pmu״̬ - } -#endif + #if SLEEP_ENABLE Enter_Sleep_Cnt_Restart_Flag = 1; diff --git a/UsrSrc/timer/sys_tim.c b/UsrSrc/timer/sys_tim.c index f0a3cf8..2dc9eb6 100644 --- a/UsrSrc/timer/sys_tim.c +++ b/UsrSrc/timer/sys_tim.c @@ -34,23 +34,33 @@ Variables definitions \******************************************************************************/ -uint8_t cnt_sys_tim_5ms = 0; -uint8_t cnt_sys_tim_10ms = 0; -uint8_t cnt_sys_tim_250ms = 0; -uint16_t cnt_sys_tim_100ms = 0; -uint8_t cnt_sys_tim_1s = 0; +uint8_t cnt_sys_tim_5ms; -bit F_sys_tim_1ms = 0; -bit F_sys_tim_5ms = 0; -bit F_sys_tim_10ms = 0; -bit F_sys_tim_250ms = 0; -bit F_sys_tim_100ms = 0; -bit F_sys_tim_1s = 0; +uint8_t cnt_sys_tim_10ms; -uint8_t F_sys_tim_tick = 0; -bit F_sys_tim1_tick = 0; +uint8_t cnt_sys_tim_250ms; -bit F_sys_tim2_tick = 0; +uint16_t cnt_sys_tim_100ms; + +uint8_t cnt_sys_tim_1s; + +bit F_sys_tim_1ms; + +bit F_sys_tim_5ms; + +bit F_sys_tim_10ms; + +bit F_sys_tim_250ms; + +bit F_sys_tim_100ms; + +bit F_sys_tim_1s; + +uint8_t F_sys_tim_tick; + +bit F_sys_tim1_tick; + +bit F_sys_tim2_tick; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/uart/uart.c b/UsrSrc/uart/uart.c index b3696b7..407da78 100644 --- a/UsrSrc/uart/uart.c +++ b/UsrSrc/uart/uart.c @@ -3,7 +3,7 @@ * * @file uart.c * @brief uart module - * @ic sy8835 + * @ic sy8835 * * @version 1.0 * @date 2024/11/01 15:00:40 @@ -34,21 +34,28 @@ #define PARITYBIT EVEN_PARITY //¶¨ÒåУÑéλ - /******************************************************************************\ +/******************************************************************************\ Variables definitions - \******************************************************************************/ +\******************************************************************************/ bit busy0; #ifdef VOX_RX + #if UART0_ENABLE -idata uint8_t RX0_Buffer[COM0_Data_Lenth] = 0; //½ÓÊÕ»º³å -bit Uart0_RX_Finish_Flag = 0; + +idata uint8_t RX0_Buffer[COM0_Data_Lenth]; //½ÓÊÕ»º³å + +bit Uart0_RX_Finish_Flag; + #endif #if UART1_ENABLE -idata uint8_t RX1_Buffer[COM0_Data_Lenth] = 0; //½ÓÊÕ»º³å -bit Uart1_RX_Finish_Flag = 0; + +idata uint8_t RX1_Buffer[COM0_Data_Lenth]; //½ÓÊÕ»º³å + +bit Uart1_RX_Finish_Flag; + #endif #endif @@ -79,16 +86,6 @@ void UART0_Init(void) SFRADDR = P0_OE; //Set P02 And P03 As Output. SFRDATA |= 0x0C; -// SFRADDR = P0_IE; //Set P02 And P03 As Input. -// SFRDATA |= 0x0C; - -// SFRADDR = P0_PU; //Set P02 And P03 30K Pullup. -// SFRDATA |= 0x0C; - -// SFRADDR = MFP_CTL0; //VOR¡¢VOL¶¼Ê¹ÓÃUART0½øÐзÖʱͨѶ¡£ -// SFRDATA &=~ 0x0F; -// SFRDATA |= 0x09; - #else /* vor¡¢volʹÓò»Í¬uart½øÐÐͨѶ */ @@ -159,13 +156,13 @@ void Uart0SendPacket(uint16_t Length,uint8_t *TransBuf) } #endif -uint8_t Rx0Status = 0; -uint8_t RX0_Cnt = 0; +uint8_t Rx0Status; + +uint8_t RX0_Cnt; + #if XUANHENG - -uint16_t RX0DataLen = 0; - +uint16_t RX0DataLen; #endif #define Vox_Comm_JL_HEADER_DATA_LEN 4 @@ -306,7 +303,7 @@ void uart0_Interrupt(void) interrupt Interrupt_Vector_RI_TI #if UART1_ENABLE -bit busy1 = 0; +bit busy1; /* ******************************************************************************* @@ -374,7 +371,6 @@ void Uart1SendPacket(uint16_t Length,uint8_t *TransBuf) S1CON |= UART_REC_ENABLE; //Enabel UART0's RX } - /* ******************************************************************************* * void Uart1SendString(char *s) @@ -462,7 +458,7 @@ void uart1_Interrupt(void) interrupt Interrupt_Vector_RI1_TI1 #if UART2_ENABLE -bit busy2 = 0; +bit busy2; #ifdef _DEBUG_ALL diff --git a/UsrSrc/userapp/userapp.c b/UsrSrc/userapp/userapp.c index 773b3a6..c860d5f 100644 --- a/UsrSrc/userapp/userapp.c +++ b/UsrSrc/userapp/userapp.c @@ -3,7 +3,7 @@ * * @file UserApp.c * @brief UserApp module - * @ic sy8835 + * @ic sy8835 * * @version 1.0 * @date 2024/11/01 15:00:40 @@ -32,15 +32,11 @@ #include "led.h" #include "vox_module.h" #include "adc.h" +#include "display_ui.h" /******************************************************************************\ Macro definitions \******************************************************************************/ -#define LED_ON_CNT 100 //10s - -#define LED_PRO_TIM 40 - -#define LED_OFF_CNT 1 /******************************************************************************\ Variables definitions @@ -48,326 +44,18 @@ xdata s_sys_state Systerm_State = {SLEEP_STATE,AWAKE_STATE,AWAKE_STATE}; -uint8_t Step_Cnt = 0; +uint8_t Step_Cnt; -uint8_t LED_On_Timer = 0; //ledÁÁʱ¼ä¼ÆÊ± +bit Wkup_Earphone_Flag; //±£»¤Ïûʧºó£¬ÐèÒªÉýѹ»½ÐѶú»ú±ê־λ -bit LED_On_Flag = 0; +uint8_t Wkup_Source_Flag; //»½ÐÑÔ´±êÖ¾ -bit Wkup_Earphone_Flag = 0; //±£»¤Ïûʧºó£¬ÐèÒªÉýѹ»½ÐѶú»ú±ê־λ +uint8_t Power_index; -uint8_t Wkup_Source_Flag = 0; //»½ÐÑÔ´±êÖ¾ - -#ifdef PWM_ENABLE - -uint8_t Breathing_Light_Cnt = 0; -#endif /******************************************************************************\ Functions definitions \******************************************************************************/ -/***************************************************************************** -* Function : void LED_Display_App(void) -* Description : 100msµ÷ÓÃÖÜÆÚ -* Input : None -* Output : None -* Return : None -* Note : None -*****************************************************************************/ -/* -³äµç£º -1¡¢³äµçÖУ¬ÎÞÆäËüÐÐΪ´ò¶Ïʱ£¬¿ª¹ØºÐ״̬϶¼ÏÔʾ³äµç³£ÁÁµÆÐ§£¨1HzÉÁ˸£©£» -2¡¢³äÂú£¬³£ÁÁ£»¿É±»ÆäËüµÆÐ§´ò¶Ï£» - -·Ç³äµç£º -1¡¢Ê×´ÎʹÓÿª¸ÇµÆÐ§£º¢Ù¸ßµç£ºÁÁ4sºóÃ𣻢ڵ͵磺1HzÉÁ4sºóÃ𣻠-2¡¢·ÇÊ×´ÎʹÓÿª¸ÇµÆÐ§£º¢Ù¶ú»úÔںУºÁÁ4sºóÃ𣻢ڶú»ú²»ÔںУº£¿£¿£¿£¿ - ¢Û³äµçÖУ¬¿ª¸ÇÉÁһϣ¬ÈçºÎÉÁ£¿ÁÁ¶à¾ÃºóÃ𣿠-3¡¢¹Ø¸ÇµÆÐ§£¬¸ßµç£ºÁÁ4sºóÃ𣻵͵磺1HzÉÁ4sºóÃ𣻠-4¡¢¹ØºÐ״̬ÏÂÎÞµÆÐ§ÏÔʾ£» - -*/ -#ifdef LED_DISPLAY - -void LED_Breating_Light_Off(void) -{ -#ifdef PWM_ENABLE - - LED_R_BREATHING_LIGHT(SHOW_NONE); - - LED_G_BREATHING_LIGHT(SHOW_NONE); - - LED_Y_BREATHING_LIGHT(SHOW_NONE); - - LED_B_BREATHING_LIGHT(SHOW_NONE); - -#endif -} - - -void LED_Display_App(void) -{ -#ifdef NTC_ENABLE - static bit LED_On_Flag1; -#endif - static bit LED_On_Chg_Flag; - - static bit LED_On_ChgDone_Flag; - - static bit Disp_Bat_Lev; - - if( LED_On_Flag ) - { - LED_On_Flag = 0; - - LED_On_Timer = 0; - - offset_bat_level = 0; - - Display_AllOff(); - -#if SLEEP_ENABLE - Enter_Sleep_Cnt_Restart_Flag = 1; -#endif - return; - } - -#ifdef NTC_ENABLE - /*NTC±£»¤£¬4µÆÒ»Ö±¿ìÉÁ(2Hz)*/ - if( CHG_NTC_Pro_Flag || Boost_NTC_Pro_Flag || Vox_Output_Short_Flag ) - { - if( !LED_On_Flag1 ) - { - LED_On_Flag1 = 1; - - LED_On_Flag = 1; - } - else - { - if( Display_RSta != LED_FLASH ) - { - Display_Red_Flash(20,10); - } - - if( Display_GSta != LED_FLASH ) - { - Display_Green_Flash(20,10); - } - - if( Display_YSta != LED_FLASH ) - { - Display_Yellow_Flash(20,10); - } - - if( Display_BSta != LED_FLASH ) - { - Display_Blue_Flash(20,10); - } - } - - return; - } - - /* ±£»¤Ïûʧºó£¬ÐèÒª¿ªÆô5VÉýѹһ¶Îʱ¼ä¡£ */ - if( LED_On_Flag1 ) - { - LED_On_Flag1 = 0; - - LED_On_ChgDone_Flag = 0; - - LED_On_Chg_Flag = 0; - - CoverEvent_Flg_led = 0; - - Earphone_Chg_Flag = 0; - - Wkup_Earphone_Flag = 1; - } - -#endif - - if (ChgStatus != CHG_NONE) - { - if ( ChgStatus == CHG_STA_COMPLETED ) // ³äµçÍê³É£¬4¸öLED³£ÁÁ - { - if( !LED_On_ChgDone_Flag ) - { - LED_On_ChgDone_Flag = 1; - - LED_On_Chg_Flag = 0; - - LED_Breating_Light_Off(); - - return; - } - - Display_AllOn(); - } - else - { - if( !LED_On_Chg_Flag ) - { - LED_On_Chg_Flag = 1; - - LED_On_ChgDone_Flag = 0; - - LED_On_Flag = 1; - - Breathing_Light_Cnt = LED_R; - } - else - { -#ifdef PWM_ENABLE - if( LED_On_Timer < LED_OFF_CNT ) - { - LED_On_Timer++; - - switch ( Breathing_Light_Cnt ) - { - case LED_R: - - if( Display_RSta != LED_BREATHING_LIGHT ) - { - LED_R_BREATHING_LIGHT(SLOW_DARK); - } - - break; - case LED_G: - - if( Display_GSta != LED_BREATHING_LIGHT ) - { - LED_G_BREATHING_LIGHT(SLOW_DARK); - } - - break; - - case LED_Y: - - if( Display_YSta != LED_BREATHING_LIGHT ) - { - LED_Y_BREATHING_LIGHT(SLOW_DARK); - } - - break; - - case LED_B: - - if( Display_BSta != LED_BREATHING_LIGHT ) - { - LED_B_BREATHING_LIGHT(SLOW_DARK); - } - - break; - - default: - - break; - } - } - else - if( LED_On_Timer < 15 ) //LEDÏÔʾ1.5s¡£ - { - LED_On_Timer++; - } - else - { - LED_On_Timer = 0; - - Breathing_Light_Cnt++; - - if( Breathing_Light_Cnt >= LED_ID_MAX ) - { - Breathing_Light_Cnt = LED_R; - } - } -#endif - } - } - - CoverEvent_Flg_led = 0; - - Earphone_Chg_Flag = 0; - - Key_Press_short_irq = 0; - - Disp_Bat_Lev = 1; - } - else - { - if( LED_On_Chg_Flag ) - { - LED_On_Chg_Flag = 0; - - LED_Breating_Light_Off(); - - LED_On_Flag = 1; - - Wkup_Earphone_Flag = 1; - - return; - } - - if( CoverEvent_Flg_led || Disp_Bat_Lev || Earphone_Chg_Flag || Key_Press_short_irq ) - { - if( LED_On_Timer < LED_OFF_CNT ) - { - LED_On_Timer++; - } - else - if( LED_On_Timer < LED_ON_CNT ) //LEDÏÔʾ10sºóÃð¡£ - { - LED_On_Timer++; - - /*µçÁ¿ÏÔʾ£¬25%µçÁ¿×ó²àµÚ1¸öµÆÉÁ£»25%-50%µçÁ¿2¸öµÆ³£ÁÁ£»50%-75%µçÁ¿3¸öµÆ³£ÁÁ£»75%-100%µçÁ¿4¸öµÆ³£Á¿¡£*/ - if( F_batlevel_25p ) - { - if (Display_RSta != LED_KEEP_FLASHING) - { - Display_Red_KeepFlash(100); - Display_Green_Off(); - Display_Yellow_Off(); - Display_Blue_Off(); - } - } - else - if( F_batlevel_50p ) - { - Display_Red_On(); - Display_Green_On(); - Display_Yellow_Off(); - Display_Blue_Off(); - } - else - if( F_batlevel_75p ) - { - Display_Red_On(); - Display_Green_On(); - Display_Yellow_On(); - Display_Blue_Off(); - } - else - { - Display_AllOn(); - } - } - else - { - CoverEvent_Flg_led = 0; - - Disp_Bat_Lev = 0; - - Earphone_Chg_Flag = 0; - - Key_Press_short_irq = 0; - - Display_AllOff(); //ÇåLEDÏÔʾ - } - } - } -} - -#endif - /* ******************************************************************************* * void PMU_ADC_GetValue_Machine(void) @@ -385,7 +73,7 @@ void LED_Display_App(void) void PMU_ADC_GetValue_Machine(void) { #ifdef _DEBUG_ADC - printf("adc chn:%d,pmu:%d,Ivol:%d,Vbat:%d,Vin:%d,Vpmid:%d,Vor:%d,Vol:%d,Vdd:%d,Ivor:%d.\r\n",(u16)ADC_Chn_Num,(u16)g_Vpmu_Adc,(u16)g_pmu_Adc_Ivol,(u16)Vbat_Adc,(u16)g_pmu_Adc_Vin,(u16)g_pmu_Adc_Vpmid,(u16)g_pmu_Adc_Vor,(u16)g_pmu_Adc_Vol,(u16)g_pmu_Adc_Vdd,(u16)g_pmu_Adc_Ivor); + //printf("adc chn:%d,pmu:%d,Ivol:%d,Vbat:%d,Vin:%d,Vpmid:%d,Vor:%d,Vol:%d,Vdd:%d,Ivor:%d.\r\n",(u16)ADC_Chn_Num,(u16)g_Vpmu_Adc,(u16)g_pmu_Adc_Ivol,(u16)Vbat_Adc,(u16)g_pmu_Adc_Vin,(u16)g_pmu_Adc_Vpmid,(u16)g_pmu_Adc_Vor,(u16)g_pmu_Adc_Vol,(u16)g_pmu_Adc_Vdd,(u16)g_pmu_Adc_Ivor); #endif PMU_ADC_Chn_Data(ADC_Chn_Num++); @@ -436,7 +124,7 @@ void System_Drivers_Machine(void) #if DISCHARGE_ENABLE DisCharge_Handler(); #endif - + #if BAT_VALUE check_bat_level(); #endif @@ -473,8 +161,6 @@ void PMU_State_Machine(void) * Return : None * Note : None *****************************************************************************/ -uint8_t Power_index = 0; - void SysTem_State_Machine(void) { uint8_t ret = 0; @@ -519,9 +205,10 @@ void SysTem_State_Machine(void) /*ϵͳÕý³£¹¤×÷ÖÐÐèÒª´¦ÀíµÄ¹¦ÄÜ£» 1¡¢³õʼ»¯½øÈëSleepµÄ¶¨Ê±Æ÷£» */ - #if SLEEP_ENABLE +#if SLEEP_ENABLE Decnt_SleepDelay = ENTER_STANDBYMODE_CNT; - #endif +#endif + #ifdef _DEBUG_MAIN printf("Normal State (line:%d)\r\n", (uint16_t)__LINE__); #endif @@ -581,7 +268,7 @@ void SysTem_State_Machine(void) /*1¡¢»½ÐѺó¹¤×÷N msºó½øÈëSleep Mode,NÐèÒª´óÓÚ100ms¡£ 2¡¢ÓÐVIN´æÔÚ¡¢VOX·Åµç¡¢»½ÐÑÔ´ÖжϵÄÇé¿öÏ£¬Ïµ²»»á½øÈësleep mode¡£ */ - #if SLEEP_ENABLE +#if SLEEP_ENABLE if(F_sys_tim_1s) { @@ -625,7 +312,7 @@ void SysTem_State_Machine(void) } } - #endif +#endif break; case SLEEP_STATE: diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index a93b58d..611b4f6 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -3,7 +3,7 @@ * * @file VOX_Module.c * @brief VOL/R module - * @ic sy8835 + * @ic sy8835 * * @version 1.0 * @date 2024/11/01 09:59:40 @@ -30,15 +30,13 @@ #include "adc.h" #include "userapp.h" -bit Vox_Vout_Enable = OFF; //Vox¹¦ÂÊÊä³ö±ê־λ +bit Vox_Vout_Enable; //Vox¹¦ÂÊÊä³ö±ê־λ -bit Earphone_Chg_Flag = 0; //¶ú»ú³öÈëºÐ±ê־λ +bit Boost_Open_Flag; -bit Boost_Open_Flag = 0; +uint8_t Vox_Type; -uint8_t Vox_Type = 0xFF; - -bit Vox_Output_Short_Flag = 0; +bit Vox_Output_Short_Flag; #if VOX_ENABLE @@ -63,7 +61,9 @@ bit Vox_Output_Short_Flag = 0; \******************************************************************************/ #if VOX_FOLLOW_CHG -xdata uint16_t Vox_Follow_Chg_Debounce = 0; +uint8_t Vox_Follow_Init_Deb; + +xdata uint16_t Vox_Follow_Chg_Debounce; g_Vox_Fllow_Chg_Cfg xdata Vox_Fllow_Chg; @@ -73,63 +73,63 @@ e_Vox_Follow_Chg_Sta Follow_Chg_Sta; #ifdef VOX_RX -xdata uint8_t Vox_Get_Vbat_Flag[2] = {0}; //¶ú»úÅä¶Ô״̬£¬VOL:µÍ4bit£»VOR:¸ß4bit¡£0ÊÇÎÞЧ£¬1ÊÇÕýÔÚÅä¶Ô£¬2ÊÇÅä¶Ô³É¹¦£¬3²»´¦Àí£¬±£³Öµ±Ç°×´Ì¬¡£ -xdata uint8_t Vox_Get_BES_Addr_Flag[2] = {0}; +xdata uint8_t Vox_Get_Vbat_Flag[2]; //¶ú»úÅä¶Ô״̬£¬VOL:µÍ4bit£»VOR:¸ß4bit¡£0ÊÇÎÞЧ£¬1ÊÇÕýÔÚÅä¶Ô£¬2ÊÇÅä¶Ô³É¹¦£¬3²»´¦Àí£¬±£³Öµ±Ç°×´Ì¬¡£ +xdata uint8_t Vox_Get_BES_Addr_Flag[2]; //idata uint8_t BES_Addr[6] = {0}; //À¶ÑÀ¶ú»úµØÖ·£¬Vox_Bes_Addr[0][6]£ºVOL£»Vox_Bes_Addr[1][6]£ºVOR #endif -uint8_t EarPhone_Num = 0; +uint8_t EarPhone_Num; #endif -bit OpenCover_TX_Cmd_Flag = 0; +bit OpenCover_TX_Cmd_Flag; -#define KEY_TWS_PAIR_TIMER 2 -#define KEY_TWS_PAIR_CNT 6 +#define KEY_TWS_PAIR_TIMER 2 +#define KEY_TWS_PAIR_CNT 6 #if XUANHENG -xdata uint8_t Vox_Pairing_State[2] = {0}; //¶ú»úÅä¶Ô״̬£¬0ÊÇÎÞЧ£¬1ÊÇÕýÔÚÅä¶Ô£¬2ÊÇÅä¶Ô³É¹¦£¬3²»´¦Àí£¬±£³Öµ±Ç°×´Ì¬¡£ +xdata uint8_t Vox_Pairing_State[2]; //¶ú»úÅä¶Ô״̬£¬0ÊÇÎÞЧ£¬1ÊÇÕýÔÚÅä¶Ô£¬2ÊÇÅä¶Ô³É¹¦£¬3²»´¦Àí£¬±£³Öµ±Ç°×´Ì¬¡£ -xdata uint8_t Vox_Set_BES_Addr_Flag[2] = {0}; +xdata uint8_t Vox_Set_BES_Addr_Flag[2]; -xdata uint8_t BES_Addr[6] = {0}; //À¶ÑÀ¶ú»úµØÖ·£¬Vox_Bes_Addr[0][6]£ºVOL£»Vox_Bes_Addr[1][6]£ºVOR +xdata uint8_t BES_Addr[6]; //À¶ÑÀ¶ú»úµØÖ·£¬Vox_Bes_Addr[0][6]£ºVOL£»Vox_Bes_Addr[1][6]£ºVOR -xdata uint8_t Random_Data[8] = {0}; +xdata uint8_t Random_Data[8]; -xdata uint8_t Bes_Bet_Level[2] = {0}; //¶Ô¶úµç³ØµçÁ¿ÐÅÏ¢£¬Bes_Bet_Level[0]£º×ó¶ú£»Bes_Bet_Level[1]£ºÓÒ¶ú +xdata uint8_t Bes_Bet_Level[2]; //¶Ô¶úµç³ØµçÁ¿ÐÅÏ¢£¬Bes_Bet_Level[0]£º×ó¶ú£»Bes_Bet_Level[1]£ºÓÒ¶ú -xdata uint8_t Bes_Chg_Full[2] = {0}; //¶Ô¶úÓ²¼þÊÇ·ñÂúµç£º0·ÇÂúµç£»1£ºÂúµç¡£ +xdata uint8_t Bes_Chg_Full[2]; //¶Ô¶úÓ²¼þÊÇ·ñÂúµç£º0·ÇÂúµç£»1£ºÂúµç¡£ -xdata uint8_t Tws_Paired_Record[2] = {0}; //TWSÅä¶Ô¼Ç¼£»0£ºÓÐTWSÅä¶Ô¼Ç¼£»1£ºÃ»ÓÐTWSÅä¶Ô¼Ç¼£» +xdata uint8_t Tws_Paired_Record[2]; //TWSÅä¶Ô¼Ç¼£»0£ºÓÐTWSÅä¶Ô¼Ç¼£»1£ºÃ»ÓÐTWSÅä¶Ô¼Ç¼£» -xdata uint8_t Phone_Paired_Record[2] = {0}; //ÊÖ»úÅä¶Ô¼Ç¼£»0£ºÓÐÓëÊÖ»úÅä¶Ô¼Ç¼£»1£ºÃ»ÓкÍÊÖ»úÅä¶Ô¼Ç¼¡£ +xdata uint8_t Phone_Paired_Record[2]; //ÊÖ»úÅä¶Ô¼Ç¼£»0£ºÓÐÓëÊÖ»úÅä¶Ô¼Ç¼£»1£ºÃ»ÓкÍÊÖ»úÅä¶Ô¼Ç¼¡£ -xdata uint8_t Bes_OTA_State[2] = {0}; //¶ú»ú¾²Ä¬Éý¼¶×´Ì¬£»1£ºÓУ»0£ºÃ»ÓÐ +xdata uint8_t Bes_OTA_State[2]; //¶ú»ú¾²Ä¬Éý¼¶×´Ì¬£»1£ºÓУ»0£ºÃ»ÓÐ -xdata uint8_t Bes_Set_SN_State[2] = {0}; //¶ú»úÓ¦´ð²ÖдÈëSNÊÇ·ñ³É¹¦¡£1£º³É¹¦£»0£ºÊ§°Ü +xdata uint8_t Bes_Set_SN_State[2]; //¶ú»úÓ¦´ð²ÖдÈëSNÊÇ·ñ³É¹¦¡£1£º³É¹¦£»0£ºÊ§°Ü -xdata uint8_t Bes_In_Pair_State[2] = {0}; //¶ú»ú½øÈëÅä¶Ô״̬±ê־λ +xdata uint8_t Bes_In_Pair_State[2]; //¶ú»ú½øÈëÅä¶Ô״̬±ê־λ -xdata uint8_t Vox_Clear_Pair_Flag[2] = {0}; +xdata uint8_t Vox_Clear_Pair_Flag[2]; -bit Vol_Bes_Addr_Flag = 0; -bit Vor_Bes_Addr_Flag = 0; +bit Vol_Bes_Addr_Flag; +bit Vor_Bes_Addr_Flag; -xdata uint8_t SN_Num[22] = {0}; //SNÂ룬ÐèÒª´ÓOTPµÄ¹Ì¶¨Î»ÖûñÈ¡¡£ +xdata uint8_t SN_Num[22]; //SNÂ룬ÐèÒª´ÓOTPµÄ¹Ì¶¨Î»ÖûñÈ¡¡£ -xdata uint8_t SN_Num_Start = 0; //SNÂë·¢ËÍÆðʼλÖã¬Óпª¸Ç¶¯×÷ʱÇåÁã¡£ +xdata uint8_t SN_Num_Start; //SNÂë·¢ËÍÆðʼλÖã¬Óпª¸Ç¶¯×÷ʱÇåÁã¡£ -bit gShip_Mode_Flag = 0; //´¬ÔËģʽ±ê־λ£º0£ºÕý³£¹Ø»ú£»1£º´¬ÔËģʽ +bit gShip_Mode_Flag; //´¬ÔËģʽ±ê־λ£º0£ºÕý³£¹Ø»ú£»1£º´¬ÔËģʽ #else -xdata uint8_t Net_Info[2][13] = {0}; +xdata uint8_t Net_Info[2][13]; -xdata uint8_t MAC_Addr[2][18] = {0}; +xdata uint8_t MAC_Addr[2][18]; -xdata uint8_t Earphone_Vbat[2] = 0; //¶Ô¶úµçÁ¿ +xdata uint8_t Earphone_Vbat[2]; //¶Ô¶úµçÁ¿ #endif /******************************************************************************\ @@ -336,7 +336,7 @@ xdata uint8_t Earphone_Vbat[2] = 0; // switch(VOX_Enable_Mode) { - case VOX_TRANS_Mode: //¹Ø±Õ×Ô¶¯Ê¶±ð¸ºÔصÄÉÏÀ­µç×è¡£ + case VOX_TRANS_Mode: //¹Ø±Õ×Ô¶¯Ê¶±ð¸ºÔصÄÉÏÀ­µç×è¡£ break; @@ -388,8 +388,6 @@ xdata uint8_t Earphone_Vbat[2] = 0; // I2cSfr_Write( VOX_CFG, VOX_Confg ); } - - #endif /* ******************************************************************************* @@ -435,6 +433,7 @@ void Vox_Det_Machine(void) static bit Vox_Getinto_Sleep_Flag; static uint8_t CHIP_STA1_BK; + static uint8_t Vox_Voltage_Hold_Timer; static uint8_t Vox_TX_Timer; @@ -490,7 +489,7 @@ void Vox_Det_Machine(void) if( CoverStatus == CLOSE ) //1¡¢¹Ø¸Ç¹Ø±ÕCOM_CTRL£»ÏÔʾµÆÐ§¡££¨ÎÞÐè²éѯLoadon¡¢IOFF״̬£¬ÎÞÂÛ¶ú»úÊÇ·ñÔÚ²Ö£¬Vox 5VÊä³ö¡££© { - Earphone_Chg_Flag = 0; //¹Ø¸ÇÈ¡Ïû¶ú»úÈëºÐµÆÐ§£¬ÏÔʾ¹Ø¸ÇµÆÐ§¡£ + Earphone_Chg_Flag_led = 0; //¹Ø¸ÇÈ¡Ïû¶ú»úÈëºÐµÆÐ§£¬ÏÔʾ¹Ø¸ÇµÆÐ§¡£ Cover_Close_Flag = 1; @@ -541,7 +540,7 @@ void Vox_Det_Machine(void) } /* ¿ª¹Ø¸Çºó£¬VOXÏÈÉýѹ5.2V Ò»¶Îʱ¼ä£¬»½ÐѶú»ú£¬ºóתÈëADT£¬»ñÈ¡ºÐÄÚ¶ú»úÊýÁ¿¡£ */ - if( Vox_Voltage_Hold_Timer < VOX_OPEN_VOUT_5V_DEBOUNCE ) //¿ª¸Çºó5V N00ms¡£ + if( Vox_Voltage_Hold_Timer < HALL_OPEN_VOX_5V_DEBOUNCE ) //¿ª¸Çºó5V N00ms¡£ { Vox_Voltage_Hold_Timer++; @@ -582,15 +581,13 @@ void Vox_Det_Machine(void) printf( "Open/Close Box,Earphones In Box(Num:%d)(VoxSta:0x%x).\r\n",(u16)EarPhone_Num, (u16)(pmu_Info.pmu_VOX_STA) ); #endif } - } - /* ·¢ËÍ¿ª¸ÇÖ¸Áî*/ if( Cover_Open_Flag ) /*¿ª¸Çºó£¬5V³ÖÐøN00msºó0V³ÖÐøN00ms£¬±£Ö¤¶ú»úÄܱ»»½ÐÑ£»Ö®ºó·¢¿ª¸ÇÂë¡£*/ { #if 1 - if( Vox_TX_Timer < VOX_OPEN_VOUT_0V_DEBOUNCE ) //ת0V N00ms + if( Vox_TX_Timer < HALL_OPEN_VOX_0V_DEBOUNCE ) //ת0V N00ms { VOX_EN_Type(VOX_PD1K_Mode); @@ -606,34 +603,30 @@ void Vox_Det_Machine(void) if( ( Vox_Output_Debounce % Vox_TX_Interval_2 ) == 0 ) //200ms·¢ËÍÒ»´Î { #ifdef VOX_TX + #if JIELI - - HandleTxCommand(VHOUSE_CMD_OPEN_BOX,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_OPEN_BOX,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif ZHONGKE - - HandleTxCommand(VHOUSE_CMD_GET_VBAT,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ + HandleTxCommand(VHOUSE_CMD_OPEN_WINDOW,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif XUANHENG HandleTxCommand(CMD_HEARTBEAT,VOL_CHAN); #endif + #endif } else if( ( Vox_Output_Debounce % Vox_TX_Interval ) == 0 ) //200ms·¢ËÍÒ»´Î { -#ifdef VOX_TX +#ifdef VOX_TX + #if JIELI - - HandleTxCommand(VHOUSE_CMD_OPEN_BOX,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_OPEN_BOX,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif ZHONGKE - - HandleTxCommand(VHOUSE_CMD_GET_VBAT,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ + HandleTxCommand(VHOUSE_CMD_OPEN_WINDOW,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif XUANHENG - HandleTxCommand(CMD_HEARTBEAT,VOR_CHAN); - #endif + #endif } @@ -674,7 +667,7 @@ void Vox_Det_Machine(void) { if ( pmu_Info.pmu_VOX_STA & ( VOR_LoadOn | VOL_LoadOn ) ) { - Earphone_Chg_Flag = 1; + Earphone_Chg_Flag_led = 1; #ifdef LED_DISPLAY LED_On_Flag = 1; #endif @@ -733,7 +726,7 @@ void Vox_Det_Machine(void) Cover_Close_Flag1 = 1; - if( Vox_Voltage_Hold_Timer <= VOX_CLOSE_5V_HOLD_CNT ) //¹Ø¸ÇBoost VOUT 5V±£³Öʱ¼ä¡£ + if( Vox_Voltage_Hold_Timer <= HALL_CLOSE_VOX_5V_HOLD_CNT ) //¹Ø¸ÇBoost VOUT 5V±£³Öʱ¼ä¡£ { Vox_Voltage_Hold_Timer++; @@ -754,17 +747,11 @@ void Vox_Det_Machine(void) #ifdef VOX_TX #if JIELI - - HandleTxCommand(VHOUSE_CMD_CLOSE_BOX,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_CLOSE_BOX,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif ZHONGKE - - HandleTxCommand(VHOUSE_CMD_CLOSE_WINDOW,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_CLOSE_WINDOW,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif XUANHENG - HandleTxCommand(CMD_HEARTBEAT,VOL_CHAN); - #endif #endif @@ -775,17 +762,11 @@ void Vox_Det_Machine(void) #ifdef VOX_TX #if JIELI - - HandleTxCommand(VHOUSE_CMD_CLOSE_BOX,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_CLOSE_BOX,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif ZHONGKE - - HandleTxCommand(VHOUSE_CMD_CLOSE_WINDOW,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_CLOSE_WINDOW,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif XUANHENG - HandleTxCommand(CMD_HEARTBEAT,VOR_CHAN); - #endif #endif @@ -803,17 +784,11 @@ void Vox_Det_Machine(void) #ifdef VOX_TX #if JIELI - - HandleTxCommand(VHOUSE_CMD_CLOSE_WIN_GET_VBAT,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_CLOSE_WIN_GET_VBAT,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif ZHONGKE - - HandleTxCommand(VHOUSE_CMD_GET_TWS_BTADDR,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_CLOSE_WIN_GET_VBAT,VOL_CHAN); //×ó¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif XUANHENG - HandleTxCommand(CMD_TWS_GET_BTADDR,VOL_CHAN); - #endif #endif @@ -824,16 +799,11 @@ void Vox_Det_Machine(void) #ifdef VOX_TX #if JIELI - HandleTxCommand(VHOUSE_CMD_CLOSE_WIN_GET_VBAT,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif ZHONGKE - - HandleTxCommand(VHOUSE_CMD_GET_TWS_BTADDR,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_CLOSE_WIN_GET_VBAT,VOR_CHAN); //ÓÒ¶ú·¢¿ª¸ÇÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #elif XUANHENG - HandleTxCommand(CMD_TWS_GET_BTADDR,VOR_CHAN); - #endif #endif @@ -900,13 +870,9 @@ void Vox_Det_Machine(void) #ifdef VOX_TX #if XUANHENG - HandleTxCommand(CMD_SHUT_DOWN,VOL_CHAN); //×ó¶ú·¢¹Ø»úÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - #else - - HandleTxCommand(VHOUSE_CMD_PWROFF,VOL_CHAN); //×ó¶ú·¢¹Ø»úÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_PWROFF,VOL_CHAN); //×ó¶ú·¢¹Ø»úÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #endif #endif @@ -917,13 +883,9 @@ void Vox_Det_Machine(void) #ifdef VOX_TX #if XUANHENG - HandleTxCommand(CMD_SHUT_DOWN,VOR_CHAN); //ÓÒ¶ú·¢¹Ø»úÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - #else - - HandleTxCommand(VHOUSE_CMD_PWROFF,VOR_CHAN); //ÓÒ¶ú·¢¹Ø»úÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ - + HandleTxCommand(VHOUSE_CMD_PWROFF,VOR_CHAN); //ÓÒ¶ú·¢¹Ø»úÖ¸Áî£¬Çø·Ö¶ú»úͨµÀ¡£ #endif #endif @@ -966,13 +928,12 @@ void Vox_Det_Machine(void) return; } - /*¶ú»ú³öÈëºÐÅжÏ*/ if( CHIP_STA1_BK != ( pmu_Info.pmu_VOX_STA & ( VOR_LoadOn | VOL_LoadOn ) ) ) //²éѯ¶ú»úloadon״̬£¬loadon״̬¸Ä±ä£¬Ôò˵Ã÷Óжú»ú³öÈëºÐ¡£ { if( pmu_Info.pmu_VOX_STA & ( VOR_LoadOn | VOL_LoadOn ) ) { - Earphone_Chg_Flag = 1; + Earphone_Chg_Flag_led = 1; #ifdef LED_DISPLAY LED_On_Flag = 1; #endif @@ -1000,8 +961,6 @@ void Vox_Det_Machine(void) * ******************************************************************************* */ -uint8_t Vox_Follow_Init_Deb = 0; - void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) { static bit nVpmid_Value_Setting; @@ -1086,9 +1045,9 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) { n_Vox_Fllow_Chg->IVox_Init[VOR_CHAN] = g_pmu_Adc_Ivor; - n_Vox_Fllow_Chg->IVox_Threshold_Neg[VOR_CHAN] = ( g_pmu_Adc_Ivor / 5 ) << 2; //Ivox_Threshold_Neg = IVox_Init * 80% + n_Vox_Fllow_Chg->IVox_Threshold_Neg[VOR_CHAN] = IVOR_Threshold_Neg(g_pmu_Adc_Ivor); //Ivox_Threshold_Neg = IVox_Init * 80% - n_Vox_Fllow_Chg->IVox_Threshold_Pos[VOR_CHAN] = g_pmu_Adc_Ivor << 1; //Ivox_Threshold_Neg = IVox_Init * 2 + n_Vox_Fllow_Chg->IVox_Threshold_Pos[VOR_CHAN] = IVOR_Threshold_Pos(g_pmu_Adc_Ivor); //Ivox_Threshold_Neg = IVox_Init * 2 #ifdef _DEBUG_FOLLOW printf("Follow CHG Sta1,VOR Chging(Ivor:%dmA).(line:%d)\r\n",g_pmu_Adc_Ivor,(u16)__LINE__); #endif @@ -1099,11 +1058,11 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) { n_Vox_Fllow_Chg->IVox_Init[VOL_CHAN] = g_pmu_Adc_Ivol; - n_Vox_Fllow_Chg->IVox_Threshold_Neg[VOL_CHAN] = ( g_pmu_Adc_Ivol / 5 ) << 2; //Ivox_Threshold_Neg = IVox_Init * 80% + n_Vox_Fllow_Chg->IVox_Threshold_Neg[VOL_CHAN] = IVOL_Threshold_Neg(g_pmu_Adc_Ivol); //Ivox_Threshold_Neg = IVox_Init * 80% - n_Vox_Fllow_Chg->IVox_Threshold_Pos[VOL_CHAN] = g_pmu_Adc_Ivol << 1; //Ivox_Threshold_Neg = IVox_Init * 2 + n_Vox_Fllow_Chg->IVox_Threshold_Pos[VOL_CHAN] = IVOL_Threshold_Pos(g_pmu_Adc_Ivol); //Ivox_Threshold_Neg = IVox_Init * 2 #ifdef _DEBUG_FOLLOW - printf("Follow CHG Sta1,VOL Chging(Ivol:%dmA).(line:%d)\r\n",g_pmu_Adc_Ivol,(u16)__LINE__); + printf("Follow CHG Sta1,VOL Chging(Ivol:%dmA).(line:%d)\r\n",(u16)g_pmu_Adc_Ivol,(uint16_t)__LINE__); #endif } @@ -1131,7 +1090,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) n_Vox_Fllow_Chg->Vox_InBox_Sta[VOR_CHAN] = ON; //ÅжÏVORÓжú»úÔÚºÐÕý³£³éµç #ifdef _DEBUG_FOLLOW - printf("Follow CHG Sta2,Get IVOR:%dmA.(line:%d)\r\n",(u16)g_pmu_Adc_Ivor,(u16)__LINE__); + printf("Follow CHG Sta2,Get IVOR:%dmA.(line:%d)\r\n",(uint16_t)g_pmu_Adc_Ivor,(u16)__LINE__); #endif } @@ -1141,7 +1100,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) n_Vox_Fllow_Chg->Vox_InBox_Sta[VOL_CHAN] = ON; //ÅжÏVOLÓжú»úÔÚºÐÕý³£³éµç #ifdef _DEBUG_FOLLOW - printf("Follow CHG Sta2,Get IVOL:%dmA.(line:%d)\r\n",(u16)g_pmu_Adc_Ivol,(u16)__LINE__); + printf("Follow CHG Sta2,Get IVOL:%dmA.(line:%d)\r\n",(uint16_t)g_pmu_Adc_Ivol,(u16)__LINE__); #endif } @@ -1167,7 +1126,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) n_Vox_Fllow_Chg->Vox_Follow_Start = OFF; //ÖØÆô¶¯¸úËæ³ä #ifdef _DEBUG_FOLLOW - printf("Follow CHG Sta3,VOX Chg ReInit.(line:%d)\r\n",(u16)__LINE__); + printf("Follow CHG Sta3,VOX Chg ReInit.(line:%d)\r\n",(uint16_t)__LINE__); #endif } else @@ -1291,14 +1250,14 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) Follow_Chg_Sta = Vox_Follow_Chg_Sta2; #ifdef _DEBUG_FOLLOW - printf("Follow CHG Sta4,VOx Vpmid AddSta(Vout:0x%x,Ivol:%dmA,Ivor:%dmA)(line:%d).\r\n",n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,g_pmu_Adc_Ivol,g_pmu_Adc_Ivor,(u16)__LINE__); + printf("Follow CHG Sta4,VOx Vpmid AddSta(Vout:0x%x,Ivol:%dmA,Ivor:%dmA)(line:%d).\r\n",(uint16_t)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(uint16_t)g_pmu_Adc_Ivol,(uint16_t)g_pmu_Adc_Ivor,(u16)__LINE__); #endif } #ifdef _DEBUG_FOLLOW else { - printf("Follow CHG Sta4,VOx Ching(Vout:0x%x,Ivol:%dmA,Ivor:%dmA)(line:%d).\r\n",n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,g_pmu_Adc_Ivol,g_pmu_Adc_Ivor,(u16)__LINE__); + printf("Follow CHG Sta4,VOx Ching(Vout:0x%x,Ivol:%dmA,Ivor:%dmA)(line:%d).\r\n",(uint16_t)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(uint16_t)g_pmu_Adc_Ivol,(uint16_t)g_pmu_Adc_Ivor,(u16)__LINE__); } #endif @@ -1317,13 +1276,13 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) Follow_Chg_Sta = Vox_Follow_Chg_Sta2; #ifdef _DEBUG_FOLLOW - printf("Follow CHG Sta4,VOR Vpmid AddSta(Vout:0x%x,Ivor:%dmA)(line:%d).\r\n",n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,g_pmu_Adc_Ivor,(u16)__LINE__); + printf("Follow CHG Sta4,VOR Vpmid AddSta(Vout:0x%x,Ivor:%dmA)(line:%d).\r\n",(uint16_t)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(uint16_t)g_pmu_Adc_Ivor,(u16)__LINE__); #endif } #ifdef _DEBUG_FOLLOW else { - printf("Follow CHG Sta4,VOR Ching(Vout:0x%x,Ivor:%dmA)(line:%d).\r\n",n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,g_pmu_Adc_Ivor,(u16)__LINE__); + printf("Follow CHG Sta4,VOR Ching(Vout:0x%x,Ivor:%dmA)(line:%d).\r\n",(uint16_t)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(uint16_t)g_pmu_Adc_Ivor,(u16)__LINE__); } #endif } @@ -1337,13 +1296,13 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) Follow_Chg_Sta = Vox_Follow_Chg_Sta2; #ifdef _DEBUG_FOLLOW - printf("Follow CHG Sta4,VOL Vpmid AddSta(Vout:0x%x,Ivol:%dmA)(line:%d).\r\n",n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,g_pmu_Adc_Ivol,(u16)__LINE__); + printf("Follow CHG Sta4,VOL Vpmid AddSta(Vout:0x%x,Ivol:%dmA)(line:%d).\r\n",(uint16_t)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(uint16_t)g_pmu_Adc_Ivol,(u16)__LINE__); #endif } #ifdef _DEBUG_FOLLOW else { - printf("Follow CHG Sta4,VOL Ching(Vout:0x%x,Ivol:%dmA)(line:%d).\r\n",n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,g_pmu_Adc_Ivol,(u16)__LINE__); + printf("Follow CHG Sta4,VOL Ching(Vout:0x%x,Ivol:%dmA)(line:%d).\r\n",(uint16_t)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(uint16_t)g_pmu_Adc_Ivol,(u16)__LINE__); } #endif } @@ -1367,7 +1326,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) { n_Vox_Fllow_Chg->Vpmid_SubSta_Flag = ON; #ifdef _DEBUG_FOLLOW - printf("Follow CHG SubSta,VOL/VOR(line:%d).\r\n",(u16)__LINE__); + printf("Follow CHG SubSta,VOL/VOR(line:%d).\r\n",(uint16_t)__LINE__); #endif } } @@ -1377,7 +1336,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) { n_Vox_Fllow_Chg->Vpmid_SubSta_Flag = ON; #ifdef _DEBUG_FOLLOW - printf("Follow CHG SubSta,VOR(line:%d).\r\n",(u16)__LINE__); + printf("Follow CHG SubSta,VOR(line:%d).\r\n",(uint16_t)__LINE__); #endif } } @@ -1388,7 +1347,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) { n_Vox_Fllow_Chg->Vpmid_SubSta_Flag = ON; #ifdef _DEBUG_FOLLOW - printf("Follow CHG SubSta,VOL(line:%d).\r\n",(u16)__LINE__); + printf("Follow CHG SubSta,VOL(line:%d).\r\n",(uint16_t)__LINE__); #endif } } @@ -1448,7 +1407,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) Follow_Chg_Sta = Vox_Follow_Chg_Sta1; } #ifdef _DEBUG_FOLLOW - printf("Follow CHG AddSta,(STA:0x%x,Vpmid:0x%x)(line:%d)\r\n",(u16)Follow_Chg_Sta,(u16)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(u16)__LINE__); + printf("Follow CHG AddSta,(STA:0x%x,Vpmid:0x%x)(line:%d)\r\n",(uint16_t)Follow_Chg_Sta,(uint16_t)n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present,(uint16_t)__LINE__); #endif Set_PMU_Boost_Vout(n_Vox_Fllow_Chg->Vpmid_Threshold_At_Present); diff --git a/sy8835_demo.si4project/sy8835_demo.SearchResults b/sy8835_demo.si4project/sy8835_demo.SearchResults index aed1aa5..e54da2f 100644 --- a/sy8835_demo.si4project/sy8835_demo.SearchResults +++ b/sy8835_demo.si4project/sy8835_demo.SearchResults @@ -1,2 +1,2 @@ ----- LED_CTL Matches (1 in 1 files) ---- -reg3315.h (UsrInc\inc) line 92 : #define LED_CTL 0x13 +---- reg3315 Matches (1 in 1 files) ---- +define.h (UsrInc\inc) line 142 : #include "reg3315.h" diff --git a/sy8835_demo.si4project/sy8835_demo.sip_sym b/sy8835_demo.si4project/sy8835_demo.sip_sym index 16f86d6..ed76abf 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_sym and b/sy8835_demo.si4project/sy8835_demo.sip_sym differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xab b/sy8835_demo.si4project/sy8835_demo.sip_xab index 95e0b3e..1ebd7a5 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xab and b/sy8835_demo.si4project/sy8835_demo.sip_xab differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xad b/sy8835_demo.si4project/sy8835_demo.sip_xad index a647e98..3e8dc7f 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xad and b/sy8835_demo.si4project/sy8835_demo.sip_xad differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xc b/sy8835_demo.si4project/sy8835_demo.sip_xc index fc24f15..184e9b3 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xc and b/sy8835_demo.si4project/sy8835_demo.sip_xc differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xf b/sy8835_demo.si4project/sy8835_demo.sip_xf index 07e19b6..11d5a3a 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xf and b/sy8835_demo.si4project/sy8835_demo.sip_xf differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xm b/sy8835_demo.si4project/sy8835_demo.sip_xm index 760b1cd..1a4381e 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xm and b/sy8835_demo.si4project/sy8835_demo.sip_xm differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xr b/sy8835_demo.si4project/sy8835_demo.sip_xr index ed07285..83dde21 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xr and b/sy8835_demo.si4project/sy8835_demo.sip_xr differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xsb b/sy8835_demo.si4project/sy8835_demo.sip_xsb index 0527e8e..8d375bf 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xsb and b/sy8835_demo.si4project/sy8835_demo.sip_xsb differ diff --git a/sy8835_demo.si4project/sy8835_demo.sip_xsd b/sy8835_demo.si4project/sy8835_demo.sip_xsd index d9a2978..ed3a62d 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.sip_xsd and b/sy8835_demo.si4project/sy8835_demo.sip_xsd differ diff --git a/sy8835_demo.si4project/sy8835_demo.siwork b/sy8835_demo.si4project/sy8835_demo.siwork index 36919c7..499469a 100644 Binary files a/sy8835_demo.si4project/sy8835_demo.siwork and b/sy8835_demo.si4project/sy8835_demo.siwork differ