diff --git a/Out/8834_JLAB_JS07_241213_1528.bin b/Out/8834_JLAB_JS07_241213_1528.bin deleted file mode 100644 index 631dfdc..0000000 Binary files a/Out/8834_JLAB_JS07_241213_1528.bin and /dev/null differ diff --git a/Out/8834_JLAB_JS07_241213_1528.hex b/Out/8834_JLAB_JS07_241213_1528.hex deleted file mode 100644 index ec627af..0000000 --- a/Out/8834_JLAB_JS07_241213_1528.hex +++ /dev/null @@ -1,208 +0,0 @@ -:0300000002059F57 -:10059F00758E3075D20078FFE4F6D8FD758155025F -:0205AF0005EC59 -:0C000E001208C0D2AED2BE12044580F72A -:08063100021700000215013759 -:0C003D00AE15AF16AB07AA06E4F9F822D6 -:02086000AD07E2 -:10086200E4FCFBFAF51DF51E75FE2975FF8BBD062E -:100872001775FE0143FF8075A541E5A520E0FB75D4 -:10088200A56175FE0153FF7FE4FCEDC454F0440101 -:10089200F5A5E5A520E0FBAFA1AB07AFA2EFFEEE09 -:1008A200FAEB251EF51EEA351DF51D0CBC08DBE52D -:0D08B2001EAE1D7803CEC313CE13D8F9FF80 -:0108BF002216 -:100A4300E4FE7F051208607C077DD0120334C006E4 -:0C0A5300C00712003DD007D0060202A22E -:100A5F00E4FE7F041208607C037DE8120334C006B5 -:0C0A6F00C00712003DD007D0060202A212 -:04063900C120C121FA -:10072F00E4FFFEF51C120A5FC3EF94D0EE9407406E -:10073F00037F0022D3EF942EEE94065030EF9412E5 -:10074F00EE94024028301E12EF9406EE94065007E6 -:10075F00C21EE4F51C8003751C01301F2BD3EF94D0 -:10076F0033EE9402401FC21FE4F51C801BD3EF949D -:10077F002EEE94064004D21E800BC3EF9412EE941B -:0A078F00025002D21F751C01AF1CBE -:01079900223D -:1007FF00E5E620E70953B3FE75F210C22022E5F2B9 -:10080F00540C601053B3FEE5F354C0604375F20C03 -:10081F0075F3C02275F3C030210453B3FE22E5F205 -:10082F0030E416C3E51894D2E517940F500575F20E -:10083F0010800353B3FED2202243B311E534D39477 -:10084F00014002C22AE534D394034002C229C220D8 -:01085F002276 -:04063D00C125C126EC -:10097400E5E530E103C22522E5E230E705C225D2F0 -:100984002622302A02802FE5E830E009C22575E8E6 -:100994000175B50122302106C225E4F5B522D22520 -:1009A400302618E5E630E713C3E5189410E51794EC -:0C09B4000E4003C22622E4F5B5C2252245 -:07064100014CFFC127C12895 -:10001E00E5E25408FF654C6015E5E230E305754BEB -:0E002E00018003E4F54BD227D228D21D8F4C5F -:01003C0022A1 -:06064800C116C117C11527 -:1006B500E5E220E12D054DE54DC3941E40102012C5 -:1006C5001DD212D211300F16D215D21D8010E54D54 -:1006D500C3940F4009201306D21CD217D213D2148B -:1006E5008019301413C214C212C213C217E54DC3C8 -:1006F50094055004D216D21DE4F54D30112BE54E6C -:10070500C394125015E54E5403700C300F09D22BCB -:10071500F513751405D22C054E22C211754E01E54F -:090725004BB401057F01120A7BAF -:01072E0022A8 -:10091E007851E6604D7853E6FFD318965004D28492 -:10092E008002C284EFC394AA4018E47853F6785537 -:10093E00E660067852161680097854E660047852FE -:10094E0006067852E6FF74AAD39F500978557601B1 -:10095E00E418F6800DEFD39401500778547601E435 -:06096E0008F67853062292 -:05064E00011F0CC12D8D -:100AA800E5E220E006201003302D04C22DC322D336 -:010AB800221B -:1008C00075FE8043FF3075FE0153FFFCD28175FE3B -:1008D0000643FF1AD21D75B7C375FE6A75FF04750E -:1008E000FE6C43FF0A758901758CFC758A66D2A976 -:1008F000D28C438910758DFF758BA4D2ABD28E75C7 -:10090000868075FE0F43FF8075FE4F75FF1075FEE4 -:0E0910001775FF3CD2A8D2B9D2AF75B1042240 -:03000300020006F2 -:0100060032C7 -:03004B00020ACDD9 -:060ACD0075EB3CD22D3256 -:04065300C11DC11CE8 -:090AC400E54F75F00584E5F02210 -:0B0AB900E47851F6C283C284D22D22E3 -:10036100202106300A27200E24201808D218E4F58F -:100371004F020AB9E54FC39467500D054F120AC4E5 -:100381006003020444B28322C283D20E22301811C8 -:10039100C218120AB9C219C21BC20BC228D21DD27D -:1003A1001CE5E630E72830200C201B05D21B120A81 -:1003B100B9D2848010201909D219C21B120AB9803E -:1003C1000478517601C216C215C228C21D22301905 -:1003D10008C219C21BD21DD21C301D08E4F54FC240 -:1003E1001D120AB9302A07201A59D21A804B200B44 -:1003F10009201606201503302849C21A3015057543 -:10040100502B8003755023E54FC394055003054FCE -:1004110022E54FC395505021054F30150A120AC4E9 -:100421007021B284C2832230290A120AC47014B224 -:1004310083C28422D284C28322C216C215C228C2B8 -:030441000BD21DBE -:010444002295 -:10044500302305C2231204F230222FC22212001ECD -:100455001209741207FF1206B5120A438E178F1878 -:1004650012072FEF24FF92217F061208608E158F49 -:100475001612004E12079A12036130246FC224E54A -:100485001FD394004009151F302D61C22D805A12CB -:100495000AA85055E5E220E703300E0875FE2453FF -:1004A500FFC3800675FE2443FF3CC2ABC2B9C2A997 -:1004B5007F01120A7B75FE2953FF7F75FE8053FF6E -:1004C500CF43870275FE8043FF30D2B9D2A9D2ABA4 -:1004D500300E14D28175FE0643FF0275B7C3D227CD -:0D04E50075E80CC20AC20E8000751F0C22C3 -:10065700C110C10BC10AC10FC10D010E00C10CC1F0 -:010667000E84 -:100A7B00E4F5B5EF24FF928175FE0653FFFB43FFB0 -:080A8B0002BF010353B7CF22A3 -:100A930075FE0643FF0453FFFDC28275B501BF0116 -:050AA3000343B73022FF -:10004E0020250302025730273DE5B5700302017BE0 -:10005E0043B730E4F50DF509F50AF50BF50CC200C2 -:10006E00C20FC20AC20EE54B7014C20BD201D205EA -:10007E00D206D210C202C209C208C20D8006C20147 -:10008E00D202C204C22720020302012AE509C39448 -:10009E00025003050922301C13E5B5700302017BE3 -:1000AE00C200E4F50BF50C43B730C21C20003DE551 -:1000BE000DC39412501FE50D54037015E5E354A0C3 -:1000CE00FFBFA00DD22BC22CE53344C4751300F52F -:1000DE0014050D8047E50BC394035003050B22D284 -:1000EE00007F01120A7BD203C2108030300315C28A -:1000FE0003E4F50BE5E354ACFFBFA004D20F80166A -:10010E00C20F8012E5E354A065086010E5E354A029 -:10011E006004D20BD21DE5E354A0F50820010302C2 -:10012E000254301C18E5B5700FFF120A93C205C2B7 -:10013E0000F50AF509C2082243B730C21CE50AC30E -:10014E00940A5003050A222005097F01120A7BD268 -:10015E00058013200010E5E354ACFFBFA004D20FBE -:10016E008002C20FD20020060DE5B57004FF020A10 -:10017E009343B730D206E5E8540C6025200E1D05DA -:10018E000DE50DC394055003020265E4F50D75E807 -:10019E000C53B7CF43B730D20AC210227F01020AE6 -:1001AE007BC20AC20E300903020236200D19750EEB -:1001BE0003C20C75FE6A43FF2075FE6C53FF3F436E -:1001CE00FF80D20D020254E509C3940A50030509BB -:1001DE0022E4F509E5E3540C6025050ED20CC3E5C7 -:1001EE000E648094824029750E02C20DD20975FEEE -:1001FE006A53FFDF75FE6C53FF3F43FF40801120B3 -:10020E000C0E150ED3E50E648094805003E4F50EAB -:10021E0075FE8F75FF6975FE7853FFFCE50E42FF84 -:10022E0075FE8F75FF01801E20081BE5E354ACFFA1 -:10023E00BFAC13E509C394325003050922D208C29C -:10024E00107F01120A7BC2072220070BD207C210B1 -:07025E007F01120A7BD21C94 -:010265002276 -:10066800013400013300C129C12A01326416350C56 -:10067800800DAC0E100E740ED80F3C0F6E0FA0102C -:1006880004103610680B270A181A202228292A3045 -:020698003132FD -:10079A00E4FFEF25E02435F8E6FC08E6FDC3E5189A -:1007AA009DE5179C40040FBF0BE8E5E16005E4F501 -:1007BA00E18F34EFD395344004053280021532E5D7 -:1007CA0032D394BE5007E532C3940A50158F34E5EC -:1007DA00266534600A74272FF8E6F53385342675C2 -:1007EA003264E534D394005002D22AE534D394011A -:0407FA005002D229AE -:0107FE0022D8 -:0F069A00011A00011900011B00C123C122C12454 -:03000B00020A05E1 -:100A0500C0E0C0D074FC258CF58C7466258AF58A07 -:100A1500D2230519E519C394644005751900D2223E -:100A2500051AE51AC394FA4010751A00051BE51B53 -:0E0A350094044005751B00D224D0D0D0E032CE -:03001B000209C017 -:1009C000C0E0C0F0C083C082C0D075D000C000C0FD -:1009D00001C002C003C004C005C006C007C28F1515 -:1009E0008D74A4258BF58B12091ED007D006D00577 -:1009F000D004D003D002D001D000D0D0D082D08398 -:050A0000D0F0D0E0324F -:030BFD00010103F0 -:0B06A900C12B01120002130000C12C45 -:1004F200202B0302059E0511E512702EE511D394FF -:100502003750028015E511D3944B50077F01120A30 -:10051200938017E511C3945F5007E4FF120A7B80B2 -:1005220009751201302C03750F04E512B4012B1565 -:100532000FE50FD394074008750F08751203800367 -:10054200751202E514AE13A80F088005CEC313CEB0 -:1005520013D8F95401F510E4F511E512B40211E5CE -:1005620011C394145006E510601F80117512012208 -:10057200E51264037026E511C3941450057F01024D -:100582000A93E511C394285005E4FF020A7B7F0118 -:0C059200120A93E4F511C22BC22CF512E2 -:01059E00223A -:1005B10002000EE493A3F8E493A34003F68001F252 -:1005C10008DFF48029E493A3F85407240CC8C3334B -:1005D100C4540F4420C8834004F456800146F6DF1A -:1005E100E4800B0102040810204080900631E47E73 -:1005F100019360BCA3FF543F30E509541FFEE4930F -:10060100A360010ECF54C025E060A840B8E493A3D5 -:10061100FAE493A3F8E493A3C8C582C8CAC583CA00 -:10062100F0A3C8C582C8CAC583CADFE9DEE780BEB8 -:0106B4000045 -:1002660075F008758200EF2FFFEE33FECD33CDCC4F -:1002760033CCC58233C5829BED9AEC99E5829840D2 -:100286000CF582EE9BFEED9AFDEC99FC0FD5F0D6AF -:10029600E4CEFBE4CDFAE4CCF9A88222B800C1B9D9 -:1002A6000059BA002DEC8BF084CFCECDFCE5F0CB17 -:1002B600F97818EF2FFFEE33FEED33FDEC33FCEB50 -:1002C60033FB10D703994004EB99FB0FD8E5E4F90B -:1002D600FA227818EF2FFFEE33FEED33FDEC33FCF8 -:1002E600C933C910D7059BE99A4007EC9BFCE99AEC -:1002F600F90FD8E0E4C9FAE4CCFB2275F010EF2F31 -:10030600FFEE33FEED33FDCC33CCC833C810D70730 -:100316009BEC9AE899400AED9BFDEC9AFCE899F86B -:0E0326000FD5F0DAE4CDFBE4CCFAE4C8F922FE -:10033400EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02D56 -:10034400FDE43CFCE8A42EC8C5F03DFDE43CFCEF14 -:0D035400A4FFE5F028FEE43DFDE43CFC22A2 -:00000001FF diff --git a/Out/8834_JLAB_JS07_241213_1528_720E_010103.bin b/Out/8834_JLAB_JS07_241213_1528_720E_010103.bin deleted file mode 100644 index 064c1e3..0000000 Binary files a/Out/8834_JLAB_JS07_241213_1528_720E_010103.bin and /dev/null differ diff --git a/Out/8834_JLAB_JS07_241217_1521.bin b/Out/8834_JLAB_JS07_241217_1521.bin new file mode 100644 index 0000000..a6e2d44 Binary files /dev/null and b/Out/8834_JLAB_JS07_241217_1521.bin differ diff --git a/Out/8834_JLAB_JS07_241217_1521.hex b/Out/8834_JLAB_JS07_241217_1521.hex new file mode 100644 index 0000000..971a6c6 --- /dev/null +++ b/Out/8834_JLAB_JS07_241217_1521.hex @@ -0,0 +1,219 @@ +:0300000002062EC7 +:10062E00758E3075D20078FFE4F6D8FD75815802CC +:02063E00067B39 +:0C000E00120953D2AED2BE12058180F759 +:0806C0000219000002170137C6 +:0C003F00AE17AF18AB07AA06E4F9F822D0 +:0208F300AD074F +:1008F500E4FCFBFAF54DF54E75FE2975FF8BBD063B +:100905001775FE0143FF8075A541E5A520E0FB7540 +:10091500A56175FE0153FF7FE4FCEDC454F044016D +:10092500F5A5E5A520E0FBAFA1AB07AFA2EFFEEE75 +:10093500FAEB254EF54EEA354DF54D0CBC08DBE5D9 +:0D0945004EAE4D7803CEC313CE13D8F9FF8C +:010952002282 +:100AF400E4FE7F051208F37C077DD01203A7C0062D +:0C0B0400C00712003FD007D00602031506 +:100B1000E4FE7F041208F37C037DE81203A7C006FD +:0C0B2000C00712003FD007D006020315EA +:0406C800C123C12465 +:1007C200E4FFFEF54C120B10C3EF94D0EE940740F9 +:1007D200037F0022D3EF942EEE94065030EF941252 +:1007E200EE94024028302112EF9406EE9406500750 +:1007F200C221E4F54C8003754C0130222BD3EF94D7 +:1008020033EE9402401FC222E4F54C801BD3EF94D6 +:100812002EEE94064004D221800BC3EF9412EE9484 +:0A082200025002D222754C01AF4CC7 +:01082C0022A9 +:10089200E5E620E70953B3FE75F210C22322E5F222 +:1008A200540C601053B3FEE5F354C0604375F20C70 +:1008B20075F3C02275F3C030240453B3FE22E5F26F +:1008C20030E416C3E51A94D2E519940F500575F277 +:1008D20010800353B3FED2232243B311E535D394E0 +:1008E200014002C230E535D394034002C22FC22335 +:0108F20022E3 +:0406CC00C12BC12C51 +:100A0700E5E530E103C22B22E5E230E705C22BD250 +:100A17002C22303002802FE5E830E009C22B75E840 +:100A27000175B50122302406C22BE4F5B522D22B7D +:100A3700302C18E5E630E713C3E51A9410E519944E +:0C0A47000E4003C22C22E4F5B5C22B22A5 +:0706D000011FFFC12DC12E27 +:10001E00E5E25408FF651F6017E5E230E305751E43 +:10002E00018003E4F51ED22DD22ED211D2208F1FC5 +:01003E00229F +:0606D700C119C11AC1188F +:10074800E5E220E12D054FE54FC3941E401020152A +:100758001DD215D214301216D218D2208010E54FAF +:10076800C3940F4009201606D21FD21AD216D217E8 +:100778008019301713C217C215C216C21AE54FC323 +:1007880094055004D219D220E4F54F30142BE550CB +:10079800C394125015E5505403700C301209D22935 +:1007A800F515751605D22A055022C214755001E5B3 +:0907B8001EB401057F01120ADCE8 +:0107C1002215 +:1009B1007854E6604D7856E6FFD318965004D284F9 +:1009C1008002C284EFC394AA4018E47856F678589E +:1009D100E660067855161680097857E66004785562 +:1009E10006067855E6FF74AAD39F50097858760118 +:1009F100E418F6800DEFD39401500778577601E49F +:060A010008F678560622FB +:0506DD0001530CC131C6 +:100B4100E5E220E006201303303104C231C322D391 +:010B51002281 +:1009530075FE8043FF3075FE0153FFFCD28175FEA7 +:100963000643FF1AD22075B7C375FE6A75FF047577 +:10097300FE6C43FF0A758901758CFC758A66D2A9E2 +:10098300D28C438910758DFF758BA4D2ABD28E7533 +:10099300868075FE0F43FF8075FE4F75FF1075FE51 +:0E09A3001775FF3CD2A8D2B9D2AF75B10422AD +:03000300020006F2 +:0100060032C7 +:03004B00020B7035 +:060B700075EB3CD23132AE +:0406E200C120C11F53 +:090B6700E55175F00584E5F0226A +:0B0B5200E47854F6C283C284D2312242 +:1003D400202406300C27201024201B08D21BE4F50F +:1003E40051020B52E551C39467500D0551120B672E +:1003F40060030204B7B28322C283D21022301B11DD +:10040400C21B120B52C21CC21EC20DC22ED220D25B +:100414001FE5E630E72830230C201E05D21E120B00 +:1004240052D2848010201C09D21CC21E120B52808E +:100434000478547601C219C218C22EC22022301C7C +:1004440008C21CC21ED220D21F302008E4F551C2BB +:1004540020120B52303007201D59D21D804B200D25 +:1004640009201906201803302E49C21D30180575BD +:10047400522B8003755223E551C394055003055153 +:1004840022E551C395525021055130180A120B67C9 +:100494007021B284C28322302F0A120B677014B207 +:1004A40083C28422D284C28322C219C218C22EC239 +:0304B4000DD22046 +:0104B7002222 +:10058100302605C2261204B830252FC22512001EBE +:10059100120A07120892120748120AF48E198F1ACA +:1005A1001207C2EF24FF92247F061208F38E178FE1 +:1005B1001812004E12082D1203D430276FC227E5FE +:1005C10053D3940040091553303161C231805A121E +:1005D1000B415055E5E220E70330100875FE245326 +:1005E100FFC3800675FE2443FF3CC2ABC2B9C2A95A +:1005F1007F01120ADC75FE2953FF7F75FE8053FFD0 +:10060100CF43870275FE8043FF30D2B9D2A9D2AB66 +:10061100301014D28175FE0643FF0275B7C3D22D87 +:0D06210075E80CC20CC210800075530C224D +:1006E600C113C10DC10CC112C111C10F011000C14E +:0306F6000EC11022 +:0A0B5D00E4F50DF50EC209C20A22EC +:060AD600D208C2137F01EB +:100ADC00E4F5B5EF24FF928175FE0653FFFB43FF4F +:080AEC0002BF010353B7CF2242 +:100B2C0075FE0643FF0453FFFDC28275B501BF017C +:050B3C000343B7302265 +:10004E00202B030202CE302D5A30110CC2117F012B +:10005E00120ADCD200C21222300010C200E5E354B4 +:10006E00AC64A060030202D8D21222E5B57003027E +:10007E0001F843B730E4F50FF50BF50CC201C20CD5 +:10008E00C210C208E51E7012C20DD202D205D206EF +:10009E00D213C203C20BC20F8007C202D203120BCD +:1000AE005DC22D2003030201A9E50BC39402500388 +:1000BE00050B22301F15E5B570030201F8120B5D1A +:1000CE00C201F50FF50C43B730C21F300103020118 +:1000DE008AE50FC394125018E50F5403700DD22900 +:1000EE00C22AE53444C4751500F516050F0201A9A0 +:1000FE003008030201A920091AE5E35488648870C8 +:10010E0029E50DC394325004050D801E53B7DFD27E +:10011E00098011E5E354806509600FE5E330E704DB +:10012E00D20DD220E5E35480F509200A1AE5E354F6 +:10013E002464247029E50EC394325004050E801EEB +:10014E0053B7EFD20A8011E5E35420650A600FE53C +:10015E00E330E504D20DD220E5E35420F50A200960 +:10016E0003300A3730120C2009030202D8200A038A +:10017E000202D8D201120AD6D204801F300404C261 +:10018E00048012E5E354A065086010E5E354A06016 +:10019E0004D20DD220E5E354A0F50820020302029A +:1001AE00CB301F18E5B5700FFF120B2CC205C20124 +:1001BE00F50CF50BC2082243B730C21FE50CC394F1 +:1001CE000A5003050C2220011AE50FC39412500E9B +:1001DE00E50F54037004D229D228050F8005D201F1 +:1001EE00E4F50F20060DE5B57004FF020B2C43B7A6 +:1001FE0030D206E5E8540C602520101D050FE50FE2 +:10020E00C3940550030202D8E4F50F75E80C53B7FA +:10021E00CF43B730D20CC213227F01020ADCC20CCC +:10022E00C210300B030202B3200F19751003C20E59 +:10023E0075FE6A43FF2075FE6C53FF3F43FF80D26D +:10024E000F0202CBE50BC3940A5003050B22E4F513 +:10025E000BE5E3540C60250510D20EC3E510648047 +:10026E0094824029751002C20FD20B75FE6A53FF9D +:10027E00DF75FE6C53FF3F43FF408011200E0E15BD +:10028E0010D3E510648094805003E4F51075FE8F52 +:10029E0075FF6975FE7853FFFCE51042FF75FE8F02 +:1002AE0075FF018018200815E5E354ACFFBFAC0DB7 +:1002BE00E50BC394325003050B22120AD6C2072255 +:0A02CE00200707D207120AD8D21F3A +:0102D8002203 +:1006F900013500013400C12FC13001336416360CB5 +:10070900800DAC0E100E740ED80F3C0F6E0FA0109A +:1007190004103610680B280A181A202228292A30B2 +:0207290031326B +:10082D00E4FFEF25E02436F8E6FC08E6FDC3E51A03 +:10083D009DE5199C40040FBF0BE8E5E16005E4F56B +:10084D00E18F35EFD395354004053380021533E53F +:10085D0033D394BE5007E533C3940A50158F35E555 +:10086D00276535600A74282FF8E6F5348535277528 +:10087D003364E535D394005002D230E535D394017D +:04088D005002D22F14 +:010891002244 +:0F072B00011C00011B00011D00C126C125C127B3 +:03000B00020A984E +:100A9800C0E0C0D074FC258CF58C7466258AF58A74 +:100AA800D226051BE51BC394644005751B00D2259F +:100AB800051CE51CC394FA4010751C00051DE51DB6 +:0E0AC80094044005751D00D227D0D0D0E03236 +:03001B00020A5383 +:100A5300C0E0C0F0C083C082C0D075D000C000C069 +:100A630001C002C003C004C005C006C007C28F1581 +:100A73008D74A4258BF58B1209B1D007D006D00550 +:100A8300D004D003D002D001D000D0D0D082D08304 +:050A9300D0F0D0E032BC +:030BFD00010104EF +:0D073A00C12901140002150000C12AC128C8 +:1004B8002029030205800513E5147048E513D39439 +:1004C800375002802F302817E513D3945F500280ED +:1004D80015E513C394875002801A7514038025E527 +:1004E80013D3944B50077F01120B2C8017E513C3CD +:1004F800945F5007E4FF120ADC8009751401302A62 +:1005080003751104E514B4012B1511E511D39407F3 +:1005180040087511087514038003751402E516AEBA +:1005280015A811088005CEC313CE13D8F95401F5C8 +:1005380012E4F513E514B40211E513C3941450063C +:10054800E512601F801175140122E51464037028F8 +:10055800E513C3941450057F01020B2CE513C394D3 +:10056800285005E4FF020ADC7F01120B2CE4F51386 +:08057800C229C22AC228F514B1 +:010580002258 +:1006400002000EE493A3F8E493A34003F68001F2C2 +:1006500008DFF48029E493A3F85407240CC8C333BB +:10066000C4540F4420C8834004F456800146F6DF8A +:10067000E4800B01020408102040809006C0E47E54 +:10068000019360BCA3FF543F30E509541FFEE4937F +:10069000A360010ECF54C025E060A840B8E493A346 +:1006A000FAE493A3F8E493A3C8C582C8CAC583CA71 +:1006B000F0A3C8C582C8CAC583CADFE9DEE780BE29 +:0107470000B1 +:1002D90075F008758200EF2FFFEE33FECD33CDCCDC +:1002E90033CCC58233C5829BED9AEC99E58298405F +:1002F9000CF582EE9BFEED9AFDEC99FC0FD5F0D63C +:10030900E4CEFBE4CDFAE4CCF9A88222B800C1B965 +:100319000059BA002DEC8BF084CFCECDFCE5F0CBA3 +:10032900F97818EF2FFFEE33FEED33FDEC33FCEBDC +:1003390033FB10D703994004EB99FB0FD8E5E4F997 +:10034900FA227818EF2FFFEE33FEED33FDEC33FC84 +:10035900C933C910D7059BE99A4007EC9BFCE99A78 +:10036900F90FD8E0E4C9FAE4CCFB2275F010EF2FBD +:10037900FFEE33FEED33FDCC33CCC833C810D707BD +:100389009BEC9AE899400AED9BFDEC9AFCE899F8F8 +:0E0399000FD5F0DAE4CDFBE4CCFAE4C8F9228B +:1003A700EC8EF0A4CCC5F0CCCDF8EFA4CEC5F02DE3 +:1003B700FDE43CFCE8A42EC8C5F03DFDE43CFCEFA1 +:0D03C700A4FFE5F028FEE43DFDE43CFC222F +:00000001FF diff --git a/Out/8834_JLAB_JS07_241217_1521_CFB1_010104.bin b/Out/8834_JLAB_JS07_241217_1521_CFB1_010104.bin new file mode 100644 index 0000000..ec39fe6 Binary files /dev/null and b/Out/8834_JLAB_JS07_241217_1521_CFB1_010104.bin differ diff --git a/Project/TP3102_Demo.uvgui.GH b/Project/TP3102_Demo.uvgui.GH index 512c9e9..d1bc055 100644 --- a/Project/TP3102_Demo.uvgui.GH +++ b/Project/TP3102_Demo.uvgui.GH @@ -93,25 +93,25 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 -1 - 160 - 1853 - 3773 - 1122 + 86 + 1912 + 3832 + 1048 0 962 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000008000000070000000100000043453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000C5D4F200FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C736C6565705C736C6565702E630000000007736C6565702E6300000000FFDC7800FFFFFFFF52453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000BECEA100FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000F0A0A100FFFFFFFF49453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C496E6974566172732E63000000000A496E6974566172732E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000F7B88600FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000D2020000 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000008000000030000000100000043453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000C5D4F200FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C736C6565705C736C6565702E630000000007736C6565702E6300000000FFDC7800FFFFFFFF52453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000BECEA100FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000F0A0A100FFFFFFFF49453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C496E6974566172732E63000000000A496E6974566172732E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000F7B88600FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000D2020000 @@ -3603,11 +3603,11 @@ 0 100 - 7 + 3 ..\UsrSrc\key\key.c 0 - 156 + 154 183 1 @@ -3633,9 +3633,9 @@ ..\UsrSrc\vox\vox_module.c - 9 - 82 - 104 + 18 + 443 + 466 1 0 @@ -3660,7 +3660,7 @@ \todaywork\20240325_tp3310\SY883X_Demo-JLAB-JS07\UsrInc\inc\define.h - 83 + 92 1 29 1 @@ -3669,9 +3669,9 @@ ..\UsrSrc\hall\hall.c - 25 + 2 56 - 82 + 79 1 0 diff --git a/TP3310_Demo.si4project/TP3310_Demo.SearchResults b/TP3310_Demo.si4project/TP3310_Demo.SearchResults index 9a8923d..c6419a5 100644 --- a/TP3310_Demo.si4project/TP3310_Demo.SearchResults +++ b/TP3310_Demo.si4project/TP3310_Demo.SearchResults @@ -1,7 +1,6 @@ ----- F_batlevel_low Matches (6 in 4 files) ---- -bat.c (UsrSrc\bat) line 33 : bit F_batlevel_low = 0; //电池低压 -check_bat_level in bat.c (UsrSrc\bat) : F_batlevel_low = 1; -check_bat_level in bat.c (UsrSrc\bat) : F_batlevel_low = 0; -bat.h (UsrInc\bat) line 33 : extern bit F_batlevel_low; //电池低压 -Charger_Handler in charger_module.c (UsrSrc\charger) : F_batlevel_low = 0; -LED_Display_App in userapp.c (UsrSrc\userapp) : if( F_batlevel_low ) +---- Get_CHIP_STA1_Flag1 Matches (5 in 1 files) ---- +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : static bit Get_CHIP_STA1_Flag1; +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Get_CHIP_STA1_Flag1 = 0; +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Get_CHIP_STA1_Flag1 = 0; +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : if( !Get_CHIP_STA1_Flag1 ) +Vox_Det_Machine in vox_module.c (UsrSrc\vox) : Get_CHIP_STA1_Flag1 = 1; diff --git a/TP3310_Demo.si4project/TP3310_Demo.sip_sym b/TP3310_Demo.si4project/TP3310_Demo.sip_sym index dd0ed7f..1c8a224 100644 Binary files a/TP3310_Demo.si4project/TP3310_Demo.sip_sym and b/TP3310_Demo.si4project/TP3310_Demo.sip_sym differ diff --git a/TP3310_Demo.si4project/TP3310_Demo.siwork b/TP3310_Demo.si4project/TP3310_Demo.siwork index 0f6bb6e..9c17e3f 100644 Binary files a/TP3310_Demo.si4project/TP3310_Demo.siwork and b/TP3310_Demo.si4project/TP3310_Demo.siwork differ diff --git a/UsrInc/gpio_comm/gpio_comm.h b/UsrInc/gpio_comm/gpio_comm.h index bcadbee..2432d95 100644 --- a/UsrInc/gpio_comm/gpio_comm.h +++ b/UsrInc/gpio_comm/gpio_comm.h @@ -35,9 +35,15 @@ extern bit Pattern_TX_Start; sbit PATTERN_TX = P0^1; #define START_LOW_55MS_TIM 55 + #define START_HIGH_20MS_TIM 20 + #define START_LOW_20MS_TIM 20 +#define START_HIGH_40MS_TIM 40 + +#define START_LOW_40MS_TIM 40 + //#define PATTERN_TX_ON() COM_CTRL_ON() //#define PATTERN_TX_OFF() COM_CTRL_OFF() @@ -53,6 +59,8 @@ extern uint8_t Gpio_TX_Steps; extern bit g_Key_Type; +extern bit g_Close_Type; + typedef enum { //GPIO_TX_STEPS_NONE = 0, GPIO_TX_STEPS_START = 0, diff --git a/UsrInc/inc/define.h b/UsrInc/inc/define.h index 4c3aa09..a7caaeb 100644 --- a/UsrInc/inc/define.h +++ b/UsrInc/inc/define.h @@ -28,7 +28,7 @@ #define FW_VER0 0x01 //³ÌÐò°æ±¾0:´ú±íÔÚÓ²¼þ´æÔڸĶ¯²»ÄܼæÈÝ֮ǰ°æ±¾Ê±¼Ó1 #define FW_VER1 0x01 //³ÌÐò°æ±¾1:´ú±íÔÚ¹¦ÄÜ´æÔڸĶ¯Ê±¼Ó1 -#define FW_VER2 0x03 //³ÌÐò°æ±¾2:´ú±íÔÚÈí¼þµ÷ÊÔ³öÏÖ²»Í¬µÄ²âÊ԰汾ʱ¸Ä¶¯Ê±¼Ó1 +#define FW_VER2 0x04 //³ÌÐò°æ±¾2:´ú±íÔÚÈí¼þµ÷ÊÔ³öÏÖ²»Í¬µÄ²âÊ԰汾ʱ¸Ä¶¯Ê±¼Ó1 /* оƬÀàÐÍÑ¡Ôñ£ºSY8836ºÏ·âOVPоƬ */ //#define SY8836 diff --git a/UsrInc/vox/vox_module.h b/UsrInc/vox/vox_module.h index 8ec09a5..1e7b168 100644 --- a/UsrInc/vox/vox_module.h +++ b/UsrInc/vox/vox_module.h @@ -35,6 +35,8 @@ extern bit Vox_Vout_Enable; extern bit Earphone_Num_2Inbox; //Ë«¶ú»úÔںбê־λ +extern bit Get_Vox_Num_Flag; + extern bit Vox_Ocp_Flag; #if VOX_ENABLE diff --git a/UsrSrc/gpio_comm/gpio_comm.c b/UsrSrc/gpio_comm/gpio_comm.c index 11a55d4..ff93d7c 100644 --- a/UsrSrc/gpio_comm/gpio_comm.c +++ b/UsrSrc/gpio_comm/gpio_comm.c @@ -36,6 +36,8 @@ uint16_t Pattern_TX_Data = 0; // bit g_Key_Type = 0; +bit g_Close_Type = 0; + /******************************************************************************\ Functions definitions \******************************************************************************/ @@ -54,13 +56,11 @@ bit g_Key_Type = 0; * ******************************************************************************* */ - void Gpio_Comm(void) { static uint8_t Bit_Cnt; static uint8_t Pin_Status; static uint8_t Gpio_TX_Comm_Cnt; - //static uint8_t Gpio_TX_Steps; /*Æðʼ֡£º55msµÍµçƽ + 20ms¸ßµçƽ + 20msµÍµçƽ¡£*/ if( Pattern_TX_Start ) @@ -74,22 +74,43 @@ void Gpio_Comm(void) Vout_Ctrl_OFF(OFF); } else - if( Gpio_TX_Comm_Cnt <= ( START_LOW_55MS_TIM + START_HIGH_20MS_TIM ) ) { - Vout_Ctrl_ON(ON); - } - else - if( Gpio_TX_Comm_Cnt < ( START_LOW_55MS_TIM + START_HIGH_20MS_TIM + START_LOW_20MS_TIM ) ) - { - Vout_Ctrl_OFF(OFF); - } - else - { - Gpio_TX_Steps = GPIO_TX_STEPS_BIT_SYC; - - if( g_Key_Type ) - { - Bit_Cnt = 4; + if( g_Close_Type ) //·¢¹Ø¸ÇÂë¡£ + { + if( Gpio_TX_Comm_Cnt <= ( START_LOW_55MS_TIM + START_HIGH_40MS_TIM ) ) + { + Vout_Ctrl_ON(ON); + } + else + if( Gpio_TX_Comm_Cnt < ( START_LOW_55MS_TIM + START_HIGH_40MS_TIM + START_LOW_40MS_TIM ) ) + { + Vout_Ctrl_OFF(OFF); + } + else + { + Gpio_TX_Steps = GPIO_TX_STEPS_STOP; + } + } + else + { + if( Gpio_TX_Comm_Cnt <= ( START_LOW_55MS_TIM + START_HIGH_20MS_TIM ) ) + { + Vout_Ctrl_ON(ON); + } + else + if( Gpio_TX_Comm_Cnt < ( START_LOW_55MS_TIM + START_HIGH_20MS_TIM + START_LOW_20MS_TIM ) ) + { + Vout_Ctrl_OFF(OFF); + } + else + { + Gpio_TX_Steps = GPIO_TX_STEPS_BIT_SYC; + + if( g_Key_Type ) + { + Bit_Cnt = 4; + } + } } } } @@ -152,6 +173,8 @@ void Gpio_Comm(void) Pattern_TX_Start = 0; g_Key_Type = 0; + + g_Close_Type = 0; Gpio_TX_Steps = GPIO_TX_STEPS_START; } diff --git a/UsrSrc/hall/hall.c b/UsrSrc/hall/hall.c index 0dbfbf8..3799805 100644 --- a/UsrSrc/hall/hall.c +++ b/UsrSrc/hall/hall.c @@ -87,6 +87,8 @@ bit CoverEvent_Flg_led = 0; CoverEvent_Flg_led = 1; + Get_Vox_Num_Flag = 1; + #if LED_DISPLAY LED_On_Flag = 1; #endif diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index 8443ed0..9e6aca7 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -46,7 +46,7 @@ bit Earphone_Chg_Flag = 0; // #define VOX_VOUT_5V_LEAST_CNT 50 #define VOX_VOUT_5V_DEBOUNCE 2 -#define VOX_VOUT_0V_DEBOUNCE 2 +#define VOX_VOUT_0V_DEBOUNCE 3 #define VOX_ADT_HOLD_CNT 3 #define Vox_TX_Pattern_Cnt 3 @@ -69,6 +69,12 @@ bit Vox_Output_Short_Flag = 0; bit Earphone_Num_2Inbox = 0; //Ë«¶ú»úÔںбê־λ +bit Get_Vox_Num_Flag = 0; + +//bit Vor_In_Box_Flag = 0; + +//bit Vol_In_Box_Flag = 0; + #if VOX_FOLLOW_CHG bit Boost_VoxVout_Follow_Flag = 0; @@ -166,6 +172,8 @@ bit Vox_Ocp_Flag = 0; void Vox_Det_Machine(void) { + static bit Get_CHIP_STA1_Flag0; + static bit Get_CHIP_STA1_Flag1; static bit Cover_Close_Flag; @@ -173,9 +181,7 @@ void Vox_Det_Machine(void) static bit Cover_Open_Flag; static bit TX_Cmd_Flag; - - static bit Cover_Open_5V_Flag; - + static bit Cover_Close_Flag0; static bit Cover_Close_Flag1; @@ -183,8 +189,16 @@ void Vox_Det_Machine(void) static bit Bat_Low_Pro_Flag; static bit Vox_Chg_Full_Flag; + + static bit Vor_Chg_Full_Flag; + + static bit Vol_Chg_Full_Flag; static uint8_t CHIP_STA1_BK; + + static uint8_t CHIP_STA1_Vor; + + static uint8_t CHIP_STA1_Vol; static bit Follow_Chg_Start_Flag; @@ -192,16 +206,61 @@ void Vox_Det_Machine(void) static uint8_t Vox_TX_Timer; - static uint8_t Vox_TX_Timer1; + static uint8_t Vor_chgFull_Timer; - static uint8_t Vox_TX_Timer2; + static uint8_t Vol_chgFull_Timer; static uint8_t Vox_Output_Debounce; if( gBoost_Prepared_Flag ) { if( CoverEvent_Flg ) //Hallʼþ´¥·¢¡£ - { + { + /*ÏÈÅжÏÓм¸Ö»¶ú»úÔÚºÐ*/ + if( Get_Vox_Num_Flag ) + { + Get_Vox_Num_Flag = 0; + + Vout_Ctrl_OFF(ON); + + Get_CHIP_STA1_Flag0 = 1; + + Earphone_Num_2Inbox = 0; + + // IRQ_FLAG0 = 0x0C; + + // Vor_In_Box_Flag = 0; + + // Vol_In_Box_Flag = 0; + + return; + } + else + { + if( Get_CHIP_STA1_Flag0 ) + { + Get_CHIP_STA1_Flag0 = 0; + + if( (CHIP_STA1 & 0xAC) == 0xA0 ) + { + Earphone_Num_2Inbox = 1; //2Ö»¶ú»úÔںУ¬°´¼ü3s²ÅÄÜ·¢Âë¡£ + } + #if 0 + else + if( (CHIP_STA1 & 0xAC) == 0x80 ) //Vor¶ú»úÔںР+ { + Vor_In_Box_Flag = 1; + } + else + if( (CHIP_STA1 & 0xAC) == 0x20 ) //Vol¶ú»úÔںР+ { + Vol_In_Box_Flag = 1; + } + #endif + return; + } + } + if( !BST_EN ) { Vout_Ctrl_ON(OFF); @@ -216,19 +275,15 @@ void Vox_Det_Machine(void) Vox_Vol_Hold_Timer = 0; //¹Ø¸ÇÇå0£¬¿ª¸ÇʹÓà Vox_TX_Timer = 0; - - Vox_TX_Timer1 = 0; - - Vox_TX_Timer2 = 0; Get_CHIP_STA1_Flag1 = 0; - - Earphone_Num_2Inbox = 0; Vox_Output_Short_Flag = 0; Vox_Ocp_Flag = 0; + Vox_Chg_Full_Flag = 0; + if( CoverStatus == CLOSE ) //1¡¢¹Ø¸Ç¹Ø±ÕCOM_CTRL£»ÏÔʾµÆЧ¡££¨ÎÞÐè²éѯLoadon¡¢IOFF״̬£¬ÎÞÂÛ¶ú»úÊÇ·ñÔÚ²Ö£¬Vox 5VÊä³ö¡££© { Earphone_Chg_Flag = 0; //¹Ø¸ÇÈ¡Ïû¶ú»úÈëºÐµÆЧ£¬ÏÔʾ¹Ø¸ÇµÆЧ¡£ @@ -244,8 +299,6 @@ void Vox_Det_Machine(void) Cover_Open_Flag = 0; Follow_Chg_Start_Flag = 0; - - Vox_Chg_Full_Flag = 0; #if VOX_FOLLOW_CHG Boost_VoxVout_Follow_Flag = 0; @@ -257,7 +310,13 @@ void Vox_Det_Machine(void) Cover_Open_Flag = 1; - Cover_Open_5V_Flag = 0; + Vor_chgFull_Timer = 0; + + Vol_chgFull_Timer = 0; + + Vor_Chg_Full_Flag = 0; + + Vol_Chg_Full_Flag = 0; } CoverEvent_Flg = 0; @@ -272,123 +331,178 @@ void Vox_Det_Machine(void) return; } - #if 0 - if( Vox_TX_Timer < VOX_VOUT_0V_DEBOUNCE ) //ת0V 200ms - { - Vout_Ctrl_OFF(OFF); - - Vox_TX_Timer++; - } - else - #endif + + /*°´¼ü1.5s¡¢°Î³äµçºóVoxÉýѹһ¶Îʱ¼ä£¬ÓÃÓÚ»½ÐѶú»ú¡£*/ + if( Wkup_Earphone_Flag ) { - /*°´¼ü1.5s¡¢°Î³äµçºóVoxÉýѹһ¶Îʱ¼ä£¬ÓÃÓÚ»½ÐѶú»ú¡£*/ - if( Wkup_Earphone_Flag ) + if( !BST_EN ) { - if( !BST_EN ) - { - Vout_Ctrl_ON(OFF); - - return; - } - - Get_CHIP_STA1_Flag1 = 0; - - Vox_TX_Timer1 = 0; - - Vox_TX_Timer2 = 0; - - VOX_CTL0 |= 0x30; //VOX Enable 5V - - Wkup_Earphone_Flag = 0; - } -#if 0 - if( Vox_TX_Timer2 < VOX_VOUT_5V_DEBOUNCE ) //5V 200ms£¬ÓÃÓÚºóÐø·¢Â뻽ÐѶú»ú¡£ - { - Vox_TX_Timer2++; - - Vout_Ctrl_ON(OFF); - + Vout_Ctrl_ON(OFF); + return; - } -#endif - if( !Get_CHIP_STA1_Flag1 ) - { - if( Vox_Output_Debounce < Vox_TX_Pattern_Tim ) - { - if( (Vox_Output_Debounce % Vox_TX_Interval == 0) ) + } + + Vor_chgFull_Timer = 0; + + Vol_chgFull_Timer = 0; + + Vor_Chg_Full_Flag = 0; + + Vol_Chg_Full_Flag = 0; + + Get_CHIP_STA1_Flag1 = 0; + + Vox_Output_Debounce = 0; + + Vox_TX_Timer = 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( (CHIP_STA1 & 0xA0) == 0xA0 ) - { #if VOX_TX_PATTERN - Pattern_TX_Start = 1; - - g_Key_Type = 0; + Pattern_TX_Start = 1; + + g_Key_Type = 0; - Pattern_TX_Data = bat_level_pdata | 0xC4; + 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++; - - return; - } - - Get_CHIP_STA1_Flag1 = 1; - - Vout_Ctrl_OFF(ON); - - TX_Cmd_Flag = 1; - - Vox_Vout_Enable = OFF; - } + + Vox_Output_Debounce++; } else - { - if( TX_Cmd_Flag ) + { + if( !Vox_Chg_Full_Flag ) { - TX_Cmd_Flag = 0; - - Vox_TX_Timer1 = 0; - - if( (CHIP_STA1 & 0xAC) == 0xA0 ) + if( !Vor_Chg_Full_Flag ) { - Earphone_Num_2Inbox = 1; //2Ö»¶ú»úÔںУ¬°´¼ü3s²ÅÄÜ·¢Âë¡£ + if( ( (CHIP_STA1 & 0x88) == 0x88 ) ) //VOR¶ú»ú³äÂú£¬×ªÈëADTģʽ¡£ + { + if( Vor_chgFull_Timer < VOX_VOUT_5V_LEAST_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ + { + Vor_chgFull_Timer++; + } + else + { + VOX_CTL0 &= ~0x20; //VOX 5v Off, Enable VOX ADT + + Vor_Chg_Full_Flag = 1; + + CHIP_STA1_Vor = CHIP_STA1 & 0x80; + } + } } else { - Earphone_Num_2Inbox = 0; - } + if( CHIP_STA1_Vor != ( CHIP_STA1 & 0x80 ) ) + { + if(CHIP_STA1 & 0x80) + { + Earphone_Chg_Flag = 1; +#ifdef LED_DISPLAY + LED_On_Flag = 1; +#endif + } + + CHIP_STA1_Vor = CHIP_STA1 & 0x80; + } + } + + if( !Vol_Chg_Full_Flag ) + { + if( ( (CHIP_STA1 & 0x24) == 0x24 ) ) //VOR¶ú»ú³äÂú£¬×ªÈëADTģʽ¡£ + { + if( Vol_chgFull_Timer < VOX_VOUT_5V_LEAST_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ + { + Vol_chgFull_Timer++; + } + else + { + VOX_CTL0 &= ~0x10; //VOX 5v Off, Enable VOX ADT + + Vol_Chg_Full_Flag = 1; + + CHIP_STA1_Vol = CHIP_STA1 & 0x20; + } + } + } + else + { + if( CHIP_STA1_Vol != ( CHIP_STA1 & 0x20 ) ) + { + if(CHIP_STA1 & 0x20) + { + Earphone_Chg_Flag = 1; +#ifdef LED_DISPLAY + LED_On_Flag = 1; +#endif + } + + CHIP_STA1_Vol = CHIP_STA1 & 0x20; + } + } + + if( Vor_Chg_Full_Flag || Vol_Chg_Full_Flag ) + { + if( Earphone_Num_2Inbox ) + { + if( !Vor_Chg_Full_Flag || !Vol_Chg_Full_Flag ) //¶ú»ú³äÂú»òºÐ×ӵ͵磬Ôò¹Ø±ÕVoutÊä³öͨ·£¬¹Ø±ÕBoost¡£ + { + return; + } + } + + Get_CHIP_STA1_Flag1 = 1; + + Vox_Chg_Full_Flag = 1; + + Vox_Vout_Enable = OFF; + + Vout_Ctrl_OFF(ON); + + TX_Cmd_Flag = 1; + } + } + } + } +#if 1 + else + { + if( TX_Cmd_Flag ) + { + TX_Cmd_Flag = 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; } - 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; - } - } } } +#endif } if( Cover_Close_Flag ) @@ -425,31 +539,33 @@ void Vox_Det_Machine(void) return; } - /*¹Ø¸Çºó£¬VoxתÈëADTģʽ£¬ÅжÏÓм¸Ö»¶ú»úÔںС£*/ - if( !Cover_Close_Flag0 ) + if( !Get_CHIP_STA1_Flag1 ) { - Vout_Ctrl_OFF(ON); //VoxתÈëADTģʽ¡£ - - Cover_Close_Flag0 = 1; - } - else - { - if( !Get_CHIP_STA1_Flag1 ) - { - if( (CHIP_STA1 & 0xAC) == 0xA0 ) + if( Vox_Output_Debounce < Vox_TX_Pattern_Tim ) + { + if( (Vox_Output_Debounce % Vox_TX_Interval == 0) ) { - Earphone_Num_2Inbox = 1; //2Ö»¶ú»úÔںУ¬°´¼ü3s²ÅÄÜ·¢Âë¡£ - } - else - { - Earphone_Num_2Inbox = 0; + // if( (CHIP_STA1 & 0xA0) == 0xA0 ) + { +#if VOX_TX_PATTERN + Pattern_TX_Start = 1; + + g_Close_Type = 1; +#endif + } } - Get_CHIP_STA1_Flag1 = 1; - + Vox_Output_Debounce++; } - } + else + { + Get_CHIP_STA1_Flag1 = 1; + Vox_Output_Debounce = 0; + } + } + + if( !Cover_Close_Flag1 ) {