更改内容:1、更改编译生成的程序的命名规则;2、更改Vox OCP保护逻辑和对应的灯效,OCP恢复后需要重新开关盖才能继续重新充电;3、更改Charger充电电流为350mA;

This commit is contained in:
Alex xu 2024-12-11 10:34:45 +08:00
parent 78a6b66c00
commit a6f71fef28
17 changed files with 623 additions and 590 deletions

Binary file not shown.

View File

@ -0,0 +1,205 @@
:0300000002058076
:10058000758E3075D20078FFE4F6D8FD758154027F
:0205900005CD97
:0C000E00120850D2AED2BE1204EC80F7F3
:0806120002160000021401377A
:0C003D00AE14AF15AB07AA06E4F9F822D8
:0207F000AD0753
:1007F200E4FCFBFAF51CF51D75FE2975FF8BBD06A1
:100802001775FE0143FF8075A541E5A520E0FB7544
:10081200A56175FE0153FF7FE4FCEDC454F0440171
:10082200F5A5E5A520E0FBAFA1AB07AFA2EFFEEE79
:10083200FAEB251DF51DEA351CF51C0CBC08DBE5A1
:0D0842001DAE1C7803CEC313CE13D8F9FFF2
:01084F002286
:100A2B00E4FE7F051207F07C077DD0120343C0065E
:0C0A3B00C00712003DD007D0060202B137
:100A4700E4FE7F041207F07C037DE8120343C0062F
:0C0A5700C00712003DD007D0060202B11B
:04061A00C120C12119
:10078500E4FFFEF51B120A47C3EF94D0EE94074031
:10079500037F0022D3EF942EEE94065030EF94128F
:1007A500EE94024028301E12EF9406EE9406500790
:1007B500C21EE4F51B8003751B01301F2BD3EF947C
:1007C50033EE9402401FC21FE4F51B801BD3EF9448
:1007D5002EEE94064004D21E800BC3EF9412EE94C5
:0A07E500025002D21F751B01AF1B6A
:0107EF0022E7
:1008AE00E5E620E70953B3FE75F210C22022E5F209
:1008BE00540C601053B3FEE5F354C0603A75F20C5D
:1008CE0075F3C02275F3C030210453B3FE22E5F256
:1008DE0030E416C3E51794D2E516940F500575F261
:1008EE0010800353B3FED2202243B311E534D394C8
:0808FE00014002C22AC22022BF
:04061E00C125C1260B
:10095C00E5E530E103C22522E5E230E705C225D208
:10096C002622302A02802FE5E830E009C22575E8FE
:10097C000175B50122302106C225E4F5B522D22538
:10098C00302618E5E630E713C3E5179410E5169406
:0C099C000E4003C22622E4F5B5C225225D
:07062200011FFFC127C128E1
:10001E00E5E25408FF651F6015E5E230E305751E45
:0E002E00018003E4F51ED227D228D21D8F1FB9
:01003C0022A1
:06062900C117C118C11643
:10069800E5E220E12D054BE54BC3941E40102013E5
:1006A8001DD213D212301016D216D21D8010E54B6F
:1006B800C3940F4009201406D21CD218D214D215A4
:1006C8008019301513C215C213C214C218E54BC3E2
:1006D80094055004D217D21DE4F54B30122FE54C87
:1006E800D394185019E54C75F00584E5F0700C307A
:1006F8001009D22BF512751305D22C054C22C21203
:0D070800754C01E51EB401057F01120A6366
:0107150022C1
:100906007850E6604D7852E6FFD318965004D284AC
:100916008002C284EFC394AA4018E47852F6785451
:10092600E660067851161680097853E66004785119
:1009360006067851E6FF74AAD39F500978547601CB
:10094600E418F6800DEFD39401500778537601E44E
:0609560008F678520622AB
:05062F00014F0AC12D7E
:100A9000E5E220E006201103302D04C22DC322D34D
:010AA0002233
:1008500075FE8043FF3075FE0153FFFCD28175FEAB
:100860000643FF1AD21D75B7C375FE6A75FF04757E
:10087000FE6C43FF0A758901758CFC758A66D2A9E6
:10088000D28C438910758DFF758BA4D2ABD28E7537
:10089000868075FE0F43FF8075FE4F75FF1075FE55
:0E08A0001775FF3CD2A8D2B9D2AF75B10422B1
:03000300020006F2
:0100060032C7
:03004B00020AB5F1
:060AB50075EB3CD22D326E
:04063400C11DC11C07
:090AAC00E54D75F00584E5F0222A
:0B0AA100E47850F6C283C284D22D22FC
:10037000202103300A1F201905D219020AA1E54DD8
:10038000C39469500D054D120AAC600302043EB2DD
:100390008322C28322301911C219120AA1C21AC2C1
:1003A0001BC20BC228D21DD21CE5E630E728302044
:1003B0000C201B05D21B120AA1D2848010201A091E
:1003C000D21AC21B120AA1800478507601C217C249
:1003D00016C228C21D22301A08C21AC21BD21DD250
:1003E0001C301D08E4F54DC21D120AA1302A0280FE
:1003F00043200B092017062016033028413016052C
:10040000754E2B8003754E23E54DC39405500305AF
:100410004D22E54DC3954E501B054D301608120A6E
:10042000AC701BB28422302908120AAC7010B2835F
:0E04300022D28422C217C216C228C20BD21DCD
:01043E00229B
:1004EC00302305C22312043F30222FC22212001ED9
:1004FC0012095C1208AE120698120A2B8E168F1770
:10050C00120785EF24FF92217F061207F08E148FBD
:10051C001512004E120716120370302456C224E531
:10052C004FD394004009154F302D48C22D804112F5
:10053C000A90503CE5E230E70875FE2453FFC38077
:10054C000675FE2443FF3CC2ABC2B9C2A953B7CF58
:10055C00E4F5B575FE2953FF7F75FE8053FFCF433D
:10056C00870275FE8043FF30D2B9D2A9D2AB80008E
:04057C00754F0A228B
:10063800C111C10BC10AC110C10FC10EC10D010DFD
:0306480000C10CE2
:100A6300E4F5B5EF24FF928175FE0653FFFB43FFC8
:080A730002BF010353B7CF22BB
:100A7B0075FE0643FF0453FFFDC28275B501BF012E
:050A8B000343B7302217
:10004E00E5E8540C6023050CE50CD394055003022F
:10005E000274E4F50C75E80C53B7CF43B730D20AEF
:10006E00C227C201C202C21122C20A202503020205
:10007E0060302737E5B570030201B343B730E4F5BE
:10008E000CF509F50AF50BC200C210E51E7014C27C
:10009E000BD201D205D206D211C202C209C208C2C7
:1000AE000D8006C201D202C204C227200203020141
:1000BE0062E509C394025003050922E50AC39402BE
:1000CE00500AE4FF120A63050A020162301C11E5B0
:1000DE00B570030201B3C200E4F50B43B730C21C86
:1000EE00200041E50CD394185023E50C75F00584DF
:1000FE00E5F07015E5E354A0FFBFA00DD22BC22C86
:10010E00E53344C4751200F513050C8047E50BC3A7
:10011E0094035003050B22D2007F01120A63D2030F
:10012E00C2118030300315C203E4F50BE5E354AC85
:10013E00FFBFA004D2108016C2108012E5E354A0B7
:10014E0065086010E5E354A06004D20BD21DE5E310
:10015E0054A0F50820010302025D301C18E5B570AD
:10016E000FFF120A7BC205C200F50AF509C208226A
:10017E0043B730C21CE50AC3940A5003050A222075
:10018E0005097F01120A63D2058013200010E5E3F2
:10019E0054ACFFBFA004D2108002C210D2002006C1
:1001AE000DE5B57004FF020A7B43B730D206300965
:1001BE000302023F200D19750D03C20C75FE6A4332
:1001CE00FF2075FE6C53FF3F43FF80D20D02025D90
:1001DE00E509C3940A5003050922E4F509E5E35441
:1001EE000C6025050DD20CC3E50D64809482402968
:1001FE00750D02C20DD20975FE6A53FFDF75FE6CD6
:10020E0053FF3F43FF408011200C0E150DD3E50D1B
:10021E00648094805003E4F50D75FE8F75FF69754B
:10022E00FE7853FFFCE50D42FF75FE8F75FF0180D2
:10023E001E20081BE5E354ACFFBFAC13E509C394C5
:10024E00325003050922D208C2117F01120A63C27D
:10025E000722200711D207C2117F01120A63E5E3BC
:06026E0054A0F508D21CAB
:010274002267
:10064B00013400013300C129C12A01326416350C73
:10065B00800DAC0E100E740ED80F3C0F6E0FA01049
:10066B0004103610680B270A181A202228292A3062
:02067B0031321A
:10071600E4FFEF25E02435F8E6FC08E6FDC3E5171F
:100726009DE5169C40040FBF0BE8E5E16005E4F586
:10073600E18F34EFD395344004053280021532E55B
:1007460032D394BE5007E532C3940A50158F34E570
:10075600266534600A74272FF8E6F5338534267546
:100766003264E534D394005002D22AE534D394029D
:0E0776005003D22922E534D394044002C22954
:010784002252
:0F067D00011900011800011A00C123C122C12474
:03000B000209EDFA
:1009ED00C0E0C0D074FC258CF58C7466258AF58A20
:1009FD00D2230518E518C394644005751800D2225A
:100A0D000519E519C394FA4010751900051AE51A70
:0E0A1D0094044005751A00D224D0D0D0E032E7
:03001B000209A82F
:1009A800C0E0C0F0C083C082C0D075D000C000C015
:1009B80001C002C003C004C005C006C007C28F152D
:1009C8008D74A4258BF58B120906D007D006D005A7
:1009D800D004D003D002D001D000D0D0D082D083B0
:0509E800D0F0D0E03268
:030BFD00010103F0
:0B068C00C12B01110002120000C12C64
:10043F00202B030204EB0510E511702EE510D39469
:10044F003750028015E510D3944B50077F01120AE5
:10045F007B8017E510C3945F5007E4FF120A638097
:10046F0009751101302C03750E04E511B4012B151C
:10047F000EE50ED394074008750E0875110380031F
:10048F00751102E513AE12A80E088005CEC313CE68
:10049F0013D8F95401F50FE4F510E511B40211E585
:1004AF0010C394145006E50F601F801175110122BF
:1004BF00E51164037026E510C3941450057F010203
:1004CF000A7BE510C394285005E4FF020A637F01FD
:0C04DF00120A7BE4F510C22BC22CF511B0
:0104EB0022EE
:1005920002000EE493A3F8E493A34003F68001F271
:1005A20008DFF48029E493A3F85407240CC8C3336A
:1005B200C4540F4420C8834004F456800146F6DF39
:1005C200E4800B0102040810204080900612E47EB1
:1005D200019360BCA3FF543F30E509541FFEE4932E
:1005E200A360010ECF54C025E060A840B8E493A3F5
:1005F200FAE493A3F8E493A3C8C582C8CAC583CA20
:10060200F0A3C8C582C8CAC583CADFE9DEE780BED7
:010697000062
:1002750075F008758200EF2FFFEE33FECD33CDCC40
:1002850033CCC58233C5829BED9AEC99E5829840C3
:100295000CF582EE9BFEED9AFDEC99FC0FD5F0D6A0
:1002A500E4CEFBE4CDFAE4CCF9A88222B800C1B9CA
:1002B5000059BA002DEC8BF084CFCECDFCE5F0CB08
:1002C500F97818EF2FFFEE33FEED33FDEC33FCEB41
:1002D50033FB10D703994004EB99FB0FD8E5E4F9FC
:1002E500FA227818EF2FFFEE33FEED33FDEC33FCE9
:1002F500C933C910D7059BE99A4007EC9BFCE99ADD
:10030500F90FD8E0E4C9FAE4CCFB2275F010EF2F21
:10031500FFEE33FEED33FDCC33CCC833C810D70721
:100325009BEC9AE899400AED9BFDEC9AFCE899F85C
:0E0335000FD5F0DAE4CDFBE4CCFAE4C8F922EF
:10034300EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D47
:10035300FDE43CFCE8A42EC8C5F03DFDE43CFCEF05
:0D036300A4FFE5F028FEE43DFDE43CFC2293
:00000001FF

Binary file not shown.

View File

@ -1,203 +0,0 @@
:0300000002057185
:10057100758E3075D20078FFE4F6D8FD758154028E
:0205810005BEB5
:0C000E00120841D2AED2BE1204DD80F711
:08060300021600000214013789
:0C003D00AE14AF15AB07AA06E4F9F822D8
:0207E100AD0762
:1007E300E4FCFBFAF51CF51D75FE2975FF8BBD06B0
:1007F3001775FE0143FF8075A541E5A520E0FB7554
:10080300A56175FE0153FF7FE4FCEDC454F0440180
:10081300F5A5E5A520E0FBAFA1AB07AFA2EFFEEE88
:10082300FAEB251DF51DEA351CF51C0CBC08DBE5B0
:0D0833001DAE1C7803CEC313CE13D8F9FF01
:010840002295
:100A1C00E4FE7F051207E17C077DD012032CC00693
:0C0A2C00C00712003DD007D00602029A5D
:100A3800E4FE7F041207E17C037DE812032CC00664
:0C0A4800C00712003DD007D00602029A41
:04060B00C120C12128
:10077600E4FFFEF51B120A38C3EF94D0EE9407404F
:10078600037F0022D3EF942EEE94065030EF94129E
:10079600EE94024028301E12EF9406EE940650079F
:1007A600C21EE4F51B8003751B01301F2BD3EF948B
:1007B60033EE9402401FC21FE4F51B801BD3EF9457
:1007C6002EEE94064004D21E800BC3EF9412EE94D4
:0A07D600025002D21F751B01AF1B79
:0107E00022F6
:10089F00E5E620E70953B3FE75F210C22022E5F218
:1008AF00540C601053B3FEE5F354C0603A75F20C6C
:1008BF0075F3C02275F3C030210453B3FE22E5F265
:1008CF0030E416C3E51794D2E516940F500575F270
:1008DF0010800353B3FED2202243B311E534D394D7
:0808EF00014002C22AC22022CE
:04060F00C125C1261A
:10094D00E5E530E103C22522E5E230E705C225D217
:10095D002622302A02802FE5E830E009C22575E80D
:10096D000175B50122302106C225E4F5B522D22547
:10097D00302618E5E630E713C3E5179410E5169415
:0C098D000E4003C22622E4F5B5C225226C
:07061300011FFFC127C128F0
:10001E00E5E25408FF651F6015E5E230E305751E45
:0E002E00018003E4F51ED227D228D21D8F1FB9
:01003C0022A1
:06061A00C117C118C11652
:10068900E5E220E12D054BE54BC3941E40102013F4
:100699001DD213D212301016D216D21D8010E54B7E
:1006A900C3940F4009201406D21CD218D214D215B3
:1006B9008019301513C215C213C214C218E54BC3F1
:1006C90094055004D217D21DE4F54B30122FE54C96
:1006D900D394185019E54C75F00584E5F0700C3089
:1006E9001009D22BF512751305D22C054C22C21212
:0D06F900754C01E51EB401057F01120A5485
:0107060022D0
:1008F7007850E6604D7852E6FFD318965004D284BC
:100907008002C284EFC394AA4018E47852F6785460
:10091700E660067851161680097853E66004785128
:1009270006067851E6FF74AAD39F500978547601DA
:10093700E418F6800DEFD39401500778537601E45D
:0609470008F678520622BA
:05062000014F0AC12D8D
:100A8100E5E220E006201103302D04C22DC322D35C
:010A91002242
:1008410075FE8043FF3075FE0153FFFCD28175FEBA
:100851000643FF1AD21D75B7C375FE6A75FF04758D
:10086100FE6C43FF0A758901758CFC758A66D2A9F5
:10087100D28C438910758DFF758BA4D2ABD28E7546
:10088100868075FE0F43FF8075FE4F75FF1075FE64
:0E0891001775FF3CD2A8D2B9D2AF75B10222C2
:03000300020006F2
:0100060032C7
:03004B00020A9D09
:060A9D0075EB3CD22D3286
:04062500C11DC11C16
:0B0A9200E47850F6C283C284D22D220B
:10035900202103300A21201907D219120A92801488
:10036900E54DD39428500B054DE54D20E006B283A9
:100379008002C283D22D2230190DC219120A92C2EB
:100389001AC21BD21DD21CE5E630E72830200C200A
:100399001B05D21B120A92D2848010201A09D21A84
:1003A900C21B120A92800478507601C217C216C283
:1003B90028C21D22301A08C21AC21BD21DD21C30F3
:1003C9001D08E4F54DC21D120A92302A02804D2003
:1003D9000B0920170620160330284B301605754ED9
:1003E9002B8003754E23E54DC394055003054D221B
:1003F900E54DC3954E5025054D30160DE54D75F06B
:100409000584E5F07020B2842230290DE54D75F0A0
:100419000584E5F07010B28322D28422C217C21675
:06042900C228C20BD21D27
:01042F0022AA
:1004DD00302305C22312043030222FC22212001EF7
:1004ED0012094D12089F120689120A1C8E168F17BB
:1004FD00120776EF24FF92217F061207E18E148FEB
:10050D001512004E120707120359302456C224E566
:10051D004FD394004009154F302D48C22D80411204
:10052D000A81503CE5E230E70875FE2453FFC38095
:10053D000675FE2443FF3CC2ABC2B9C2A953B7CF67
:10054D00E4F5B575FE2953FF7F75FE8053FFCF434C
:10055D00870275FE8043FF30D2B9D2A9D2AB80009D
:04056D00754F0A229A
:10062900C111C10BC10AC110C10FC10EC10D010D0C
:0306390000C10CF1
:100A5400E4F5B5EF24FF928175FE0653FFFB43FFD7
:080A640002BF010353B7CF22CA
:100A6C0075FE0643FF0453FFFDC28275B501BF013D
:050A7C000343B7302226
:10004E00E5E8540C600C75E80C53B7CF43B730D2CB
:10005E000A22C20A202503020249302737E5B5706D
:10006E000302019C43B730E4F50CF509F50AF50BD4
:10007E00C200C210E51E7014C20BD201D205D20608
:10008E00D211C202C209C208C20D8006C201D2023A
:10009E00C204C22720020302014BE509C394025099
:1000AE0003050922E50AC39402500AE4FF120A541A
:1000BE00050A02014B301C11E5B5700302019CC20A
:1000CE0000E4F50B43B730C21C200041E50CD3947D
:1000DE00185023E50C75F00584E5F07015E5E35432
:1000EE00A0FFBFA00DD22BC22CE53344C475120065
:1000FE00F513050C8047E50BC394035003050B2243
:10010E00D2007F01120A54D203C21180303003157F
:10011E00C203E4F50BE5E354ACFFBFA004D210809C
:10012E0016C2108012E5E354A065086010E5E35492
:10013E00A06004D20BD21DE5E354A0F50820010304
:10014E00020246301C18E5B5700FFF120A6CC2058C
:10015E00C200F50AF509C2082243B730C21CE50AEF
:10016E00C3940A5003050A222005097F01120A547E
:10017E00D2058013200010E5E354ACFFBFA004D2DB
:10018E00108002C210D20020060DE5B57004FF02E9
:10019E000A6C43B730D206300903020228200D192B
:1001AE00750D03C20C75FE6A43FF2075FE6C53FF7E
:1001BE003F43FF80D20D020246E509C3940A500365
:1001CE00050922E4F509E5E3540C6025050DD20C72
:1001DE00C3E50D648094824029750D02C20DD209CB
:1001EE0075FE6A53FFDF75FE6C53FF3F43FF408081
:1001FE0011200C0E150DD3E50D648094805003E490
:10020E00F50D75FE8F75FF6975FE7853FFFCE50DD4
:10021E0042FF75FE8F75FF01801E20081BE5E3541B
:10022E00ACFFBFAC13E509C394325003050922D2CB
:10023E0008C2117F01120A54C20722200711D207E9
:0F024E00C2117F01120A54E5E354A0F508D21C37
:01025D00227E
:10063C00013400013300C129C12A01326416350C82
:10064C00800DAC0E100E740ED80F3C0F6E0FA01058
:10065C0004103610680B270A181A202228292A3071
:02066C00313229
:10070700E4FFEF25E02435F8E6FC08E6FDC3E5172E
:100717009DE5169C40040FBF0BE8E5E16005E4F595
:10072700E18F34EFD395344004053280021532E56A
:1007370032D394BE5007E532C3940A50158F34E57F
:10074700266534600A74272FF8E6F5338534267555
:100757003264E534D394005002D22AE534D39402AC
:0E0767005003D22922E534D394044002C22963
:010775002261
:0F066E00011900011800011A00C123C122C12483
:03000B000209DE09
:1009DE00C0E0C0D074FC258CF58C7466258AF58A2F
:1009EE00D2230518E518C394644005751800D22269
:1009FE000519E519C394FA4010751900051AE51A80
:0E0A0E0094044005751A00D224D0D0D0E032F6
:03001B000209993E
:10099900C0E0C0F0C083C082C0D075D000C000C024
:1009A90001C002C003C004C005C006C007C28F153C
:1009B9008D74A4258BF58B1208F7D007D006D005C6
:1009C900D004D003D002D001D000D0D0D082D083BF
:0509D900D0F0D0E03277
:030BFD00010102F1
:0B067D00C12B01110002120000C12C73
:10043000202B030204DC0510E511702EE510D39487
:100440003750028015E510D3944B50077F01120AF4
:100450006C8017E510C3945F5007E4FF120A5480C4
:1004600009751101302C03750E04E511B4012B152B
:100470000EE50ED394074008750E0875110380032E
:10048000751102E513AE12A80E088005CEC313CE77
:1004900013D8F95401F50FE4F510E511B40211E594
:1004A00010C394145006E50F601F801175110122CE
:1004B000E51164037026E510C3941450057F010212
:1004C0000A6CE510C394285005E4FF020A547F012A
:0C04D000120A6CE4F510C22BC22CF511CE
:0104DC0022FD
:1005830002000EE493A3F8E493A34003F68001F280
:1005930008DFF48029E493A3F85407240CC8C33379
:1005A300C4540F4420C8834004F456800146F6DF48
:1005B300E4800B0102040810204080900603E47ECF
:1005C300019360BCA3FF543F30E509541FFEE4933D
:1005D300A360010ECF54C025E060A840B8E493A304
:1005E300FAE493A3F8E493A3C8C582C8CAC583CA2F
:1005F300F0A3C8C582C8CAC583CADFE9DEE780BEE7
:010688000071
:10025E0075F008758200EF2FFFEE33FECD33CDCC57
:10026E0033CCC58233C5829BED9AEC99E5829840DA
:10027E000CF582EE9BFEED9AFDEC99FC0FD5F0D6B7
:10028E00E4CEFBE4CDFAE4CCF9A88222B800C1B9E1
:10029E000059BA002DEC8BF084CFCECDFCE5F0CB1F
:1002AE00F97818EF2FFFEE33FEED33FDEC33FCEB58
:1002BE0033FB10D703994004EB99FB0FD8E5E4F913
:1002CE00FA227818EF2FFFEE33FEED33FDEC33FC00
:1002DE00C933C910D7059BE99A4007EC9BFCE99AF4
:1002EE00F90FD8E0E4C9FAE4CCFB2275F010EF2F39
:1002FE00FFEE33FEED33FDCC33CCC833C810D70739
:10030E009BEC9AE899400AED9BFDEC9AFCE899F873
:0E031E000FD5F0DAE4CDFBE4CCFAE4C8F92206
:10032C00EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D5E
:10033C00FDE43CFCE8A42EC8C5F03DFDE43CFCEF1C
:0D034C00A4FFE5F028FEE43DFDE43CFC22AA
:00000001FF

File diff suppressed because one or more lines are too long

View File

@ -1,10 +1,6 @@
---- Key_Press_ll_irq_led Matches (9 in 3 files) ----
key.c (UsrSrc\key) line 35 : bit Key_Press_ll_irq_led = 0;
Key_Handler in key.c (UsrSrc\key) : Key_Press_ll_irq_led = 1;
key.h (UsrInc\key) line 28 : extern bit Key_Press_ll_irq_led;
LED_Display_App in userapp.c (UsrSrc\userapp) : Key_Press_ll_irq_led = 0;
LED_Display_App in userapp.c (UsrSrc\userapp) : Key_Press_ll_irq_led = 0;
LED_Display_App in userapp.c (UsrSrc\userapp) : if( (Earphone_Chg_Flag || Key_Press_irq || Key_Press_ll_irq_led || CoverEvent_Flg_led) ) //耳机出入盒、按键触发,显示灯效
LED_Display_App in userapp.c (UsrSrc\userapp) : if( Key_Press_ll_irq_led )
LED_Display_App in userapp.c (UsrSrc\userapp) : if( Key_Press_ll_irq_led )
LED_Display_App in userapp.c (UsrSrc\userapp) : Key_Press_ll_irq_led = 0;
---- Vox_Output_Short_Flag Matches (5 in 3 files) ----
LED_Display_App in userapp.c (UsrSrc\userapp) : if( NTC_Pro_Flag || Vox_Output_Short_Flag )
vox_module.c (UsrSrc\vox) line 68 : bit Vox_Output_Short_Flag = 0;
Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Vox_Output_Short_Flag = 1;
Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Vox_Output_Short_Flag = 0;
vox_module.h (UsrInc\vox) line 31 : extern bit Vox_Output_Short_Flag;

View File

@ -35,7 +35,7 @@ set crc_path=%2
::设置.hex文件所在目录路径\Objects\
set obj_path=%4
::设置输出后的文件名
set output_nameTmp=SY883X_EVB_%project_name%_%date:~0,4%_%date:~5,2%_%date:~8,2%_%time:~0,2%%time:~3,2%%time:~6,2%
set output_nameTmp=8834_JLAB_JS07_%date:~2,2%%date:~5,2%%date:~8,2%_%time:~0,2%%time:~3,2%
::如果hour小于10会有空格下面这句话可以除去字符串中的空格并用0代替。
set output_name=%output_nameTmp: =0%
@ -69,4 +69,4 @@ move .%obj_path%%output_name%.bin .\..\Out >nul
::del .%obj_path%%output_name%.hex
::del .%obj_path%%output_name%.bin
del .%obj_path%%output_name%_crc.bin
move .%obj_path%%output_name%_crc(*.bin .\..\Out >nul
move .%obj_path%%output_name%_*.bin .\..\Out >nul

Binary file not shown.

View File

@ -28,7 +28,7 @@
#define FW_VER0 0x01 //程序版本0:代表在硬件存在改动不能兼容之前版本时加1
#define FW_VER1 0x01 //程序版本1:代表在功能存在改动时加1
#define FW_VER2 0x02 //程序版本2:代表在软件调试出现不同的测试版本时改动时加1
#define FW_VER2 0x03 //程序版本2:代表在软件调试出现不同的测试版本时改动时加1
/* 芯片类型选择SY8836合封OVP芯片 */
//#define SY8836

View File

@ -70,7 +70,6 @@ SFRDATA |= (VOX_IOUT_500MA << 3) | VOX_ADT_Cur_2_5UA;
#define VOX_HAVEY_TO_LIGHT_64 0x03
/******************************************************************************\
Variables definitions
\******************************************************************************/

View File

@ -186,7 +186,7 @@ void System_Init(void)
#endif
/*如下参数按需更改。*/
REG_CHG1 = CHG_CURRENT_250MA; //ÉèÖóäµçµçÁ÷ 250mA
REG_CHG1 = CHG_CURRENT_350MA; //ÉèÖóäµçµçÁ÷350mA
#endif

View File

@ -46,8 +46,8 @@
#define LED_KEY_BLINK_CNT 5
#define LED_BLINK_CNT 5
#define LED_PRO_TIM 40
#define LED_PRO_CNT 2
#define LED_PRO_TIM 105
#define LED_PRO_CNT 5
/******************************************************************************\
Variables definitions
@ -121,7 +121,7 @@ void LED_Display_App(void)
}
else
{
if( LED_On_Timer <= LED_PRO_TIM )
if( LED_On_Timer < LED_PRO_TIM )
{
LED_On_Timer++;
@ -138,7 +138,7 @@ void LED_Display_App(void)
#if SLEEP_ENABLE
Enter_Sleep_Cnt_Restart_Flag = 1;
// Enter_Sleep_Cnt_Restart_Flag = 1;
#endif
return;
@ -155,6 +155,10 @@ void LED_Display_App(void)
LED_On_ChgDone_Flag = 0;
Earphone_Chg_Flag = 0;
CoverEvent_Flg_led = 0;
LED_On_Flag = 1;
Wkup_Earphone_Flag = 1;

View File

@ -57,6 +57,8 @@ bit Earphone_Chg_Flag = 0; //
#define VOX_FOLLOW_CHG_CNT 10
#define VOX_OCP_CNT 5
#define VOX_CLOSE_HOLD_CNT 10 //¹Ø¸Ç·¢Âëǰ±£³Öʱ¼ä
/******************************************************************************\
@ -191,261 +193,39 @@ void Vox_Det_Machine(void)
static uint8_t Vox_Output_Debounce;
/*Vox 过流保护,两只耳机都每隔200ms打嗝一次*/
/*Vox 过流保护,两只耳机都每隔500ms打嗝一次*/
if( IRQ_FLAG0 & 0x0C )
{
IRQ_FLAG0 = 0x0C;
VOX_CTL0 &= ~0x30; //VOX Disable 5V And Disable VOX ADT
VOX_CTL0 |= 0x30; //VOX Enable 5V
Vox_Output_Short_Flag = 1;
return;
}
Vox_Output_Short_Flag = 0;
if( gBoost_Prepared_Flag )
{
if( CoverEvent_Flg ) //Hall事件触发。
{
if( !BST_EN )
{
Vout_Ctrl_ON(OFF);
return;
}
VOX_CTL0 |= 0x30; //VOX Enable 5V
Vox_Output_Debounce = 0;
Vox_Vol_Hold_Timer = 0; //关盖清0开盖使用
Vox_TX_Timer = 0;
Vox_TX_Timer1 = 0;
Get_CHIP_STA1_Flag1 = 0;
Earphone_Num_2Inbox = 0;
if( CoverStatus == CLOSE ) //1、关盖关闭COM_CTRL显示灯效。无需查询Loadon、IOFF状态无论耳机是否在仓Vox 5V输出。
{
Earphone_Chg_Flag = 0; //关盖取消耳机入盒灯效,显示关盖灯效。
Cover_Close_Flag = 1;
Cover_Close_Flag0 = 1;
Cover_Close_Flag1 = 1;
Vox_Vout_Enable = ON;
Cover_Open_Flag = 0;
Follow_Chg_Start_Flag = 0;
Vox_Chg_Full_Flag = 0;
#if VOX_FOLLOW_CHG
Boost_VoxVout_Follow_Flag = 0;
#endif
}
else //2、开盖处理5v 500ms 转0V 500ms后转ADT模式。
{
Cover_Close_Flag = 0;
Cover_Open_Flag = 1;
Cover_Open_5V_Flag = 0;
}
CoverEvent_Flg = 0;
}
/* 发送开盖指令*/
if( Cover_Open_Flag ) /*开盖后5V持续500ms后0V持续500msVox转入adt模式等待耳机出入盒并显示相应的灯效。*/
Vox_Output_Debounce++;
if( Vox_Output_Debounce > VOX_OCP_CNT )
{
if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_DEBOUNCE ) //开关盖后5V 200ms用于唤醒耳机。
{
Vox_Vol_Hold_Timer++;
return;
}
Vox_Output_Debounce = 0;
if( Vox_TX_Timer < VOX_VOUT_0V_DEBOUNCE ) //转0V 200ms
{
Vout_Ctrl_OFF(OFF);
Vox_TX_Timer++;
}
else
{
/*按键1.5s、拔充电后Vox升压一段时间用于唤醒耳机。*/
if( Wkup_Earphone_Flag )
{
if( !BST_EN )
{
Vout_Ctrl_ON(OFF);
return;
}
Get_CHIP_STA1_Flag1 = 0;
Vox_TX_Timer1 = 0;
VOX_CTL0 |= 0x30; //VOX Enable 5V
Wkup_Earphone_Flag = 0;
}
if( !Get_CHIP_STA1_Flag1 )
{
if( Vox_Output_Debounce <= Vox_TX_Pattern_Tim )
{
if( (Vox_Output_Debounce % Vox_TX_Interval == 0) )
{
if( (CHIP_STA1 & 0xA0) == 0xA0 )
{
#if VOX_TX_PATTERN
Pattern_TX_Start = 1;
g_Key_Type = 0;
IRQ_FLAG0 = 0x0C;
VOX_CTL0 &= ~0x30; //VOX Disable 5V And Disable VOX ADT
VOX_CTL0 |= 0x30; //VOX Enable 5V
Vox_Output_Short_Flag = 1;
Pattern_TX_Data = bat_level_pdata | 0xC4;
#endif
}
}
Vox_Output_Debounce++;
}
else
{
if( Vox_TX_Timer1 < VOX_ADT_HOLD_CNT ) //关盖后5V持续300ms。
{
Vox_TX_Timer1++;
CoverEvent_Flg = 0;
return;
}
// Vox_Output_Debounce = 0;
Get_CHIP_STA1_Flag1 = 1;
Vout_Ctrl_OFF(ON);
Cover_Close_Flag = 0;
TX_Cmd_Flag = 1;
Vox_Vout_Enable = OFF;
}
}
else
{
if( TX_Cmd_Flag )
{
TX_Cmd_Flag = 0;
Cover_Open_Flag = 0;
Vox_TX_Timer1 = 0;
if( (CHIP_STA1 & 0xAC) == 0xA0 )
{
Earphone_Num_2Inbox = 1; //2只耳机在盒按键3s才能发码。
}
else
{
Earphone_Num_2Inbox = 0;
}
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
}
else
{
/*耳机出入盒判断*/
if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //查询耳机loadon状态loadon状态改变则说明有耳机出入盒。
{
if(CHIP_STA1 & 0xA0)
{
Earphone_Chg_Flag = 1;
#ifdef LED_DISPLAY
LED_On_Flag = 1;
#endif
}
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
}
}
}
}
Vox_Vout_Enable = OFF;
}
if( Cover_Close_Flag )
{
/*按键1.5s、拔充电后Vox升压一段时间用于唤醒耳机。*/
if( Wkup_Earphone_Flag )
{
if( !BST_EN )
{
Vout_Ctrl_ON(OFF);
Cover_Close_Flag0 = 0;
Get_CHIP_STA1_Flag1 = 0;
Vox_TX_Timer = 0;
Vox_Vol_Hold_Timer = 0;
Vox_Chg_Full_Flag = 0;
return;
}
VOX_CTL0 |= 0x30; //VOX Enable 5V
Wkup_Earphone_Flag = 0;
}
}
else
{
Vox_Output_Short_Flag = 0;
if( Vox_TX_Timer < VOX_CLOSE_HOLD_CNT ) //关盖后5V持续3s。
{
Vox_TX_Timer++;
return;
}
/*关盖后Vox转入ADT模式判断有几只耳机在盒。*/
if( !Cover_Close_Flag0 )
{
Vout_Ctrl_OFF(ON); //Vox转入ADT模式。
Cover_Close_Flag0 = 1;
}
else
{
if( !Get_CHIP_STA1_Flag1 )
{
if( (CHIP_STA1 & 0xAC) == 0xA0 )
{
Earphone_Num_2Inbox = 1; //2只耳机在盒按键3s才能发码。
}
else
{
Earphone_Num_2Inbox = 0;
}
Get_CHIP_STA1_Flag1 = 1;
}
}
if( !Cover_Close_Flag1 )
{
if( gBoost_Prepared_Flag )
{
if( CoverEvent_Flg ) //Hall事件触发。
{
if( !BST_EN )
{
Vout_Ctrl_ON(OFF);
@ -455,145 +235,379 @@ void Vox_Det_Machine(void)
VOX_CTL0 |= 0x30; //VOX Enable 5V
Cover_Close_Flag1 = 1;
}
#if VOX_FOLLOW_CHG
if( !Follow_Chg_Start_Flag )
{
/*跟随充逻辑*/
if( !Boost_VoxVout_Follow_Flag )
{
Boost_Vout_Value = 0x03;
Boost_Up_Flag = 0;
SFRADDR = VOX_CON0; //IOFF选择高电流档10/15/20/25mA
SFRDATA |= 0x20;
SFRADDR = VOX_CON2;
SFRDATA &= ~0xC0;
SFRDATA |= 0x80; //IOFF 20mA
Vox_Output_Debounce = 0;
Boost_VoxVout_Follow_Flag = 1;
Vox_Vol_Hold_Timer = 0; //关盖清0开盖使用
Vox_TX_Timer = 0;
Vox_TX_Timer1 = 0;
Get_CHIP_STA1_Flag1 = 0;
Earphone_Num_2Inbox = 0;
if( CoverStatus == CLOSE ) //1、关盖关闭COM_CTRL显示灯效。无需查询Loadon、IOFF状态无论耳机是否在仓Vox 5V输出。
{
Earphone_Chg_Flag = 0; //关盖取消耳机入盒灯效,显示关盖灯效。
Cover_Close_Flag = 1;
Cover_Close_Flag0 = 1;
Cover_Close_Flag1 = 1;
Vox_Vout_Enable = ON;
Cover_Open_Flag = 0;
Follow_Chg_Start_Flag = 0;
Vox_Chg_Full_Flag = 0;
#if VOX_FOLLOW_CHG
Boost_VoxVout_Follow_Flag = 0;
#endif
}
else //2、开盖处理5v 500ms 转0V 500ms后转ADT模式。
{
Cover_Close_Flag = 0;
Cover_Open_Flag = 1;
Cover_Open_5V_Flag = 0;
}
CoverEvent_Flg = 0;
}
/* 发送开盖指令*/
if( Cover_Open_Flag ) /*开盖后5V持续500ms后0V持续500msVox转入adt模式等待耳机出入盒并显示相应的灯效。*/
{
if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_DEBOUNCE ) //开关盖后5V 200ms用于唤醒耳机。
{
Vox_Vol_Hold_Timer++;
return;
}
if( Vox_TX_Timer < VOX_VOUT_0V_DEBOUNCE ) //转0V 200ms
{
Vout_Ctrl_OFF(OFF);
Vox_TX_Timer++;
}
else
{
if( Vox_Vol_Hold_Timer < VOX_FOLLOW_CHG_CNT ) //等耳机抽电。
{
/*按键1.5s、拔充电后Vox升压一段时间用于唤醒耳机。*/
if( Wkup_Earphone_Flag )
{
Vox_Vol_Hold_Timer++;
return;
}
Vox_Vol_Hold_Timer = 0;
if ( CHIP_STA1 & 0x0C ) //是否存在IOFF标志存在则Boost上升一个step否则Boost下降一个step。
{
Boost_Vout_Value += 1; //Boost 输出上升一个step
Boost_Up_Flag = 1;
if( Boost_Vout_Value >= BOOST_VOUT_MAX ) //Boost输出达到电压上限值则结束跟随充。
if( !BST_EN )
{
Boost_Vout_Value = BOOST_VOUT_MAX;
Vout_Ctrl_ON(OFF);
return;
}
Get_CHIP_STA1_Flag1 = 0;
Vox_TX_Timer1 = 0;
VOX_CTL0 |= 0x30; //VOX Enable 5V
Wkup_Earphone_Flag = 0;
}
if( !Get_CHIP_STA1_Flag1 )
{
if( Vox_Output_Debounce <= Vox_TX_Pattern_Tim )
{
if( (Vox_Output_Debounce % Vox_TX_Interval == 0) )
{
if( (CHIP_STA1 & 0xA0) == 0xA0 )
{
#if VOX_TX_PATTERN
Pattern_TX_Start = 1;
Boost_VoxVout_Follow_Flag = 0;
g_Key_Type = 0;
Pattern_TX_Data = bat_level_pdata | 0xC4;
#endif
}
}
Follow_Chg_Start_Flag = 1;
Vox_Output_Debounce++;
}
else
{
SFRADDR = VOX_CON0; //IOFF选择低电流档2/3/4/5mA
SFRDATA &= ~0x20;
SFRADDR = VOX_CON2;
SFRDATA &= ~0xC0;
SFRDATA |= 0x40; //IOFF 3mA
}
if( Vox_TX_Timer1 < VOX_ADT_HOLD_CNT ) //关盖后5V持续300ms。
{
Vox_TX_Timer1++;
return;
}
// Vox_Output_Debounce = 0;
Get_CHIP_STA1_Flag1 = 1;
Vout_Ctrl_OFF(ON);
TX_Cmd_Flag = 1;
Vox_Vout_Enable = OFF;
}
}
else
{
if( !Boost_Up_Flag ) //只在初始化找最低轻载电压时执行
{
if( TX_Cmd_Flag )
{
Boost_Vout_Value -= 1; //Boost 输出下降一个step
if( Boost_Vout_Value <= 0 )
TX_Cmd_Flag = 0;
Vox_TX_Timer1 = 0;
if( (CHIP_STA1 & 0xAC) == 0xA0 )
{
Boost_Vout_Value = 0;
Earphone_Num_2Inbox = 1; //2只耳机在盒按键3s才能发码。
}
else
{
Earphone_Num_2Inbox = 0;
}
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
}
else
{
/*耳机出入盒判断*/
if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //查询耳机loadon状态loadon状态改变则说明有耳机出入盒。
{
if(CHIP_STA1 & 0xA0)
{
Earphone_Chg_Flag = 1;
#ifdef LED_DISPLAY
LED_On_Flag = 1;
#endif
}
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
}
}
}
SFRADDR = OTP_KEY;
SFRDATA = 0x69;
SFRADDR = BST_CTL0; //Boost 输出
SFRDATA &= ~0x03;
SFRDATA |= Boost_Vout_Value;
SFRADDR = OTP_KEY;
SFRDATA = 0x01;
}
}
else
#endif
{
if( !Vox_Chg_Full_Flag )
}
if( Cover_Close_Flag )
{
/*按键1.5s、拔充电后Vox升压一段时间用于唤醒耳机。*/
if( Wkup_Earphone_Flag )
{
if( ( (CHIP_STA1 & 0xAC) == 0xAC ) ) //耳机充满或盒子低电则关闭Vout输出通路关闭Boost。
{
if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //重载转轻载延时5s后关闭Boost输出。
if( !BST_EN )
{
Vout_Ctrl_ON(OFF);
Cover_Close_Flag0 = 0;
Get_CHIP_STA1_Flag1 = 0;
Vox_TX_Timer = 0;
Vox_Vol_Hold_Timer = 0;
Vox_Chg_Full_Flag = 0;
return;
}
VOX_CTL0 |= 0x30; //VOX Enable 5V
Wkup_Earphone_Flag = 0;
}
if( Vox_TX_Timer < VOX_CLOSE_HOLD_CNT ) //关盖后5V持续1s。
{
Vox_TX_Timer++;
return;
}
/*关盖后Vox转入ADT模式判断有几只耳机在盒。*/
if( !Cover_Close_Flag0 )
{
Vout_Ctrl_OFF(ON); //Vox转入ADT模式。
Cover_Close_Flag0 = 1;
}
else
{
if( !Get_CHIP_STA1_Flag1 )
{
if( (CHIP_STA1 & 0xAC) == 0xA0 )
{
Earphone_Num_2Inbox = 1; //2只耳机在盒按键3s才能发码。
}
else
{
Earphone_Num_2Inbox = 0;
}
Get_CHIP_STA1_Flag1 = 1;
}
}
if( !Cover_Close_Flag1 )
{
if( !BST_EN )
{
Vout_Ctrl_ON(OFF);
return;
}
VOX_CTL0 |= 0x30; //VOX Enable 5V
Cover_Close_Flag1 = 1;
}
#if VOX_FOLLOW_CHG
if( !Follow_Chg_Start_Flag )
{
/*跟随充逻辑*/
if( !Boost_VoxVout_Follow_Flag )
{
Boost_Vout_Value = 0x03;
Boost_Up_Flag = 0;
SFRADDR = VOX_CON0; //IOFF选择高电流档10/15/20/25mA
SFRDATA |= 0x20;
SFRADDR = VOX_CON2;
SFRDATA &= ~0xC0;
SFRDATA |= 0x80; //IOFF 20mA
Boost_VoxVout_Follow_Flag = 1;
}
else
{
if( Vox_Vol_Hold_Timer < VOX_FOLLOW_CHG_CNT ) //等耳机抽电。
{
Vox_Vol_Hold_Timer++;
return;
}
Vox_Chg_Full_Flag = 1;
Vox_Vout_Enable = OFF;
Vox_Vol_Hold_Timer = 0;
if ( CHIP_STA1 & 0x0C ) //是否存在IOFF标志存在则Boost上升一个step否则Boost下降一个step。
{
Boost_Vout_Value += 1; //Boost 输出上升一个step
Vout_Ctrl_OFF(ON);
Boost_Up_Flag = 1;
if( Boost_Vout_Value >= BOOST_VOUT_MAX ) //Boost输出达到电压上限值则结束跟随充。
{
Boost_Vout_Value = BOOST_VOUT_MAX;
Boost_VoxVout_Follow_Flag = 0;
Follow_Chg_Start_Flag = 1;
SFRADDR = VOX_CON0; //IOFF选择低电流档2/3/4/5mA
SFRDATA &= ~0x20;
SFRADDR = VOX_CON2;
SFRDATA &= ~0xC0;
SFRDATA |= 0x40; //IOFF 3mA
}
}
else
{
if( !Boost_Up_Flag ) //只在初始化找最低轻载电压时执行
{
Boost_Vout_Value -= 1; //Boost 输出下降一个step
if( Boost_Vout_Value <= 0 )
{
Boost_Vout_Value = 0;
}
}
}
SFRADDR = OTP_KEY;
SFRDATA = 0x69;
SFRADDR = BST_CTL0; //Boost 输出
SFRDATA &= ~0x03;
SFRDATA |= Boost_Vout_Value;
SFRADDR = OTP_KEY;
SFRDATA = 0x01;
}
}
}
}
Bat_Low_Pro_Flag = 0;
}
#if 1
else
{
if( !Bat_Low_Pro_Flag )
{
Bat_Low_Pro_Flag = 1;
Vox_Vout_Enable = OFF;
Vout_Ctrl_OFF(ON);
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
Wkup_Earphone_Flag = 1;
}
#if 0
/*耳机出入盒判断*/
if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //查询耳机loadon状态loadon状态改变则说明有耳机出入盒。
{
if(CHIP_STA1 & 0xA0)
{
Earphone_Chg_Flag = 1;
#ifdef LED_DISPLAY
LED_On_Flag = 1;
#endif
}
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
}
#endif
}
}
else
#endif
{
if( !Vox_Chg_Full_Flag )
{
if( ( (CHIP_STA1 & 0xAC) == 0xAC ) ) //耳机充满或盒子低电则关闭Vout输出通路关闭Boost。
{
if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //重载转轻载延时5s后关闭Boost输出。
{
Vox_Vol_Hold_Timer++;
return;
}
Vox_Chg_Full_Flag = 1;
Vox_Vout_Enable = OFF;
Vout_Ctrl_OFF(ON);
}
}
}
}
Bat_Low_Pro_Flag = 0;
}
else
{
if( !Bat_Low_Pro_Flag )
{
Bat_Low_Pro_Flag = 1;
Vox_Vout_Enable = OFF;
Vout_Ctrl_OFF(ON);
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
Wkup_Earphone_Flag = 1;
}
#if 0
/*耳机出入盒判断*/
if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //查询耳机loadon状态loadon状态改变则说明有耳机出入盒。
{
if(CHIP_STA1 & 0xA0)
{
Earphone_Chg_Flag = 1;
#ifdef LED_DISPLAY
LED_On_Flag = 1;
#endif
}
CHIP_STA1_BK = CHIP_STA1 & 0xA0;
}
#endif
}
}
}
#endif