更改内容:1、更改按键逻辑,短按(小于500ms)灯效同开关盖;长按大于500ms开始显示配对灯效,长按不到5s,等效灭,大于5s发送配对协议和灯效;2、更改盒子充电电流200mA;3、耳机入盒灯效显示过程中,开关盖,则切换到开关盖灯效。

This commit is contained in:
Alex xu 2024-09-23 19:42:04 +08:00
parent 94aa2e165e
commit 0d5c3e729d
19 changed files with 325 additions and 318 deletions

View File

@ -1,208 +0,0 @@
:030000000204E611
:1004E600758E3075D20078FFE4F6D8FD7581570217
:0204F6000533CC
:0F0A75001205F8D2AED2BE12093812057880F4FD
:04044900025200005B
:0208F400AD074E
:1008F600E4FCFBFAF528F52975FE2975FF8BEDC496
:1009060054F04401F5A5E5A520E0FBAFA1AB07AF88
:10091600A2EFFEEEFAEB2529F529EA3528F5280C93
:10092600BC08DBE529AE287803CEC313CE13D8F96D
:01093600FFC1
:01093700229D
:10097700E4F525F5267F051208F48E258F267F06D8
:100987001208F4E4FCFDC004A905AA06AB07AE25CE
:10099700AF267C077DD012023BD0001201998E252D
:0209A7008F2699
:0109A900222B
:1009AA00E4F526F5277F041208F48E268F277F06A2
:1009BA001208F4E4FCFDC004A905AA06AB07AE269A
:1009CA00AF277C037DE812023BD0001201998E26E4
:0209DA008F2765
:0109DC0022F8
:02044D00C116D6
:1006F200E4FFFEF5251209AAC3EF94D0EE94074059
:10070200037F0122D3EF9436EE94055030EF94220A
:10071200EE94024028301412EF9414EE9405500720
:10072200C214E4F525800375250130152BD3EF940F
:1007320044EE9402401FC215E4F525801BD3EF94CA
:1007420036EE94054004D214800BC3EF9422EE944B
:0A075200025002D215752501AF25F3
:01075C00227A
:10075D00E5E620E70953B3FE75F210C21622E5F265
:10076D00540C601053B3FEE5F354C0603B75F20CAE
:10077D0075F3C022E5F354C0600375F3C01206F2A1
:10078D00EF600453B3FE22E5F230E417C37853E66D
:10079D0094EB18E6940F500575F210800353B3FED9
:0907AD00D2162243B301C2162248
:04044F00C117C118F8
:10085600E5E530E103C21722E5E230E705C217D22B
:100866001822E5E830E00EC217300A35C20A75E8EC
:100876000175B501221206F2EF6006C217E4F5B55E
:1008860022D21730181BE5E630E716C37853E694F4
:100896001018E6940E4005D217C21822E4F5B5C228
:0208A600172217
:07045300C119C11A0139FFB4
:100A0400E5E25408FF6539601CE5E230E30575381A
:100A1400018003E4F538D219D21AE4F536F51ED272
:050A2400208F39D21FF4
:010A290022AA
:10045A00C113C110C10FC111C112015500015400CD
:1009DD00E5E220E11D785406E6C394324011E5E2CC
:1009ED0020E10CD20FD211087603E418F6D220D2F2
:0709FD001F22E47854F622EA
:0D000E00EF146006047005D28422D2832214
:0D0A9300EF146006047005C28422C28322A5
:10067600E4FE743B2EF8E66067743F2EF974412E53
:10068600F8E6D397AF06500512000E8003120A93C0
:1006960074412EF8E6C394AA401EE4F674452EF87B
:1006A600E66008743F2EF81616800D74432EF8E6A1
:1006B6006006743F2EF80606743F2EF8E6FF74AA0D
:1006C600D39F500A74452EF876017443800EEFD3FB
:1006D6009401500C74432EF8760174452EF8E4F616
:0B06E60074412EF8060EEE64027087CF
:0106F10022E6
:05046A00013A0AC11F68
:100A5400E5E620E706200803301F04C21FC322D3A3
:010A6400226F
:1005F80075FE8043FF3075FE0153FFFCD2DF438751
:100608008075BA0375AADC759840D299D298D2AC95
:1006180075B7C375FE6A53FFE043FF04758901751A
:100628008CFC758A17D2A9D28C438910758DFF75F9
:100638008B9BD2ABD28E75FE0675FF1C75FE0375BB
:10064800FF3CC284C283E4F58675FE0F43FF8075C4
:10065800FE4F75FF1075FE1775FF3CD2A8D2B9D2B0
:0E066800AF75F21C75F3C075E80C43B3102299
:03000300020006F2
:0100060032C7
:03004B00020AA7FF
:060AA70075EB3CD21F328A
:0F046F000B470000000000000000000000C11C4F
:060026008B2C8A2D892EAF
:10002C00E4FEEEC39F5016201BFD782CE475F00106
:0D003C0012022B120144D21BF5990E80E533
:010049002294
:03002300020A844A
:0F0A8400309904C299C21B309804C298D21F3215
:0B047E00013600013500013700C120ED
:100A4200E4783BF608F6784176AA0876AAC284C210
:020A52008322FD
:1002680030013CE537C394045006120A4205372290
:10027800E537C39455501E0537201D05E5E630E7E0
:100288000A783B7601E408F6C28322E4783BF60854
:100298007601C28422120A42C201C21AF53722E547
:1002A800E630E72A301604D283801EE536C394046C
:1002B8005008C284C2830536800FE536C394C850FF
:1002C800060536D2848002C284C21AD22022302087
:1002D8000BC284C283E4F536F535C220301A3630B5
:1002E8001D17E536C394045002803AE536C39432AC
:1002F8005002803FC284C21A22C284E536C39404E5
:1003080050028023E536C3943250050536D2832245
:10031800C283C21A2230113DE53864017037E536D0
:10032800C394045007C284C283053622E536C394B9
:100338003250050536D28422C284E535C39407506D
:100348000D0535E53520E003D28322C28322C2831E
:06035800E4F535C211229C
:10057800300921C2091209777852A60608A607127F
:100588000A041209DD12085612075D12035E1202F0
:1005980068120800300B58C20BE53AD394004009A2
:1005A800153A301F4AC21F8043120A54503E75FE46
:1005B8002443FF3CC2ACC2B9C2A9C2AB53B7CFE413
:1005C800F5B575FE2953FF7F75FE4FF5FF75FE8063
:1005D80053FFCF43870275FE8043FF3075FE4F758A
:1005E800FF10D2ACD2B9D2A9D2AB8000753A0A2298
:070AA000000000000000004F
:10048900C108C101011E00011D00C103C107C10648
:0E049900C102011F00C100C105011C00C10409
:100A6500D282EF700753B7CF43B7302253B7CF22A7
:10035E00E5E8540C6013051FE51FC39402400AE440
:10036E00F51F75E80CFF020A6530193F301733D2BE
:10037E0082201D0DE5B5700475B50122E4FF120A49
:10038E0065E538700CD203C219D208C206F51D807D
:10039E001AC203E4F51DD206C200C219C204F51F2B
:1003AE0080097F01120A65C208C219300668E51D70
:1003BE00C394055003051D22E51EC39405500BC2C0
:1003CE0082E4F5B5051ED205804C30050DC205D26E
:1003DE0082C2087F01120A65800B200008D200E558
:1003EE00E354A0F51C30002EE5E354A0651C600B11
:1003FE00D201E4F537E5E354A0F51C300F18E51FE4
:10040E00C3940A500CE51F20E0031208A8051F80B4
:10041E0005C20FE4F51F300321E5E354AC64AC6074
:10042E0003301D16E51DC394325003051D22E4F55D
:0B043E00B57F01120A65C208C28222CD
:1008A80078257C007D007BFF7A0A79A07E007F078F
:1008B80012011E7525557526AA7527027528067515
:1008C80029DD752ABAC282E4F5FE43FF0275FE0EE1
:1008D80043FF04FB7A0079257F0712002675FE0E78
:0B08E80053FFF3E4F5FE53FFFDD28246
:0108F30022E2
:1004A700015700C11DC11E01561E14080C800CE423
:1004B7000D480E4C0E920ED80F3C0F8C0FD21068C1
:10080000E4FFEF25E02408F8E6FC08E6FDC3785392
:10081000E69D18E69C40040FBF0AE77857E6FEEF16
:10082000D39E4004180680037856167856E6FED309
:1008300094325006EEC3940A50077857A6071876EC
:100840001E7857E6FFD394015003D21D22EFD394B4
:05085000024002C21D80
:010855002280
:1004C700013200013000012F00013100C10DC10AC6
:0E04D700C109C10B013400013300C10CC10E7C
:10093800E534603AE4F5340532E532C3940A4005FB
:10094800E4F532D20D052FE52FC394644005E4F594
:100958002FD2090530E530C394FA4012E4F530D2BD
:0F0968000A0531E53194044005E4F531D20B2244
:03000B00020A2ABC
:100A2A00C0E0C0D074FC258CF58C7417258AF58A31
:080A3A00753401D0D0D0E03288
:03001B000207B623
:1007B600C0E0C0F0C083C082C0D075D000C000C009
:1007C60001C002C003C004C005C006C007C28F1521
:1007D6008D749B258BF58B120676D20ED007D0062C
:1007E600D005D004D003D002D001D000D0D0D08222
:0707F600D083D0F0D0E03207
:030BFD00010102F1
:1004F800020A75E493A3F8E493A34003F68001F29B
:1005080008DFF48029E493A3F85407240CC8C33304
:10051800C4540F4420C8834004F456800146F6DFD3
:10052800E4800B0102040810204080900449E47E16
:10053800019360BCA3FF543F30E509541FFEE493C8
:10054800A360010ECF54C025E060A840B8E493A38F
:10055800FAE493A3F8E493A3C8C582C8CAC583CABA
:10056800F0A3C8C582C8CAC583CADFE9DEE780BE72
:0104E5000016
:10004E00E709F608DFFA8046E709F208DFFA803E94
:10005E0088828C83E709F0A3DFFA8032E309F60881
:10006E00DFFA8078E309F208DFFA807088828C83E9
:10007E00E309F0A3DFFA806489828A83E0A3F6089D
:10008E00DFFA805889828A83E0A3F208DFFA804C77
:10009E0080D280FA80C680D4806980F2803380104E
:1000AE0080A680EA809A80A880DA80E280CA8033B7
:1000BE0089828A83ECFAE493A3C8C582C8CCC5832F
:1000CE00CCF0A3C8C582C8CCC583CCDFE9DEE780FF
:1000DE000D89828A83E493A3F608DFF9ECFAA9F07E
:1000EE00EDFB2289828A83ECFAE0A3C8C582C8CCD4
:1000FE00C583CCF0A3C8C582C8CCC583CCDFEADEED
:10010E00E880DB89828A83E493A3F208DFF980CC4E
:10011E0088F0EF60010E4E60C388F0ED2402B40447
:10012E000050B9F582EB2402B4040050AF232345EE
:06013E00822390009E7375
:10014400BB010689828A83E0225002E722BBFE02B9
:09015400E32289828A83E49322EC
:10015D0075F008758200EF2FFFEE33FECD33CDCC59
:10016D0033CCC58233C5829BED9AEC99E5829840DC
:10017D000CF582EE9BFEED9AFDEC99FC0FD5F0D6B9
:10018D00E4CEFBE4CDFAE4CCF9A88222B800C1B9E3
:10019D000059BA002DEC8BF084CFCECDFCE5F0CB21
:1001AD00F97818EF2FFFEE33FEED33FDEC33FCEB5A
:1001BD0033FB10D703994004EB99FB0FD8E5E4F915
:1001CD00FA227818EF2FFFEE33FEED33FDEC33FC02
:1001DD00C933C910D7059BE99A4007EC9BFCE99AF6
:1001ED00F90FD8E0E4C9FAE4CCFB2275F010EF2F3B
:1001FD00FFEE33FEED33FDCC33CCC833C810D7073B
:10020D009BEC9AE899400AED9BFDEC9AFCE899F875
:0E021D000FD5F0DAE4CDFBE4CCFAE4C8F92208
:10022B00FAE6FB0808E6F925F0F618E6CA3AF622D4
:10023B00EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D50
:10024B00FDE43CFCE8A42EC8C5F03DFDE43CFCEF0E
:0D025B00A4FFE5F028FEE43DFDE43CFC229C
:00000001FF

Binary file not shown.

View File

@ -0,0 +1,211 @@
:030000000204EC0B
:1004EC00758E3075D20078FFE4F6D8FD7581560212
:0204FC000539C0
:0F0AAA0012057ED2AED2BE1209C712060580F425
:040452000252000052
:02098300AD07BE
:10098500E4FCFBFAF528F52975FE2975FF8BEDC406
:1009950054F04401F5A5E5A520E0FBAFA1AB07AFF9
:1009A500A2EFFEEEFAEB2529F529EA3528F5280C04
:1009B500BC08DBE529AE287803CEC313CE13D8F9DE
:0109C500FF32
:0109C600220E
:1007C500E4F525F5267F051209838E258F267F06FC
:1007D500120983E4FCFDC004A905AA06AB07AE25F2
:1007E500AF267C077DD012023BD0001201998E25E1
:0207F5008F264D
:0107F70022DF
:100A0600E4F526F5277F041209838E268F277F06B5
:100A1600120983E4FCFDC004A905AA06AB07AE26AD
:100A2600AF277C037DE812023BD0001201998E2687
:020A36008F2708
:010A3800229B
:02045600C116CD
:10070100E4FFFEF525120A06C3EF94D0EE940740EC
:10071100037F0022D3EF9436EE94055030EF9422FC
:10072100EE94024028301412EF9414EE9405500711
:10073100C214E4F525800375250130152BD3EF9400
:1007410044EE9402401FC215E4F525801BD3EF94BB
:1007510036EE94054004D214800BC3EF9422EE943C
:0A076100025002D215752501AF25E4
:01076B00226B
:10076C00E5E620E70953B3FE75F210C21622E5F256
:10077C00540C601053B3FEE5F354C0603B75F20C9F
:10078C0075F3C022E5F354C0600375F3C012070182
:10079C00EF600453B3FE22E5F230E417C37853E65E
:1007AC0094EB18E6940F500575F210800353B3FECA
:0907BC00D2162243B301C2162239
:04045800C117C118EF
:10085600E5E530E103C21722E5E230E705C217D22B
:100866001822E5E830E00EC217300A35C20A75E8EC
:100876000175B50122120701EF6006C217E4F5B54E
:1008860022D21730181BE5E630E716C37853E694F4
:100896001018E6940E4005D217C21822E4F5B5C228
:0208A600172217
:07045C00C119C11A0139FFAB
:100A3900E5E25408FF6539601CE5E230E3057538E5
:100A4900018003E4F538D219D21AE4F536F51ED23D
:050A5900208F39D21FBF
:010A5E002275
:0D046300C113C110C10FC111C1120156001B
:1008F400E5E220E122785606E6FFC394324006D2B0
:100904000FE4F6800DEFC394054007201104D211C3
:10091400D220D212D21F22301219C212D2207856FB
:10092400E6FFC394055004D2138008EFC3943250F9
:0809340002C211E47856F6221C
:0D000E00EF146006047005D28422D2832214
:0D0AC800EF146006047005C28422C2832270
:10068500E4FE743B2EF8E66067743F2EF974412E44
:10069500F8E6D397AF06500512000E8003120AC87C
:1006A50074412EF8E6C394AA401EE4F674452EF86C
:1006B500E66008743F2EF81616800D74432EF8E692
:1006C5006006743F2EF80606743F2EF8E6FF74AAFE
:1006D500D39F500A74452EF876017443800EEFD3EC
:1006E5009401500C74432EF8760174452EF8E4F607
:0B06F50074412EF8060EEE64027087C0
:0107000022D6
:05047000013A0AC11F62
:100A8900E5E620E706200803301F04C21FC322D36E
:010A9900223A
:10057E0075FE8043FF3075FE0153FFFCD2DF4387CB
:10058E008075BA0375AADC759840D299D298D2AC10
:10059E0075B7C375FE6A53FFE043FF0475FE6C43E7
:1005AE00FF0A758901758CFC758A66D2A9D28C43B7
:1005BE008910758DFF758BA4D2ABD28E75FE067524
:1005CE00FF1CC284C28375FE0375FF3CE4F586757D
:1005DE00FE0F43FF8075FE4F75FF1075FE1775FFFA
:1005EE003CD2A8D2B9D2AF75F21C75F3C075E80C27
:0705FE0043B31075B10122A7
:03000300020006F2
:0100060032C7
:03004B00020AD5D1
:060AD50075EB3CD21F325C
:0F0475000B470000000000000000000000C11C49
:060026008B2C8A2D892EAF
:10002C00E4FEEEC39F5016201BFD782CE475F00106
:0D003C0012022B120144D21BF5990E80E533
:010049002294
:03002300020AB915
:0F0AB900309904C299C21B309804C298D21F32E0
:0B048400013600013500013700C120E7
:100A7700E4783BF608F6784176AA0876AAC284C2DB
:020A87008322C8
:1002680030013CE537C394045006120A770537225B
:10027800E537C39455501E0537201D05E5E630E7E0
:100288000A783B7601E408F6C28322E4783BF60854
:100298007601C28422120A77C201C21AF53722E512
:1002A800E630E72F301609D283C284E4F536801E83
:1002B800E536C394045008C284C2830536800FE52E
:1002C80036C394C850060536D2848002C284C21A46
:1002D800D22022302009120A77F536F535C22020BF
:1002E8001A03301337301D16E536C39404500280C4
:1002F8003BE536C3943250028040C2848019C284E0
:10030800E536C3940450028025E536C3943250057F
:100318000536D28322C283C21AC2132230113DE5A8
:100328003864017037E536C394045007C284C28329
:10033800053622E536C3943250050536D28422C2EA
:1003480084E535C39407500D0535E53520E003D223
:0D0358008322C28322C283E4F535C2112244
:10060500300921C2091207C57852A60608A60712A5
:100615000A391208F412085612076C120365120201
:1006250068120800300B58C20BE53AD39400400914
:10063500153A301F4AC21F8043120A89503E75FE83
:100645002443FF3CC2ACC2B9C2A9C2AB53B7CFE485
:10065500F5B575FE2953FF7F75FE4FF5FF75FE80D5
:1006650053FFCF43870275FE8043FF3075FE4F75FC
:10067500FF10D2ACD2B9D2A9D2AB8000753A0A220A
:0707F80000000000000000FA
:10048F00C108C101011E00011D00C103C107C10642
:0E049F00C102011F00C100C105011C00C10403
:100A9A00D282EF700753B7CF43B7302253B7CF2272
:10036500E5E8540C6013051FE51FC39402400AE439
:10037500F51F75E80CFF020A9A301941301735D27E
:1003850082201D0DE5B5700475B50122E4FF120A42
:100395009AE538700EC201D203C219D208C206F519
:1003A5001D801AC203E4F51DD206C200C219C2049B
:1003B500F51F80097F01120A9AC208C21930066822
:1003C500E51DC394055003051D22E51EC394055084
:1003D5000BC282E4F5B5051ED205804C30050DC271
:1003E50005D282C2087F01120A9A800B200008D22A
:1003F50000E5E354A0F51C30002EE5E354A0651C90
:10040500600BD201E4F537E5E354A0F51C300F1875
:10041500E51FC3940A500CE51F20E0031208A80548
:100425001F8005C20FE4F51F300321E5E354AC64DA
:10043500AC6003301D16E51DC394325003051D2223
:0D044500E4F5B57F01120A9AC208C28222B6
:1008A80078257C007D007BFF7A0779F87E007F073A
:1008B80012011E7525557526AA7527027528067515
:1008C80029DD752ABAC282E4F5FE43FF0275FE0EE1
:1008D80043FF04FB7A0079257F0712002675FE0E78
:0B08E80053FFF3E4F5FE53FFFDD28246
:0108F30022E2
:1004AD00015500C11DC11E01541E14080C800CE421
:1004BD000D480E4C0E920ED80F3C0F8C0FD21068BB
:10080000E4FFEF25E02408F8E6FC08E6FDC3785392
:10081000E69D18E69C40040FBF0AE77855E6FEEF18
:10082000D39E4004180680037854167854E6FED30D
:1008300094325006EEC3940A50077855A6071876EE
:100840001E7855E6FFD394015003D21D22EFD394B6
:05085000024002C21D80
:010855002280
:1004CD00013200013000012F00013100C10DC10AC0
:0E04DD00C109C10B013400013300C10CC10E76
:1009C700E534603AE4F5340532E532C3940A40056C
:1009D700E4F532D20D052FE52FC394644005E4F505
:1009E7002FD2090530E530C394FA4012E4F530D22E
:0F09F7000A0531E53194044005E4F531D20B22B5
:03000B00020A5F87
:100A5F00C0E0C0D074FC258CF58C7466258AF58AAD
:080A6F00753401D0D0D0E03253
:03001B0002093C9B
:10093C00C0E0C0F0C083C082C0D075D000C000C081
:10094C0001C002C003C004C005C006C007C28F1599
:10095C008D74A4258BF58B120685D20ED007D0068C
:10096C00D005D004D003D002D001D000D0D0D0829A
:07097C00D083D0F0D0E0327F
:030BFD00010105EE
:1004FE00020AAAE493A3F8E493A34003F68001F260
:10050E0008DFF48029E493A3F85407240CC8C333FE
:10051E00C4540F4420C8834004F456800146F6DFCD
:10052E00E4800B0102040810204080900452E47E07
:10053E00019360BCA3FF543F30E509541FFEE493C2
:10054E00A360010ECF54C025E060A840B8E493A389
:10055E00FAE493A3F8E493A3C8C582C8CAC583CAB4
:10056E00F0A3C8C582C8CAC583CADFE9DEE780BE6C
:0104EB000010
:10004E00E709F608DFFA8046E709F208DFFA803E94
:10005E0088828C83E709F0A3DFFA8032E309F60881
:10006E00DFFA8078E309F208DFFA807088828C83E9
:10007E00E309F0A3DFFA806489828A83E0A3F6089D
:10008E00DFFA805889828A83E0A3F208DFFA804C77
:10009E0080D280FA80C680D4806980F2803380104E
:1000AE0080A680EA809A80A880DA80E280CA8033B7
:1000BE0089828A83ECFAE493A3C8C582C8CCC5832F
:1000CE00CCF0A3C8C582C8CCC583CCDFE9DEE780FF
:1000DE000D89828A83E493A3F608DFF9ECFAA9F07E
:1000EE00EDFB2289828A83ECFAE0A3C8C582C8CCD4
:1000FE00C583CCF0A3C8C582C8CCC583CCDFEADEED
:10010E00E880DB89828A83E493A3F208DFF980CC4E
:10011E0088F0EF60010E4E60C388F0ED2402B40447
:10012E000050B9F582EB2402B4040050AF232345EE
:06013E00822390009E7375
:10014400BB010689828A83E0225002E722BBFE02B9
:09015400E32289828A83E49322EC
:10015D0075F008758200EF2FFFEE33FECD33CDCC59
:10016D0033CCC58233C5829BED9AEC99E5829840DC
:10017D000CF582EE9BFEED9AFDEC99FC0FD5F0D6B9
:10018D00E4CEFBE4CDFAE4CCF9A88222B800C1B9E3
:10019D000059BA002DEC8BF084CFCECDFCE5F0CB21
:1001AD00F97818EF2FFFEE33FEED33FDEC33FCEB5A
:1001BD0033FB10D703994004EB99FB0FD8E5E4F915
:1001CD00FA227818EF2FFFEE33FEED33FDEC33FC02
:1001DD00C933C910D7059BE99A4007EC9BFCE99AF6
:1001ED00F90FD8E0E4C9FAE4CCFB2275F010EF2F3B
:1001FD00FFEE33FEED33FDCC33CCC833C810D7073B
:10020D009BEC9AE899400AED9BFDEC9AFCE899F875
:0E021D000FD5F0DAE4CDFBE4CCFAE4C8F92208
:10022B00FAE6FB0808E6F925F0F618E6CA3AF622D4
:10023B00EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D50
:10024B00FDE43CFCE8A42EC8C5F03DFDE43CFCEF0E
:0D025B00A4FFE5F028FEE43DFDE43CFC229C
:00000001FF

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,7 @@
---- LED_On_Flag Matches (4 in 1 files) ---- ---- Earphone_Chg_Flag Matches (6 in 3 files) ----
userapp.c (UsrSrc\userapp) line 48 : bit LED_On_Flag = 0; LED_Display_App in userapp.c (UsrSrc\userapp) : if( Earphone_Chg_Flag ) //耳机出入仓呼吸灯循环3次。
LED_Display_App in userapp.c (UsrSrc\userapp) : LED_On_Flag = 1; LED_Display_App in userapp.c (UsrSrc\userapp) : Earphone_Chg_Flag = 0;
LED_Display_App in userapp.c (UsrSrc\userapp) : if( LED_On_Flag ) vox_module.c (UsrSrc\vox) line 35 : bit Earphone_Chg_Flag = 0; //耳机出入盒标志位
LED_Display_App in userapp.c (UsrSrc\userapp) : LED_On_Flag = 0; Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Earphone_Chg_Flag = 0; //关盖取消耳机入盒灯效,显示关盖灯效。
Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Earphone_Chg_Flag = 1;
vox_module.h (UsrInc\vox) line 32 : extern bit Earphone_Chg_Flag; //耳机出入盒标志位

View File

@ -28,7 +28,7 @@
#define FW_VER0 0x01 //程序版本0:代表在硬件存在改动不能兼容之前版本时加1 #define FW_VER0 0x01 //程序版本0:代表在硬件存在改动不能兼容之前版本时加1
#define FW_VER1 0x01 //程序版本1:代表在功能存在改动时加1 #define FW_VER1 0x01 //程序版本1:代表在功能存在改动时加1
#define FW_VER2 0x02 //程序版本2:代表在软件调试出现不同的测试版本时改动时加1 #define FW_VER2 0x05 //程序版本2:代表在软件调试出现不同的测试版本时改动时加1
/*Function Select功能选择宏定义*/ /*Function Select功能选择宏定义*/

View File

@ -43,6 +43,8 @@ extern bit Key_Press_ll_irq1;
extern bit Key_l_Flag; extern bit Key_l_Flag;
#if 0
typedef enum { typedef enum {
KEY_EVENT_Empty = 0x00, KEY_EVENT_Empty = 0x00,
KEY_EVENT_SHORT, //Key short press(60ms-1s) interrupt flag KEY_EVENT_SHORT, //Key short press(60ms-1s) interrupt flag
@ -52,6 +54,7 @@ typedef enum {
extern idata KEY_EVENT_E Event_key; extern idata KEY_EVENT_E Event_key;
#endif
/******************************************************************************\ /******************************************************************************\
Functions definitions Functions definitions
\******************************************************************************/ \******************************************************************************/

View File

@ -29,11 +29,16 @@
//#define FOSC 11059200L //#define FOSC 11059200L
#define T1MS 1000 #define T1MS 921
#define T100uS 100 #define T100uS 91
#define T10MS 10000 //FOSC/12/100 #define T200uS 183
#define T300uS 275
#define T400uS 368
#define T500uS 460
#define T600uS 552
#define T800uS 736
#define T10MS_DEBOUNCE_1S 100 //10ms周期定时1s #define T10MS 9215 //FOSC/12/100
#define C_TIM0_Reload (65535 - T1MS) //1ms (65535 - N) * 1/FOSC = Time -> (65535 - N) * 1/11.0592M = 1ms -> 65535 - N = 11059.2 -> N = 65535 - 11059.2 #define C_TIM0_Reload (65535 - T1MS) //1ms (65535 - N) * 1/FOSC = Time -> (65535 - N) * 1/11.0592M = 1ms -> 65535 - N = 11059.2 -> N = 65535 - 11059.2

View File

@ -146,7 +146,7 @@ uint8_t PMU_NTC_Control(void)
if(NTC_Adc >= 2000) ////屏蔽NTC功能NTC浮空屏蔽 NTC 功能,并锁定。 if(NTC_Adc >= 2000) ////屏蔽NTC功能NTC浮空屏蔽 NTC 功能,并锁定。
{ {
return 1; return 0;
} }
if(NTC_Adc <= T_0C && NTC_Adc > T_45C) //NTC正常 if(NTC_Adc <= T_0C && NTC_Adc > T_45C) //NTC正常

View File

@ -174,6 +174,7 @@ void DisCharge_Handler(void)
return; return;
} }
#endif #endif
gBoost_Prepared_Flag = 1; gBoost_Prepared_Flag = 1;
#if ADC_ENABLE #if ADC_ENABLE

View File

@ -30,7 +30,9 @@
/******************************************************************************\ /******************************************************************************\
Macro definitions Macro definitions
\******************************************************************************/ \******************************************************************************/
#define KEY_PRESS_CNT0 5 //按键长按500ms显示长按灯效
#define KEY_PRESS_CNT 50 //按键按下计数5s #define KEY_PRESS_CNT 50 //按键按下计数5s
/******************************************************************************\ /******************************************************************************\
Variables definitions Variables definitions
\******************************************************************************/ \******************************************************************************/
@ -42,7 +44,7 @@ bit Key_Press_ll_irq1 = 0;
bit Key_l_Flag = 0; bit Key_l_Flag = 0;
idata KEY_EVENT_E Event_key = 0; //idata KEY_EVENT_E Event_key = 0;
idata uint8_t Key_Press_Debounce = 0; idata uint8_t Key_Press_Debounce = 0;
@ -56,6 +58,7 @@ idata uint8_t Key_Press_Debounce = 0;
* *
* Description : Key Handler --- 5ms(2s) * Description : Key Handler --- 5ms(2s)
CoverStatus --- Key事件标志位 CoverStatus --- Key事件标志位
10ms调用周期
* *
* Arguments : NONE * Arguments : NONE
@ -68,36 +71,30 @@ idata uint8_t Key_Press_Debounce = 0;
void Key_Handler(void) void Key_Handler(void)
{ {
#if 1
#if 0
if( IRQ_FLAG7 ) //Óа´¼ü´¥·¢
{
if( IRQ_FLAG7 & 0x40 ) //key super long press for 8s interrupt flag
{
Key_Press_ll_irq = 1;
Event_key = KEY_EVENT_LL_8S;
}
IRQ_FLAG7 = 0xFF; //Clear Key Interrupt Flag
}
#else
if( !(CHIP_STA0 & 0x02) ) //CHIP_STA0 的bit1为Key的状态值0按下 if( !(CHIP_STA0 & 0x02) ) //CHIP_STA0 的bit1为Key的状态值0按下
{ {
Key_Press_Debounce++; Key_Press_Debounce++;
if( Key_Press_Debounce >= KEY_PRESS_CNT )
{ if( Key_Press_Debounce >= KEY_PRESS_CNT ) //长按5s
if( (CHIP_STA0 & 0x02) == 0 )
{ {
Key_Press_ll_irq = 1; Key_Press_ll_irq = 1;
Key_Press_ll_irq1 = 1;
Event_key = KEY_EVENT_LL_8S;
Key_Press_Debounce = 0; Key_Press_Debounce = 0;
}
else
if( Key_Press_Debounce >= KEY_PRESS_CNT0 ) //按键长按500ms显示长按灯效
{
if( !Key_Press_ll_irq1 )
{
Key_Press_ll_irq1 = 1;
LED_On_Flag = 1; LED_On_Flag = 1;
} }
} }
Key_l_Flag = 1;
#if SLEEP_ENABLE #if SLEEP_ENABLE
Enter_Sleep_Cnt_Restart_Flag = 1; Enter_Sleep_Cnt_Restart_Flag = 1;
@ -107,51 +104,27 @@ idata uint8_t Key_Press_Debounce = 0;
} }
else else
{ {
if( Key_l_Flag )
{
Key_l_Flag = 0;
LED_On_Flag = 1;
if( (Key_Press_Debounce < KEY_PRESS_CNT0) ) //松开按键按下时间小于500ms则识别为短按显示电量
{
Key_Press_short_irq = 1; //短按,显示电量
}
else
if( Key_Press_Debounce < KEY_PRESS_CNT ) //长按不到5s灯效灭。
{
Key_Press_ll_irq1 = 0;
}
}
Key_Press_Debounce = 0; Key_Press_Debounce = 0;
} }
#endif
#else
if( Key_l_Flag )
{
Key_Press_l_irq = 0;
Key_l_Flag = 0;
/*todo*/
Event_key = KEY_EVENT_L_2S;
/*¶ú»úÅä¶Ô*/
#ifdef _DEBUG_KEY
printf("long press\r\n");
#endif
}
if( Key_Press_ll_irq )
{
Key_Press_ll_irq = 0;
/*todo*/
Event_key = KEY_EVENT_LL_8S;
#ifdef _DEBUG_KEY
printf("supper long press\r\n");
#endif
}
if( Key_Press_short_irq )
{
Key_Press_short_irq = 0;
/*todo*/
Event_key = KEY_EVENT_SHORT;
#ifdef _DEBUG_KEY
printf("short press\r\n");
#endif
} }
#endif #endif
}
#endif

View File

@ -104,6 +104,9 @@ void System_Init(void)
SFRDATA &= ~0x1F; SFRDATA &= ~0x1F;
SFRDATA |= (VOX_IOUT_200MA << 3) | VOX_ADT_Cur_4_5UA; SFRDATA |= (VOX_IOUT_200MA << 3) | VOX_ADT_Cur_4_5UA;
SFRADDR = VOX_CON2; //设置VOX轻重载转换滤波时间。
SFRDATA |= 0x0A;
#endif #endif
TMOD = 0x01; //mode 1, 16bit timer TMOD = 0x01; //mode 1, 16bit timer
@ -132,12 +135,12 @@ void System_Init(void)
#ifdef LED_DISPLAY #ifdef LED_DISPLAY
SFRADDR = P0_DRV; //P03、P04限流开限流电阻为400Ω
SFRDATA = 0x3C;
pin_LED_1 = 0; pin_LED_1 = 0;
pin_LED_2 = 0; pin_LED_2 = 0;
SFRADDR = P0_DRV; //P03、P04限流开限流电阻为400Ω
SFRDATA = 0x3C;
#endif #endif
#if WTG_ENABLE #if WTG_ENABLE
@ -187,7 +190,7 @@ void System_Init(void)
CHG_CTL |= 0x10; //开启充电超时使能 CHG_CTL |= 0x10; //开启充电超时使能
// REG_CHG1 = CHG_CURRENT_400MA; //充电电流400mA。 REG_CHG1 = CHG_CURRENT_200MA; //充电电流200mA。
//REG_CHG2 = 0x01; //CV电压4.35V //REG_CHG2 = 0x01; //CV电压4.35V

View File

@ -127,6 +127,7 @@ void LED_Display_App(void)
Earphone_Chg_Flag = 0; Earphone_Chg_Flag = 0;
CoverEvent_Flg_led = 0; CoverEvent_Flg_led = 0;
Earphone_Chg_LED_On_Timer = 0; Earphone_Chg_LED_On_Timer = 0;
} }
} }
else else
@ -136,6 +137,8 @@ void LED_Display_App(void)
if ( Charger_Done ) // ³äµçÍê³É£¬LEDÂ̵Ƴ£ÁÁ if ( Charger_Done ) // ³äµçÍê³É£¬LEDÂ̵Ƴ£ÁÁ
{ {
LEDG_ON(); LEDG_ON();
LEDR_OFF();
LED_On_Timer = 0;
} }
else else
{ {
@ -167,15 +170,23 @@ void LED_Display_App(void)
{ {
if( LED_On_Flag ) if( LED_On_Flag )
{ {
#ifdef BREATHING_LIGHT
BL_LED.Breathing_Light_On[LED_R] = 0;
BL_LED.Breathing_Light_On[LED_G] = 0;
BL_LED.BL_Timer[LED_R] = BL_DUTY_MAX;
BL_LED.BL_Timer[LED_G] = BL_DUTY_MAX;
#endif
LEDR_OFF(); LEDR_OFF();
LEDG_OFF(); LEDG_OFF();
LED_On_Timer = 0; LED_On_Timer = 0;
LED1_On_Timer = 0; LED1_On_Timer = 0;
LED_On_Flag = 0; LED_On_Flag = 0;
} }
if ( CoverEvent_Flg_led ) //开关盖低电橙灯亮5s非低电绿灯亮5s。 if ( CoverEvent_Flg_led || Key_Press_short_irq ) //开关盖、短按按键低电橙灯亮5s非低电绿灯亮5s。
{ {
if( F_batlevel_low ) if( F_batlevel_low )
{ {
@ -198,6 +209,8 @@ void LED_Display_App(void)
LEDR_OFF(); LEDR_OFF();
CoverEvent_Flg_led = 0; CoverEvent_Flg_led = 0;
Key_Press_short_irq = 0;
} }
} }
else else
@ -222,6 +235,8 @@ void LED_Display_App(void)
LEDG_OFF(); LEDG_OFF();
CoverEvent_Flg_led = 0; CoverEvent_Flg_led = 0;
Key_Press_short_irq = 0;
} }
} }
} }
@ -267,7 +282,6 @@ void LED_Display_App(void)
} }
} }
} }
} }
} }
} }
@ -284,6 +298,7 @@ void LED_Display_App(void)
*****************************************************************************/ *****************************************************************************/
void UserAPP(void) void UserAPP(void)
{ {
if( F_sys_tim_100ms ) if( F_sys_tim_100ms )
{ {
F_sys_tim_100ms = 0; F_sys_tim_100ms = 0;

View File

@ -188,6 +188,8 @@ void Vox_Det_Machine(void)
#endif #endif
Earphone_Chg_Flag = 0; //关盖取消耳机入盒灯效,显示关盖灯效。
Cover_Close_Flag = 1; Cover_Close_Flag = 1;
CoverEvent_Flg = 0; CoverEvent_Flg = 0;
@ -371,10 +373,10 @@ void Vox_Det_Machine(void)
return; return;
} }
BST_EN = 0;
VOX_EN_Type(VOX_ADT_Mode); VOX_EN_Type(VOX_ADT_Mode);
BST_EN = 0;
Vox_Vout_Enable = OFF; Vox_Vout_Enable = OFF;
COM_CTRL = OFF; //关MOS管节省功耗。 COM_CTRL = OFF; //关MOS管节省功耗。