From a29b5cb50be46c67e820a9f5962cc2502f9ad923 Mon Sep 17 00:00:00 2001 From: Alex xu Date: Mon, 10 Feb 2025 11:37:49 +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=E5=B0=86=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E5=9C=A8?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=97=B6=E4=B8=8D=E8=B5=8B=E5=88=9D=E5=80=BC?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E8=B5=8B=E5=88=9D=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=9C=A8=E7=B3=BB=E7=BB=9F=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=87=BD=E6=95=B0=E4=B8=AD=E8=B5=8B=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E8=8A=82=E7=9C=81ROM=E5=8D=A0=E7=94=A8=E6=9C=88100Bytes?= =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E5=88=A0=E9=99=A4=E6=8C=89=E9=94=AE?= =?UTF-8?q?=E7=9F=AD=E6=8C=89=E6=98=BE=E7=A4=BA=E7=94=B5=E9=87=8F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9B=203=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BC=80?= =?UTF-8?q?=E7=9B=96Vox=E8=BE=93=E5=87=BA5V=E7=BB=99=E8=80=B3=E6=9C=BA?= =?UTF-8?q?=E5=85=85=E7=94=B5=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9C=89=E8=80=B3?= =?UTF-8?q?=E6=9C=BA=E5=85=A5=E7=9B=92=E7=81=AF=E6=95=88=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E5=87=BA=E7=9B=92=E7=81=AF=E6=95=88=EF=BC=8CVox=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=88=B0=E8=BD=BB=E8=BD=BD=E5=90=8E=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?10=E5=88=86=E9=92=9F=E5=90=8E=E5=85=B3=E9=97=ADVox=E8=BE=93?= =?UTF-8?q?=E5=87=BA5V=EF=BC=8C=E8=BD=AC=E5=85=A5ADT=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=9B=204=E3=80=81=E5=A2=9E=E5=8A=A0Vox=E5=85=85=E7=94=B5?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E7=94=B5=E6=B1=A0=E7=94=B5=E5=8E=8B?= =?UTF-8?q?=E8=A7=A6=E5=8F=913.6V=E4=BD=8E=E7=94=B5=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E9=98=88=E5=80=BC=E5=90=8E=EF=BC=8CVox=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=94=B5=E9=87=8F=E7=A0=81pattern=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Out/8834_JLAB_JS07_241218_0929.bin | Bin 3072 -> 0 bytes Out/8834_JLAB_JS07_241218_0929.hex | 224 ------------ ...8834_JLAB_JS07_241218_0929_DB7C_010104.bin | Bin 3074 -> 0 bytes Out/8834_JLAB_JS07_250210_1118.bin | Bin 0 -> 3072 bytes Out/8834_JLAB_JS07_250210_1118.hex | 214 +++++++++++ ...8834_JLAB_JS07_250210_1118_30CE_010104.bin | Bin 0 -> 3074 bytes Project/TP3102_Demo.uvgui.GH | 334 +++++++++--------- .../TP3310_Demo.SearchResults | 9 +- TP3310_Demo.si4project/TP3310_Demo.sip_sym | Bin 165752 -> 351512 bytes TP3310_Demo.si4project/TP3310_Demo.siwork | Bin 35235 -> 45730 bytes UsrInc/bat/bat.h | 1 + UsrInc/hall/hall.h | 2 + UsrInc/key/key.h | 4 +- UsrSrc/adc/adc.c | 4 +- UsrSrc/bat/bat.c | 14 +- UsrSrc/charger/charger_module.c | 5 +- UsrSrc/discharge/discharge_module.c | 4 +- UsrSrc/gpio_comm/gpio_comm.c | 10 +- UsrSrc/hall/hall.c | 6 +- UsrSrc/key/key.c | 11 +- UsrSrc/sleep/sleep.c | 4 +- UsrSrc/system/system.c | 22 +- UsrSrc/timer/sys_tim.c | 12 +- UsrSrc/uart/uart.c | 4 +- UsrSrc/userapp/userapp.c | 12 +- UsrSrc/vox/vox_module.c | 190 +++++----- 26 files changed, 563 insertions(+), 523 deletions(-) delete mode 100644 Out/8834_JLAB_JS07_241218_0929.bin delete mode 100644 Out/8834_JLAB_JS07_241218_0929.hex delete mode 100644 Out/8834_JLAB_JS07_241218_0929_DB7C_010104.bin create mode 100644 Out/8834_JLAB_JS07_250210_1118.bin create mode 100644 Out/8834_JLAB_JS07_250210_1118.hex create mode 100644 Out/8834_JLAB_JS07_250210_1118_30CE_010104.bin diff --git a/Out/8834_JLAB_JS07_241218_0929.bin b/Out/8834_JLAB_JS07_241218_0929.bin deleted file mode 100644 index f6cefc4859cf3e340d876947378fc1b1713590ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3072 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¥(RpXV)nE!%(HOBxV0$XIV-d^Ea6gIjw`fsr6PzbP&onx zJ4HEMg&PcWhf>x+V)l3mlNgK_pAvH84Q5y^<8d1wlTn#r#$=`v=50BBx8A5X>FxSP zy57<|^iI7>uhuK+xKHoW8+1tz>jB-bhxAfCNDGuM=px-s(RWe0qHm%jePx?{TFEKD z;NR!J9M}@r8#pR(!e-%dZ;Pj*N|IYzHz=FB=o*Tyrs!HqZ`RlAE&2vJL@{BC(%bY_ z%CHLNHqqOgolocHAfMR*N}ilgcg&?7F=ak2&ZU`Xiz18jX@|{nBIwWCAltXm%DOfX zjMxJ8Xr0ZizO5MLu&j9j(bkSJcpXTe*(Mv-eA86p=3CP%uIbe*srn76{B@KIyyu-E zSCcS~u8wriPrlq8<@kukgd-#}nSM9sBoTWsgh#qb^X~4XXJ1R_t!eYFpLaK_kv`H5 zSq%m@*@SILk;$}l%^iQUpxzWvqfBnXAQ50mzD#72J?c%L`ejCjPif+S3;T*u2Ck$r zsZ0lAJZNbwY~V(@=gpvvN=F$~gy(=z0P>GcV`X{C+-~+lb*R>Xzc|X(0u5tKJ$^4a zE=?_~#~%d-)Qz!nrK68@4vdYo7;WwxIQ7hr?;or z+bzR_N0wb=MTC{xSqEtaH3lP7wK#Z+^;jPDIa)oqqCWo^l;Xjj=LGcyOFeK5pTvjM z{hC?`*zOc|s20rGa@E>`Pe9S0QUAorsl;@0durFTHCgdXNZ4VGLBsRe^y|?IBeiQG z_3(7kk$SMKOmn9mnoe@52OY4Sw)VX~`P-N~_3#t4QL&(v%tKgW&eTJ&bSG!O23tm%34dECrblj>}`FUqUc6kgBQkeY0IDJrNn z6kkhf(;RHnQn&>$rn<;y3756IJ{gAde9o(Nv<5GXI^2O_?2XjRMqz-5Ci|rGshr48 z*lvm5Q?@e<`z_ex>^=6Wng7{C;Q@F=oweJv-8tjdGBnTkXcl@3+&XkpE^e)&L5LMF zq5D8Mr74FLW|b}ub!FvA`E>c2ij&UQ9me7<*+?Z85R5$BC9BuB;I85e-hRdZKR=r0 HK6&y#C72f4 diff --git a/Out/8834_JLAB_JS07_250210_1118.bin b/Out/8834_JLAB_JS07_250210_1118.bin new file mode 100644 index 0000000000000000000000000000000000000000..2b04c2936edc74b1170c99ba7480da035ad66875 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 0599ca4..6f69f60 100644 --- a/Project/TP3102_Demo.uvgui.GH +++ b/Project/TP3102_Demo.uvgui.GH @@ -91,7 +91,7 @@ 44 2 - 2 + 3 -32000 -32000 @@ -101,17 +101,17 @@ -1 - 86 - 1912 - 3832 - 1048 + 164 + -392 + 1528 + 1126 0 962 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000008000000030000000100000043453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000C5D4F200FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C736C6565705C736C6565702E630000000007736C6565702E6300000000FFDC7800FFFFFFFF52453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000BECEA100FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000F0A0A100FFFFFFFF49453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C496E6974566172732E63000000000A496E6974566172732E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000F7B88600FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F483FFFF4F83FFFF808AFFFFBB85FFFF + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000008000000030000000100000043453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C6B65795C6B65792E6300000000056B65792E6300000000C5D4F200FFFFFFFF47453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C736C6565705C736C6565702E630000000007736C6565702E6300000000FFDC7800FFFFFFFF52453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C636861726765725C636861726765725F6D6F64756C652E630000000010636861726765725F6D6F64756C652E6300000000BECEA100FFFFFFFF4A453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C766F785C766F785F6D6F64756C652E63000000000C766F785F6D6F64756C652E6300000000F0A0A100FFFFFFFF49453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C73797374656D5C73797374656D2E63000000000873797374656D2E6300000000BCA8E100FFFFFFFF44453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C496E6974566172732E63000000000A496E6974566172732E63000000009CC1B600FFFFFFFF46453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C557372496E635C696E635C646566696E652E680000000008646566696E652E6800000000F7B88600FFFFFFFF45453A5C746F646179776F726B5C32303234303332355F7470333331305C5359383833585F44656D6F2D4A4C41422D4A5330375C5573725372635C68616C6C5C68616C6C2E63000000000668616C6C2E6300000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F400000066000000800700008D020000 @@ -134,7 +134,7 @@ 16 - 7408000066000000100D0000F6000000 + A2070000390000006A0A0000C9000000 @@ -150,11 +150,11 @@ 0 16 - 0300000066000000ED000000A2020000 + 0300000066000000ED0000005D020000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -170,11 +170,11 @@ 0 16 - 0300000066000000ED000000A2020000 + 0300000066000000ED0000005D020000 16 - A4000000BB000000C0010000FB020000 + A207000039000000BE08000079020000 @@ -190,11 +190,11 @@ 0 16 - 03000000300200008D050000A4020000 + 000000002D02000090050000BD020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -210,11 +210,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -230,11 +230,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -250,11 +250,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -270,11 +270,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D05000001010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -294,7 +294,7 @@ 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -314,7 +314,7 @@ 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -330,11 +330,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -350,11 +350,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -370,11 +370,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -390,11 +390,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -410,11 +410,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -430,11 +430,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -450,11 +450,11 @@ 0 16 - 0300000066000000ED000000A2020000 + 0300000066000000ED0000005D020000 16 - A4000000BB000000C0010000FB020000 + A207000039000000BE08000079020000 @@ -470,11 +470,11 @@ 0 16 - 0300000066000000ED000000A2020000 + 0300000066000000ED0000005D020000 16 - A4000000BB000000C0010000FB020000 + A207000039000000BE08000079020000 @@ -490,11 +490,11 @@ 0 16 - 00000000D302000080070000E6030000 + 000000008E02000080070000E6030000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -514,7 +514,7 @@ 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -530,11 +530,11 @@ 0 16 - 03000000D60200007D070000CD030000 + 03000000910200008D050000F1020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -550,11 +550,11 @@ 0 16 - F7000000660000008D050000C6000000 + F40000006300000090050000DF000000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -574,7 +574,7 @@ 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -610,11 +610,11 @@ 0 16 - A3040000660000008D05000010020000 + A0040000630000009005000029020000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -630,11 +630,11 @@ 0 16 - 03000000300200008D050000A4020000 + 000000002D02000090050000A9020000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -654,7 +654,7 @@ 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -674,7 +674,7 @@ 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -690,11 +690,11 @@ 0 16 - F7000000660000008D050000C6000000 + F40000006300000090050000DF000000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -714,7 +714,7 @@ 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -730,11 +730,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -750,11 +750,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -770,11 +770,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -790,11 +790,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -810,11 +810,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -830,11 +830,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -850,11 +850,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -870,11 +870,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -890,11 +890,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -910,11 +910,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -930,11 +930,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -950,11 +950,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -970,11 +970,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -990,11 +990,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1010,11 +1010,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1030,11 +1030,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1050,11 +1050,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1070,11 +1070,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1090,11 +1090,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1110,11 +1110,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1130,11 +1130,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1150,11 +1150,11 @@ 0 16 - 0300000066000000ED000000A2020000 + 0300000066000000ED000000A4020000 16 - A4000000BB000000C0010000FB020000 + A207000039000000BE08000079020000 @@ -1170,11 +1170,11 @@ 0 16 - 03000000D60200007D070000CD030000 + 000000008E020000900500000A030000 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -1190,11 +1190,11 @@ 0 16 - 03000000D60200007D070000CD030000 + 03000000910200008D050000F1020000 16 - A4000000BB000000C0010000FB020000 + A207000039000000BE08000079020000 @@ -1210,11 +1210,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1230,11 +1230,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1250,11 +1250,11 @@ 0 16 - 03000000D60200007D070000CD030000 + 03000000910200008D050000F1020000 16 - A4000000BB000000C0010000FB020000 + A207000039000000BE08000079020000 @@ -1270,11 +1270,11 @@ 0 16 - 03000000D60200007D070000CD030000 + 03000000910200008D050000F1020000 16 - A4000000BB000000C0010000FB020000 + A207000039000000BE08000079020000 @@ -1294,7 +1294,7 @@ 16 - A4000000BB0000006C0300004B010000 + A2070000390000006A0A0000C9000000 @@ -1310,11 +1310,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1330,11 +1330,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1350,11 +1350,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1370,11 +1370,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1390,11 +1390,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1410,11 +1410,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1430,11 +1430,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1450,11 +1450,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1470,11 +1470,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1490,11 +1490,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1510,11 +1510,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1530,11 +1530,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1550,11 +1550,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1570,11 +1570,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1590,11 +1590,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1610,11 +1610,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1630,11 +1630,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1650,11 +1650,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1670,11 +1670,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1690,11 +1690,11 @@ 0 16 - A3040000660000008D05000010020000 + A3040000660000008D0500007C010000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 @@ -1704,7 +1704,7 @@ 0 0 0 - 966 + 32767 0 8192 0 @@ -1744,7 +1744,7 @@ 0 0 0 - 476 + 32767 0 8192 1 @@ -1764,7 +1764,7 @@ 0 0 0 - 612 + 32767 0 8192 2 @@ -1790,23 +1790,23 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000300200008D05000090020000 16 - A4000000BB0000009401000086010000 + A2070000390000009208000004010000 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000007408000066000000100D0000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000200C000066000000100D000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000BB020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000800700006600000070080000D2020000000000004F000000F0000000BB0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000008007000030020000100D0000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000BB02000080070000BF02000001000000010000100400000001000000C9FCFFFF55000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000080070000D6020000000F0000FD03000000000000BF02000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A2070000390000006A0A0000C9000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A2070000390000009208000004010000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000076020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000A2070000390000009208000004010000000000004F000000F0000000760200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000A2070000390000009208000004010000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000076020000800700007A0200000100000001000010040000000100000002FDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000A2070000390000006A0A0000C9000000000000007A02000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2558 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000832303234313031359600000000000000010008323032343130313500000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2914 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000036162739600000000000000140003616273083230323431303135084144435F43544C310F636872675F69635F64697361626C6508636872675F69635F04343235300E496E697469616C5F5354373733350564656275671C4932435F57726974655F4F6E654279746528305844342C307830312C1C4932435F57726974655F4F6E654279746528305844342C307831302C0B536C6565705F64656C61791B4932435F57726974655F4F6E654279746528305844342C307830371B4932435F57726974655F4F6E654279746528305844342C3078313010636872675F63757272656E745F736574174932435F57726974655F4F6E654279746528305844342C1B4932435F57726974655F4F6E654279746528305844342C30783033023033084C444F5F43544C30043437303008766F6C5F766261740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 898 @@ -3633,9 +3633,9 @@ ..\UsrSrc\vox\vox_module.c - 15 - 443 - 471 + 30 + 207 + 216 1 0 @@ -3660,7 +3660,7 @@ \todaywork\20240325_tp3310\SY883X_Demo-JLAB-JS07\UsrInc\inc\define.h - 95 + 107 1 29 1 diff --git a/TP3310_Demo.si4project/TP3310_Demo.SearchResults b/TP3310_Demo.si4project/TP3310_Demo.SearchResults index c9bac77..773b71d 100644 --- a/TP3310_Demo.si4project/TP3310_Demo.SearchResults +++ b/TP3310_Demo.si4project/TP3310_Demo.SearchResults @@ -1,2 +1,7 @@ ----- VOX_ADT_HOLD_CNT Matches (1 in 1 files) ---- -vox_module.c (UsrSrc\vox) line 51 : #define VOX_ADT_HOLD_CNT 3 +---- F_batlevel_low Matches (6 in 4 files) ---- +bat.c (UsrSrc\bat) line 33 : bit F_batlevel_low; //电池低压 +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 ) diff --git a/TP3310_Demo.si4project/TP3310_Demo.sip_sym b/TP3310_Demo.si4project/TP3310_Demo.sip_sym index 7bfe370e581352ea8a37eb342bbaf37c114ceafd..c3e47166c9fea16197dcc675ad0af8cef6952379 100644 GIT binary patch delta 3277 zcmeHHUu=_A6#vfc?b>Y}eBauRjz98&LqG`>1vl6tAe~MnQe@&xfVME8#u>UXbSi-& zdw{S&>(Sl$KFZCivp}PIB_Q zxqr?*=XZYhPMs;}_|j{59hz3FY5ZfRY3(*mbMza>iVN>+ng--ftpbnfUfEYX!0->3 z4s-F`hZ}If8#L-@nUhbWXe?%K-1vkGuax?6VlKyMNuNk~nceYhq&c+Z;5+RZsKNNR z9&z#j(?zNZxTx=i3K1RyyV!RPwxa3tfG*eiwu3=QW#dmH9^dVjJ*7wNB3#V4*!U`# za?8T7O$5JyGMQN%01@w|QAJs_0OK3@96LqWPp)i$JXerk6@;0Utzu#?E5nvmiEJiC zvuVeZHG=-<-|pBT`o3WoM(!(i*e~(UkjqSnCXfq*-~kis>{pdQ0Mn)KcHwdEmWf89!Q*B+d?4>My#}IVEhtL2 zHJ`VuWG}tv;TSv3i;C#Ta&i@7IW|7(#@K2utB#Ix?CQ>?=RZ*aS(0R1tEWKR?1nu3 zU{h#s^uTk68yZ5jZ@jgyDY@vG_Hy7w`4py~Jd4R9S^=kEbJA}YW}H;u?*tR>VY0Cj<4tz?d+N}vEK4%hOMDZxkT14fg@tmo zFOY}zle$R!3S9cFA)9LziFWqC1ZLDw8cLYch!HRKVuYh-utKK3ayo=5p;omq+w`Th zS2ca9N}GMn@R1|yQ6J+n{LMt+-&Hp}RJ9@Lh^lrP)p2+qBh9%Y@-sg=vn`e5qX~O% z)b>lOfopuaG$+1GWT&jDIJg)Fw(FMX1o-nX{UfzQb}CXHd!M{I5!t>y11yhO!_7ItwaxnXuk#?Y~8I};a;c% zqRcLgcp(=4QkI4M4YEzYM+Z>_ZX0 z>(G^}Yxp`W1M#m^Gk)|gNF6{Iyv@YI* z9!IwQA`XmO(Mf2r8#|~jRrfSvWYVqF$t~x7_{d?rM2oY?|G_=#4O?j&n*t?xab=7y zyJ2Txn-QUHierV!B3X{Z`OL*Y7o7{hZN&@OiaZft$#{{{(iZY8;%cAU${1`JSDXlE z2_pt@(?Pnagbf$|hxp)v+v;1)8cGUBD2Qs1OAF%J&lXsLbu5!-Bxyz!rcl{=Ysp6T zys17=arX@6oCs41^9N~3ZBwYMoMf+ptyGMILR*8?FNd(SHGt^_WpGPG^4SKl(_leyqmp?< z$6=NdsdkFG^KC_CnEv&hpPE)n3-jk0FH#1ImuVE8gWwj!M_JXwKY#2BDPVx;BIe*- kyydU7hK{izN54MjFr$GP4g6mXB>kzs0470-*#H0l delta 1589 zcmYjReQZ-z6o2RTcJ0=7ynb!tD?FhSWWc)cF$PUGq{~9YP(B2V1gkD&gee747epv9 zbZXIHW+?Eh-a(eFTJLkOf z``zC?eP8+~KPYqiZJM@8(|9-2v=bIh^9;HVc^v;}ng(QctsW2Qewp?RG2C=XhiQ1S zw-JZ@5zO7-E>0mE$qHT!?gSs6bU1K$Y7q0&IJQ-!S*=BsH?j?w>hihgQ0Sv;44;TK zVy?0kd~#{kM!=gpiZ$0!l&ZN7?>2blz|;d);XDQbxpr36BGPZrE;l<2n0%az$SpAB z@<3aeh6l)e#P}Zp*}5bQ;`%}e;K=yPWh? zM@EEdb@Fb*E)YXI!7X22Su^#-SHLmzmmxEoGJfnou47Y;Q%ojc2_`;`$f{j!;2xtq zE1B|Y-H|=*KXUO+oCRcZ55dj1aF+_$U3jf&Z^>WxZUO)2^r*;s)cfT6eW$Fd?F;*T z9Q88pa#6@!GS&E8+%w0Eu{th82S+)0u&!ph3?5w$sP_b9qSHrgHUhUz*}Qx2^J`ua z!4)jr6SQJF#PL9{4wYEiT`l&{Ve{qI?l{AKLzm+{k#d|!MbN176@V)#h)@HwW4>a6 zoJj2}$JTqgjGZT9vmVBw6i@qR$Y7=tOkJ|u>~B&L>b_m{`Po{LKLS26oCczOoMZULa@22g z8T~r%a9pMWD)3R5ByG21^r5tAUx{_&UP|>8VcT=p?CKol#Awo5*d%`HbPHb3bZO)- zCq?TIpqrC%a58c27;Sw=Ay^`2+<}1E_AU%CcaDlGbjqvsy{JxrS*T!6Bw&;~vh;5e zZ^-<%2To2yy`GDa1i>J}&Ex=;AzgEqg8~KZ|+p0BnSB7tcVV?U925eMv4=}IUb`LtN?)B8J zLjTYsobeVer)mEej@vN4jJwJyU=5k_QFTqttc6XINb5N`@w?w=nb)l>YQdzzF%~w= zXeo0tI_c9h!E44HY(WVopDs?67Am2Rv_(KYHIZ|(d0c@N_6pWdV{6rJDqg`x93uE6 z4G0yw`a#O-0;B2Kti8g2mHtyl;?ka>-{SgNtUp2}!woD~(z}_9$$Q|0kId>O)?x@_ zBe9c=s;=W6-C0etRQW436GZ3*HsiDGi;Ro$a}+hUgDEK)I_CRAX11MWN_rRRXf$(? ze3ebu1C*#Pq>^-0^^Q$9n#49Yi-_whnNRe+#!?uivAgXP!`${deNyomFgrRJDKG1M z0IQikui!P~V3${n9AqK7u^c~sC!%Jy81A6~`V_q{D$j;fXke|qKsWOc%h>)0z`M~! diff --git a/TP3310_Demo.si4project/TP3310_Demo.siwork b/TP3310_Demo.si4project/TP3310_Demo.siwork index e879b9f93e6c07bf688422f5c66fb5b82ad9eda2..d7a606c766585a5b2e9a1a833d69f72dcd4280f4 100644 GIT binary patch literal 45730 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 (C_bat_level_lowpower + 2) ) diff --git a/UsrSrc/charger/charger_module.c b/UsrSrc/charger/charger_module.c index 70ba4f0..957927e 100644 --- a/UsrSrc/charger/charger_module.c +++ b/UsrSrc/charger/charger_module.c @@ -28,11 +28,11 @@ #include "userapp.h" #include "bat.h" -bit Charger_Done = 0; +bit Charger_Done; //#ifdef NTC_ENABLE -bit NTC_Pro_Flag = 0; +bit NTC_Pro_Flag; //#endif @@ -243,6 +243,7 @@ void Charger_Handler(void) if( bat_level > (C_bat_level_lowpower + 2) ) { + Bat_Low_TX_Flag = 0; F_batlevel_low = 0; } diff --git a/UsrSrc/discharge/discharge_module.c b/UsrSrc/discharge/discharge_module.c index 06ebc84..61907f4 100644 --- a/UsrSrc/discharge/discharge_module.c +++ b/UsrSrc/discharge/discharge_module.c @@ -26,7 +26,7 @@ #include "led.h" #include "bat.h" -bit gBoost_Prepared_Flag = 0; //BoostÂú×㿪ÆôÌõ¼þ¡£ +bit gBoost_Prepared_Flag; //BoostÂú×㿪ÆôÌõ¼þ¡£ #if DISCHARGE_ENABLE @@ -38,7 +38,7 @@ bit gBoost_Prepared_Flag = 0; //Boost Variables definitions \******************************************************************************/ -bit gBoost_UVLO_Flag = 0; +bit gBoost_UVLO_Flag; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/gpio_comm/gpio_comm.c b/UsrSrc/gpio_comm/gpio_comm.c index ff93d7c..439cb24 100644 --- a/UsrSrc/gpio_comm/gpio_comm.c +++ b/UsrSrc/gpio_comm/gpio_comm.c @@ -20,7 +20,7 @@ #include "gpio_comm.h" #include "vox_module.h" -bit Pattern_TX_Start = 0; +bit Pattern_TX_Start; #if VOX_TX_PATTERN /******************************************************************************\ @@ -30,13 +30,13 @@ bit Pattern_TX_Start = 0; /******************************************************************************\ Variables definitions \******************************************************************************/ -uint8_t Gpio_TX_Steps = GPIO_TX_STEPS_START; +uint8_t Gpio_TX_Steps; -uint16_t Pattern_TX_Data = 0; //ÐèҪͨ¹ýVOX·¢Ë͵ÄÊý¾Ý£º¸ß8λ£ººÐ×ÓµçÁ¿£»µÍ8λ°æ±¾ºÅ +uint16_t Pattern_TX_Data; //ÐèҪͨ¹ýVOX·¢Ë͵ÄÊý¾Ý£º¸ß8λ£ººÐ×ÓµçÁ¿£»µÍ8λ°æ±¾ºÅ -bit g_Key_Type = 0; +bit g_Key_Type; -bit g_Close_Type = 0; +bit g_Close_Type; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/hall/hall.c b/UsrSrc/hall/hall.c index a980dcb..65755d6 100644 --- a/UsrSrc/hall/hall.c +++ b/UsrSrc/hall/hall.c @@ -33,12 +33,12 @@ /******************************************************************************\ Variables definitions \******************************************************************************/ -uint8_t Hall_Sta_bk = 0xff; +uint8_t Hall_Sta_bk; CoverStatus_E CoverStatus; -bit CoverEvent_Flg = 0; //Hall¿ª¹Ø´¥·¢Ê¼þ±ê־λ -bit CoverEvent_Flg_led = 0; +bit CoverEvent_Flg; //Hall¿ª¹Ø´¥·¢Ê¼þ±ê־λ +bit CoverEvent_Flg_led; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/key/key.c b/UsrSrc/key/key.c index afbfe54..fbbb388 100644 --- a/UsrSrc/key/key.c +++ b/UsrSrc/key/key.c @@ -28,11 +28,11 @@ #include "gpio_comm.h" #include "hall.h" -bit Key_Press_irq = 0; +//bit Key_Press_irq = 0; -bit Key_Press_short_irq = 0; +bit Key_Press_short_irq; -bit Key_Press_ll_irq_led = 0; +bit Key_Press_ll_irq_led; #ifdef KEY_ENABLE /******************************************************************************\ @@ -156,14 +156,15 @@ void Key_Handler(void) nKey_Press_Flag = 0; Key_Press_short_irq = 0; - +#if 0 if( (Key_Press_Debounce < KEY_PRESS_CNT0) ) //ËÉ¿ª°´¼ü£¬°´ÏÂʱ¼äСÓÚ500ms£¬Ôòʶ±ðΪ¶Ì°´£¬ÏÔʾµçÁ¿ { Key_Press_irq = 1; //¶Ì°´£¬ÏÔʾµçÁ¿ #if LED_DISPLAY LED_On_Flag = 1; #endif - } + } +#endif } Key_Press_Debounce = 0; diff --git a/UsrSrc/sleep/sleep.c b/UsrSrc/sleep/sleep.c index 67ec3a5..9df47c1 100644 --- a/UsrSrc/sleep/sleep.c +++ b/UsrSrc/sleep/sleep.c @@ -31,9 +31,9 @@ Variables definitions \******************************************************************************/ -uint8_t Decnt_SleepDelay = ENTER_STANDBYMODE_CNT; +uint8_t Decnt_SleepDelay; -bit Enter_Sleep_Cnt_Restart_Flag = 0; +bit Enter_Sleep_Cnt_Restart_Flag; /******************************************************************************\ Functions definitions diff --git a/UsrSrc/system/system.c b/UsrSrc/system/system.c index f49ac19..7b9d8f9 100644 --- a/UsrSrc/system/system.c +++ b/UsrSrc/system/system.c @@ -100,7 +100,6 @@ void System_Init(void) P01 = 1; - SFRADDR = P0_OE; //Set P03¡¢P04 LED1-LED2,P01 As TX SFRDATA |= 0x1A; @@ -118,7 +117,8 @@ void System_Init(void) SFRADDR = VOX_CON2; //ÉèÖÃVOXÇáÖØÔØת»»Â˲¨Ê±¼ä¡£bit3:2 VOXÇáÔØתÖØÔØÂ˲¨Ê±¼ä£»bit1:0 VOXÖØÔØתÇáÔØÂ˲¨Ê±¼ä SFRDATA |= (VOX_LIGHT_TO_HAVEY_128 << 2) | VOX_HAVEY_TO_LIGHT_8; - + + Vox_Vout_Enable = OFF; #endif TMOD = 0x01; //mode 1, 16bit timer @@ -148,8 +148,15 @@ void System_Init(void) WDTREL = 0x80; //WDTPS = 0,wdt_f = wdt_f1/2;WDTPS = 1,wdt_f = wdt_f1/32; #endif +#if ADC_ENABLE + + Vref_Adc = 311; + +#endif + #ifdef HALL_ENABLE + Hall_Sta_bk = 0xff; #endif @@ -190,6 +197,17 @@ void System_Init(void) #endif +#if VOX_TX_PATTERN + + Gpio_TX_Steps = GPIO_TX_STEPS_START; + +#endif + +#if SLEEP_ENABLE + + Decnt_SleepDelay = ENTER_STANDBYMODE_CNT; + +#endif } /* diff --git a/UsrSrc/timer/sys_tim.c b/UsrSrc/timer/sys_tim.c index 0f5d742..81158a8 100644 --- a/UsrSrc/timer/sys_tim.c +++ b/UsrSrc/timer/sys_tim.c @@ -32,15 +32,15 @@ /******************************************************************************\ Variables definitions \******************************************************************************/ -uint8_t cnt_sys_tim_250ms = 0; -uint8_t cnt_sys_tim_100ms = 0; -uint8_t cnt_sys_tim_1s = 0; +uint8_t cnt_sys_tim_250ms; +uint8_t cnt_sys_tim_100ms; +uint8_t cnt_sys_tim_1s; //uint8_t cnt_sys_tim_10ms = 0; -bit F_sys_tim_1ms = 0; +bit F_sys_tim_1ms; -bit F_sys_tim_100ms = 0; -bit F_sys_tim_1s = 0; +bit F_sys_tim_100ms; +bit F_sys_tim_1s; /******************************************************************************\ diff --git a/UsrSrc/uart/uart.c b/UsrSrc/uart/uart.c index 59fade2..be20e62 100644 --- a/UsrSrc/uart/uart.c +++ b/UsrSrc/uart/uart.c @@ -42,8 +42,8 @@ bit busy0; #ifdef VOX_RX -idata uint8_t RX0_Buffer[COM0_Data_Lenth] = 0; //½ÓÊÕ»º³å -bit Uart0_RX_Finish_Flag = 0; +idata uint8_t RX0_Buffer[COM0_Data_Lenth]; //½ÓÊÕ»º³å +bit Uart0_RX_Finish_Flag; #endif #ifdef _DEBUG_ALL diff --git a/UsrSrc/userapp/userapp.c b/UsrSrc/userapp/userapp.c index 7a26cae..c0f4522 100644 --- a/UsrSrc/userapp/userapp.c +++ b/UsrSrc/userapp/userapp.c @@ -52,9 +52,9 @@ /******************************************************************************\ Variables definitions \******************************************************************************/ -bit LED_On_Flag = 0; +bit LED_On_Flag; -bit Wkup_Earphone_Flag = 0; +bit Wkup_Earphone_Flag; /******************************************************************************\ Functions definitions @@ -196,7 +196,7 @@ void LED_Display_App(void) } } - Key_Press_irq = 0; +// Key_Press_irq = 0; // Key_Press_ll_irq_led = 0; @@ -234,7 +234,7 @@ void LED_Display_App(void) { LED_Bat_Pro_Flag = 1; - Key_Press_irq = 0; + // Key_Press_irq = 0; Key_Press_ll_irq_led = 0; @@ -247,7 +247,7 @@ void LED_Display_App(void) } else { - if( (Earphone_Chg_Flag || Key_Press_irq || Key_Press_ll_irq_led || CoverEvent_Flg_led) ) //¶ú»ú³öÈëºÐ¡¢°´¼ü´¥·¢£¬ÏÔʾµÆЧ + if( (Earphone_Chg_Flag || Key_Press_ll_irq_led || CoverEvent_Flg_led) ) //¶ú»ú³öÈëºÐ¡¢°´¼ü´¥·¢£¬ÏÔʾµÆЧ { LED_Bat_Pro_Flag = 0; @@ -294,7 +294,7 @@ void LED_Display_App(void) } else { - Key_Press_irq = 0; + // Key_Press_irq = 0; Key_Press_ll_irq_led = 0; diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index 33cc63e..4cd7f44 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -31,9 +31,9 @@ #include "charger_module.h" #include "gpio_comm.h" -bit Vox_Vout_Enable = OFF; //Vox¹¦ÂÊÊä³ö±ê־λ -bit Earphone_Chg_Flag = 0; //¶ú»ú³öÈëºÐ±ê־λ -//uint8_t Vox_TX_Timer = 0; //VOX·¢ËÍÖ¸Áî³ÖÐøʱ¼ä¼ÆÊý,ÔÚHall_Handler¼ì²âÖÐÇå0. +bit Vox_Vout_Enable; //Vox¹¦ÂÊÊä³ö±ê־λ +bit Earphone_Chg_Flag; //¶ú»ú³öÈëºÐ±ê־λ +//uint8_t Vox_TX_Timer; //VOX·¢ËÍÖ¸Áî³ÖÐøʱ¼ä¼ÆÊý,ÔÚHall_Handler¼ì²âÖÐÇå0. #if VOX_ENABLE @@ -43,7 +43,10 @@ bit Earphone_Chg_Flag = 0; // /*100msµ÷ÓÃÖÜÆÚ*/ #define VOX_OUTPUT_SHORT_CNT 2 #define VOX_LOW_BAT_CNT 25 //¹Ø¸ÇÇ°£¬ºÐ×ӵ͵籣»¤£¬Vox 5V³ÖÐø2.5s -#define VOX_VOUT_5V_LEAST_CNT 50 + +#define COVER_OPEN_VOX_VOUT_5V_LEAST_CNT 6000 //¿ª¸Çºó5V³ÖÐø10·ÖÖÓ + +#define VOX_VOUT_5V_LEAST_CNT 60 #define VOX_VOUT_5V_DEBOUNCE 2 #define VOX_VOUT_0V_DEBOUNCE 3 @@ -51,6 +54,8 @@ bit Earphone_Chg_Flag = 0; // #define VOX_ADT_HOLD_CNT 3 #define Vox_TX_Pattern_Cnt 3 +#define VOX_DET_CNT 3 + #define BOOST_VOUT_MAX 2 //¸úËæ³äBoostÊä³öµçѹÉÏÏÞÖµ£º0:4.6V,1:4.7V,2:4.8V,3:5.05V. #define VOX_IOFF_HOLD_CNT 50 @@ -65,23 +70,23 @@ bit Earphone_Chg_Flag = 0; // Variables definitions \******************************************************************************/ -bit Vox_Output_Short_Flag = 0; +bit Vox_Output_Short_Flag; -bit Earphone_Num_2Inbox = 0; //Ë«¶ú»úÔںбê־λ +bit Earphone_Num_2Inbox; //Ë«¶ú»úÔںбê־λ -bit Get_Vox_Num_Flag = 0; +bit Get_Vox_Num_Flag; -//bit Vor_In_Box_Flag = 0; +//bit Vor_In_Box_Flag; -//bit Vol_In_Box_Flag = 0; +//bit Vol_In_Box_Flag; #if VOX_FOLLOW_CHG -bit Boost_VoxVout_Follow_Flag = 0; +bit Boost_VoxVout_Follow_Flag; -int8 Boost_Vout_Value = 0; +int8 Boost_Vout_Value; -bit Boost_Up_Flag = 0; +bit Boost_Up_Flag; #endif @@ -168,7 +173,11 @@ void Vout_Ctrl_ON(uint8_t Type) * ******************************************************************************* */ -bit Vox_Ocp_Flag = 0; +bit Vox_Ocp_Flag; + +uint16_t Vor_chgFull_Timer; + +uint16_t Vol_chgFull_Timer; void Vox_Det_Machine(void) { @@ -196,9 +205,9 @@ void Vox_Det_Machine(void) static uint8_t CHIP_STA1_BK; - static uint8_t CHIP_STA1_Vor; +// static uint8_t CHIP_STA1_Vor; - static uint8_t CHIP_STA1_Vol; +// static uint8_t CHIP_STA1_Vol; static bit Follow_Chg_Start_Flag; @@ -206,16 +215,18 @@ void Vox_Det_Machine(void) static uint8_t Vox_TX_Timer; - static uint8_t Vor_chgFull_Timer; + //static uint16_t Vor_chgFull_Timer; - static uint8_t Vol_chgFull_Timer; + //static uint16_t Vol_chgFull_Timer; static uint8_t Vox_Output_Debounce; static bit Vor_Get_Sta_Flag; static bit Vol_Get_Sta_Flag; - + + static uint8_t nBat_Low_TX_Debounce; + if( gBoost_Prepared_Flag ) { /*ÏÈÅжÏÓм¸Ö»¶ú»úÔÚºÐ*/ @@ -245,6 +256,39 @@ void Vox_Det_Machine(void) // return; } } + + if( F_batlevel_low ) + { + if( !Bat_Low_TX_Flag ) + { + if( nBat_Low_TX_Debounce < Vox_TX_Pattern_Tim ) + { + if( (nBat_Low_TX_Debounce % Vox_TX_Interval == 0) ) + { +#if VOX_TX_PATTERN + Pattern_TX_Start = 1; + + g_Key_Type = 0; + + Pattern_TX_Data = bat_level_pdata | 0xC4; +#endif + } + + nBat_Low_TX_Debounce++; + + + } + else + { + + Bat_Low_TX_Flag = 1; + + nBat_Low_TX_Debounce = 0; + } + + return; + } + } if( CoverEvent_Flg ) //Hallʼþ´¥·¢¡£ { @@ -271,6 +315,8 @@ void Vox_Det_Machine(void) Vox_Chg_Full_Flag = 0; + Vox_Vout_Enable = ON; + if( CoverStatus == CLOSE ) //1¡¢¹Ø¸Ç¹Ø±ÕCOM_CTRL£»ÏÔʾµÆЧ¡££¨ÎÞÐè²éѯLoadon¡¢IOFF״̬£¬ÎÞÂÛ¶ú»úÊÇ·ñÔÚ²Ö£¬Vox 5VÊä³ö¡££© { Earphone_Chg_Flag = 0; //¹Ø¸ÇÈ¡Ïû¶ú»úÈëºÐµÆЧ£¬ÏÔʾ¹Ø¸ÇµÆЧ¡£ @@ -280,9 +326,7 @@ void Vox_Det_Machine(void) Cover_Close_Flag0 = 1; Cover_Close_Flag1 = 1; - - Vox_Vout_Enable = ON; - + Cover_Open_Flag = 0; Follow_Chg_Start_Flag = 0; @@ -400,7 +444,7 @@ void Vox_Det_Machine(void) { if( ( (CHIP_STA1 & 0x88) == 0x88 ) ) //VOR¶ú»ú³äÂú£¬×ªÈëADTģʽ¡£ { - if( Vor_chgFull_Timer < VOX_VOUT_5V_LEAST_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ + if( Vor_chgFull_Timer < COVER_OPEN_VOX_VOUT_5V_LEAST_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ { Vor_chgFull_Timer++; } @@ -408,104 +452,71 @@ void Vox_Det_Machine(void) { VOX_CTL0 &= ~0x20; //VOX 5v Off, Enable VOX ADT - Vor_Get_Sta_Flag = 1; - Vor_Chg_Full_Flag = 1; Vor_chgFull_Timer = 0; } - } - } - else - { - if( Vor_Get_Sta_Flag ) - { - if( Vor_chgFull_Timer <= VOX_ADT_HOLD_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ - { - Vor_chgFull_Timer++; - return; - } - Vor_Get_Sta_Flag = 0; - - CHIP_STA1_Vor = CHIP_STA1 & 0x80; } else { - if( !Key_Press_short_irq ) + if( CHIP_STA1 & 0x80 ) { - if( CHIP_STA1_Vor != ( CHIP_STA1 & 0x80 ) ) + if ( !Vor_Get_Sta_Flag ) { - if(CHIP_STA1 & 0x80) - { - Earphone_Chg_Flag = 1; + Vor_chgFull_Timer = 0; + + Vor_Get_Sta_Flag = 1; + + Earphone_Chg_Flag = 1; #ifdef LED_DISPLAY - LED_On_Flag = 1; -#endif - } - - CHIP_STA1_Vor = CHIP_STA1 & 0x80; + LED_On_Flag = 1; +#endif } } } } - + if( !Vol_Chg_Full_Flag ) { if( ( (CHIP_STA1 & 0x24) == 0x24 ) ) //VOR¶ú»ú³äÂú£¬×ªÈëADTģʽ¡£ { - if( Vol_chgFull_Timer < VOX_VOUT_5V_LEAST_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ + if( Vol_chgFull_Timer < COVER_OPEN_VOX_VOUT_5V_LEAST_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ { Vol_chgFull_Timer++; } else { - VOX_CTL0 &= ~0x10; //VOX 5v Off, Enable VOX ADT - - Vol_Get_Sta_Flag = 1; + VOX_CTL0 &= ~0x10; //VOX 5v Off, Enable VOX ADT Vol_Chg_Full_Flag = 1; Vol_chgFull_Timer = 0; } - } - } - else - { - if( Vol_Get_Sta_Flag ) - { - if( Vol_chgFull_Timer <= VOX_ADT_HOLD_CNT ) //ÖØÔØתÇáÔØÑÓʱ5sºó¹Ø±ÕBoostÊä³ö¡£ - { - Vol_chgFull_Timer++; - return; - } - Vol_Get_Sta_Flag = 0; - - CHIP_STA1_Vol = CHIP_STA1 & 0x20; } else { - if( !Key_Press_short_irq ) + if( CHIP_STA1 & 0x20 ) { - if( CHIP_STA1_Vol != ( CHIP_STA1 & 0x20 ) ) + if ( !Vol_Get_Sta_Flag ) + { - if(CHIP_STA1 & 0x20) - { - Earphone_Chg_Flag = 1; + Vol_Get_Sta_Flag = 1; + + Vol_chgFull_Timer = 0; + + Earphone_Chg_Flag = 1; #ifdef LED_DISPLAY - LED_On_Flag = 1; + LED_On_Flag = 1; #endif - } - - CHIP_STA1_Vol = CHIP_STA1 & 0x20; } - } + } } } - + if( Vor_Chg_Full_Flag && Vol_Chg_Full_Flag ) { Get_CHIP_STA1_Flag1 = 1; @@ -542,15 +553,22 @@ void Vox_Det_Machine(void) /*¶ú»ú³öÈëºÐÅжÏ*/ 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 - } + Vox_TX_Timer++; - CHIP_STA1_BK = CHIP_STA1 & 0xA0; + if( Vox_TX_Timer <= VOX_DET_CNT ) //loadon״̬³ÖÐø300ms£¬ÈÔ´æÔÚ£¬Ôò˵Ã÷¶ú»úÈëºÐ£¬ + { + if(CHIP_STA1 & 0xA0) + { + Earphone_Chg_Flag = 1; +#ifdef LED_DISPLAY + LED_On_Flag = 1; +#endif + } + + Vox_TX_Timer = 0; + + CHIP_STA1_BK = CHIP_STA1 & 0xA0; + } } } }