From 05092cd7226f68728a769f23def4a78eb7eeac86 Mon Sep 17 00:00:00 2001 From: Alex xu Date: Mon, 9 Sep 2024 16:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=82=B9=EF=BC=9A1=E3=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E7=9B=96=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?500ms=205V=E5=90=8E0V=20500ms=EF=BC=8C=E5=86=8D=E8=BD=AC?= =?UTF-8?q?=E5=88=B0ADT=E6=A8=A1=E5=BC=8F=EF=BC=9B2=E3=80=81=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=BC=80=E7=9B=96=E7=8A=B6=E6=80=81=E4=B8=8B=E6=8C=89?= =?UTF-8?q?=E9=94=AE=E9=95=BF=E6=8C=895s=E8=A7=A6=E5=8F=91VOX=E5=8F=91?= =?UTF-8?q?=E9=80=81pattern=EF=BC=9B3=E3=80=81=E6=9B=B4=E6=94=B9UART?= =?UTF-8?q?=E6=B3=A2=E7=89=B9=E7=8E=87=E4=B8=BA9600=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Out/SY883X_EVB_mcu_2024_09_03_152604.bin | Bin 3072 -> 0 bytes Out/SY883X_EVB_mcu_2024_09_03_152604.hex | 202 ------------------ ...cu_2024_09_03_152604_crc(821c)_V010101.bin | Bin 3074 -> 0 bytes Out/SY883X_EVB_mcu_2024_09_09_153809.bin | Bin 0 -> 3072 bytes Out/SY883X_EVB_mcu_2024_09_09_153809.hex | 202 ++++++++++++++++++ ...cu_2024_09_09_153809_crc(c586)_V010101.bin | Bin 0 -> 3074 bytes Project/TP3102_Demo.uvgui.GH | 37 ++-- .../TP3310_Demo.SearchResults | 8 +- TP3310_Demo.si4project/TP3310_Demo.sip_sym | Bin 141992 -> 141992 bytes TP3310_Demo.si4project/TP3310_Demo.siwork | Bin 62994 -> 63172 bytes UsrInc/key/key.h | 1 + UsrInc/uart/uart.h | 2 +- UsrInc/vox/vox_module.h | 3 + UsrSrc/key/key.c | 29 ++- UsrSrc/system/system.c | 10 +- UsrSrc/vox/vox_module.c | 16 +- 16 files changed, 275 insertions(+), 235 deletions(-) delete mode 100644 Out/SY883X_EVB_mcu_2024_09_03_152604.bin delete mode 100644 Out/SY883X_EVB_mcu_2024_09_03_152604.hex delete mode 100644 Out/SY883X_EVB_mcu_2024_09_03_152604_crc(821c)_V010101.bin create mode 100644 Out/SY883X_EVB_mcu_2024_09_09_153809.bin create mode 100644 Out/SY883X_EVB_mcu_2024_09_09_153809.hex create mode 100644 Out/SY883X_EVB_mcu_2024_09_09_153809_crc(c586)_V010101.bin diff --git a/Out/SY883X_EVB_mcu_2024_09_03_152604.bin b/Out/SY883X_EVB_mcu_2024_09_03_152604.bin deleted file mode 100644 index 9037ef33bdaabb3541250a7ee023c34c15567c13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3072 zcmeHJ|8EoL8Nc_w`RpXNcS#&4HFkQ~5XKsgxDeD*>MgXIrfRq(ox0yViE3;=AuVs@ zwzPR?M=Re7)oN)Z>F72ng22cRtfI74=Q}r3U?F&Kwt-r$c;(JXOA=e57v-yO@7a_w z?Jt-#OTK%)d_K?fyzjlwb4RnaG{v`3dxzTC#B^p3y&?o3~ zbQOgy?DUfM=E>2K#OT;aa;$h?y7k3plc>f55I2duIK6bXII}EOD7pK%2N+*|HibUD z#~}F^(b$1vAqJe^k7W)NXM*$}SSotiNZhGN!)w<*m00@*b>e3q0N!Hdq$oWpeNdur zmy>93O0X!v1Xb8%&W20Z!q>*aVk~zpL%5aaIx?D__Yzd&mGM7y@EjV)=Ti_%hlSrGDzq2jzZfAz6>Y5HjK)YwRI?Ak)%)c8p8 zkyUN`%G9aW(UIa4mRLAt>cy6lR#qf^s;fFy%LVj6CPhaanh}6g)h6w5$lfPqPZ%ef zeKq>K`&jrckTg?tIP^#NRbxi=VnOANHK<7?CvFYqRZ8`$tPw!=UO-T)pn7F~uf8Ue z;-U<DRYvI_ z-Liz|qK#a;>~qAo^#DznSCf(!-!?Dw0JX0o&Bu523<*6$YM+`^f!b)aOL|_O{H9#b z;w17{f(e$FYez0i9gXr_JMKd?F*f3WBnRx4n=C;M$c<0PK3|2zs(q-*65FDjMUX5! zxm3KI6;S%OJ1LR;jS@U6Lrld@ZT{ve{COwM#%M-Mfdi4aLsUGGYV za?LUplPs{)yx#E|{q;(%Qt)|F#94d}QE;n6(n{UiS{L%M zA9rtWUF_aL#ED-G^HENuoQM$}+sdX)YAE8@=DWXRAq9e5@OV&7cf?Y8OXbVgyxBc8 z@pjZ<;d(%K1UU;6DG;r;fJ7%&5`(1RowIxBeXo%bQ8I#}eK1o2qX`xrwUZ?MlZUhjZ2Bfk?^-{-0KtgF|A(RUW3;7ixziJ_W?ajXxVO@W8OvZQTONEIO5!TBi zCjP7^{%pQ9L7JGKwdRs7zWcPz+v6uF)7m8l`y{embc9xY(&3GVzIE^stu&i?JL+j} zT8(eiU=fJ)MiK19O-8>H>CywuqU-WM8Py|^7yBfqdT;}o)N;ouTU?WFWFu+UZr|%BJjiDb1*an z*U@l24_p2LH@t7n=Mpp-(mSL#mS3V?3=*X6FGTM&?^gN>C!};PT}&s_iF6ibsWg=a zX*$iM*)*5t(>C>3{p;O>p~J>uk$)UJv$ias<+5y+$v$?k4+q9MC zC1btOLQXg|56^tuRon@Tcl39fbIZfOJ!c#KU7<9)bSKnew0yZ`y|KRfL*Y}s<-+%l5<$O(A(W7@ zu9vkap=0a*ixL`Mx1V`s>OO^Fto_P%uY`^mN4gtAhm1oo49GU*+Vn!qsTbrtk6rQ3 z9tIZ3ddRWnn*~Ppv#LKMO-MLV*k>bipyQG(k((rv7sdtrk!ar_avz|t#+wOfSl2@3Tl;EB1#Pq$~re*sA=-a!BW diff --git a/Out/SY883X_EVB_mcu_2024_09_03_152604.hex b/Out/SY883X_EVB_mcu_2024_09_03_152604.hex deleted file mode 100644 index 269621c..0000000 --- a/Out/SY883X_EVB_mcu_2024_09_03_152604.hex +++ /dev/null @@ -1,202 +0,0 @@ -:03000000020413E4 -:10041300758E3075D20078FFE4F6D8FD75815302EE -:02042300046073 -:0F0A1A00120537D2AED2BE1209291205BB80F4E5 -:0404A500024F000002 -:0208E500AD075D -:1008E700E4FCFBFAF527F52875FE2975FF8BEDC4A7 -:1008F70054F04401F5A5E5A520E0FBAFA1AB07AF98 -:10090700A2EFFEEEFAEB2528F528EA3527F5270CA6 -:10091700BC08DBE528AE277803CEC313CE13D8F97E -:01092700FFD0 -:0109280022AC -:10096800E4F524F5257F051208E58E248F257F06FA -:100978001208E5E4FCFDC004A905AA06AB07AE24ED -:10098800AF257C077DD012023BD0001201998E243E -:020998008F25A9 -:01099A00223A -:10099B00E4F525F5267F041208E58E258F267F06C4 -:1009AB001208E5E4FCFDC004A905AA06AB07AE25B9 -:1009BB00AF267C037DE812023BD0001201998E25F5 -:0209CB008F2675 -:0109CD002207 -:0204A900C1157B -:1006B700E4FFFEF52412099BC3EF94D0EE940740A4 -:1006C700037F0122D3EF9436EE94055030EF942246 -:1006D700EE94024028301312EF9414EE940550075D -:1006E700C213E4F524800375240130142BD3EF944F -:1006F70044EE9402401FC214E4F524801BD3EF9408 -:1007070036EE94054004D213800BC3EF9422EE9487 -:0A071700025002D214752401AF2431 -:0107210022B5 -:10072200E5E620E70953B3FE75F210C21522E5F2A1 -:10073200540C601053B3FEE5F354C0603B75F20CE9 -:1007420075F3C022E5F354C0600375F3C01206B717 -:10075200EF600453B3FE22E5F230E417C37850E6AB -:1007620094EB18E6940F500575F210800353B3FE14 -:09077200D2152243B301C2152285 -:0404AB00C116C1179E -:10080000E5E530E103C21622E5E230E705C216D283 -:100810001722E5E830E00EC216300A35C20A75E844 -:100820000175B501221206B7EF6006C216E4F5B5F0 -:1008300022D21630171BE5E630E716C37850E6944F -:100840001018E6940E4005D216C21722E4F5B5C280 -:0208500016226E -:0704AF00C118C1190135FF5E -:10002600E5E25408FF6535601AE5E230E30575340C -:10003600018003E4F534D218D219E4F537F51E8FA2 -:0300460035D21E92 -:010049002294 -:0B04B600C112C110C10FC111015300A1 -:1009E600E5EF600EE5EF30E606D20F785376037535 -:0309F600EFFF22EE -:0D000E00EF146006047005D28422D2832214 -:0D0A3800EF146006047005C28422C2832200 -:10063B00E4FE74382EF8E66067743C2EF9743E2E97 -:10064B00F8E6D397AF06500512000E8003120A3856 -:10065B00743E2EF8E6C394AA401EE4F674422EF8BC -:10066B00E66008743C2EF81616800D74402EF8E6E2 -:10067B006006743C2EF80606743C2EF8E6FF74AA4E -:10068B00D39F500A74422EF876017440800EEFD33C -:10069B009401500C74402EF8760174422EF8E4F657 -:0B06AB00743E2EF8060EEE640270870D -:0106B6002221 -:0504C10001360AC11E16 -:1009F900E5E620E706200803301E04C21EC322D301 -:010A090022CA -:1005370075FE8043FF3075FE0153FFFC75FE0E7597 -:10054700FF05D2DF43878075BA0375AAFD7598D07A -:10055700D299D298D2AC75B7C375FE6A53FFE04300 -:10056700FF04758901758CFC758A17D2A9D28C4353 -:100577008910758DFF758B9BD2ABD28E75FE067574 -:10058700FF1C75FE0375FF3CC284C283E4F58675C4 -:10059700FE0F43FF8075FE4F75FF1075FE1775FF41 -:1005A7003CD2A8D2B9D2AF75F21C75F3C075E80C6E -:0405B70043B3102218 -:03000300020006F2 -:0100060032C7 -:03004B00020A4561 -:060A450075EB3CD21E32ED -:0F04C6000B440000000000000000000000C11BFC -:0607D1008B2B8A2C892D00 -:1007D700E4FEEEC39F5016201AFD782BE475F00156 -:0D07E70012022B120144D21AF5990E80E582 -:0107F40022E2 -:03002300020A29A5 -:0F0A2900309904C299C21A309804C298D21E3272 -:0504D500013700C11F0A -:10035300300141E537C39402500261DFE537C394AE -:100363005550190537301C0A78387601E408F6C26F -:100373008322E47838F6087601C28422E47838F6DA -:1003830008F6783E76AA0876AAC284C283C201C25E -:1003930019F53722E5E630E72A301504D283801EAB -:1003A300E537C394025008C284C2830537800FE542 -:1003B30037C394C850060537D2848002C284C21959 -:1003C300D21F22301F09C284C283E4F537C21F3013 -:1003D300193D301C1CE537C394025004C284801AB3 -:1003E300E537C3943250050537D28422C284C2193B -:1003F30022C284E537C394025005C283053722E540 -:1004030037C3943250050537D28322C283C21922DF -:1005BB00300921C209120968784FA60608A607124E -:1005CB0000261209E6120800120722120268120313 -:1005DB005312077B300B58C20BE536D394004009FE -:1005EB001536301E4AC21E80431209F9503E75FE65 -:1005FB002443FF3CC2ACC2B9C2A9C2AB53B7CFE4D0 -:10060B00F5B575FE2953FF7F75FE4FF5FF75FE801F -:10061B0053FFCF43870275FE8043FF3075FE4F7546 -:10062B00FF10D2ACD2B9D2A9D2AB800075360A2258 -:0707F50000000000000000FD -:1004DA00C108C101011E00011D00C103C107C106F7 -:0E04EA00C102011F00C100C105011C00C104B8 -:100A0A00D282EF700753B7CF43B7302253B7CF2202 -:10026800E5E8540C6013051FE51FC39402400AE437 -:10027800F51F75E80CFF020A0A30183F301633D212 -:1002880082201C0DE5B5700475B50122E4FF120A41 -:100298000AE534700CD203C218D208C206F51D80D4 -:1002A8001AC203E4F51DD206C200C218C204F51F23 -:1002B80080097F01120A0AC208C218300668E51DC3 -:1002C800C394055003051D22E51EC39405500BC2B7 -:1002D80082E4F5B5051ED205804C30050DC205D265 -:1002E80082C2087F01120A0A800B200008D200E5AA -:1002F800E354A0F51C30002EE5E354A0651C600B08 -:10030800D201E4F537E5E354A0F51C300F18E51FDA -:10031800C3940A500CE51F20E003120852051F8001 -:1003280005C20FE4F51F300321E5E354AC64AC606B -:1003380003301C16E51DC394325003051D22E4F555 -:0B034800B57F01120A0AC208C282221F -:1008520078247C007D007BFF7A0779F57E007F0794 -:1008620012011E7524557525AA752602752706756F -:1008720028DD7529BAC282E4F5FE75FF0375FE0E06 -:1008820043FF04FB7A0079247F071207D175FE0E1D -:0B08920053FFF375FE0153FFFCD28200 -:01089D002238 -:1004F800015200C11CC11D01511E14080C800CE4DE -:100508000D480E4C0E920ED80F3C0F8C0FD210686F -:10077B00E4FFEF25E02408F8E6FC08E6FDC378501B -:10078B00E69D18E69C40040FBF0AE77852E6FEEFA1 -:10079B00D39E4004180680037851167851E6FED399 -:1007AB0094325006EEC3940A50077852A607187677 -:1007BB001E7852E6FFD394015003D21C22EFD39440 -:0507CB00024002C21C07 -:0107D0002206 -:10051800013100012F00012E00013000C10DC10A78 -:0E052800C109C10B013300013200C10CC10E2C -:10092900E533603AE4F5330531E531C3940A40050E -:10093900E4F531D20D052EE52EC394644005E4F5A6 -:100949002ED209052FE52FC394FA4012E4F52FD2D0 -:0F0959000A0530E53094044005E4F530D20B2256 -:03000B000209CE19 -:1009CE00C0E0C0D074FC258CF58C7417258AF58A8E -:0809DE00753301D0D0D0E032E6 -:03001B0002089E3A -:10089E00C0E0C0F0C083C082C0D075D000C000C020 -:1008AE0001C002C003C004C005C006C007C28F1538 -:1008BE008D749B258BF58B12063BD20ED007D0067E -:1008CE00D005D004D003D002D001D000D0D0D08239 -:0708DE00D083D0F0D0E0321E -:030BFD00010101F2 -:10042500020A1AE493A3F8E493A34003F68001F2C9 -:1004350008DFF48029E493A3F85407240CC8C333D8 -:10044500C4540F4420C8834004F456800146F6DFA7 -:10045500E4800B01020408102040809004A5E47E8E -:10046500019360BCA3FF543F30E509541FFEE4939C -:10047500A360010ECF54C025E060A840B8E493A363 -:10048500FAE493A3F8E493A3C8C582C8CAC583CA8E -:10049500F0A3C8C582C8CAC583CADFE9DEE780BE46 -:0105360000C4 -: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 diff --git a/Out/SY883X_EVB_mcu_2024_09_03_152604_crc(821c)_V010101.bin b/Out/SY883X_EVB_mcu_2024_09_03_152604_crc(821c)_V010101.bin deleted file mode 100644 index 622d71ea959d168cc3f53360088c6be35f582d89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3074 zcmeHJ|8EoL8Nc_w`RpXNcS#&4HFkQ~5XKsgxDeD*>MgXIrfRq(ox0yViE3;=AuVs@ zwzPR?M=Re7)oN)Z>F72ng22cRtfI74=Q}r3U?F&Kwt-r$c;(JXOA=e57v-yO@7a_w z?Jt-#OTK%)d_K?fyzjlwb4RnaG{v`3dxzTC#B^p3y&?o3~ zbQOgy?DUfM=E>2K#OT;aa;$h?y7k3plc>f55I2duIK6bXII}EOD7pK%2N+*|HibUD z#~}F^(b$1vAqJe^k7W)NXM*$}SSotiNZhGN!)w<*m00@*b>e3q0N!Hdq$oWpeNdur zmy>93O0X!v1Xb8%&W20Z!q>*aVk~zpL%5aaIx?D__Yzd&mGM7y@EjV)=Ti_%hlSrGDzq2jzZfAz6>Y5HjK)YwRI?Ak)%)c8p8 zkyUN`%G9aW(UIa4mRLAt>cy6lR#qf^s;fFy%LVj6CPhaanh}6g)h6w5$lfPqPZ%ef zeKq>K`&jrckTg?tIP^#NRbxi=VnOANHK<7?CvFYqRZ8`$tPw!=UO-T)pn7F~uf8Ue z;-U<DRYvI_ z-Liz|qK#a;>~qAo^#DznSCf(!-!?Dw0JX0o&Bu523<*6$YM+`^f!b)aOL|_O{H9#b z;w17{f(e$FYez0i9gXr_JMKd?F*f3WBnRx4n=C;M$c<0PK3|2zs(q-*65FDjMUX5! zxm3KI6;S%OJ1LR;jS@U6Lrld@ZT{ve{COwM#%M-Mfdi4aLsUGGYV za?LUplPs{)yx#E|{q;(%Qt)|F#94d}QE;n6(n{UiS{L%M zA9rtWUF_aL#ED-G^HENuoQM$}+sdX)YAE8@=DWXRAq9e5@OV&7cf?Y8OXbVgyxBc8 z@pjZ<;d(%K1UU;6DG;r;fJ7%&5`(1RowIxBeXo%bQ8I#}eK1o2qX`xrwUZ?MlZUhjZ2Bfk?^-{-0KtgF|A(RUW3;7ixziJ_W?ajXxVO@W8OvZQTONEIO5!TBi zCjP7^{%pQ9L7JGKwdRs7zWcPz+v6uF)7m8l`y{embc9xY(&3GVzIE^stu&i?JL+j} zT8(eiU=fJ)MiK19O-8>H>CywuqU-WM8Py|^7yBfqdT;}o)N;ouTU?WFWFu+UZr|%BJjiDb1*an z*U@l24_p2LH@t7n=Mpp-(mSL#mS3V?3=*X6FGTM&?^gN>C!};PT}&s_iF6ibsWg=a zX*$iM*)*5t(>C>3{p;O>p~J>uk$)UJv$ias<+5y+$v$?k4+q9MC zC1btOLQXg|56^tuRon@Tcl39fbIZfOJ!c#KU7<9)bSKnew0yZ`y|KRfL*Y}s<-+%l5<$O(A(W7@ zu9vkap=0a*ixL`Mx1V`s>OO^Fto_P%uY`^mN4gtAhm1oo49GU*+Vn!qsTbrtk6rQ3 z9tIZ3ddRWnn*~Ppv#LKMO-MLV*k>bipyQG(k((rv7sdtrk!ar_avz|t#+wOfSl2@3Tl;EB1#Pq$~rgzsMl>)zi0 diff --git a/Out/SY883X_EVB_mcu_2024_09_09_153809.bin b/Out/SY883X_EVB_mcu_2024_09_09_153809.bin new file mode 100644 index 0000000000000000000000000000000000000000..1d7923e3c73eda740865881c87c3ee99f076eee3 GIT binary patch literal 3072 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 literal 0 HcmV?d00001 diff --git a/Project/TP3102_Demo.uvgui.GH b/Project/TP3102_Demo.uvgui.GH index b21b9ee..5253fa0 100644 --- a/Project/TP3102_Demo.uvgui.GH +++ b/Project/TP3102_Demo.uvgui.GH @@ -101,17 +101,17 @@ -1 - 88 - 2041 - 3961 - 1050 + 86 + 1912 + 3832 + 1048 0 - 1796 - 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000001000000100000000F0000000100000041453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF53453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000FFDC7800FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000F0A0A100FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C756172745C756172742E630000000006756172742E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6164635C6164632E6300000000056164632E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000F7B88600FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C74696D65725C7379735F74696D2E6300000000097379735F74696D2E6300000000D9ADC200FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6C65645C6C65642E6300000000056C65642E6300000000A5C2D700FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000B3A6BE00FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5372635C737461727475705C535441525455502E413531000000000B535441525455502E41353100000000EAD6A300FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C496E6974566172732E63000000000A496E6974566172732E6300000000F6FA7D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E63000000000B6770696F5F636F6D6D2E6300000000B5E99D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E68000000000B6770696F5F636F6D6D2E68000000005FC3CF00FFFFFFFF57453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000C1838300FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000CACAD500FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000F7020000 + 1887 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000011000000100000000100000041453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF53453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000FFDC7800FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000F0A0A100FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C756172745C756172742E630000000006756172742E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6164635C6164632E6300000000056164632E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000F7B88600FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C74696D65725C7379735F74696D2E6300000000097379735F74696D2E6300000000D9ADC200FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6C65645C6C65642E6300000000056C65642E6300000000A5C2D700FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000B3A6BE00FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5372635C737461727475705C535441525455502E413531000000000B535441525455502E41353100000000EAD6A300FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C496E6974566172732E63000000000A496E6974566172732E6300000000F6FA7D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E63000000000B6770696F5F636F6D6D2E6300000000B5E99D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E68000000000B6770696F5F636F6D6D2E68000000005FC3CF00FFFFFFFF57453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000C1838300FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000CACAD500FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000F7020000 @@ -1806,7 +1806,7 @@ File 2763 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B960000000000000008001D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B197379363230785F6972715F68616E646C65725F746872656164044E4F4E4511677379363230785F6465766963655F7379144932435F4745545F4F574E5F4144445245535331144932435F4745545F4F574E5F41444452455353320C4932435F4F4152325F4F41321E48414C5F534D4255535F4D6173746572527843706C7443616C6C6261636B0000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C5750545F636865636B456E64960000000000000009000C5750545F636865636B456E641D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B197379363230785F6972715F68616E646C65725F746872656164044E4F4E4511677379363230785F6465766963655F7379144932435F4745545F4F574E5F4144445245535331144932435F4745545F4F574E5F41444452455353320C4932435F4F4152325F4F41321E48414C5F534D4255535F4D6173746572527843706C7443616C6C6261636B000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,7 +3603,7 @@ 0 100 - 15 + 16 ..\UsrSrc\main.c 0 @@ -3633,7 +3633,7 @@ ..\UsrSrc\userapp\userapp.c - 4 + 7 112 131 1 @@ -3714,7 +3714,7 @@ ..\UsrSrc\gpio_comm\gpio_comm.c - 19 + 22 54 77 1 @@ -3741,9 +3741,18 @@ \todaywork\20240325_tp3310\SY883X_Demo_langxun-J8\UsrInc\inc\define.h - 17 + 0 19 - 37 + 48 + 1 + + 0 + + + ..\UsrSrc\key\key.c + 14 + 76 + 93 1 0 diff --git a/TP3310_Demo.si4project/TP3310_Demo.SearchResults b/TP3310_Demo.si4project/TP3310_Demo.SearchResults index 3a67cba..8dff35b 100644 --- a/TP3310_Demo.si4project/TP3310_Demo.SearchResults +++ b/TP3310_Demo.si4project/TP3310_Demo.SearchResults @@ -1,3 +1,5 @@ ----- VOX_VOUT_5V_LEAST_CNT Matches (2 in 1 files) ---- -vox_module.c (UsrSrc\vox) line 46 : #define VOX_VOUT_5V_LEAST_CNT 250 -Vox_Det_Machine in vox_module.c (UsrSrc\vox) : if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //开盖后5V 500ms。 +---- P0_PU Matches (4 in 3 files) ---- +reg3310.h (UsrInc\inc) line 15 : #define P0_PU 0x00 +System_Init in system.c (UsrSrc\system) : SFRADDR = P0_PU; +Vox_TX_Machine in vox_module.c (UsrSrc\vox) : SFRADDR = P0_PU; +Vox_TX_Machine in vox_module.c (UsrSrc\vox) : SFRADDR = P0_PU; diff --git a/TP3310_Demo.si4project/TP3310_Demo.sip_sym b/TP3310_Demo.si4project/TP3310_Demo.sip_sym index cef2ac0b28d1557ec7819789f949302cb0162b6a..613480b573b6de3910fa24612e6d3b7d09204135 100644 GIT binary patch delta 2182 zcmZ`(eQXp}5Z|}=j=R!3*kjw=DPLPSpd=+Jkr*ljj#99NQw~}}5h5i4A)x6|s!%{Z zKGcc_tR3Xl#KdATl&_@6lWd6uYa}AdM~yT=CE2&Ajx)h~CQTR?(QHD5h%@pOUMBX(9(MnBn)o}RA6-9BPWDsT?(`Bji z$`FX032HHHr4ofaE`fEU zn;(B(P7Xfxec3dogzfv2acD2pU{XMXNHGV`xHuHXINTnq0UxTtsd1*LYGWFk2zdi_ z8O_h(5St!^mI6~W4OdhD^(sby2~^g|vI*-Qki5&i6m~v}jqvSYT_y`lheF83z0aWf zITRaZQ5Z)0rr_3%LP*~fk=Vy_WY5}V4v78Dy&QE|F2zQ7x>v zs9*2!t;Q|+&mfghBx^B!;dmUh6_}PW2K2|xC!0d+E)zn_IV49Kuwu6fSK>hk>@gqR zl;`)H(xCfA4h3k?`W=_8O-minahyZb3z)D zI{XaEt!;~#=l~2j>es}bUZ%b=o5xZG4MU<{mq#y@FsK@x>I`Bzb;c6xjOI*|l0_WOUy4I$cTjHWpht_j zpMoq#p&(5Zs+mL4VdgKNlHu{oPjtI~uP#@2RyllmXik*PpiK-B>ti0cI%<+E_?0s% zip|In8WMX#a>j3qaB{TeK*=#|ncq#{%ju&GQs>I(Rg5xJ$-N#tu0z2oq}0KDmo7us zFtGOFLD`bTg?W&Bsl6AY*a#RQXg5sXD``yzA#tM_BGoDT1?kfTw*AJNrrkZ{fx5>= z`=p@Dgy=-<_AUdGU8X(j=#*xijdJTPYGee-aStsgM#vMcWW~- zIcT-)Wqp_}1811S5KBK{9;;&?yTcl`2d!iy3%fMHV&ppp4fisRFO4b`oyM_8ka27%QmS;bTe zFo%Y&rFAo+^EvL#!iP&y2*cDvR`M_U7sI6nMQJa&G;*N!ux9o5+INbB*7^HSyX_ZE z|FSs5p2sm%$Fs`NDgAkw-JFpJ=#2&=sc10TD0&{SX5ZZOHiLF3ZT+m>fxLj$Z5qs9 z6?&8dHWhsJx-b(g-zs2g$oa%^;J5Y;Pm8EWRLREx&iA_-y8?C#8)J4o!gL?}24HWun#6nGN7NKe!TyETxp0EZZ_Y1?P z-hsl!POeZUuBTfW@iKfsH+y fRgtT94S>S()ZOaz-D<0B7)JGk=dHwW^}gqSR$fYG delta 2190 zcma)84@^~M6o21+AOGY&xz7vnij)i95*N*9xh5MaI#V#LhoZ6~#m!arM;@~YmF8<{ z(R$&{qkgp620@96+ruw+b#v}*xoV|}Q(PvSPo*sq7d9uFPCMtm$6K4U^=)TA?)lC+ z-}(RO>PzqHOV7zkbGfQrF1|%^xhA+>uCs{W^b}lR5UkN8R}41_e*$GK<^f|K18p^j{%`@TDcC9k z0md`Nq23~-aj@!gE*M!HjKVOqE#{s~Glx(@WzBV1&n)!|xOHWBh`FZkGW2OS3r?~Ln#*93J zJbJ4_UVZy=CX~&H=ROZvl>0n+aSMtYzHHH%g>h)j76s=NVJ_ZN5$4LC=5=l;$~Q&q zE%dcA9ER&HCfo^I#DvJF7WAJsVReh;eF^0$kx7JxjXL{cLxRo-=8lba7!Gl;1ijy#}k z8^rnys`Ad^Y@YWaK18t+(s>W_K`D92C1I1617$}y3!{^9PbxCkAkk%`>^r)gjh3?g zom^QR)%a*9%I0JEa@}N}F&<^9p5vjw%thz9to>f&BD#gCDb#CIv7>Zp{dAK-poBx{ zT)a#Rp{H4w-6!TTFZCYv?I_j&JK6CcS&E^F<0r!qxDn6c3e=-quAm&s4ZY}8?*U#w zfs`RRfgqBI;vk-ZnKpPLt3Qg*ZvHXDPY} z-DE2C7tWBy=QsmvQM`#}p#U|}EIH@boarW#4dp6BJ964`!D-)a~(vZqvf4AaY zk5?)ZA+8tKdZMe1U_^S--kZT;HnCGg`P^YyqS zjW}r#E(2`Ki~tJWy?5_k7JRmGnp*vT)NnDe02Hjzq5MiQ)C~t9G~1MCh9eyiDK+h` z?F_rsxMhmk9Za=*cd{WSf}dk`wGp2kYh{(`q8FHH2ih5yAoQIn4t>ciT1fGH&<3WK zTMQR#bQ0wv*ulbJ8Qeo5KZZodZ+kk~I`_5@OwqZUVbq!r0GD z5#7U75!%Z()1Ea&(LPjA7pl(ED+QLP+x`1kYueZw$ZnOay42aA9_pl-NYqI)9Yt-J z;ot;0_hcZCHYQ;O&6FMci(;g?3vDt)`E~S+0)k+!21AE6`_6UJjdq&$@saLc#Ym_Ih%N>^v-C|&;rrQE-oY%5j4ss>kZCjm`pkrL1Z*GhEJovv6A$>E~-Bj)@L*>xGph7?g& zk6V#e=bK0l+E>RbIL7`ZamQXmKAn28R8u;<^hupLiuLGkt}wjHkP=|x1+TK+L;nx_ y+uSEHDb7sMzMz?M(4Lc{jHG(sz;E&(iFU=q=*j(0+C3AM5%nK!5=F-V diff --git a/TP3310_Demo.si4project/TP3310_Demo.siwork b/TP3310_Demo.si4project/TP3310_Demo.siwork index 22ad1163f6f7d29920be2a5e4e27e0e631f8da4e..f2f9c54f22cc970c5fb796306ed2c1e47d5c4dcd 100644 GIT binary patch literal 63172 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 VtRmfOG-*sF-IIWgs*|Ah{{h-j9gYA1 literal 62994 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 diff --git a/UsrInc/key/key.h b/UsrInc/key/key.h index ab49540..353dfad 100644 --- a/UsrInc/key/key.h +++ b/UsrInc/key/key.h @@ -34,6 +34,7 @@ \******************************************************************************/ #if KEY_ENABLE +sbit KEY_PIN = P0^5; extern bit Key_Press_short_irq; extern bit Key_Press_l_irq; diff --git a/UsrInc/uart/uart.h b/UsrInc/uart/uart.h index 94c1baf..555083c 100644 --- a/UsrInc/uart/uart.h +++ b/UsrInc/uart/uart.h @@ -28,7 +28,7 @@ /******************************************************************************\ Macro definitions \******************************************************************************/ -#define Baud_Rate0 115200//9600//19200//38400//93750 +#define Baud_Rate0 9600//9600//19200//38400//93750 #define S0REL_VALUE (1024-375000/Baud_Rate0) #if UART0_ENABLE diff --git a/UsrInc/vox/vox_module.h b/UsrInc/vox/vox_module.h index a0d73d4..bbf0c3e 100644 --- a/UsrInc/vox/vox_module.h +++ b/UsrInc/vox/vox_module.h @@ -25,8 +25,11 @@ #include "define.h" extern bit Vox_Vout_Enable; + sbit COM_CTRL = P0^2; +sbit PATTERN_TX_PIN = P0^1; + extern uint8_t Vox_TX_Timer; //VOXָʱ,Hall_Handler0. extern bit Earphone_Chg_Flag; //б־λ diff --git a/UsrSrc/key/key.c b/UsrSrc/key/key.c index 7cfdab6..5c22dd8 100644 --- a/UsrSrc/key/key.c +++ b/UsrSrc/key/key.c @@ -29,7 +29,7 @@ /******************************************************************************\ Macro definitions \******************************************************************************/ - +#define KEY_PRESS_CNT 50 //¼5s /******************************************************************************\ Variables definitions \******************************************************************************/ @@ -42,6 +42,8 @@ bit Key_l_Flag = 0; idata KEY_EVENT_E Event_key = 0; +idata uint8_t Key_Press_Debounce = 0; + /******************************************************************************\ Functions definitions \******************************************************************************/ @@ -66,6 +68,8 @@ idata KEY_EVENT_E Event_key = 0; { #if 1 +#if 0 + if( IRQ_FLAG7 ) //а { if( IRQ_FLAG7 & 0x40 ) //key super long press for 8s interrupt flag @@ -75,8 +79,29 @@ idata KEY_EVENT_E Event_key = 0; } IRQ_FLAG7 = 0xFF; //Clear Key Interrupt Flag } + +#else - + if( (CHIP_STA0 & 0x02) == 0 ) //CHIP_STA0 bit1ΪKey״ֵ̬0£ + { + Key_Press_Debounce++; + if( Key_Press_Debounce >= KEY_PRESS_CNT ) + { + if( (CHIP_STA0 & 0x02) == 0 ) + { + Key_Press_ll_irq = 1; + Event_key = KEY_EVENT_LL_8S; + Key_Press_Debounce = 0; + } + } + } + else + { + Key_Press_Debounce = 0; + } + +#endif + #else diff --git a/UsrSrc/system/system.c b/UsrSrc/system/system.c index 23e8305..ebef688 100644 --- a/UsrSrc/system/system.c +++ b/UsrSrc/system/system.c @@ -66,7 +66,7 @@ */ void System_Init(void) { - SFRADDR = PMU_CTL0; //оƬӲ󣬹̶ + SFRADDR = PMU_CTL0; //оƬӲ󣬹̶ ; Key Enable,Hall Enable SFRDATA |= 0x30; /*test*/ @@ -75,11 +75,11 @@ void System_Init(void) #if UART0_ENABLE - //SFRADDR = P0_PU; - //SFRDATA = 0x03; +// SFRADDR = P0_PU; +// SFRDATA = 0x02; - SFRADDR = MFP_CTL0; - SFRDATA = 0x05; //P01 as UART's TX,P00 as UART's RX +// SFRADDR = MFP_CTL0; +// SFRDATA = 0x05; //P01 as UART's TX,P00 as UART's RX BD = 1; //Select additional Baudrate generator PCON |= 0x80; //Baudrate double enable diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index bcb6cfb..d26c10b 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -51,6 +51,8 @@ uint8_t Vox_TX_Timer = 0; //VOX #define BOOST_VOUT_MAX 2 //Boostѹֵ0:4.6V,1:4.7V,2:4.8V,3:5.05V. +#define Vox_TX_Pattern_Tim 10 + #define Vox_TX_Interval 2 //Voxʱָʱ /******************************************************************************\ @@ -166,7 +168,7 @@ void Vox_Det_Machine(void) if( CoverStatus == CLOSE ) //1ظǹرCOM_CTRLʾЧѯLoadonIOFF״̬۶Ƿڲ֣Vox 5V { - #if VOX_FOLLOW_CHG +#if VOX_FOLLOW_CHG if( BST_EN ) { @@ -184,7 +186,7 @@ void Vox_Det_Machine(void) SFRDATA |= 0x80; //IOFF 20mA } - #endif +#endif Cover_Close_Flag = 1; @@ -200,7 +202,6 @@ void Vox_Det_Machine(void) Boost_VoxVout_Follow_Flag = 1; #endif - //VOX_EN_Type(VOX_VOUT_Mode); //VOX Enable 5VVOX˵NMOS } else //2Ǵ5v 500ms ת0V 500msתADTģʽ { @@ -219,7 +220,6 @@ void Vox_Det_Machine(void) Vox_Output_Debounce = 0; - // VOX_EN_Type(VOX_VOUT_Mode); //VOX Enable 5VVOX˵NMOS } } else @@ -290,7 +290,7 @@ void Vox_Det_Machine(void) /*״̬£8sVOXݣ55 AA 02 06 DD BA*/ if( Key_Press_ll_irq ) { - if( Vox_Output_Debounce < 10 ) + if( Vox_Output_Debounce < Vox_TX_Pattern_Tim ) { if( (Vox_Output_Debounce % Vox_TX_Interval == 0) ) { @@ -418,7 +418,7 @@ void Vox_TX_Machine(void) COM_CTRL = OFF; //VOXлͨѶTXģʽ3.3V SFRADDR = P0_PU; - SFRDATA = 0x03; + SFRDATA |= 0x02; SFRADDR = MFP_CTL0; SFRDATA |= 0x04; //P01 as UART's TX @@ -428,8 +428,8 @@ void Vox_TX_Machine(void) SFRADDR = MFP_CTL0; //Set P01 Pinmux As GPIO Function SFRDATA &= ~0x0C; - SFRADDR = P0_PD; - SFRDATA &= ~0x03; + SFRADDR = P0_PU; + SFRDATA &= ~0x02; COM_CTRL = ON; }