更改内容：优化发码逻辑，电池电量大于4.2V后，固定发4.2V对应的电量码。

2025-03-10 18:02:18 +08:00 · 2025-03-10 18:02:18 +08:00 · 9d1d06c68b
commit 9d1d06c68b
parent 0d03afd2ef
9 changed files with 103 additions and 103 deletions
--- a/Out/8834_JLAB_JS07_250310_1741.bin
+++ b/Out/8834_JLAB_JS07_250310_1741.bin
--- a/Out/8834_JLAB_JS07_250310_1741_8955_010105.bin
+++ b/Out/8834_JLAB_JS07_250310_1741_8955_010105.bin
--- a/Out/8834_JLAB_JS07_250310_1754.bin
+++ b/Out/8834_JLAB_JS07_250310_1754.bin
--- a/Out/8834_JLAB_JS07_250310_1754.hex
+++ b/Out/8834_JLAB_JS07_250310_1754.hex
@ -2,42 +2,42 @@
 :10067700758E3075D20078FFE4F6D8FD75815F027C
 :0206870006C4A7
 :0C000E00120795D2AED2BE1205CA80F7D0
-:0C0BA600AE4CAF4DAB07AA06E4F9F822F4
-:02096300AD07DE
-:10096500E4FCFBFAF554F55575FE2975FF8BBD06BC
-:100975001775FE0143FF8075A541E5A520E0FB75D0
-:10098500A56175FE0153FF7FE4FCEDC454F04401FD
-:10099500F5A5E5A520E0FBAFA1AB07AFA2EFFEEE05
-:1009A500FAEB2555F555EA3554F5540CBC08DBE54D
-:0D09B50055AE547803CEC313CE13D8F9FF0E
-:0109C2002212
-:100B2C00E4FE7F051209637C077DD01203DDC0064D
-:0C0B3C00C007120BA6D007D00602034B26
-:100B4800E4FE7F041209637C037DE81203DDC0061E
-:0C0B5800C007120BA6D007D00602034B0A
-:10088E00E4FFFEF553120B48C3EF94D0EE940740ED
-:10089E00037F0022D3EF941AEE94065030EF943378
-:1008AE00EE94024028301912EF9406EE940650078B
-:1008BE00C219E4F5538003755301301A2BD3EF940C
-:1008CE0044EE9402401FC21AE4F553801BD3EF94FA
-:1008DE001AEE94064004D219800BC3EF9433EE94B3
-:0A08EE00025002D21A755301AF53F5
-:0108F80022DD
-:1008F900E5E620E70953B3FE75F210C21B22E5F2C3
-:10090900540C601053B3FEE5F354C0604C75F20CFF
-:1009190075F3C02275F3C0301C0453B3FE22E5F20F
-:1009290030E416C3E54F94D2E54E940F500575F2A5
-:1009390010800353B3FED21B2243B311E535D39480
-:10094900024004C226C225E535D394034009C223D7
-:0A095900302402D21DC224C21B226A
-:100A1900E5E530E103C22D22E5E230E705C22DD23A
-:100A29002E22302502802FE5E830E009C22D75E835
-:100A39000175B50122301C06C22DE4F5B522D22D6F
-:100A4900302E18E5E630E713C3E54F9410E54E94D0
-:0C0A59000E4003C22E22E4F5B5C22D228F
-:100B0B00E5E25408FF651F6017E5E230E305751E4B
-:100B1B00018003E4F51ED22FD230C22BD2188F1FC7
-:010B2B0022A7
+:0C0BAE00AE4CAF4DAB07AA06E4F9F822EC
+:02096B00AD07D6
+:10096D00E4FCFBFAF554F55575FE2975FF8BBD06B4
+:10097D001775FE0143FF8075A541E5A520E0FB75C8
+:10098D00A56175FE0153FF7FE4FCEDC454F04401F5
+:10099D00F5A5E5A520E0FBAFA1AB07AFA2EFFEEEFD
+:1009AD00FAEB2555F555EA3554F5540CBC08DBE545
+:0D09BD0055AE547803CEC313CE13D8F9FF06
+:0109CA00220A
+:100B3400E4FE7F0512096B7C077DD01203DDC0063D
+:0C0B4400C007120BAED007D00602034B16
+:100B5000E4FE7F0412096B7C037DE81203DDC0060E
+:0C0B6000C007120BAED007D00602034BFA
+:10089600E4FFFEF553120B50C3EF94D0EE940740DD
+:1008A600037F0022D3EF941AEE94065030EF943370
+:1008B600EE94024028301912EF9406EE9406500783
+:1008C600C219E4F5538003755301301A2BD3EF9404
+:1008D60044EE9402401FC21AE4F553801BD3EF94F2
+:1008E6001AEE94064004D219800BC3EF9433EE94AB
+:0A08F600025002D21A755301AF53ED
+:0109000022D4
+:10090100E5E620E70953B3FE75F210C21B22E5F2BA
+:10091100540C601053B3FEE5F354C0604C75F20CF7
+:1009210075F3C02275F3C0301C0453B3FE22E5F207
+:1009310030E416C3E54F94D2E54E940F500575F29D
+:1009410010800353B3FED21B2243B311E535D39478
+:10095100024004C226C225E535D394034009C223CF
+:0A096100302402D21DC224C21B2262
+:100A2100E5E530E103C22D22E5E230E705C22DD232
+:100A31002E22302502802FE5E830E009C22D75E82D
+:100A41000175B50122301C06C22DE4F5B522D22D67
+:100A5100302E18E5E630E713C3E54F9410E54E94C8
+:0C0A61000E4003C22E22E4F5B5C22D2287
+:100B1300E5E25408FF651F6017E5E230E305751E43
+:100B2300018003E4F51ED22FD230C22BD2188F1FBF
+:010B3300229F
 :10070900E5E220E1520556E556C3941E4012301F1A
 :1007190042C21FD21EC22B301139D221D2188033C6
 :10072900E556C3940A402C201F29202626D222E50B
@ -48,14 +48,14 @@
 :10077900F00584E5F0700C301109D22BF51C751DBC
 :0B07890005D22C055722C21EE4F557D4
 :010794002242
-:1009C300785BE6604D785DE6FFD318965004D284D9
-:1009D3008002C284EFC394AA4018E4785DF6785F7E
-:1009E300E66006785C16168009785EE66004785C3B
-:1009F3000606785CE6FF74AAD39F5009785F7601F8
-:100A0300E418F6800DEFD394015007785E7601E485
-:060A130008F6785D0622E2
-:100B9500E5E220E006201203303104C231C322D33E
-:010BA500222D
+:1009CB00785BE6604D785DE6FFD318965004D284D1
+:1009DB008002C284EFC394AA4018E4785DF6785F76
+:1009EB00E66006785C16168009785EE66004785C33
+:1009FB000606785CE6FF74AAD39F5009785F7601F0
+:100A0B00E418F6800DEFD394015007785E7601E47D
+:060A1B0008F6785D0622DA
+:100B9D00E5E220E006201203303104C231C322D336
+:010BAD002225
 :1007950075FE8043FF3075FE0153FFFCD28175FE67
 :1007A5000643FF1AD21875B7C375FE6A75FF04753F
 :1007B500FE6C43FF0AC212758901758CFC758A6649
@ -69,86 +69,86 @@
 :0100060032C7
 :03004B000200446C
 :0600440075EB3CD23132E5
-:090BBD00E55875F00584E5F0220D
-:0B0BB200E4785BF6C283C284D23122DB
+:090BC500E55875F00584E5F02205
+:0B0BBA00E4785BF6C283C284D23122D3
 :10040A00201C06300D29200F2620130AD213E4F5EA
-:10041A0058120BB28016E558C39467500B05581250
-:10042A000BBD7008B2838004C283D20FD23122304E
-:10043A001311C213120BB2C214C216C20EC230D2A8
+:10041A0058120BBA8016E558C39467500B05581248
+:10042A000BC57008B2838004C283D20FD231223046
+:10043A001311C213120BBAC214C216C20EC230D2A0
 :10044A0018D217E5E630E727202124301B0C2016A6
-:10045A0005D216120BB2D2848010201409D214C20B
-:10046A0016120BB28004785B7601C230C2182230B1
+:10045A0005D216120BBAD2848010201409D214C203
+:10046A0016120BBA8004785B7601C230C2182230A9
 :10047A001408C214C216D218D217301808E4F55854
-:10048A00C218120BB2302607201554D21580482004
+:10048A00C218120BBA302607201554D215804820FC
 :10049A000E06202103303047C21530210575592B2D
 :1004AA008003755923E558C394055003055822E57E
-:1004BA0058C395595021055830210A120BBD701F97
-:1004CA00B284C2832230240A120BBD7012B283C2D4
+:1004BA0058C395595021055830210A120BC5701F8F
+:1004CA00B284C2832230240A120BC57012B283C2CC
 :0F04DA008422D284C28322C221C230C20ED21821
 :0104E90022F0
-:1005CA00302805C2281204EA30272FC227120B0B43
-:1005DA00120A191208F9120709120B2C8E4E8F4FA4
-:1005EA0012088EEF24FF921C7F061209638E4C8F2D
+:1005CA00302805C2281204EA30272FC227120B133B
+:1005DA00120A21120901120709120B348E4E8F4F8B
+:1005EA00120896EF24FF921C7F0612096B8E4C8F1D
 :1005FA004D12004E12081A12040A30296FC229E558
 :10060A005AD394004009155A303161C231805A12C6
-:10061A000B955055E5E220E703300F0875FE245389
+:10061A000B9D5055E5E220E703300F0875FE245381
 :10062A00FFC3800675FE2443FF3CC2ABC2B9C2A910
-:10063A007F01120B6875FE2953FF7F75FE8053FFF9
+:10063A007F01120B7075FE2953FF7F75FE8053FFF1
 :10064A00CF43870275FE8043FF30D2B9D2A9D2AB1D
 :10065A00300F14D28175FE0643FF0275B7C3D22F3D
 :0D066A0075E80CC20DC20F8000755A0C22FD
-:100AE800C208C209F514F515F512F5132253B7DF3C
-:100AF800D208E4F514F5152253B7EFD209E4F5123C
-:030B0800F51322C0
-:040B6400C2127F0139
-:100B6800E4F5B5EF24FF928175FE0653FFFB43FFC2
-:080B780002BF010353B7CF22B5
-:100B800075FE0643FF0453FFFDC28275B501BF0128
-:050B90000343B7302211
-:10004E00202D0302030430100CC2107F01120B6826
+:100AF000C208C209F514F515F512F5132253B7DF34
+:100B0000D208E4F514F5152253B7EFD209E4F51233
+:030B1000F51322B8
+:040B6C00C2127F0131
+:100B7000E4F5B5EF24FF928175FE0653FFFB43FFBA
+:080B800002BF010353B7CF22AD
+:100B880075FE0643FF0453FFFDC28275B501BF0120
+:050B98000343B7302209
+:10004E00202D0302030430100CC2107F01120B701E
 :10005E00D200C2112230000CC200E5E354ACFFBF47
 :10006E00A002D211302F46E5B5700302027043B7DD
 :10007E0030E4F510F511F509F50AF50BC201C20DC4
-:10008E00C20F120AE8D212F50CF50DF50EF50FE5BA
+:10008E00C20F120AF0D212F50CF50DF50EF50FE5B2
 :10009E001E7010C20ED202D205D206C203C20AC20E
 :1000AE00238008C202D203D20BD20CC22F2003032C
 :1000BE0002020D301720E5B57003020270E4120A39
-:1000CE00ECC208C209F510F50BF509D20BD20C43A0
+:1000CE00F4C208C209F510F50BF509D20BD20C4398
 :1000DE00B730C217D212E509C394025003050922A4
 :1000EE003001030201DFE510C39418501AE51075B4
 :1000FE00F00584E5F0700DD22BC22CE53444C475A6
 :10010E001C00F51D051022E50AC394025003050AD2
 :10011E0022200850E5E3548864887031C3E51594B5
 :10012E0070E5149417500A0515E51570070514802F
-:10013E0003120AF5D3E50D9403E50C9400500A055D
+:10013E0003120AFDD3E50D9403E50C9400500A0555
 :10014E000DE50D701F050C801BC20B8017E5E3300B
 :10015E00E712200B0FE4F514F515F50CF50DD20B87
 :10016E00D20ED218200950E5E3542464247031C312
 :10017E00E5139470E5129417500A0513E5137007F2
-:10018E0005128003120B00D3E50F9403E50E9400C5
+:10018E0005128003120B08D3E50F9403E50E9400BD
 :10019E00500A050FE50F701F050E801BC20C80174D
 :1001AE00E5E330E512200C0FD20CE4F50EF50FF559
 :1001BE0012F513D20ED21830080320090330263F51
-:1001CE00D201C208C209C20BC20C120B64D2048047
+:1001CE00D201C208C209C20BC20C120B6CD204803F
 :1001DE002E20222B300404C204801EE5E354A065B9
 :1001EE0008601C050BE50BD394035013E5E354A0F4
 :1001FE006004D20ED218E4F50BE5E354A0F5082006
 :10020E000203020301301719E5B570028054C205CE
-:10021E00C206E4F50BF509120AE843B730C217D24D
+:10021E00C206E4F50BF509120AF043B730C217D245
 :10022E0012E50BC3940A5003050B2230010620245D
 :10023E0003301D27202324E511C394185011E51116
 :10024E0075F00584E5F07004D22BD22A051122D266
 :10025E0001302402D223C21DE4F51120060DE5B5AE
-:10026E007004FF020B8043B730D206E5E8540C60F1
+:10026E007004FF020B8843B730D206E5E8540C60E9
 :10027E0028200F200511E511C39405500302030E2B
 :10028E00E4F51175E80C53B7CF43B730D20D120A0F
-:10029E00E8C212227F01020B68C20DC20F20082095
+:10029E00F0C212227F01020B70C20DC20F20082085
 :1002AE00E5E35488FFBF8818C3E515943CE5149424
-:1002BE0000500A0515E515700705148003120AF59E
+:1002BE0000500A0515E515700705148003120AFD96
 :1002CE00200920E5E35424FFBF2418C3E513943C12
 :1002DE00E5129400500A0513E5137007051280030A
-:1002EE00120B00300803200903302607C208C2098A
-:1002FE00120B64C20722200707D207120B64D21713
+:1002EE00120B08300803200903302607C208C20982
+:1002FE00120B6CC20722200707D207120B6CD21703
 :01030E0022CC
 :10001E0016360BEA0C800D7A0DAC0DDE0E100E743A
 :10002E000ED80F3C0FA010680B28030A1318191ACC
@ -156,38 +156,38 @@
 :10081A00E4FFEF25E02436F8E6FC08E6FDC3E54FE1
 :10082A009DE54E9C40040FBF0BE8E5E16005E4F549
 :10083A00E18F35EFD395354004053380021533E552
-:10084A0033D394BE5007E533C3940A501B8F35E562
-:10085A00276535600A74282FF8E6F5348535273080
-:10086A001B03853234753364E535D394005002D2C4
-:10087A0025E535D394015002D226E535D3940250AA
-:03088A0002D22473
-:01088D002248
-:03000B00020AAA3C
-:100AAA00C0E0C0D074FC258CF58C7466258AF58A62
-:100ABA00D2280550E550C394644005755000D227EA
-:100ACA000551E551C394FA40107551000552E5529B
-:0E0ADA0094044005755200D229D0D0D0E032ED
-:03001B00020A6571
-:100A6500C0E0C0F0C083C082C0D075D000C000C057
-:100A750001C002C003C004C005C006C007C28F156F
-:100A85008D74A4258BF58B1209C3D007D006D0052C
-:100A9500D004D003D002D001D000D0D0D082D083F2
-:050AA500D0F0D0E032AA
+:10084A0033D394BE5007E533C3940A50238F35E55A
+:10085A00276535600A74282FF8E6F534853527C3ED
+:10086A00E54F954BE54E954A40037534327533642E
+:10087A00E535D394005002D225E535D394015002D0
+:0B088A00D226E535D394025002D224A0
+:010895002240
+:03000B00020AB234
+:100AB200C0E0C0D074FC258CF58C7466258AF58A5A
+:100AC200D2280550E550C394644005755000D227E2
+:100AD2000551E551C394FA40107551000552E55293
+:0E0AE20094044005755200D229D0D0D0E032E5
+:03001B00020A6D69
+:100A6D00C0E0C0F0C083C082C0D075D000C000C04F
+:100A7D0001C002C003C004C005C006C007C28F1567
+:100A8D008D74A4258BF58B1209CBD007D006D0051C
+:100A9D00D004D003D002D001D000D0D0D082D083EA
+:050AAD00D0F0D0E032A2
 :030BFD00010105EE
 :1004EA00202B030205C90518E51B705FE518D39494
 :1004FA003750028046302A2E30240B75195FE519D1
 :10050A00243CF51A8009751973E5192428F51AE5AA
 :10051A0018D3951950028015E518C3951A50028010
 :10052A001A751B038025E518D3944B50077F0112D7
-:10053A000B808017E518C3945F5007E4FF120B681D
+:10053A000B888017E518C3945F5007E4FF120B700D
 :10054A008009751B01302C03751604E51BB4012BB9
 :10055A001516E516D394074008751608751B03800F
 :10056A0003751B02E51DAE1CA816088005CEC31331
 :10057A00CE13D8F95401F517E4F518E51BB40211A6
 :10058A00E518C394145006E517601F8011751B0106
 :10059A0022E51B64037028E518C3941450057F01F3
-:1005AA00020B80E518C394285005E4FF020B687F0C
-:0F05BA0001120B80E4F518C22BC22CC22AF51BCC
+:1005AA00020B88E518C394285005E4FF020B707FFC
+:0F05BA0001120B88E4F518C22BC22CC22AF51BC4
 :0105C900220F
 :1006890002000EE493A3F8E493A34003F68001F279
 :1006990008DFF48029E493A3F85407240CC8C33372
--- a/Out/8834_JLAB_JS07_250310_1754_593F_010105.bin
+++ b/Out/8834_JLAB_JS07_250310_1754_593F_010105.bin
--- a/Project/TP3102_Demo.uvgui.GH
+++ b/Project/TP3102_Demo.uvgui.GH
@ -3696,9 +3696,9 @@
      </Doc>
      <Doc>
        <Name>..\UsrSrc\bat\bat.c</Name>
-        <ColumnNumber>0</ColumnNumber>
+        <ColumnNumber>16</ColumnNumber>
        <TopLine>74</TopLine>
-        <CurrentLine>99</CurrentLine>
+        <CurrentLine>98</CurrentLine>
        <Folding>1</Folding>
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>
--- a/TP3310_Demo.si4project/TP3310_Demo.sip_sym
+++ b/TP3310_Demo.si4project/TP3310_Demo.sip_sym
--- a/TP3310_Demo.si4project/TP3310_Demo.siwork
+++ b/TP3310_Demo.si4project/TP3310_Demo.siwork
--- a/UsrSrc/bat/bat.c
+++ b/UsrSrc/bat/bat.c
@ -211,9 +211,9 @@ void check_bat_level(void)
 			bat_level_bk = bat_level;
 		}

-		if( Charger_Done )
+		if( Vbat_Adc >= Boost_batlevel_Threshold[C_batLevel_SetMax - 1] )
 		{
-			bat_level_pdata = batlev_data[C_batLevel_SetMax - 1];
+			bat_level_pdata = 0x32;
 		}
 		
   	   	offset_bat_level = ( C_offset_bat_level_MAX + C_offset_bat_level_MIN ) / 2;