更改点:1、增加跟随冲功能;2、更改低电开盖Vbat持续时间为300ms。

This commit is contained in:
Alex xu 2024-09-13 17:37:19 +08:00
parent bf309b587a
commit 9ed3bf45d3
20 changed files with 268 additions and 243 deletions

View File

@ -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

Binary file not shown.

View File

@ -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

File diff suppressed because one or more lines are too long

View File

@ -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;

View File

@ -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

View File

@ -31,6 +31,7 @@
#define FW_VER2 0x05 //程序版本2:代表在软件调试出现不同的测试版本时改动时加1
/*Function Select功能选择宏定义*/
#define SY8836 //sy8836合封芯片需要关闭VBUS OV检测使能和关VDPM环。
#define TIMER1_ENABLE 1 //Timer1 定时周期1ms

View File

@ -339,6 +339,7 @@ void Charger_Handler(void)
printf("Dis Chg\r\n");
#endif
}
Charger_Done = 1;
#endif

View File

@ -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

View File

@ -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
}
}

View File

@ -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

View File

@ -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
}

View File

@ -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;

View File

@ -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;
@ -145,6 +147,9 @@ void Vox_Det_Machine(void)
{
COM_CTRL = ON;
SFRADDR = MFP_CTL0;
SFRDATA |= 0x04; //P01 as UART's TX
/*Set P01 As Output*/
SFRADDR = P0_OE;
SFRDATA |= 0x02;
@ -190,7 +195,7 @@ void Vox_Det_Machine(void)
{
Cover_Close_Flag = 0;
if( Vox_Vout_Enable == OFF ) //开盖前耳机充满或盒子电池低电则开盖后VOX 5V输出持续150ms
if( Vox_Vout_Enable == OFF ) //开盖前耳机充满或盒子电池低电则开盖后VOX 5V输出持续300ms
{
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; //打开VOX负端MOS
VOX_CTL0 |= 0x30; //打开VOX负端MOS
Pattern_TX_Start = 1;
@ -299,11 +304,6 @@ void Vox_Det_Machine(void)
if( Cover_Close_Flag )
{
/*跟随充说明:
1Boost输出5VIOFF 20mA
*/
#if VOX_FOLLOW_CHG
if( Boost_VoxVout_Follow_Flag )