diff --git a/Out/SY883X_EVB_mcu_2024_08_23_153134.bin b/Out/SY883X_EVB_mcu_2024_08_23_153134.bin deleted file mode 100644 index 5fdf08a..0000000 Binary files a/Out/SY883X_EVB_mcu_2024_08_23_153134.bin and /dev/null differ diff --git a/Out/SY883X_EVB_mcu_2024_08_23_153134.hex b/Out/SY883X_EVB_mcu_2024_08_23_153134.hex deleted file mode 100644 index ce080cf..0000000 --- a/Out/SY883X_EVB_mcu_2024_08_23_153134.hex +++ /dev/null @@ -1,188 +0,0 @@ -:030000000203FAFE -:1003FA00758E3075D20078FFE4F6D8FD7581480213 -:02040A000447A5 -:0F099F00120615D2AED2BE1208D912068580F408 -:04051300024500009D -:02089500AD07AD -:10089700E4FCFBFAF533F53475FE2975FF8BEDC4DF -:1008A70054F04401F5A5E5A520E0FBAFA1AB07AFE8 -:1008B700A2EFFEEEFAEB2534F534EA3533F5330CC7 -:1008C700BC08DBE534AE337803CEC313CE13D8F9B7 -:0108D700FF21 -:0108D80022FD -:10091800E4F530F5317F051208958E308F317F066A -:10092800120895E4FCFDC004A905AA06AB07AE3081 -:10093800AF317C077DD012022BD0001201998E3086 -:020948008F31ED -:01094A00228A -:10094B00E4F531F5327F041208958E318F327F0634 -:10095B00120895E4FCFDC004A905AA06AB07AE314D -:10096B00AF327C037DE812022BD0001201998E313D -:02097B008F32B9 -:01097D002257 -:02051700C11011 -:10025800E4FFFE75300112094BC3EF94D0EE94070A -:1002680040037F0122E5E630E77AD3EF9436EE9437 -:10027800055057EF9422EE9402404FD3EF941AEEB4 -:1002880094044005E4F5B1D20F300D13C3EF941474 -:10029800EE94055007C20D7530018003E4F5303047 -:1002A8000E13D3EF9444EE94024007C20E7530014A -:1002B8008003E4F530200F026142C3EF94E4EE942A -:1002C800035077C20F75B1058070D3EF9436EE9462 -:1002D800054004D20D8060C3EF9422EE940250577B -:1002E800D20E8053D3EF94FAEE94055032EF945E19 -:1002F800EE9401402A300D12EF94D7EE9405500782 -:10030800C20D7530018003E4F530300E2DD3EF9423 -:1003180072EE94014007C20E753001801D8018D31B -:10032800EF94FAEE94054004D20D800BC3EF945E6F -:0C033800EE94015002D20EE4F530AF301C -:010344002296 -:10075500E5E620E70953B3FE75F210C21022E5F273 -:10076500540C601053B3FEE5F354C0603B75F20CB6 -:1007750075F3C022E5F354C0600375F3C012025847 -:10078500EF700453B3FE22E5F230E417C37846E672 -:1007950094EB18E6940F500575F210800353B3FEE1 -:0907A500D2102243B301C210225C -:04051900C111C11239 -:1007AE00E5E530E103C21122E5E230E705C211D2E0 -:1007BE001222E5E830E00EC211300834C20875E8A6 -:1007CE000175B50122120258EF7005C211F5B5225E -:1007DE00D21130121BE5E630E716C37846E69410C8 -:1007EE0018E6940E4005D211C21222E4F5B5C211DC -:0107FE0022D8 -:07051D00C113C1140136FFF8 -:10001E00E5E25408FF6536601AE5E230E305753512 -:10002E00018003E4F535D213D214E4F538F51E8FB2 -:03003E0036D217A0 -:01004100229C -:0D000E00EF146006047005D28422D2832214 -:0D09AE00EF146006047005C28422C283228B -:10059900E4FE74392EF8E66067743D2EF9743F2E37 -:1005A900F8E6D397AF06500512000E80031209AE84 -:1005B900743F2EF8E6C394AA401EE4F674432EF85D -:1005C900E66008743D2EF81616800D74412EF8E683 -:1005D9006006743D2EF80606743D2EF8E6FF74AAEF -:1005E900D39F500A74432EF876017441800EEFD3DD -:1005F9009401500C74412EF8760174432EF8E4F6F8 -:0B060900743F2EF8060EEE64027087AE -:0106140022C3 -:0505240001370AC117B8 -:10097E00E5E620E706200603301704C217C322D38C -:01098E002246 -:1006150075FE0153FFFC75B7C375FE6A53FFE77599 -:100625008901758CFC758A17D2A9D28C43891075FE -:100635008DFF758B9BD2ABD28E75FE0675FF1E7531 -:10064500FE0375FF3CC284C283E4F58675FE0F4345 -:10065500FF8075FE4F75FF1075FE1775FF3CD2A81C -:10066500D2B9D2AF75F21C75F3C075E80C75FE876B -:1006750053FFDF43B31075FE7043FF0475B10522C8 -:03000300020006F2 -:0100060032C7 -:03004B000200426E -:0600420075EB3CD2173201 -:05052900013800C118BB -:10048C00E5E630E72B30100AE47839F608F6D2842A -:10049C00801730150BE47839F6087601C284800990 -:1004AC0078397601E408F6C283C214C201D218224C -:1004BC0030180CE47839F608F6C284C283C21820CE -:1004CC00140330014130151EC284E538C394025028 -:1004DC0005C283053822E538C3942050050538D26F -:1004EC008322C283801CC283E538C394025005C2A8 -:1004FC0084053822E538C3942050050538D284226F -:07050C00C284C214C20122E7 -:1006850030071EC2071209187845A60608A60712E4 -:10069500001E1207AE12075512004E12048C1206E8 -:1006A500ED300943C209E537D394004009153730C9 -:1006B5001735C217802E12097E502975FE2443FF77 -:1006C5003CC2B9C2A9C2AB75FE2953FF7F75FE4F67 -:1006D500E4F5FF43870275FE4F75FF10D2B9D2A925 -:0806E500D2AB800075370A2238 -:10052E00C106C101011E00011D00C103C105C102AA -:0A053E00011F00C100C104011C00F0 -:10098F00D282EF700753B7CF43B7302253B7CF227E -:10004E00E5E8540C6013051FE51FC39402400AE453 -:10005E00F51F75E80CFF02098F301361301159D26C -:10006E008275FE0643FF02E5357016E5B570047520 -:10007E00B50122D203C213D206C205E4F51DFF80DC -:10008E0039C20320061675B50143B730E51DC3947A -:10009E00035003051D2253B7CFE4F5B5C282D281BA -:1000AE00E4F51DD205C200C2137848E675F00AA425 -:1000BE00F52E7405F52F80057F0112098F30055B33 -:1000CE00E51DC394035003051D22E51EC394035082 -:1000DE001275B501C28143B730D219051ED204D2B2 -:1000EE00828038300414C204E4F5B575FE0653FF61 -:1000FE00FDC2067F0112098F800B200008D200E599 -:10010E00E354A0F51C300013E5E354A0651C600B0E -:10011E00D201E4F538E5E354A0F51C300330E5E3F5 -:10012E0054AC64AC600330162530160AE51EC39439 -:10013E0019500D051E22E51EC394FA5003051E220A -:0F014E00E4F5B553B7CFC282C206C211C28122F7 -:10054800014800C115C11601471E14080D160DCA31 -:100558000DFC0E4C0E920ED80F3C0F8C0FD210686B -:1006ED00E4FFEF25E02408F8E6FC08E6FDC37846B4 -:1006FD00E69D18E69C40040FBF0AE77848E6FEEF3A -:10070D00D39E4004180680037847167847E6FED33B -:10071D0094325006EEC3940A50077848A60718760F -:10072D001E7848E6FFD394005004D2168008EFD30C -:10073D0094014002C216EFD394015003D21522EF5B -:07074D00D394024002C21523 -:010754002282 -:10056800012700012500012400012600C10BC10854 -:0E057800C107C109012900012800C10AC10CF8 -:1008D900E529603AE4F5290527E527C3940A400587 -:1008E900E4F527D20B0524E524C394644005E4F517 -:1008F90024D2070525E525C394FA4012E4F525D24B -:0F090900080526E52694044005E4F526D20922C8 -:03000B00020800E8 -:10080000C0E0C0F0C083C082C0D075D000C000C0BE -:1008100001C002C003C004C005C006C00774FC25A7 -:100820008CF58C7417258AF58A752901AF2FAE2EA9 -:10083000120345D007D006D005D004D003D002D093 -:0E08400001D000D0D0D082D083D0F0D0E032F2 -:03001B0002084E8A -:10084E00C0E0C0F0C083C082C0D075D000C000C070 -:10085E0001C002C003C004C005C006C007C28F1588 -:10086E008D749B258BF58B120599D20CD007D00673 -:10087E00D005D004D003D002D001D000D0D0D08289 -:07088E00D083D0F0D0E0326E -:030BFD00010105EE -:10058600012C00012B01012D10012A00022E000072 -:02059600C11989 -:1003450020190261F9052CE52B64017027E52CD3F2 -:10035500940A5004C282801CE52CD3940B5004D21D -:10036500828011E52CD39416500AC282E52CB4166E -:1003750003752B02E52BB40228152DE52DD3940F1B -:100385004008752D10752B048003752B03EFA82DE0 -:10039500088005CEC313CE13D8F95401F52AE4F528 -:1003A5002CE52B6403702EE52A6013E52CD394020B -:1003B5005003D28222E52CD3940350388011E52CCA -:1003C500C394015003D28222E52CD394015025C257 -:1003D50082752B0222E52BB4041AE52CC3940A502E -:1003E50009C282E4F5B553B7CF22D281E4F52CC218 -:0503F50019752B012227 -:10040C0002099FE493A3F8E493A34003F68001F25E -:10041C0008DFF48029E493A3F85407240CC8C333F1 -:10042C00C4540F4420C8834004F456800146F6DFC0 -:10043C00E4800B0102040810204080900513E47E38 -:10044C00019360BCA3FF543F30E509541FFEE493B5 -:10045C00A360010ECF54C025E060A840B8E493A37C -:10046C00FAE493A3F8E493A3C8C582C8CAC583CAA7 -:10047C00F0A3C8C582C8CAC583CADFE9DEE780BE5F -:010598000062 -:10015D0075F008758200EF2FFFEE33FECD33CDCC59 -:10016D0033CCC58233C5829BED9AEC99E5829840DC -:10017D000CF582EE9BFEED9AFDEC99FC0FD5F0D6B9 -:10018D00E4CEFBE4CDFAE4CCF9A88222B800C1B9E3 -:10019D000059BA002DEC8BF084CFCECDFCE5F0CB21 -:1001AD00F97818EF2FFFEE33FEED33FDEC33FCEB5A -:1001BD0033FB10D703994004EB99FB0FD8E5E4F915 -:1001CD00FA227818EF2FFFEE33FEED33FDEC33FC02 -:1001DD00C933C910D7059BE99A4007EC9BFCE99AF6 -:1001ED00F90FD8E0E4C9FAE4CCFB2275F010EF2F3B -:1001FD00FFEE33FEED33FDCC33CCC833C810D7073B -:10020D009BEC9AE899400AED9BFDEC9AFCE899F875 -:0E021D000FD5F0DAE4CDFBE4CCFAE4C8F92208 -:10022B00EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D60 -:10023B00FDE43CFCE8A42EC8C5F03DFDE43CFCEF1E -:0D024B00A4FFE5F028FEE43DFDE43CFC22AC -:00000001FF diff --git a/Out/SY883X_EVB_mcu_2024_08_23_153134_crc(cd7b)_V010105.bin b/Out/SY883X_EVB_mcu_2024_08_23_153134_crc(cd7b)_V010105.bin deleted file mode 100644 index 6aba004..0000000 Binary files a/Out/SY883X_EVB_mcu_2024_08_23_153134_crc(cd7b)_V010105.bin and /dev/null differ diff --git a/Out/SY883X_EVB_mcu_2024_09_13_173428.bin b/Out/SY883X_EVB_mcu_2024_09_13_173428.bin new file mode 100644 index 0000000..3eb1727 Binary files /dev/null and b/Out/SY883X_EVB_mcu_2024_09_13_173428.bin differ diff --git a/Out/SY883X_EVB_mcu_2024_09_13_173428.hex b/Out/SY883X_EVB_mcu_2024_09_13_173428.hex new file mode 100644 index 0000000..1f6ff0a --- /dev/null +++ b/Out/SY883X_EVB_mcu_2024_09_13_173428.hex @@ -0,0 +1,191 @@ +:03000000020400F7 +:10040000758E3075D20078FFE4F6D8FD758148020C +:02041000044D99 +:0F09BD0012061DD2AED2BE12092A12069380F482 +:04049200024500001F +:0208E600AD075C +:1008E800E4FCFBFAF533F53475FE2975FF8BEDC48E +:1008F80054F04401F5A5E5A520E0FBAFA1AB07AF97 +:10090800A2EFFEEEFAEB2534F534EA3533F5330C75 +:10091800BC08DBE534AE337803CEC313CE13D8F965 +:01092800FFCF +:0109290022AB +:1007C800E4F530F5317F051208E68E308F317F066B +:1007D8001208E6E4FCFDC004A905AA06AB07AE3082 +:1007E800AF317C077DD0120231D00012019F8E30CC +:0207F8008F313F +:0107FA0022DC +:10096900E4F531F5327F041208E68E318F327F06C5 +:100979001208E6E4FCFDC004A905AA06AB07AE31DE +:10098900AF327C037DE8120231D00012019F8E3113 +:020999008F329B +:01099B002239 +:02049600C11192 +:10025E00E4FFFE753001120969C3EF94D0EE9407E6 +:10026E0040037F0122E5E630E77AD3EF9436EE9431 +:10027E00055057EF9422EE9402404FD3EF941AEEAE +:10028E0094044005E4F5B1D210300E13C3EF94146C +:10029E00EE94055007C20E7530018003E4F5303040 +:1002AE000F13D3EF9444EE94024007C20F75300142 +:1002BE008003E4F5302010026148C3EF94E4EE941D +:1002CE00035077C21075B1058070D3EF9436EE945B +:1002DE00054004D20E8060C3EF9422EE9402505774 +:1002EE00D20F8053D3EF94FAEE94055032EF945E12 +:1002FE00EE9401402A300E12EF94D7EE940550077B +:10030E00C20E7530018003E4F530300F2DD3EF941B +:10031E0072EE94014007C20F753001801D8018D314 +:10032E00EF94FAEE94054004D20E800BC3EF945E68 +:0C033E00EE94015002D20FE4F530AF3015 +:01034A002290 +:10076F00E5E620E70953B3FE75F210C21122E5F258 +:10077F00540C601053B3FEE5F354C0603B75F20C9C +:10078F0075F3C022E5F354C0600375F3C012025E27 +:10079F00EF700453B3FE22E5F230E417C37846E658 +:1007AF0094D218E6940F500575F210800353B3FEE0 +:0907BF00D2112243B301C2112240 +:04049800C112C113B9 +:10080000E5E530E103C21222E5E230E705C212D28B +:100810001322E5E830E00EC212300934C20975E84F +:100820000175B5012212025EEF7005C212F5B52204 +:10083000D21230131BE5E630E716C37846E6941073 +:1008400018E6940E4005D212C21322E4F5B5C21286 +:010850002285 +:07049C00C114C1150136FF78 +:10001E00E5E25408FF6536601AE5E230E305753512 +:10002E00018003E4F535D214D215E4F538F51E8FB0 +:03003E0036D2189F +:01004100229C +:0D000E00EF146006047005D28422D2832214 +:0D09CC00EF146006047005C28422C283226D +:1005A100E4FE74392EF8E66067743D2EF9743F2E2F +:1005B100F8E6D397AF06500512000E80031209CC5E +:1005C100743F2EF8E6C394AA401EE4F674432EF855 +:1005D100E66008743D2EF81616800D74412EF8E67B +:1005E1006006743D2EF80606743D2EF8E6FF74AAE7 +:1005F100D39F500A74432EF876017441800EEFD3D5 +:100601009401500C74412EF8760174432EF8E4F6EF +:0B061100743F2EF8060EEE64027087A6 +:01061C0022BB +:0504A30001370AC11839 +:10099C00E5E620E706200703301804C218C322D36B +:0109AC002228 +:10061D0075FE8043FF3075FE0153FFFC75B7C37542 +:10062D00FE6A53FFE7758901758CFC758A17D2A98F +:10063D00D28C438910758DFF758B9BD2ABD28E7585 +:10064D00FE0675FF1E75FE0375FF3CC284C283E472 +:10065D00F58675FE0F43FF8075FE4F75FF1075FE15 +:10066D001775FF3CD2A8D2B9D2AF75F21C75F3C085 +:10067D0075E80C75FE8753FFDF75FE7043FF04436D +:06068D00B31075B1052257 +:03000300020006F2 +:0100060032C7 +:03004B000200426E +:0600420075EB3CD2183200 +:0504A800013800C1193C +:10051A00E5E630E72B30110AE47839F608F6D2849A +:10052A00801730160BE47839F6087601C284800900 +:10053A0078397601E408F6C283C215C201D21922BB +:10054A0030190CE47839F608F6C284C283C219203D +:10055A00150330014130161EC284E538C394025097 +:10056A0005C283053822E538C3942050050538D2E0 +:10057A008322C283801CC283E538C394025005C219 +:10058A0084053822E538C3942050050538D28422E0 +:07059A00C284C215C2012258 +:1006930030081EC2081207C87845A60608A6071226 +:1006A300001E12080012076F12004E12051A1207DD +:1006B30007300A4FC20AE537D39400400915373093 +:1006C3001841C218803A12099C503575FE2443FF25 +:1006D3003CC2B9C2A9C2AB75FE2953FF7F75FE4F59 +:1006E300E4F5FF75FE8053FFCF43870275FE804319 +:1006F300FF3075FE4F75FF10D2B9D2A9D2AB80007F +:0407030075370A221A +:1004AD00C107C101011E00011D00C103C106C10527 +:0C04BD00C102011F00C100C104011C00AD +:1009AD00D282EF700753B7CF43B7302253B7CF2260 +:10004E00E5E8540C6013051FE51FC39402400AE453 +:10005E00F51F75E80CFF0209AD30146730125FD240 +:10006E008275FE0E43FF0475FE0643FF02E53570F2 +:10007E0016E5B5700475B50122D203C214D207C2BB +:10008E0005E4F51DFF8039C20320071675B501433F +:10009E00B730E51DC394035003051D2253B7CFE4BB +:1000AE00F5B5C282D281E4F51DD205C200C2147824 +:1000BE0048E675F00AA4F52E7405F52F80057F012C +:1000CE001209AD30055BE51DC394035003051D22D7 +:1000DE00E51EC39403501275B501C28143B730D2E9 +:1000EE001A051ED204D2828038300414C204E4F5FC +:1000FE00B575FE0653FFFDC2077F011209AD800BD9 +:10010E00200008D200E5E354A0F51C300013E5E30F +:10011E0054A0651C600BD201E4F538E5E354A0F55C +:10012E001C300330E5E354AC64AC6003301725306B +:10013E00170AE51EC39419500D051E22E51EC39421 +:10014E00FA5003051E22E4F5B553B7CFC282C2079B +:05015E00C212C2812263 +:1004C900014800C116C11701471E14080D160DCAAF +:1004D9000DFC0E4C0E920ED80F3C0F8C0FD21068EB +:10070700E4FFEF25E02408F8E6FC08E6FDC3784699 +:10071700E69D18E69C40040FBF0AE77848E6FEEF1F +:10072700D39E4004180680037847167847E6FED321 +:1007370094325006EEC3940A50077848A6071876F5 +:100747001E7848E6FFD394005004D2178008EFD3F1 +:1007570094014002C217EFD394015003D21622EF3F +:07076700D394024002C21608 +:01076E002268 +:1004E900012700012500012400012600C10CC109D2 +:0E04F900C108C10A012900012800C10BC10D74 +:10092A00E529603AE4F5290527E527C3940A400535 +:10093A00E4F527D20C0524E524C394644005E4F5C4 +:10094A0024D2080525E525C394FA4012E4F525D2F8 +:0F095A00090526E52694044005E4F526D20A2275 +:03000B0002085197 +:10085100C0E0C0F0C083C082C0D075D000C000C06D +:1008610001C002C003C004C005C006C00774FC2556 +:100871008CF58C7417258AF58A752901AF2FAE2E58 +:1008810012034BD007D006D005D004D003D002D03C +:0E08910001D000D0D0D082D083D0F0D0E032A1 +:03001B0002089F39 +:10089F00C0E0C0F0C083C082C0D075D000C000C01F +:1008AF0001C002C003C004C005C006C007C28F1537 +:1008BF008D749B258BF58B1205A1D20DD007D00619 +:1008CF00D005D004D003D002D001D000D0D0D08238 +:0708DF00D083D0F0D0E0321D +:030BFD00010105EE +:10050700012C00012B01012D10012A00022E0000F1 +:02051700C11A07 +:10034B00201A0261FF052CE52B64017027E52CD3E5 +:10035B00940A5004C282801CE52CD3940B5004D217 +:10036B00828011E52CD39416500AC282E52CB41668 +:10037B0003752B02E52BB40228152DE52DD3940F15 +:10038B004008752D10752B048003752B03EFA82DDA +:10039B00088005CEC313CE13D8F95401F52AE4F522 +:1003AB002CE52B6403702EE52A6013E52CD3940205 +:1003BB005003D28222E52CD3940350388011E52CC4 +:1003CB00C394015003D28222E52CD394015025C251 +:1003DB0082752B0222E52BB4041AE52CC3940A5028 +:1003EB0009C282E4F5B553B7CF22D281E4F52CC212 +:0503FB001A752B012220 +:100412000209BDE493A3F8E493A34003F68001F23A +:1004220008DFF48029E493A3F85407240CC8C333EB +:10043200C4540F4420C8834004F456800146F6DFBA +:10044200E4800B0102040810204080900492E47EB4 +:10045200019360BCA3FF543F30E509541FFEE493AF +:10046200A360010ECF54C025E060A840B8E493A376 +:10047200FAE493A3F8E493A3C8C582C8CAC583CAA1 +:10048200F0A3C8C582C8CAC583CADFE9DEE780BE59 +:0105190000E1 +:1001630075F008758200EF2FFFEE33FECD33CDCC53 +:1001730033CCC58233C5829BED9AEC99E5829840D6 +:100183000CF582EE9BFEED9AFDEC99FC0FD5F0D6B3 +:10019300E4CEFBE4CDFAE4CCF9A88222B800C1B9DD +:1001A3000059BA002DEC8BF084CFCECDFCE5F0CB1B +:1001B300F97818EF2FFFEE33FEED33FDEC33FCEB54 +:1001C30033FB10D703994004EB99FB0FD8E5E4F90F +:1001D300FA227818EF2FFFEE33FEED33FDEC33FCFC +:1001E300C933C910D7059BE99A4007EC9BFCE99AF0 +:1001F300F90FD8E0E4C9FAE4CCFB2275F010EF2F35 +:10020300FFEE33FEED33FDCC33CCC833C810D70734 +:100213009BEC9AE899400AED9BFDEC9AFCE899F86F +:0E0223000FD5F0DAE4CDFBE4CCFAE4C8F92202 +:10023100EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D5A +:10024100FDE43CFCE8A42EC8C5F03DFDE43CFCEF18 +:0D025100A4FFE5F028FEE43DFDE43CFC22A6 +:00000001FF diff --git a/Out/SY883X_EVB_mcu_2024_09_13_173428_crc(ea61)_V010105.bin b/Out/SY883X_EVB_mcu_2024_09_13_173428_crc(ea61)_V010105.bin new file mode 100644 index 0000000..927c018 Binary files /dev/null and b/Out/SY883X_EVB_mcu_2024_09_13_173428_crc(ea61)_V010105.bin differ diff --git a/Project/TP3102_Demo.uvgui.GH b/Project/TP3102_Demo.uvgui.GH index 1017234..1c0a6ea 100644 --- a/Project/TP3102_Demo.uvgui.GH +++ b/Project/TP3102_Demo.uvgui.GH @@ -91,27 +91,27 @@ 44 2 - 2 + 3 - -32000 - -32000 + -1 + -1 -1 -1 - 86 - 1912 - 3832 - 1048 + 76 + 36 + 1956 + 1038 0 1732 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000001000000002000000010000003D453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4F453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000FFDC7800FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF48453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000F0A0A100FFFFFFFF42453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C756172745C756172742E630000000006756172742E6300000000BCA8E100FFFFFFFF40453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6164635C6164632E6300000000056164632E63000000009CC1B600FFFFFFFF42453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000F7B88600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C74696D65725C7379735F74696D2E6300000000097379735F74696D2E6300000000D9ADC200FFFFFFFF40453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6C65645C6C65642E6300000000056C65642E6300000000A5C2D700FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000B3A6BE00FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5372635C737461727475705C535441525455502E413531000000000B535441525455502E41353100000000EAD6A300FFFFFFFF41453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C496E6974566172732E63000000000A496E6974566172732E6300000000F6FA7D00FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E63000000000B6770696F5F636F6D6D2E6300000000B5E99D00FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C557372496E635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E68000000000B6770696F5F636F6D6D2E68000000005FC3CF00FFFFFFFF53453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000C1838300FFFFFFFF43453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000CACAD500FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F483FFFF4F83FFFF808AFFFFE085FFFF + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000001000000002000000010000003D453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4F453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000FFDC7800FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF48453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000F0A0A100FFFFFFFF42453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C756172745C756172742E630000000006756172742E6300000000BCA8E100FFFFFFFF40453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6164635C6164632E6300000000056164632E63000000009CC1B600FFFFFFFF42453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000F7B88600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C74696D65725C7379735F74696D2E6300000000097379735F74696D2E6300000000D9ADC200FFFFFFFF40453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6C65645C6C65642E6300000000056C65642E6300000000A5C2D700FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000B3A6BE00FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5372635C737461727475705C535441525455502E413531000000000B535441525455502E41353100000000EAD6A300FFFFFFFF41453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C496E6974566172732E63000000000A496E6974566172732E6300000000F6FA7D00FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E63000000000B6770696F5F636F6D6D2E6300000000B5E99D00FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C557372496E635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E68000000000B6770696F5F636F6D6D2E68000000005FC3CF00FFFFFFFF53453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000C1838300FFFFFFFF43453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F526F636B2D415C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000CACAD500FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000F7020000 @@ -134,7 +134,7 @@ 16 - 7408000066000000100D0000F6000000 + F40000006600000090050000F6000000 @@ -1799,14 +1799,14 @@ 3390 - 000000000A000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000007408000066000000100D0000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000200C000066000000100D000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000E0020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000800700006600000070080000F7020000000000004F000000F0000000E00200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000001502000090050000190200000000000001000000040000000100000000000000000000000000000000000000000000000100000000000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000000000000000000000810700003102000080F8FFFFE9FFFFFF010000001A02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000080000001000000FFFFFFFFFFFFFFFF00000000E002000080070000E402000001000000010000100400000001000000BCFDFFFF48010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000080070000FB020000000F0000FD03000000000000E402000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC500000001000000FFFF02001400434D756C746950616E654672616D65576E64457800010084A4000000BB0000006C0300004B01000000000000000000000200000000000000C60000000000000000000000000000000000000001000000C60000000000000000000000 + 000000000A000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000E0020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000F7020000000000004F000000F0000000E00200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000001502000090050000190200000000000001000000040000000100000000000000000000000000000000000000000000000100000000000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000080F8FFFF00000000010000003102000080F8FFFFE9FFFFFF010000001A02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000080000001000000FFFFFFFFFFFFFFFF00000000E002000080070000E402000001000000010000100400000001000000BCFDFFFF48010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000FB02000080070000FD03000000000000E402000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC500000001000000FFFF02001400434D756C746950616E654672616D65576E64457800010084A4000000BB0000006C0300004B01000000000000000000000200000000000000C60000000000000000000000000000000000000001000000C60000000000000000000000 59392 File 2763 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B960000000000000008001D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B197379363230785F6972715F68616E646C65725F746872656164044E4F4E4511677379363230785F6465766963655F7379144932435F4745545F4F574E5F4144445245535331144932435F4745545F4F574E5F41444452455353320C4932435F4F4152325F4F41321E48414C5F534D4255535F4D6173746572527843706C7443616C6C6261636B0000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C5750545F636865636B456E64960000000000000009000C5750545F636865636B456E641D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B197379363230785F6972715F68616E646C65725F746872656164044E4F4E4511677379363230785F6465766963655F7379144932435F4745545F4F574E5F4144445245535331144932435F4745545F4F574E5F41444452455353320C4932435F4F4152325F4F41321E48414C5F534D4255535F4D6173746572527843706C7443616C6C6261636B000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3624,18 +3624,18 @@ ..\UsrSrc\vox\vox_module.c - 17 + 58 23 - 42 + 44 1 0 ..\UsrSrc\userapp\userapp.c - 43 + 0 78 - 100 + 102 1 0 @@ -3687,9 +3687,9 @@ ..\UsrSrc\system\system.c - 4 + 1 58 - 75 + 76 1 0 @@ -3714,7 +3714,7 @@ ..\UsrSrc\gpio_comm\gpio_comm.c - 13 + 16 54 77 1 diff --git a/TP3310_Demo.si4project/TP3310_Demo.SearchResults b/TP3310_Demo.si4project/TP3310_Demo.SearchResults index b447f5f..71bd1e6 100644 --- a/TP3310_Demo.si4project/TP3310_Demo.SearchResults +++ b/TP3310_Demo.si4project/TP3310_Demo.SearchResults @@ -1,7 +1,11 @@ ----- F_batlevel_low Matches (6 in 3 files) ---- -bat.c (UsrSrc\bat) line 24 : bit F_batlevel_low = 0; //电池低压 -check_bat_level in bat.c (UsrSrc\bat) : F_batlevel_low = 1; -check_bat_level in bat.c (UsrSrc\bat) : F_batlevel_low = 0; -bat.h (UsrInc\bat) line 36 : extern bit F_batlevel_low; //电池低压 -LED_Display_App in userapp.c (UsrSrc\userapp) : if( F_batlevel_low ) //低电红灯呼吸 -LED_Display_App in userapp.c (UsrSrc\userapp) : if( F_batlevel_low ) +---- Enter_Sleep_Cnt_Restart_Flag Matches (10 in 6 files) ---- +Hall_Handler in hall.c (UsrSrc\hall) : Enter_Sleep_Cnt_Restart_Flag = 1; +sleep.c (UsrSrc\sleep) line 36 : bit Enter_Sleep_Cnt_Restart_Flag = 0; +Check_Require_Sleep in sleep.c (UsrSrc\sleep) : if( ( CHIP_STA4 & 0x80 ) || ( ON == Vox_Vout_Enable ) || Enter_Sleep_Cnt_Restart_Flag ) /*VBUS Power Good存在、有中断、耳机处于充电状态情况下，Boost重载输出，系统不进休眠模式。 */ +Check_Require_Sleep in sleep.c (UsrSrc\sleep) : Enter_Sleep_Cnt_Restart_Flag = 0; +sleep.h (UsrInc\sleep) line 37 : extern bit Enter_Sleep_Cnt_Restart_Flag; +EX2_isr in system.c (UsrSrc\system) : Enter_Sleep_Cnt_Restart_Flag = 1; +system.c (UsrSrc\system) line 268 : Enter_Sleep_Cnt_Restart_Flag = 1; +uart0_Interrupt in uart.c (UsrSrc\uart) : Enter_Sleep_Cnt_Restart_Flag = 1; +UserAPP in userapp.c (UsrSrc\userapp) : if( Enter_Sleep_Cnt_Restart_Flag ) +UserAPP in userapp.c (UsrSrc\userapp) : Enter_Sleep_Cnt_Restart_Flag = 0; diff --git a/TP3310_Demo.si4project/TP3310_Demo.sip_sym b/TP3310_Demo.si4project/TP3310_Demo.sip_sym index b3d0fe9..3fb4447 100644 Binary files a/TP3310_Demo.si4project/TP3310_Demo.sip_sym and b/TP3310_Demo.si4project/TP3310_Demo.sip_sym differ diff --git a/TP3310_Demo.si4project/TP3310_Demo.sip_xm b/TP3310_Demo.si4project/TP3310_Demo.sip_xm index 649320a..810aaaa 100644 Binary files a/TP3310_Demo.si4project/TP3310_Demo.sip_xm and b/TP3310_Demo.si4project/TP3310_Demo.sip_xm differ diff --git a/TP3310_Demo.si4project/TP3310_Demo.siwork b/TP3310_Demo.si4project/TP3310_Demo.siwork index a7737b4..6bf6107 100644 Binary files a/TP3310_Demo.si4project/TP3310_Demo.siwork and b/TP3310_Demo.si4project/TP3310_Demo.siwork differ diff --git a/UsrInc/inc/config.h b/UsrInc/inc/config.h index fd23b58..9194ec3 100644 --- a/UsrInc/inc/config.h +++ b/UsrInc/inc/config.h @@ -30,7 +30,7 @@ #define BAT_CV 4200 //CVѹã4.20V #define BAT_PRE 3000 //ѹ3.0v -#define BAT_RECHARG 4075 //ظѹ4200mv - 135mv = 4075mv +#define BAT_RECHARG 4050 //ظѹ4200mv - 150mv = 4050mv #define CHG_CURRENT_400MA 0x05 diff --git a/UsrInc/inc/define.h b/UsrInc/inc/define.h index a3fe300..a30fe6a 100644 --- a/UsrInc/inc/define.h +++ b/UsrInc/inc/define.h @@ -31,6 +31,7 @@ #define FW_VER2 0x05 //汾2:ԳֲͬIJ԰汾ʱĶʱ1 /*Function Selectѡ궨*/ +#define SY8836 //sy8836ϷоƬҪرVBUS OVʹܺ͹VDPM #define TIMER1_ENABLE 1 //Timer1 ʱ1ms diff --git a/UsrSrc/charger/charger_module.c b/UsrSrc/charger/charger_module.c index d484ba2..2262761 100644 --- a/UsrSrc/charger/charger_module.c +++ b/UsrSrc/charger/charger_module.c @@ -339,6 +339,7 @@ void Charger_Handler(void) printf("Dis Chg\r\n"); #endif } + Charger_Done = 1; #endif diff --git a/UsrSrc/discharge/discharge_module.c b/UsrSrc/discharge/discharge_module.c index 8f1c502..f7d4dd0 100644 --- a/UsrSrc/discharge/discharge_module.c +++ b/UsrSrc/discharge/discharge_module.c @@ -36,8 +36,6 @@ bit gBoost_Prepared_Flag = 0; //Boost Variables definitions \******************************************************************************/ - - bit gBoost_UVLO_Flag = 0; /******************************************************************************\ @@ -154,6 +152,7 @@ void DisCharge_Handler(void) } return; } + #if NTC_ENABLE /*NTC Handle*/ //ʹBoostǰȼNTC¶ȣ쳣Ͳŵ硣 if( PMU_NTC_Control() == FALSE ) //NTCŵ硣 @@ -163,6 +162,7 @@ void DisCharge_Handler(void) return; } #endif + gBoost_Prepared_Flag = 1; #if ADC_ENABLE diff --git a/UsrSrc/hall/hall.c b/UsrSrc/hall/hall.c index ffe595b..f576e66 100644 --- a/UsrSrc/hall/hall.c +++ b/UsrSrc/hall/hall.c @@ -93,7 +93,12 @@ uint8_t Hall_Sta_bk = 0xff; LED_On_Timer = 0; Vox_TX_Timer = 0; Hall_Sta_bk = Hall_Sta; +#if SLEEP_ENABLE + Enter_Sleep_Cnt_Restart_Flag = 1; + +#endif + } } diff --git a/UsrSrc/key/key.c b/UsrSrc/key/key.c index f12ebf3..bdbf008 100644 --- a/UsrSrc/key/key.c +++ b/UsrSrc/key/key.c @@ -38,8 +38,6 @@ bit Key_Press_short_irq = 0; bit Key_Press_l_irq = 0; bit Key_Press_ll_irq = 0; -bit Key_l_Flag = 0; - idata KEY_EVENT_E Event_key = 0; /******************************************************************************\ @@ -64,36 +62,41 @@ idata KEY_EVENT_E Event_key = 0; void Key_Handler(void) { - if( Key_l_Flag ) + if( IRQ_FLAG7 & 0x20 ) //2sҪ̧ { - Key_Press_l_irq = 0; - Key_l_Flag = 0; + Key_Press_l_irq = 1; /*todo*/ Event_key = KEY_EVENT_L_2S; /**/ - + + IRQ_FLAG7 = 0x20; + #ifdef _DEBUG_KEY printf("long press\r\n"); #endif } - if( Key_Press_ll_irq ) + if( IRQ_FLAG7 & 0x40 ) //8sҪ̧ { - Key_Press_ll_irq = 0; + Key_Press_ll_irq = 1; /*todo*/ Event_key = KEY_EVENT_LL_8S; + + IRQ_FLAG7 = 0x40; #ifdef _DEBUG_KEY printf("supper long press\r\n"); #endif } - if( Key_Press_short_irq ) + if( IRQ_FLAG7 & 0x18 ) //̰16ms-1sҪ̧ { - Key_Press_short_irq = 0; + Key_Press_short_irq = 1; /*todo*/ Event_key = KEY_EVENT_SHORT; + IRQ_FLAG7 = 0x18; + #ifdef _DEBUG_KEY printf("short press\r\n"); #endif diff --git a/UsrSrc/system/system.c b/UsrSrc/system/system.c index 76e5363..c85327d 100644 --- a/UsrSrc/system/system.c +++ b/UsrSrc/system/system.c @@ -66,6 +66,9 @@ */ void System_Init(void) { + SFRADDR = PMU_CTL0; //оƬӲ󣬹̶ + SFRDATA |= 0x30; + /*test*/ SFRADDR = P0_PD; SFRDATA &= ~0x03; @@ -175,13 +178,15 @@ void System_Init(void) #if CHARGER_ENABLE - SFRADDR = PMU_CTL7; //ϷоƬرVBUS OVʹ +#ifdef SY8836 //ϷоƬرVBUS OVʹ + SFRADDR = PMU_CTL7; SFRDATA &= ~0x20; - CHG_CTL |= 0x10; //糬ʱʹ - SFRADDR = REG_CHG0; SFRDATA |= 0x04; //VDPM +#endif + + CHG_CTL |= 0x10; //糬ʱʹ REG_CHG1 = CHG_CURRENT_400MA; //400mA @@ -230,10 +235,9 @@ void EX2_isr(void) interrupt Interrupt_Vector_IE2 IRQ_FLAG3 = 0x3C; #if SLEEP_ENABLE -// if( !Enter_Sleep_Cnt_Restart_Flag ) - { - Enter_Sleep_Cnt_Restart_Flag = 1; - } + + Enter_Sleep_Cnt_Restart_Flag = 1; + #endif } diff --git a/UsrSrc/userapp/userapp.c b/UsrSrc/userapp/userapp.c index 5bd542c..75aa492 100644 --- a/UsrSrc/userapp/userapp.c +++ b/UsrSrc/userapp/userapp.c @@ -274,10 +274,14 @@ void UserAPP(void) SFRADDR = ADCCS_CTL0; //AD0~AD4 GPIO constant 20uA current source disable. SFRDATA = 0x00; #endif + SFRADDR = PMU_CTL0; //оƬӲ󣬹̶ + SFRDATA &= ~0x30; PCON |= 0x02; //Enter StandbyMode, Only int0 or int1 can wake up system /* OutSleep Handler */ //Enable IRQ + SFRADDR = PMU_CTL0; //оƬӲ󣬹̶ + SFRDATA |= 0x30; SFRADDR = ADCCS_CTL0; //AD0~AD4 GPIO constant 20uA current source enable. SFRDATA = 0x10; diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index 03ccf9c..c0b9996 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -57,6 +57,8 @@ uint8_t Vox_TX_Timer = 0; //VOX uint8_t Vox_Vol_Hold_Timer = 0; bit Cover_Close_Flag = 0; +bit Cover_Close_Flag1 = 0; + bit Cover_Open_Flag = 0; bit Vox_Vout_5V_Flag = 0; @@ -144,6 +146,9 @@ void Vox_Det_Machine(void) if( gBoost_Prepared_Flag ) { COM_CTRL = ON; + + SFRADDR = MFP_CTL0; + SFRDATA |= 0x04; //P01 as UART's TX /*Set P01 As Output*/ SFRADDR = P0_OE; @@ -190,7 +195,7 @@ void Vox_Det_Machine(void) { Cover_Close_Flag = 0; - if( Vox_Vout_Enable == OFF ) //ǰӵص͵磬򿪸ǺVOX 5V150ms + if( Vox_Vout_Enable == OFF ) //ǰӵص͵磬򿪸ǺVOX 5V300ms { BST_EN = 1; @@ -230,9 +235,9 @@ void Vox_Det_Machine(void) } /* Ϳָ*/ - if( Cover_Open_Flag ) /*Ǻÿ100msһοָ3֮VoxתadtģʽȴУʾӦĵЧ*/ + if( Cover_Open_Flag ) /*ǺVbat(Adtģʽ)300ms󣬷pattern*/ { - if( Vox_Vol_Hold_Timer < VOX_ADT_HOLD_CNT ) //ǺVbat(Adtģʽ)300ms󣬷pattern + if( Vox_Vol_Hold_Timer < VOX_ADT_HOLD_CNT ) { Vox_Vol_Hold_Timer++; @@ -245,7 +250,7 @@ void Vox_Det_Machine(void) PATTERN_TX = OFF; - VOX_CTL0 |= 0x30; //VOXMOS + VOX_CTL0 |= 0x30; //VOXMOS Pattern_TX_Start = 1; @@ -299,11 +304,6 @@ void Vox_Det_Machine(void) if( Cover_Close_Flag ) { - /*˵ - 1ظǺʼBoost5VIOFF 20mA - - - */ #if VOX_FOLLOW_CHG if( Boost_VoxVout_Follow_Flag )