From 520b223a8d26a912fcd58fe91c502d054bbd3c34 Mon Sep 17 00:00:00 2001 From: Alex xu Date: Wed, 11 Sep 2024 14:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=86=85=E5=AE=B9=EF=BC=9A1?= =?UTF-8?q?=E3=80=81=E6=8C=89=E9=94=AE=E5=A4=84=E7=90=86=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=80=92=E6=95=B0=E8=BF=9B=E4=BC=91?= =?UTF-8?q?=E7=9C=A0=E9=87=8D=E6=96=B0=E8=AE=A1=E6=97=B6=E6=A0=87=E5=BF=97?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=9B=B4=E6=94=B9UART=E6=B3=A2=E7=89=B9?= =?UTF-8?q?=E7=8E=87=E8=AE=A1=E7=AE=97=E5=85=AC=E5=BC=8F=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E7=94=A811.0592M=E4=B8=BB=E9=A2=91=EF=BC=9B=E6=9B=B4=E6=94=B9U?= =?UTF-8?q?ART=E4=BC=A0=E8=BE=93=E4=B8=BA8-bit=20UART=20Mode=201=20REN=20D?= =?UTF-8?q?isable=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...n => SY883X_EVB_mcu_2024_09_11_142613.bin} | Bin 3072 -> 3072 bytes ...x => SY883X_EVB_mcu_2024_09_11_142613.hex} | 48 +++++++++--------- ...u_2024_09_11_142613_crc(a85c)_V010101.bin} | Bin 3074 -> 3074 bytes Project/TP3102_Demo.uvgui.GH | 33 +++++++----- .../TP3310_Demo.SearchResults | 17 +++++-- TP3310_Demo.si4project/TP3310_Demo.sip_sym | Bin 141992 -> 141992 bytes TP3310_Demo.si4project/TP3310_Demo.siwork | Bin 63172 -> 68562 bytes UsrInc/uart/uart.h | 2 +- UsrSrc/hall/hall.c | 5 ++ UsrSrc/key/key.c | 8 ++- UsrSrc/system/system.c | 4 +- UsrSrc/vox/vox_module.c | 14 ++--- 12 files changed, 79 insertions(+), 52 deletions(-) rename Out/{SY883X_EVB_mcu_2024_09_09_153809.bin => SY883X_EVB_mcu_2024_09_11_142613.bin} (73%) rename Out/{SY883X_EVB_mcu_2024_09_09_153809.hex => SY883X_EVB_mcu_2024_09_11_142613.hex} (88%) rename Out/{SY883X_EVB_mcu_2024_09_09_153809_crc(c586)_V010101.bin => SY883X_EVB_mcu_2024_09_11_142613_crc(a85c)_V010101.bin} (73%) diff --git a/Out/SY883X_EVB_mcu_2024_09_09_153809.bin b/Out/SY883X_EVB_mcu_2024_09_11_142613.bin similarity index 73% rename from Out/SY883X_EVB_mcu_2024_09_09_153809.bin rename to Out/SY883X_EVB_mcu_2024_09_11_142613.bin index 1d7923e3c73eda740865881c87c3ee99f076eee3..5edc69e386838514d80430bb626d6e7cc2c44a24 100644 GIT binary patch delta 128 zcmZpWXprDzVp+k&z-Gh%1WcSCC-R9iT253`XY}9bXT-!PHMx;V97xV&QU#LxnGAsB z2c}p?sm*@Od5nx&llQXhVC0-!#u~+Pr*wwH<}0k7OpG3z<2XtfB_%5Y*`6JqV&uU4 d^pV0tj!XO;Wz0_`zFm^r{E}0MiJ6g+5da`nB&YxY delta 128 zcmZpWXprDzVp+k&z-Gh%1WcUoC-R9inom?yXY}3ZXT-!PF}aaR97xV&QU#LxnGAsB z2c}p?iOqh@d5nx2llQXhU}T?M#u~+PvvkIV%~x1EnHb$R$8nS}ii=kSvOPOI#mGVE d=_7@QyqEYn%9x)>eB1n*Q;3O`fq{{c5dbZXBsl;8 diff --git a/Out/SY883X_EVB_mcu_2024_09_09_153809.hex b/Out/SY883X_EVB_mcu_2024_09_11_142613.hex similarity index 88% rename from Out/SY883X_EVB_mcu_2024_09_09_153809.hex rename to Out/SY883X_EVB_mcu_2024_09_11_142613.hex index b87ecf2..530cfd9 100644 --- a/Out/SY883X_EVB_mcu_2024_09_09_153809.hex +++ b/Out/SY883X_EVB_mcu_2024_09_11_142613.hex @@ -1,7 +1,7 @@ :030000000204A84F :1004A800758E3075D20078FFE4F6D8FD7581540258 :0204B80004F549 -:0F0A28001205BAD2AED2BE12092912053A80F4D5 +:0F0A2A001205BAD2AED2BE12092912053A80F4D3 :04041300024F000094 :0208E500AD075D :1008E700E4FCFBFAF527F52875FE2975FF8BEDC4A7 @@ -48,9 +48,9 @@ :0300460035D21E92 :010049002294 :0E042400C112C110C10FC111015200015100DF -:1009CE00E5E220E117785106E6C394324012E5E2E3 -:1009DE0020E10DD20F087603E418F622E47851F6E2 -:0109EE0022E6 +:1009CE00E5E220E119785106E6C39432400DE5E2E6 +:1009DE0020E108D20F087603E418F6D21E22E4783E +:0309EE0051F6229D :0D000E00EF146006047005D28422D2832214 :0D07F200EF146006047005C28422C2832249 :10063800E4FE74382EF8E66067743C2EF9743E2E9A @@ -63,10 +63,10 @@ :0B06A800743E2EF8060EEE6402708710 :0106B3002224 :0504320001360AC11EA5 -:100A0700E5E620E706200803301E04C21EC322D3F2 -:010A170022BC +:100A0900E5E620E706200803301E04C21EC322D3F0 +:010A190022BA :1005BA0075FE8043FF3075FE0153FFFCD2DF43878F -:1005CA008075BA0375AAD97598D0D299D298D2AC47 +:1005CA008075BA0375AADC759840D299D298D2ACD4 :1005DA0075B7C375FE6A53FFE043FF047589017559 :1005EA008CFC758A17D2A9D28C438910758DFF7538 :1005FA008B9BD2ABD28E75FE0675FF1C75FE0375FA @@ -75,15 +75,15 @@ :0E062A00AF75F21C75F3C075E80C43B31022D7 :03000300020006F2 :0100060032C7 -:03004B00020A4D59 -:060A4D0075EB3CD21E32E5 +:03004B00020A4F57 +:060A4F0075EB3CD21E32E3 :0F0437000B440000000000000000000000C11B8B :0607CE008B2B8A2C892D03 :1007D400E4FEEEC39F5016201AFD782BE475F00159 :0D07E40012022B120144D21AF5990E80E585 :0107F10022E5 -:03002300020A3797 -:0F0A3700309904C299C21A309804C298D21E3264 +:03002300020A3995 +:0F0A3900309904C299C21A309804C298D21E3262 :05044600013700C11F99 :10035300300141E537C39402500261DFE537C394AE :100363005550190537301C0A78387601E408F6C26F @@ -100,31 +100,31 @@ :10053A00300921C209120968784FA60608A60712CF :10054A0000261209CE12080012071F1202681203AF :10055A0053120778300B58C20BE536D39400400982 -:10056A001536301E4AC21E8043120A07503E75FED7 +:10056A001536301E4AC21E8043120A09503E75FED5 :10057A002443FF3CC2ACC2B9C2A9C2AB53B7CFE451 :10058A00F5B575FE2953FF7F75FE4FF5FF75FE80A1 :10059A0053FFCF43870275FE8043FF3075FE4F75C8 :1005AA00FF10D2ACD2B9D2A9D2AB800075360A22DA -:070A460000000000000000A9 +:070A480000000000000000A7 :10044B00C108C101011E00011D00C103C107C10686 :0E045B00C102011F00C100C105011C00C10447 -:100A1800D282EF700753B7CF43B7302253B7CF22F4 +:100A1A00D282EF700753B7CF43B7302253B7CF22F2 :10026800E5E8540C6013051FE51FC39402400AE437 -:10027800F51F75E80CFF020A1830183F301633D204 +:10027800F51F75E80CFF020A1A30183F301633D202 :1002880082201C0DE5B5700475B50122E4FF120A41 -:1002980018E534700CD203C218D208C206F51D80C6 +:100298001AE534700CD203C218D208C206F51D80C4 :1002A8001AC203E4F51DD206C200C218C204F51F23 -:1002B80080097F01120A18C208C218300668E51DB5 +:1002B80080097F01120A1AC208C218300668E51DB3 :1002C800C394055003051D22E51EC39405500BC2B7 :1002D80082E4F5B5051ED205804C30050DC205D265 -:1002E80082C2087F01120A18800B200008D200E59C +:1002E80082C2087F01120A1A800B200008D200E59A :1002F800E354A0F51C30002EE5E354A0651C600B08 :10030800D201E4F537E5E354A0F51C300F18E51FDA :10031800C3940A500CE51F20E003120852051F8001 :1003280005C20FE4F51F300321E5E354AC64AC606B :1003380003301C16E51DC394325003051D22E4F555 -:0B034800B57F01120A18C208C2822211 -:1008520078247C007D007BFF7A0A79467E007F0740 +:0B034800B57F01120A1AC208C282220F +:1008520078247C007D007BFF7A0A79487E007F073E :1008620012011E7524557525AA752602752706756F :1008720028DD7529BAC282E4F5FE43FF0275FE0E39 :1008820043FF04FB7A0079247F071207CE75FE0E20 @@ -145,9 +145,9 @@ :10093900E4F531D20D052EE52EC394644005E4F5A6 :100949002ED209052FE52FC394FA4012E4F52FD2D0 :0F0959000A0530E53094044005E4F530D20B2256 -:03000B000209EFF8 -:1009EF00C0E0C0D074FC258CF58C7417258AF58A6D -:0809FF00753301D0D0D0E032C5 +:03000B000209F1F6 +:1009F100C0E0C0D074FC258CF58C7417258AF58A6B +:080A0100753301D0D0D0E032C2 :03001B0002089E3A :10089E00C0E0C0F0C083C082C0D075D000C000C020 :1008AE0001C002C003C004C005C006C007C28F1538 @@ -155,7 +155,7 @@ :1008CE00D005D004D003D002D001D000D0D0D08239 :0708DE00D083D0F0D0E0321E :030BFD00010101F2 -:1004BA00020A28E493A3F8E493A34003F68001F226 +:1004BA00020A2AE493A3F8E493A34003F68001F224 :1004CA0008DFF48029E493A3F85407240CC8C33343 :1004DA00C4540F4420C8834004F456800146F6DF12 :1004EA00E4800B0102040810204080900413E47E8B diff --git a/Out/SY883X_EVB_mcu_2024_09_09_153809_crc(c586)_V010101.bin b/Out/SY883X_EVB_mcu_2024_09_11_142613_crc(a85c)_V010101.bin similarity index 73% rename from Out/SY883X_EVB_mcu_2024_09_09_153809_crc(c586)_V010101.bin rename to Out/SY883X_EVB_mcu_2024_09_11_142613_crc(a85c)_V010101.bin index 9d209e6d47d214bd02593c2ec6894f1607d6bf10..4d5281464f8fb441d688ad079e6581961791922d 100644 GIT binary patch delta 130 zcmZpYXp-P#Vp+k&z-Gh%1WcSCC-R9iT253`XY}9bXT-!PHMx;V97xV&QU#LxnGAsB z2c}p?sm*@Od5nx&llQXhVC0-!#u~+Pr*wwH<}0k7OpG3z<2XtfB_%5Y*`6JqV&uU4 f^pV0tj!XO;Wz0_`zFm^r{E}0MiItI&aYYOOZDA#{ delta 130 zcmZpYXp-P#Vp+k&z-Gh%1WcUoC-R9inom?yXY}3ZXT-!PF}aaR97xV&QU#LxnGAsB z2c}p?iOqh@d5nx2llQXhU}T?M#u~+PvvkIV%~x1EnHb$R$8nS}ii=kSvOPOI#mGVE f=_7@QyqEYn%9x)>eB1n*Q;3P3fq{{c@n{2 3 - -32000 - -32000 + -1 + -1 -1 @@ -110,8 +110,8 @@ 0 - 1887 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000011000000100000000100000041453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF53453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000FFDC7800FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000F0A0A100FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C756172745C756172742E630000000006756172742E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6164635C6164632E6300000000056164632E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000F7B88600FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C74696D65725C7379735F74696D2E6300000000097379735F74696D2E6300000000D9ADC200FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6C65645C6C65642E6300000000056C65642E6300000000A5C2D700FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000B3A6BE00FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5372635C737461727475705C535441525455502E413531000000000B535441525455502E41353100000000EAD6A300FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C496E6974566172732E63000000000A496E6974566172732E6300000000F6FA7D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E63000000000B6770696F5F636F6D6D2E6300000000B5E99D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E68000000000B6770696F5F636F6D6D2E68000000005FC3CF00FFFFFFFF57453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000C1838300FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000CACAD500FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000F7020000 + 1981 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000012000000110000000100000041453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF53453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000FFDC7800FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000BECEA100FFFFFFFF4C453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C757365726170705C757365726170702E630000000009757365726170702E6300000000F0A0A100FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C756172745C756172742E630000000006756172742E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6164635C6164632E6300000000056164632E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000F7B88600FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C74696D65725C7379735F74696D2E6300000000097379735F74696D2E6300000000D9ADC200FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6C65645C6C65642E6300000000056C65642E6300000000A5C2D700FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000B3A6BE00FFFFFFFF4B453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5372635C737461727475705C535441525455502E413531000000000B535441525455502E41353100000000EAD6A300FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C496E6974566172732E63000000000A496E6974566172732E6300000000F6FA7D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E63000000000B6770696F5F636F6D6D2E6300000000B5E99D00FFFFFFFF50453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C6770696F5F636F6D6D5C6770696F5F636F6D6D2E68000000000B6770696F5F636F6D6D2E68000000005FC3CF00FFFFFFFF57453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6469736368617267655C6469736368617267655F6D6F64756C652E6300000000126469736368617267655F6D6F64756C652E6300000000C1838300FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000CACAD500FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000C5D4F200FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F5F6C616E6778756E2D4A385C557372496E635C756172745C756172742E680000000006756172742E6800000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000F7020000 @@ -1806,7 +1806,7 @@ File 2763 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C5750545F636865636B456E64960000000000000009000C5750545F636865636B456E641D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B197379363230785F6972715F68616E646C65725F746872656164044E4F4E4511677379363230785F6465766963655F7379144932435F4745545F4F574E5F4144445245535331144932435F4745545F4F574E5F41444452455353320C4932435F4F4152325F4F41321E48414C5F534D4255535F4D6173746572527843706C7443616C6C6261636B000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C5750545F636865636B456E64960000000000000009000C5750545F636865636B456E641D48414C5F534D4255535F536C617665527843706C7443616C6C6261636B197379363230785F6972715F68616E646C65725F746872656164044E4F4E4511677379363230785F6465766963655F7379144932435F4745545F4F574E5F4144445245535331144932435F4745545F4F574E5F41444452455353320C4932435F4F4152325F4F41321E48414C5F534D4255535F4D6173746572527843706C7443616C6C6261636B000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3603,7 +3603,7 @@ 0 100 - 16 + 17 ..\UsrSrc\main.c 0 @@ -3633,9 +3633,9 @@ ..\UsrSrc\userapp\userapp.c - 7 + 0 112 - 131 + 132 1 0 @@ -3714,7 +3714,7 @@ ..\UsrSrc\gpio_comm\gpio_comm.c - 22 + 28 54 77 1 @@ -3750,9 +3750,18 @@ ..\UsrSrc\key\key.c - 14 + 4 76 - 93 + 98 + 1 + + 0 + + + ..\UsrInc\uart\uart.h + 15 + 1 + 17 1 0 diff --git a/TP3310_Demo.si4project/TP3310_Demo.SearchResults b/TP3310_Demo.si4project/TP3310_Demo.SearchResults index 8dff35b..bb7850e 100644 --- a/TP3310_Demo.si4project/TP3310_Demo.SearchResults +++ b/TP3310_Demo.si4project/TP3310_Demo.SearchResults @@ -1,5 +1,12 @@ ----- 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; +---- Enter_Sleep_Cnt_Restart_Flag Matches (11 in 7 files) ---- +Hall_Handler in hall.c (UsrSrc\hall) : Enter_Sleep_Cnt_Restart_Flag = 1; +Key_Handler in key.c (UsrSrc\key) : Enter_Sleep_Cnt_Restart_Flag = 1; +sleep.c (UsrSrc\sleep) line 36 : bit Enter_Sleep_Cnt_Restart_Flag = 0; +Check_Require_Sleep in sleep.c (UsrSrc\sleep) : if( ( CHIP_STA4 & 0x80 ) || ( ON == Vox_Vout_Enable ) || Enter_Sleep_Cnt_Restart_Flag ) /*VBUS Power Good存在、有中断、耳机处于充电状态情况下,Boost重载输出,系统不进休眠模式。 */ +Check_Require_Sleep in sleep.c (UsrSrc\sleep) : Enter_Sleep_Cnt_Restart_Flag = 0; +sleep.h (UsrInc\sleep) line 37 : extern bit Enter_Sleep_Cnt_Restart_Flag; +EX2_isr in system.c (UsrSrc\system) : Enter_Sleep_Cnt_Restart_Flag = 1; +system.c (UsrSrc\system) line 268 : Enter_Sleep_Cnt_Restart_Flag = 1; +uart0_Interrupt in uart.c (UsrSrc\uart) : Enter_Sleep_Cnt_Restart_Flag = 1; +UserAPP in userapp.c (UsrSrc\userapp) : if( Enter_Sleep_Cnt_Restart_Flag ) +UserAPP in userapp.c (UsrSrc\userapp) : Enter_Sleep_Cnt_Restart_Flag = 0; diff --git a/TP3310_Demo.si4project/TP3310_Demo.sip_sym b/TP3310_Demo.si4project/TP3310_Demo.sip_sym index 613480b573b6de3910fa24612e6d3b7d09204135..5aa71a481d34da40eb86de4abb9b0cbe13c04f00 100644 GIT binary patch delta 51 zcmZ2+m1D(Kjtv%-jA@%KEB{A|PGewTU;<)h1`!|$0sNB{KL|G`T;85=nb9L00FWLI AS^xk5 delta 51 zcmZ2+m1D(Kjtv%-jES2qEB{A|PGDeQU;<)h24Nrx0sNB{KL|G`T;85=nb9L00FG@A AP5=M^ diff --git a/TP3310_Demo.si4project/TP3310_Demo.siwork b/TP3310_Demo.si4project/TP3310_Demo.siwork index f2f9c54f22cc970c5fb796306ed2c1e47d5c4dcd..8abcda2e42d21272cbbff0e9c159f2c64c1be944 100644 GIT binary patch literal 68562 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 literal 63172 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 VtRmfOG-*sF-IIWgs*|Ah{{h-j9gYA1 diff --git a/UsrInc/uart/uart.h b/UsrInc/uart/uart.h index 555083c..155217c 100644 --- a/UsrInc/uart/uart.h +++ b/UsrInc/uart/uart.h @@ -29,7 +29,7 @@ Macro definitions \******************************************************************************/ #define Baud_Rate0 9600//9600//19200//38400//93750 -#define S0REL_VALUE (1024-375000/Baud_Rate0) +#define S0REL_VALUE (1024-345600/Baud_Rate0) #if UART0_ENABLE diff --git a/UsrSrc/hall/hall.c b/UsrSrc/hall/hall.c index ffe595b..f576e66 100644 --- a/UsrSrc/hall/hall.c +++ b/UsrSrc/hall/hall.c @@ -93,7 +93,12 @@ uint8_t Hall_Sta_bk = 0xff; LED_On_Timer = 0; Vox_TX_Timer = 0; Hall_Sta_bk = Hall_Sta; +#if SLEEP_ENABLE + Enter_Sleep_Cnt_Restart_Flag = 1; + +#endif + } } diff --git a/UsrSrc/key/key.c b/UsrSrc/key/key.c index 5c22dd8..9525d43 100644 --- a/UsrSrc/key/key.c +++ b/UsrSrc/key/key.c @@ -82,7 +82,7 @@ idata uint8_t Key_Press_Debounce = 0; #else - if( (CHIP_STA0 & 0x02) == 0 ) //CHIP_STA0 bit1ΪKey״ֵ̬0£ + if( !(CHIP_STA0 & 0x02) ) //CHIP_STA0 bit1ΪKey״ֵ̬0£ { Key_Press_Debounce++; if( Key_Press_Debounce >= KEY_PRESS_CNT ) @@ -94,6 +94,12 @@ idata uint8_t Key_Press_Debounce = 0; Key_Press_Debounce = 0; } } +#if SLEEP_ENABLE + + Enter_Sleep_Cnt_Restart_Flag = 1; + +#endif + } else { diff --git a/UsrSrc/system/system.c b/UsrSrc/system/system.c index ebef688..2a6e7e1 100644 --- a/UsrSrc/system/system.c +++ b/UsrSrc/system/system.c @@ -66,7 +66,7 @@ */ void System_Init(void) { - SFRADDR = PMU_CTL0; //оƬӲ󣬹̶ ; Key Enable,Hall Enable + SFRADDR = PMU_CTL0; //оƬӲ󣬹̶ SFRDATA |= 0x30; /*test*/ @@ -88,7 +88,7 @@ void System_Init(void) S0RELH = HIBYTE(S0REL_VALUE); S0RELL = LOBYTE(S0REL_VALUE);//s0rel=1023, baudrate = fclk/32 = 187.5k - S0CON = 0xD0; //SCON: MODE 3, 9-bit UART, RI enable, EVEN Parity + S0CON = 0x40; //SCON: MODE 1, 8-bit UART, REN disable TI0 = 1; RI0 = 1; diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index d26c10b..3beb4ba 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -235,14 +235,14 @@ void Vox_Det_Machine(void) /* Ϳָ*/ if( Cover_Open_Flag ) /*Ǻ5V500ms0V500msVoxתadtģʽȴУʾӦĵЧ*/ { - if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_DEBOUNCE ) //Ǻ5V 500ms + if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_DEBOUNCE ) //Ǻ5V 500ms { Vox_Vol_Hold_Timer++; return; } - if( Vox_TX_Timer < VOX_VOUT_5V_DEBOUNCE ) //ת0V 500ms + if( Vox_TX_Timer < VOX_VOUT_5V_DEBOUNCE ) //ת0V 500ms { COM_CTRL = OFF; @@ -254,7 +254,7 @@ void Vox_Det_Machine(void) } else { - if( Pattern_TX_Over_Flag ) //תadtģʽںʶּ + if( Pattern_TX_Over_Flag ) //תadtģʽںʶּ { Pattern_TX_Over_Flag = 0; @@ -270,14 +270,14 @@ void Vox_Det_Machine(void) { Get_CHIP_STA1_Flag = 1; - CHIP_STA1_BK = CHIP_STA1 & 0xA0; //ȡloadon״̬ + CHIP_STA1_BK = CHIP_STA1 & 0xA0; //ȡloadon״̬ } } if( Get_CHIP_STA1_Flag ) { /*ж*/ - if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //ѯloadon״̬loadon״̬ı䣬˵жС + if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //ѯloadon״̬loadon״̬ı䣬˵жС { Earphone_Chg_Flag = 1; @@ -362,9 +362,9 @@ void Vox_Det_Machine(void) #endif - if( ( (CHIP_STA1 & 0xAC) == 0xAC ) || F_batlevel_low ) //ӵ͵磬رVoutͨ·رBoost + if( ( (CHIP_STA1 & 0xAC) == 0xAC ) || F_batlevel_low ) //ӵ͵磬رVoutͨ·رBoost { - if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //תʱ5sرBoost + if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //תʱ5sرBoost { Vox_Vol_Hold_Timer++;