更改内容:1、优化188数码管电量显示相关逻辑和效果;2、优化电量算法。

This commit is contained in:
Alex xu 2024-10-11 10:11:01 +08:00
parent 42c5596193
commit 9ec147057a
16 changed files with 356 additions and 352 deletions

View File

@ -1,231 +0,0 @@
:03000000020845AE
:10084500758E3075D20078FFE4F6D8FD7581CC023F
:02085500089207
:0C000E0012095CD2AED2BE12079B80F734
:0403E40002C900004A
:020AFE00AD0742
:100B0000E4FCFBFAF559F55A75FE2975FF8BEDC427
:100B100054F04401F5A5E5A520E0FBAFA1AB07AF7C
:100B2000A2EFFEEEFAEB255AF55AEA3559F5590CC3
:100B3000BC08DBE55AAE597803CEC313CE13D8F9FF
:010B4000FFB5
:010B41002291
:100B4200E4F557F5587F05120AFE8E578F587F0637
:100B5200120AFEE4FCFDC004A905AA06AB07AE57C3
:100B6200AF587C077DD01205FAD0001205428E578D
:020B72008F589A
:010B7400225E
:0203E800C11B37
:100A1D00E5E620E70953B3FE75F210C21B22E5F29D
:100A2D00540C601053B3FEE5F354C0602E75F20CF8
:100A3D0075F3C02275F3C0E5F230E41AC378CAE647
:100A4D0094EB18E6940F500575F210800353B3FE26
:0C0A5D00D21BE4F5172243B311C21B2288
:0403EA00C119C11A5A
:100AB500E5E530E103C21922E5E230E705C219D2C6
:100AC5001A22301E02802CE5E830E00EC2193013E0
:100AD50027C21375E80175B50122D219301A19E537
:100AE500E630E714C378CAE6941018E6940E40037E
:090AF500C21A22E4F5B5C219226F
:1003EE00013EBC19250000000000000000000000C6
:1003FE000000000000000000000000000000204689
:10040E005B060708090A0B180708181818181806AB
:10041E00070C0A09181806070C080918180B0C0700
:10042E0008181818060B0C08091818060B0C0809E2
:10043E000A1806070818181818060B0C08090A07D8
:10044E00060708090B0C1814A1181818180018180C
:10045E001800011818000102180001020314B51843
:10046E001818181418181814151818141516181416
:03047E0015161739
:10004E0075FE0653FFC00524E524D39418400375AE
:10005E002401E5241205D400B10100C50200D90324
:10006E0000ED04010105011506012907013D0801F6
:10007E00510901650A01790B018D0C01A10D01B524
:10008E000E01C90F01DD1001F01102031202161349
:10009E00022D14023D15025416026B17028218002F
:1000AE0000029775FE0643FF20D285E525640160A8
:1000BE000302029702028F75FE0643FF20D285E5EA
:1000CE00266401600302029702024B75FE0643FF8F
:1000DE0020D285E52764016003020297020224758F
:1000EE00FE0643FF20D285E52864016003020297D5
:1000FE0002027975FE0643FF10D284E53964016071
:10010E000302029702026275FE0643FF10D284E5D7
:10011E003A6401600302029702024B75FE0643FF2A
:10012E0010D284E53B64016003020297020224753B
:10013E00FE0643FF10D284E53C6401600302029781
:10014E0002027975FE0643FF08D283E52964016039
:10015E000302029702026275FE0643FF01D280E59A
:10016E002A6401600302029702022475FE0643FF11
:10017E0008D283E52B6401600302029702028F7599
:10018E00FE0643FF02D281E52C6401600302029752
:10019E0002026275FE0643FF04D282E52D64016001
:1001AE000302029702024B75FE0643FF04D282E55C
:1001BE002E6401600302029702028F75FE0643FF52
:1001CE0004D282E52F640160030202970202627577
:1001DE00FE0643FF08D283E53064016003020297F6
:1001EE00803475FE0643FF08D283E5316401600357
:1001FE00020297807675FE0643FF02D281E53264D5
:10020E00016003020297803575FE0643FF02D2811C
:10021E00E5336401707375FE0643FF04C2822275D6
:10022E00FE0643FF01D280E5346401705C80527596
:10023E00FE0643FF01D280E5356401704C75FE0663
:10024E0043FF08C2832275FE0643FF01D280E538C4
:10025E006401703575FE0643FF20C2852275FE06C9
:10026E0043FF04D282E5366401701E75FE0643FF1D
:10027E0002C2812275FE0643FF02D281E537B40128
:09028E000875FE0643FF10C2844E
:010297002244
:090BCF007F197825E4F608DFFC2B
:010BD80022FA
:090BD9007F107829E4F608DFFC26
:010BE20022F0
:0209BE00AE0782
:1009C000E4FDFCF9FFFB120BD9EE75F06484F9EE3F
:1009D00075F06484ABF0EB75F00A84FFEB75F00AF8
:1009E00084ABF0E96006752901752A01E4FDEED3B8
:1009F0009409400FEF75F007A4245B2DF8E6242539
:100A0000F87601EB75F007A4245B2DF8E6FC64187A
:0C0A10006006742C2CF876010DBD07D296
:010A1C0022B7
:100B7500E4FD7E047839E4F608DEFCE4FEEF25E0CA
:100B850025E024B52EF8E6FD2425F876010EBE04F1
:010B9500EC73
:010B9600223C
:100B9700E4FD7E047825E4F608DEFCE4FEEF25E0BC
:100BA70025E024A12EF8E6FD2425F876010EBE04E3
:010BB700EC51
:010BB800221A
:05048100011E0AC11C70
:100BB900E5E220E009200F06200E03301C05C21CC7
:060BC9007F00227F0122E3
:02048600C11D96
:10095C0075FE8075FFB075FE0153FFFC75B7C3754E
:10096C00FE6A53FFE043FF0475FE6C43FF0A758972
:10097C0001758CFC758A66D2A9D28C438910758D51
:10098C00FE758B33D2ABD28E75868075FE1775FFD4
:10099C003CD2A8D2B9D2AF75E80C75FE0F53FFF359
:1009AC00AF3E1209BE7F04120B757F04120B97D257
:0209BC001D22FA
:03000300020006F2
:0100060032C7
:03004B000200456B
:0600450075EB3CD21C32F9
:100488000112BC011700011800C118011500C1179D
:10049800011400011300C11601113C0116000119D5
:0104A8000053
:10029800E4F55778CCE6FF6512600BEF75F00AA419
:1002A800F5158F12804D0510E510D395114044E4E3
:1002B800F510E5E630E71CE5152409FFE433FEC335
:1002C800E53E9FEE6480F87480985002053E8516DE
:1002D800118016200F03300E10E51524F6FFE53EB9
:1002E800D39F4002153E851911E53ED3946440031F
:1002F800753E642016030203E3E5E630E748301B49
:1003080018E517C3940A500C0517753E64AF3E12E2
:1003180009BE802E120BCF802920171575570D7432
:10032800252557F8E4F60557E557B414F2D2178097
:1003380011E53EC394634003753E63AF3E1209BEA8
:10034800C217D218802F2006062007033018232052
:100358000F19200E16E517C3940450040517800BD7
:10036800E4F517C206C207C218800AAF3E1209BEDA
:100378008003120BCF300F1C200B19AF14120B7512
:100388000514E514D39404400375140175195075C8
:10039800161E8005E4FF120B75300E1C200A19AFDB
:1003A80013120B970513E513D39404400375130137
:1003B80075195075161E8005E4FF120B97300E1B39
:1003C800200A18300F15200B12E514651360067506
:0B03D800130175140175193C75162304
:0103E30022F7
:10079B00301538C215200F33200E302000033010D7
:1007AB0027E4F5B5E518C39403500D051875FE6ADB
:1007BB0043FF8043B70C8010C200C210E4F51875DC
:1007CB00FE6A53FF7F53B7F375161430121BC21218
:1007DB00120AB5120A1D120B4278C9A60608A60703
:1007EB001208D71206271206E130144DC21412025A
:1007FB0098E51ED394004009151E301C3CC21C808A
:10080B0035120BB9EF602F75FE2443FF3CC2ABC210
:10081B00B9C2A975FE2953FF7F75FE0653FFC0753C
:10082B00FE8053FFCF43870275FE8043FF30D2B962
:0A083B00D2A9D2AB8000751E0A227C
:1004A900C10FC10EC107C106C10BC10AC103C102F7
:1004B900011C02011D02C111C101C110C100C10409
:0A04C900C105C10CC108C10DC10935
:10062700E5E830E21E051AE51AC3940250030206F4
:10063700E0E4F51A75E80453B7EF43B710C20E7537
:100647001C02222019030206D4E51C146011146051
:1006570064240260030206E043B710751C0122E51B
:10066700E354246424701D300806C208D20AD20C51
:10067700051AE51AC394284060E4F51A53B7EFD278
:1006870011D21022E5E3542464207019F51A300CB6
:1006970006C20CC20AF517D208301103C20E222077
:1006A7000437D20E22E5E35424702E751C02C206CD
:1006B700C208C2112253B7EFE4F51AC20EE5E330C0
:1006C700E517E4F51CC20475B501D20622751C02B4
:0906D700C206D204C20E53B7EFB3
:0106E00022F7
:1006E100E5E830E31E051BE51BC394025003020736
:1006F1009AE4F51B75E80853B7DF43B720C20F75BD
:100701001D022220190302078EE51D1460111460D9
:10071100642402600302079A43B720751D0122E594
:10072100E354886488701D300906C209D20BD20DCA
:10073100051BE51BC394284060E4F51B53B7DFD2CA
:1007410001D20022E5E3548864807019F51B300D55
:1007510006C20DC20BF517D209300103C20F2220C8
:100761000537D20F22E5E35488702E751D02F51B63
:10077100C209C2012253B7DFE4F51BC20FE5E33022
:10078100E717E4F51DC20575B501D20722751D02F3
:09079100C207D205C20F53B7DF05
:01079A00223C
:1004D30001CC00C11E01CB32143F0C800D7A0DB646
:0E04E3000DE20E060E6A0EBF0F230FA010686A
:1008D700E4FFEF25E0243FF8E6FC08E6FDC378CA0D
:1008E700E69D18E69C40040FBF0AE778CCE6FEEFCA
:1008F700D39E40041806800378CB1678CBE6FED348
:10090700945A5006EEC3940A503678CCA607301D89
:100917002BC21DC378CAE6954218E695415006E4F6
:1009270078CCF6800478CCA60778CCE675F00AA4D4
:10093700F53EFF1209BED218D216D21C78CB7632FA
:1009470078CCE6FFD394005003D21E22EFD3940154
:040957004002C21E7A
:01095B002279
:1004F100015400015300015500015600C115C113FB
:04050100C112C1144E
:03000B00020A697D
:100A6900C0E0C0D074FC258CF58C7466258AF58AA3
:100A79000556E556C3940A4005755600D215055327
:100A8900E553C394644005755300D2120554E554E7
:100A9900C394FA4012755400D2130555E5559404D0
:0C0AA9004005755500D214D0D0D0E032CA
:03001B0002001EC2
:10001E00C0E0C0F0C083C082C0D075D008C28F15BA
:10002E008D158D7433258BF58B12004ED0D0D0826A
:07003E00D083D0F0D0E032C6
:030BFD00010104EF
:1008570002000EE493A3F8E493A34003F68001F2A9
:1008670008DFF48029E493A3F85407240CC8C333A2
:10087700C4540F4420C8834004F456800146F6DF71
:10088700E4800B01020408102040809003E4E47E1A
:10089700019360BCA3FF543F30E509541FFEE49366
:1008A700A360010ECF54C025E060A840B8E493A32D
:1008B700FAE493A3F8E493A3C8C582C8CAC583CA58
:1008C700F0A3C8C582C8CAC583CADFE9DEE780BE10
:0105050000F5
:1005060075F008758200EF2FFFEE33FECD33CDCCAC
:1005160033CCC58233C5829BED9AEC99E58298402F
:100526000CF582EE9BFEED9AFDEC99FC0FD5F0D60C
:10053600E4CEFBE4CDFAE4CCF9A88222B800C1B936
:100546000059BA002DEC8BF084CFCECDFCE5F0CB74
:10055600F97818EF2FFFEE33FEED33FDEC33FCEBAD
:1005660033FB10D703994004EB99FB0FD8E5E4F968
:10057600FA227818EF2FFFEE33FEED33FDEC33FC55
:10058600C933C910D7059BE99A4007EC9BFCE99A49
:10059600F90FD8E0E4C9FAE4CCFB2275F010EF2F8E
:1005A600FFEE33FEED33FDCC33CCC833C810D7078E
:1005B6009BEC9AE899400AED9BFDEC9AFCE899F8C9
:0E05C6000FD5F0DAE4CDFBE4CCFAE4C8F9225C
:1005D400D083D082F8E4937012740193700DA3A3B6
:1005E40093F8740193F5828883E4737402936860CA
:0605F400EFA3A3A380DFCA
:1005FA00EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D8E
:10060A00FDE43CFCE8A42EC8C5F03DFDE43CFCEF4B
:0D061A00A4FFE5F028FEE43DFDE43CFC22D9
:00000001FF

Binary file not shown.

View File

@ -0,0 +1,231 @@
:030000000208549F
:10085400758E3075D20078FFE4F6D8FD7581CC0230
:0208640008A1E9
:0C000E00120969D2AED2BE1207AA80F718
:04053700021E0000A0
:020B0B00AD0734
:100B0D00E4FCFBFAF55BF55C75FE2975FF8BEDC416
:100B1D0054F04401F5A5E5A520E0FBAFA1AB07AF6F
:100B2D00A2EFFEEEFAEB255CF55CEA355BF55B0CAE
:100B3D00BC08DBE55CAE5B7803CEC313CE13D8F9EE
:010B4D00FFA8
:010B4E002284
:100B4F00E4F559F55A7F05120B0B8E598F5A7F0614
:100B5F00120B0BE4FCFDC004A905AA06AB07AE59A6
:100B6F00AF5A7C077DD012050AD0001204528E595D
:020B7F008F5A8B
:010B81002251
:02053B00C119E4
:100A2A00E5E620E70953B3FE75F210C21922E5F292
:100A3A00540C601053B3FEE5F354C0602E75F20CEB
:100A4A0075F3C02275F3C0E5F230E41AC3781FE6E5
:100A5A0094EB18E6940F500575F210800353B3FE19
:0C0A6A00D219E4F5172243B311C219227F
:04053D00C117C11809
:100AC200E5E530E103C21722E5E230E705C217D2BD
:100AD2001822301C02802CE5E830E00EC2173011DB
:100AE20027C21175E80175B50122D217301819E530
:100AF200E630E714C3781FE6941018E6940E40031C
:090B0200C21822E4F5B5C2172265
:10054100013EBC1925000000000000000000000071
:100551000000000000000000000000000000204634
:100561005D060708090A0B18070818181818180655
:10057100070C0A09181806070C080918180B0C07AC
:1005810008181818060B0C08091818060B0C08098E
:100591000A1806070818181818060B0C08090A0784
:1005A100060708090B0C1814A318181818001818B6
:1005B1001800011818000102180001020314B718ED
:1005C10018181814181818141518181415161814C2
:0305D100151617E5
:10004E0075FE0653FFC00524E524D39418400375AE
:10005E002401E5241204E400B10100C50200D90315
:10006E0000ED04010105011506012907013D0801F6
:10007E00510901650A01790B018D0C01A10D01B524
:10008E000E01C90F01DD1001F01102031202161349
:10009E00022D14023D15025416026B17028218002F
:1000AE0000029775FE0643FF20D285E525640160A8
:1000BE000302029702028F75FE0643FF20D285E5EA
:1000CE00266401600302029702024B75FE0643FF8F
:1000DE0020D285E52764016003020297020224758F
:1000EE00FE0643FF20D285E52864016003020297D5
:1000FE0002027975FE0643FF10D284E53964016071
:10010E000302029702026275FE0643FF10D284E5D7
:10011E003A6401600302029702024B75FE0643FF2A
:10012E0010D284E53B64016003020297020224753B
:10013E00FE0643FF10D284E53C6401600302029781
:10014E0002027975FE0643FF08D283E52964016039
:10015E000302029702026275FE0643FF01D280E59A
:10016E002A6401600302029702022475FE0643FF11
:10017E0008D283E52B6401600302029702028F7599
:10018E00FE0643FF02D281E52C6401600302029752
:10019E0002026275FE0643FF04D282E52D64016001
:1001AE000302029702024B75FE0643FF04D282E55C
:1001BE002E6401600302029702028F75FE0643FF52
:1001CE0004D282E52F640160030202970202627577
:1001DE00FE0643FF08D283E53064016003020297F6
:1001EE00803475FE0643FF08D283E5316401600357
:1001FE00020297807675FE0643FF02D281E53264D5
:10020E00016003020297803575FE0643FF02D2811C
:10021E00E5336401707375FE0643FF04C2822275D6
:10022E00FE0643FF01D280E5346401705C80527596
:10023E00FE0643FF01D280E5356401704C75FE0663
:10024E0043FF08C2832275FE0643FF01D280E538C4
:10025E006401703575FE0643FF20C2852275FE06C9
:10026E0043FF04D282E5366401701E75FE0643FF1D
:10027E0002C2812275FE0643FF02D281E537B40128
:09028E000875FE0643FF10C2844E
:010297002244
:090BDC007F197825E4F608DFFC1E
:010BE50022ED
:090BE6007F107829E4F608DFFC19
:010BEF0022E3
:0209CB00AE0775
:1009CD00E4FDFCF9FFFB120BE6EE75F06484F9EE25
:1009DD0075F06484ABF0EB75F00A84FFEB75F00AEB
:1009ED0084ABF0E96006752901752A01E4FDEED3AB
:1009FD009409400FEF75F007A4245D2DF8E624252A
:100A0D00F87601EB75F007A4245D2DF8E6FC64186B
:0C0A1D006006742C2CF876010DBD07D289
:010A290022AA
:100B8200E4FD7E047839E4F608DEFCE4FEEF25E0BD
:100B920025E024B72EF8E6FD2425F876010EBE04E2
:010BA200EC66
:010BA300222F
:100BA400E4FD7E047825E4F608DEFCE4FEEF25E0AF
:100BB40025E024A32EF8E6FD2425F876010EBE04D4
:010BC400EC44
:010BC500220D
:0505D400011D0AC11A1F
:100BC600E5E220E009200D06200C03301A05C21AC2
:060BD6007F00227F0122D6
:0205D900C11B44
:1009690075FE8075FFB075FE0153FFFC75B7C37541
:10097900FE6A53FFE043FF0475FE6C43FF0A758965
:1009890001758CFC758A66D2A9D28C438910758D44
:10099900FE758B33D2ABD28E75868075FE1775FFC7
:1009A9003CD2A8D2B9D2AF75E80C75FE0F53FFF34C
:1009B900AF3E1209CB7F04120B827F04120BA4D223
:0209C9001B22EF
:03000300020006F2
:0100060032C7
:03004B000200456B
:0600450075EB3CD21A32FB
:1005DB000112BC011700011800C116011500C1154D
:0E05EB00011400011300C1140111500116008B
:10029800E4F55978CCE6FF6512600CEF75F00AA416
:1002A800F5158F120203360510E510D3951140732A
:1002B800E4F510E5E630E71CE5152409FFE433FE14
:1002C800C3E53E9FEE6480F87480985002053E8531
:1002D80016118045200D03300C3FE515D3940A50C4
:1002E8000DE53E940A400280157511328018E53EEE
:1002F800D395154011E53E9515D394054005751124
:100308000A8003751150E53ED394004002153EE57E
:100318003E7006201C03753E01E53ED394644003FD
:10032800753E64301C08E5E620E703E4F53E20143A
:1003380003020415E5E630E748301918E517C394B9
:100348000A500C0517753E64AF3E1209CB802E1279
:100358000BDC802920151575590D74252559F8E4ED
:10036800F60559E559B414F2D2158011E53EC39447
:10037800634003753E63AF3E1209CBC215D21680A7
:100388002F200406200503301623200D19200C16F3
:10039800E517C3940450040517800BE4F517C2044D
:1003A800C205C216800AAF3E1209CB8003120BDCCD
:1003B800300D19200916AF14120B820514E514D359
:1003C8009404400375140175161E8005E4FF120B92
:1003D80082300C19200816AF13120BA40513E5136D
:1003E800D39404400375130175161E8005E4FF12AB
:1003F8000BA4300C18200815300D1220090FE51435
:0D0408006513600675130175140175162348
:0104150022C4
:1007AA00301338C213200D33200C30200003300ED2
:1007BA0027E4F5B5E518C39403500D051875FE6ACC
:1007CA0043FF8043B70C8010C200C20EE4F51875CF
:1007DA00FE6A53FF7F53B7F375161430101BC2100D
:1007EA00120AC2120A2A120B4F781EA60608A60778
:1007FA001208E61206541206FF30124DC2121202F5
:10080A0098E51DD394004009151D301A3CC21A8080
:10081A0035120BC6EF602F75FE2443FF3CC2ABC2F4
:10082A00B9C2A975FE2953FF7F75FE0653FFC0752D
:10083A00FE8053FFCF43870275FE8043FF30D2B953
:0A084A00D2A9D2AB8000751D0A226E
:1005F900C10DC10CC105C104C109C108011B02011A
:100609001C02C10FC101C10EC100C102C103C10A4F
:06061900C106C10BC10780
:10065400E5E830E20F75E80453B7EF43B710C20C76
:10066400751B02222017030206F2E51B1460111405
:100674006064240260030206FE43B710751B012266
:10068400E5E354246424701D300606C206D208D261
:100694000A0519E519C394284060E4F51953B7EF26
:1006A400D20FD20E22E5E3542464207019F51930D8
:1006B4000A06C20AC208F517D206300F03C20C227A
:1006C400200237D20C22E5E35424702E751B02C29B
:1006D40004C206C20F2253B7EFE4F519C20CE5E3D6
:1006E40030E517E4F51BC20275B501D20422751B6F
:0A06F40002C204D202C20C53B7EF99
:0106FE0022D9
:1006FF00E5E830E30F75E80853B7DF43B720C20DC5
:10070F00751C022220170302079DE51C14601114AB
:10071F006064240260030207A943B720751C0122FD
:10072F00E5E354886488701D300706C207D209D2EA
:10073F000B051AE51AC394284060E4F51A53B7DF86
:10074F00D201D20022E5E3548864807019F51A3083
:10075F000B06C20BC209F517D207300103C20D22D7
:10076F00200337D20D22E5E35488702E751C02F555
:10077F001AC207C2012253B7DFE4F51AC20DE5E32F
:10078F0030E717E4F51CC20375B501D20522751CBD
:0A079F0002C205D203C20D53B7DFFA
:0107A900222D
:10061F0001CC00C11C01CB23163F0C800D7A0DB607
:10062F000DF70E2E0E740EC90F230FA010041068B5
:1008E600E4FFEF25E0243FF8E6FC08E6FDC3781FA9
:1008F600E69D18E69C40040FBF0BE778CCE6FEEFBA
:10090600D39E40041806800378CB1678CBE6FED338
:10091600943C5006EEC3940A503478CCA607301B9C
:1009260029C21BC3781FE6954218E695415006E496
:1009360078CCF6800478CCA60778CCE675F00AA4C5
:10094600F53EFF1209CBD216D21478CB762378CC9B
:10095600E6FFD394005003D21C22EFD39401400249
:02096600C21CB1
:01096800226C
:10063F00015600015500015700015800C113C111A7
:04064F00C110C11203
:03000B00020A7670
:100A7600C0E0C0D074FC258CF58C7466258AF58A96
:100A86000558E558C3940A4005755800D213055514
:100A9600E555C394644005755500D2100556E556D4
:100AA600C394FA4012755600D2110557E5579404BF
:0C0AB6004005755700D212D0D0D0E032BD
:03001B0002001EC2
:10001E00C0E0C0F0C083C082C0D075D008C28F15BA
:10002E008D158D7433258BF58B12004ED0D0D0826A
:07003E00D083D0F0D0E032C6
:030BFD00010106ED
:1008660002000EE493A3F8E493A34003F68001F29A
:1008760008DFF48029E493A3F85407240CC8C33393
:10088600C4540F4420C8834004F456800146F6DF62
:10089600E4800B0102040810204080900537E47EB6
:1008A600019360BCA3FF543F30E509541FFEE49357
:1008B600A360010ECF54C025E060A840B8E493A31E
:1008C600FAE493A3F8E493A3C8C582C8CAC583CA49
:1008D600F0A3C8C582C8CAC583CADFE9DEE780BE01
:0106530000A6
:1004160075F008758200EF2FFFEE33FECD33CDCC9D
:1004260033CCC58233C5829BED9AEC99E582984020
:100436000CF582EE9BFEED9AFDEC99FC0FD5F0D6FD
:10044600E4CEFBE4CDFAE4CCF9A88222B800C1B927
:100456000059BA002DEC8BF084CFCECDFCE5F0CB65
:10046600F97818EF2FFFEE33FEED33FDEC33FCEB9E
:1004760033FB10D703994004EB99FB0FD8E5E4F959
:10048600FA227818EF2FFFEE33FEED33FDEC33FC46
:10049600C933C910D7059BE99A4007EC9BFCE99A3A
:1004A600F90FD8E0E4C9FAE4CCFB2275F010EF2F7F
:1004B600FFEE33FEED33FDCC33CCC833C810D7077F
:1004C6009BEC9AE899400AED9BFDEC9AFCE899F8BA
:0E04D6000FD5F0DAE4CDFBE4CCFAE4C8F9224D
:1004E400D083D082F8E4937012740193700DA3A3A7
:1004F40093F8740193F5828883E4737402936860BB
:06050400EFA3A3A380DFBA
:10050A00EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D7E
:10051A00FDE43CFCE8A42EC8C5F03DFDE43CFCEF3C
:0D052A00A4FFE5F028FEE43DFDE43CFC22CA
:00000001FF

File diff suppressed because one or more lines are too long

View File

@ -1,9 +1,2 @@
---- BatLev_Update_Uint_Tim Matches (8 in 1 files) ----
userapp.c (UsrSrc\userapp) line 102 : uint8_t BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG;
LED_188Display_App in userapp.c (UsrSrc\userapp) : if( BatLev_Update_Uint_Cnt > BatLev_Update_Uint_Tim )
LED_188Display_App in userapp.c (UsrSrc\userapp) : BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_CHG0;
LED_188Display_App in userapp.c (UsrSrc\userapp) : BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_CHG1; //充电35s更新一次电量个位数
LED_188Display_App in userapp.c (UsrSrc\userapp) : BatLev_Update_Uint_Tim = 50;
LED_188Display_App in userapp.c (UsrSrc\userapp) : BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG; //放电180s更新一次电量个位数
LED_188Display_App in userapp.c (UsrSrc\userapp) : BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_CHG1; //2只耳机输出充电
UserAPP in userapp.c (UsrSrc\userapp) : BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_CHG0; //无输出充电
---- Vol_GetOut_Box_Flag1 Matches (1 in 1 files) ----
vox_module.c (UsrSrc\vox) line 37 : bit Vol_GetOut_Box_Flag1 = 0;

View File

@ -28,7 +28,7 @@
#define FW_VER0 0x01 //程序版本0:代表在硬件存在改动不能兼容之前版本时加1
#define FW_VER1 0x01 //程序版本1:代表在功能存在改动时加1
#define FW_VER2 0x04 //程序版本2:代表在软件调试出现不同的测试版本时改动时加1
#define FW_VER2 0x06 //程序版本2:代表在软件调试出现不同的测试版本时改动时加1
/******************************************************************************\
Variables definitions

View File

@ -78,11 +78,11 @@ uint16_t ADC_Chn_Data(ADC_CHANNELS_E adc_chn)
#ifdef _DEBUG_ADC
printf("adc4:%d,plus:%d.\r\n",(uint16_t)adc_data,(uint16_t)adc_plus_data);
#endif
// adc_data = 0;
}
adc_data = adc_plus_data >> 3;
// adc_data = adc_plus_data >> 3 - (char)(ADC_OFFSET);
adc_data = adc_plus_data >> 3;
#ifdef _DEBUG_ADC
printf("adc_chn1:%d.\r\n",(uint16_t)adc_data);
#endif
@ -91,7 +91,7 @@ uint16_t ADC_Chn_Data(ADC_CHANNELS_E adc_chn)
printf("Adc,Vadc:%d,Vref:%d.\r\n", (uint16_t)adc_data, (uint16_t)adc_plus_data);
#endif
return adc_data;
return adc_data ;
}
/*

View File

@ -30,7 +30,7 @@ idata uint8_t bat_level = 0;
#if BAT_VALUE
#define C_offset_bat_level_MAX 90
#define C_offset_bat_level_MAX 60
#define C_offset_bat_level_MIN 10
#define C_bat_level_protect 0
@ -41,54 +41,44 @@ bit F_batlevel_protect = 0; //
idata uint8_t offset_bat_level = ( C_offset_bat_level_MAX + C_offset_bat_level_MIN ) / 2;
#define C_batLevel_SetMax 10
#define C_batLevel_SetMax 11
/*充电电池电压会浮高,具体电压需要测试。*/
const uint16_t Boost_batlevel_Threshold[C_batLevel_SetMax] =
{
#if 0
3200, //1
3550, //2
3580, //3
3620, //4
3670, //5
3720, //6
3800, //7
3950, //8
4050, //9
4200 //10
#if 1
/*实际测试电压会有偏差原因adc误差在50mV左右。*/
3200, //0
//3300, //5%
3450, //10%
3510, //20%
3575, //30%
3630, //40%
3700, //50%
3785, //60%
3875, //70%
4000, //80%
4100, //90%
4200 //100%
#else
3200, //1
3450, //2
3510, //3
3554, //4
3590, //5
3690, //6
3775, //7
3875, //8
4000, //9
4200 //10
/*实际测试电压会有偏差原因adc误差在50mV左右。*/
3200, //0
//3300, //5%
3450, //10%
3510, //20%
3554, //30%
3590, //40%
3690, //50%
3775, //60%
3875, //70%
4000, //80%
4100, //90%
4200 //100%
#endif
};
#if 0
const uint16_t Charger_batlevel_Threshold[C_batLevel_SetMax] =
{
3400, //1
3650, //2
3705, //3
3745, //4
3785, //5
3853, //6
3945, //7
4075, //8
4150, //9
4200 //10
};
#endif
void check_bat_level(void)
{
uint8_t i = 0;
@ -98,21 +88,9 @@ void check_bat_level(void)
for(i=0; i < C_batLevel_SetMax; i++)
{
#if 0
if(CHIP_STA4 & 0x80)
if( Vbat_Adc < Boost_batlevel_Threshold[i] )
{
if( Vbat_Adc < Charger_batlevel_Threshold[i] )
{
break;
}
}
else
#endif
{
if( Vbat_Adc < Boost_batlevel_Threshold[i] )
{
break;
}
break;
}
}
@ -158,7 +136,7 @@ void check_bat_level(void)
Init_LED_Disp_Flag = 1;
Enter_Sleep_Cnt_Restart_Flag = 1;
// Enter_Sleep_Cnt_Restart_Flag = 1;
#endif
}

View File

@ -50,14 +50,15 @@
#define BATLEV_UPDATE_UINT_TIM_CHG2 35 //80mA输出充电时间。
#define BATLEV_UPDATE_UINT_TIM_DISCHG0 60 //80mA放电时间
#define BATLEV_UPDATE_UINT_TIM_DISCHG0 80 //慢放电时间
#define BATLEV_UPDATE_UINT_TIM_DISCHG1 80 //40mA放电时间
#define BATLEV_UPDATE_UINT_TIM_DISCHG1 10 //放电快追时间
#define BATLEV_UPDATE_UINT_TIM_DISCHG2 50 //电量小于10%时的放电时间
#endif
#define VOX_RST_CNT 3
#define VOX_RST_CNT 3 //Vox软复位debounce时间
/******************************************************************************\
Variables definitions
@ -109,7 +110,7 @@ bit Init_LED_Disp_Flag = 0;
uint8_t BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG0;
uint8_t BatLev_Update_Uint_CHG_Tim = 0;
uint8_t BatLev_Update_Uint_DisCHG_Tim = 0;
//uint8_t BatLev_Update_Uint_DisCHG_Tim = 0;
void LED_188Display_App(void)
@ -117,21 +118,12 @@ void LED_188Display_App(void)
uint8_t i = 0;
static uint8_t BatLev_Update_Uint_Cnt;
if (bat_level_update != bat_level) //电量发生变化,不能立刻变化,需要缓慢变化
if (bat_level_update != bat_level) //电量发生变化,不能立刻变化,需要缓慢变化
{
#if 0
if( !Init_LED_Disp_Flag )
{
Init_LED_Disp_Flag = 1;
g_188_Num = bat_level * 10;
}
else
#endif
{
bat_level_Disp_Num = 10 * bat_level;
}
bat_level_Disp_Num = 10 * bat_level;
bat_level_update = bat_level;
}
else
{
@ -141,7 +133,7 @@ void LED_188Display_App(void)
{
BatLev_Update_Uint_Cnt = 0;
if ( CHIP_STA4 & 0x80 ) //充电中
if ( CHIP_STA4 & 0x80 ) //充电中
{
if( g_188_Num < (bat_level_Disp_Num + 9) )
{
@ -154,13 +146,46 @@ void LED_188Display_App(void)
{
if( ( Vor_Vout_Enable == ON ) || ( Vol_Vout_Enable == ON ) ) //有耳机充电,电量才减
{
if ( bat_level_Disp_Num <= 10 )
{
if( g_188_Num > 10 )
{
BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG1;
}
else
{
BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG2; /* 2、当显示的电量小于10%则60s变化一次。*/
}
}
else
{
if( g_188_Num > bat_level_Disp_Num )
{
if( g_188_Num > (bat_level_Disp_Num - 10) )
/* 1、当188数码管显示的电量比实际电量大则数字快速变化。 */
if( ( g_188_Num - bat_level_Disp_Num ) > 5 )
{
BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG1;
}
else
{
BatLev_Update_Uint_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG0; /*3、当显示电量和实际电量差不多时则60s更新一次电量个位数 */
}
}
}
if( g_188_Num > 0 )
{
g_188_Num -= 1;
}
BatLev_Update_Uint_Tim = BatLev_Update_Uint_DisCHG_Tim; //放电60s更新一次电量个位数
/*电量计数到0但未出现低电告警则电量显示1%.*/
if( (g_188_Num == 0) && !F_batlevel_protect )
{
g_188_Num = 1;
}
}
}
@ -169,6 +194,14 @@ void LED_188Display_App(void)
g_188_Num = 100;
}
}
/*非充电条件下出现电池低电报警则电量显示0%*/
if( F_batlevel_protect && !( CHIP_STA4 & 0x80 ) )
{
g_188_Num = 0;
}
}
#ifdef NTC_ENABLE
@ -291,7 +324,7 @@ void LED_188Display_App(void)
Disp_Vor_Lev = 1;
}
/*1只耳机放电设置充放电时间*/
BatLev_Update_Uint_DisCHG_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG1;
// BatLev_Update_Uint_DisCHG_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG1;
BatLev_Update_Uint_CHG_Tim = BATLEV_UPDATE_UINT_TIM_CHG1;
}
else
@ -308,7 +341,7 @@ void LED_188Display_App(void)
Disp_Vol_Lev = 1;
}
/*1只耳机放电设置充放电时间*/
BatLev_Update_Uint_DisCHG_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG1;
// BatLev_Update_Uint_DisCHG_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG1;
BatLev_Update_Uint_CHG_Tim = BATLEV_UPDATE_UINT_TIM_CHG1;
}
else
@ -324,7 +357,7 @@ void LED_188Display_App(void)
Disp_Vor_Lev = 1;
}
/*2只耳机同时放电设置充放电时间*/
BatLev_Update_Uint_DisCHG_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG0;
// BatLev_Update_Uint_DisCHG_Tim = BATLEV_UPDATE_UINT_TIM_DISCHG0;
BatLev_Update_Uint_CHG_Tim = BATLEV_UPDATE_UINT_TIM_CHG2;
}
#endif

View File

@ -33,8 +33,8 @@ bit Vol_GetInto_Box_Flag = 0;
bit Vor_GetOut_Box_Flag = 0; //耳机出盒标志位
bit Vol_GetOut_Box_Flag = 0;
bit Vor_GetOut_Box_Flag1 = 0; //耳机出盒标志位
bit Vol_GetOut_Box_Flag1 = 0;
//bit Vor_GetOut_Box_Flag1 = 0; //耳机出盒标志位
//bit Vol_GetOut_Box_Flag1 = 0;
#if VOX_ENABLE
@ -100,10 +100,10 @@ void Vol_Det_Machine(void)
/*Vol 过流保护每隔200ms打嗝一次*/
if( IRQ_FLAG0 & 0x04 )
{
Vol_Output_Debounce++;
if( Vol_Output_Debounce >= 2 ) //Vor短路保护200ms后重新开启ADT
// Vol_Output_Debounce++;
// if( Vol_Output_Debounce >= 2 ) //Vor短路保护200ms后重新开启ADT
{
Vol_Output_Debounce = 0;
// Vol_Output_Debounce = 0;
IRQ_FLAG0 = 0x04;
@ -276,10 +276,10 @@ void Vor_Det_Machine(void)
/*Vor 过流保护(读中断标志位)每隔200ms打嗝一次*/
if( IRQ_FLAG0 & 0x08 )
{
Vor_Output_Debounce++;
if( Vor_Output_Debounce >= 2 ) //Vor短路保护200ms后重新开启ADT
// Vor_Output_Debounce++;
// if( Vor_Output_Debounce >= 2 ) //Vor短路保护200ms后重新开启ADT
{
Vor_Output_Debounce = 0;
// Vor_Output_Debounce = 0;
IRQ_FLAG0 = 0x08;