diff --git a/MDK-ARM/motor.uvoptx b/MDK-ARM/motor.uvoptx
index 4a49e55..9a541c9 100644
--- a/MDK-ARM/motor.uvoptx
+++ b/MDK-ARM/motor.uvoptx
@@ -145,7 +145,7 @@
0
ST-LINKIII-KEIL_SWO
- -US -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(0BC11477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L0xx_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32L072RBTx$CMSIS\Flash\STM32L0xx_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2
+ -US -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(0BC11477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32L0xx_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32L072RBTx$CMSIS\Flash\STM32L0xx_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2
diff --git a/MDK-ARM/motor.uvprojx b/MDK-ARM/motor.uvprojx
index 756e848..0975227 100644
--- a/MDK-ARM/motor.uvprojx
+++ b/MDK-ARM/motor.uvprojx
@@ -138,7 +138,7 @@
1
BIN\UL2V8M.DLL
-
+ "" ()
diff --git a/MDK-ARM/motor/motor.hex b/MDK-ARM/motor/motor.hex
index 1975be2..6208f7f 100644
--- a/MDK-ARM/motor/motor.hex
+++ b/MDK-ARM/motor/motor.hex
@@ -14,13 +14,13 @@
:1000C00000F002F800F03EF80CA030C80838241800
:1000D0002D18A246671EAB4654465D46AC4201D180
:1000E00000F030F87E460F3E0FCCB6460126334274
-:1000F00000D0FB1AA246AB46334318470C4600001B
-:100100002C460000103A02D378C878C1FAD85207BA
+:1000F00000D0FB1AA246AB4633431847184600000F
+:1001000038460000103A02D378C878C1FAD85207AE
:1001100001D330C830C101D504680C6070470000BD
:100120000023002400250026103A01D378C1FBD813
:10013000520700D330C100D50B6070471FB51FBDFB
:1001400010B510BD00F024FE1146FFF7F7FF02F0D6
-:10015000C7FF00F03CFE03B4FFF7F2FF03BC00F062
+:10015000CBFF00F03CFE03B4FFF7F2FF03BC00F05E
:1001600071FE000070B505460C46164602E00FCC45
:100170000FC5103E102EFAD2082E02D303CC03C5B1
:10018000083E042E07D301CC01C5361F03E02178B9
@@ -127,7 +127,7 @@
:1007D000D4420BD04B4002D592021143E2E74900CC
:1007E0004908DFE75940C90FC90718E00020084948
:1007F000D8E7054801420DD10342F7D0F2E70000E7
-:100800000000FF07C44100000000F07F0000E0FF8F
+:100800000000FF07D04100000000F07F0000E0FF83
:100810000000F87F114859400143C01241400020B8
:10082000C0E70123089A9B069A4205DC032252077F
:100830008918C90FC907B5E7052252078918074A61
@@ -196,7 +196,7 @@
:100C2000F6D8AB4201D1A942F2D0A94201D10021AC
:100C300001E061004908D0050843F0BD1102090E2A
:100C4000FBD0FF200243D005F0BD0A460146104606
-:100C500054E700007A3B00000000C07F0102C2158B
+:100C500054E70000863B00000000C07F0102C2157F
:100C600004D00123DB071943002A0ADB9E239A1ACA
:100C700002D40846D0407047FF224100120691423C
:100C800001D900207047C017C04370471F22030CD2
@@ -231,7 +231,7 @@
:100E500070470000024600BF002A03D1034801800A
:100E600000BFFEE700BF012070470000E400002043
:100E700010B5024807C801F09BFD10BD8800002096
-:100E800010B50249086802F0EDFE10BD08390020D7
+:100E800010B50249086802F0F3FE10BD08390020D1
:100E900000BFFEE770B504460D460026204600F070
:100EA00019F8002810D1A96868680843E968084360
:100EB000E168074A11400843E0602069800080082B
@@ -245,31 +245,31 @@
:100F30005B0B1A43826270478168024A1140091DA7
:100F400081607047E8FFFF7F10B54A1E044B9A5C32
:100F5000825853085B004A1E014CA25C835010BDAE
-:100F6000CF45000810B54A1E044B9A5C82580123F5
-:100F70001A434B1E014CE35CC25010BDCF45000824
+:100F6000DB45000810B54A1E044B9A5C82580123E9
+:100F70001A434B1E014CE35CC25010BDDB45000818
:100F800010B54A1E044B9A5C825802231A434B1E2A
-:100F9000014CE35CC25010BDCF45000830B54B1E7C
+:100F9000014CE35CC25010BDDB45000830B54B1E70
:100FA000054CE35CC35803242403A34313434C1EA2
-:100FB000014D2C5D035130BD3645000830B54B1E48
+:100FB000014D2C5D035130BD4245000830B54B1E3C
:100FC000064CE35C1B185B681B0C1B0413434C1E94
-:100FD000024D2C5D2418636030BD0000CF45000831
+:100FD000024D2C5D2418636030BD0000DB45000825
:100FE00030B54B1E054CE35CC358054C23401343FE
-:100FF0004C1E024D2C5D035130BD000036450008EB
+:100FF0004C1E024D2C5D035130BD000042450008DF
:10100000EFBFFFFF10B54B1E024CE35C1B18DA600C
-:1010100010BD0000CF45000830B54B1E054CE35C09
+:1010100010BD0000DB45000830B54B1E054CE35CFD
:10102000C3588024A34313434C1E024D2C5D03512F
-:1010300030BD00003645000830B54B1E054CE35C62
+:1010300030BD00004245000830B54B1E054CE35C56
:10104000C3580324A402A34313434C1E014D2C5D3B
-:10105000035130BD3645000830B54B1E054CE35CEE
+:10105000035130BD4245000830B54B1E054CE35CE2
:10106000C3582024A34313434C1E024D2C5D03514F
-:1010700030BD00003645000810B54B1E024CE35C45
-:101080001B189A6010BD0000CF45000830B54B1EFC
+:1010700030BD00004245000810B54B1E024CE35C39
+:101080001B189A6010BD0000DB45000830B54B1EF0
:10109000054CE35CC3584024A34313434C1E024D4C
-:1010A0002C5D035130BD00003645000830B5A82343
+:1010A0002C5D035130BD00004245000830B5A82337
:1010B0001B584C1EA5000F24AC40A3434C1EA5009A
:1010C0001446AC402343A824235030BD30B54B1EFA
:1010D000054CE35CC35803242402A34313434C1E72
-:1010E000014D2C5D035130BD364500080249496869
+:1010E000014D2C5D035130BD42450008024949685D
:1010F0008143014A51607047000401400249096878
:101100008143014A11607047000401400249496867
:101110000143014A51607047000401400249C96817
@@ -417,7 +417,7 @@
:1019F000164917480068FEF720FC0A2148430546AF
:101A0000FEF71BFC044600E0641E002CFCD110B065
:101A100070BD00000010024000080050000400509B
-:101A200080000240F0440008EFBFFFFF8000001C70
+:101A200080000240FC440008EFBFFFFF8000001C64
:101A300000240140000100200002002400040028CE
:101A40000020003408270140E8FFFF7F400D03001D
:101A50000000002008B501200C49096B01430B4A26
@@ -510,7 +510,7 @@
:101FC0000140019100BF00BF400302900220039036
:101FD00000200490059006900620079002A907486B
:101FE000FFF712F910B070BD00100240E7030000C7
-:101FF000000801401A45000821450008000400506F
+:101FF00000080140264500082D4500080004005057
:1020000000B585B00020019002900390049010204C
:102010001649896B0143154A91631146896B01404A
:10202000009100BF00BF0021112000F0D9FB11205A
@@ -568,11 +568,11 @@
:1023600004465560D3618868106400BF1462002081
:1023700070BD7047014600BF0548C068F02210409C
:1023800010400009034A125C0846D0407047000024
-:102390000010024059450008014600BF0548C068CA
+:102390000010024065450008014600BF0548C068BE
:1023A000072212021040000A034A125C0846D0407D
-:1023B000704700000010024069450008014600BF58
+:1023B000704700000010024075450008014600BF4C
:1023C0000548C0680722D2021040C00A034A125CC6
-:1023D0000846D040704700000010024069450008E0
+:1023D0000846D040704700000010024075450008D4
:1023E00010B500BF1648C0680C210840002806D070
:1023F00004280CD0082812D00C2816D111E0FFF7C1
:102400004FF8400B401C01218140CC0315E0FFF741
@@ -586,7 +586,7 @@
:10248000032189050840800D461C0748C0680F21BC
:1024900089040840800C0849085C604307463146BF
:1024A000FDF7CBFEF8BD00000010024000093D0022
-:1024B0000024F40000127A007145000808B50146B6
+:1024B0000024F40000127A007D45000808B50146AA
:1024C00000910098020EFF231B041840000A121806
:1024D0001B120098184000021018009A120680186B
:1024E0000090009808BD70477047000010B50120AB
@@ -611,12 +611,12 @@
:1026100082B21143044A4032D16000BF10BD0000B5
:102620000020024000700040001002400048E80115
:102630007047000010B50848FEF792FF00280AD046
-:102640000648006801F062F900BF0120C04302495A
+:102640000648006801F068F900BF0120C043024954
:10265000086100BF00BF10BD000801407C000020E1
:1026600010B50A48FEF77CFF00280DD000BF0848CF
:102670000068401C0649086000BF00BF0120C0433D
:102680000249086100BF00BF10BD000000100040FB
-:102690006000002010B50249086801F0FBFB10BD86
+:102690006000002010B50249086801F001FC10BD7F
:1026A0000839002030B47446641E2578641CAB429F
:1026B00004D3635D5B00E31830BC18471D46F8E7A0
:1026C000002805DBC206D20E01219140014A1160AB
@@ -657,7 +657,7 @@
:1028F0009042F7D3704700002400002010B506482E
:10290000046803E02046FFF7E9FF04460348006837
:102910008442F7D310BD00002000002024000020D6
-:1029200010B504462146002000F0F2FD10BD10B5A0
+:1029200010B504462146002000F0F6FD10BD10B59C
:1029300001E00170401C1346541EA2B2002BF8D1D6
:1029400010BD0FB46A46908800990A69024082421D
:1029500001D1012200E00022D0B204B070470FB4D0
@@ -687,466 +687,467 @@
:102AD000EB5C1B18DA6000BF029901984A1E2B4676
:102AE0009A5C825801231A434B1EEB5CC25000BF14
:102AF000032C02D10098FEF71FFAFEBD75000020DE
-:102B0000E8FFFF7FAC4500084038002038B5044698
-:102B1000002000902068002802D029287ED175E08E
-:102B200000BF002000F03AF94049886000F0FEFF45
-:102B30003E49486008468068FF21090208400012AB
-:102B40003A4989680902401839490880012000F093
-:102B500025F936494861012000F0F8FC3349086145
-:102B600008464069FF210902084001122F484069C8
-:102B7000000208182E494880022000F00FF92B4966
-:102B8000C862022000F0E2FC284988620846C06A58
-:102B9000FF210902084001122448C06A00020818F7
-:102BA00023498880032000F0F9F8204908620320B7
-:102BB00000F094F81D49C8610846006AFF21090227
-:102BC000084001121948006A000208181849C88014
-:102BD000042000F0E3F815498863042000F07EF833
-:102BE000124948630846806BFF2109020840011220
-:102BF0000E48806B000208180D49088100BF0D487F
-:102C00000068606000BF2920206000BF094960683B
-:102C10000968081A0A2802D2002038BD01E000BF66
-:102C20007FE70020206000900320F6E7A800002046
-:102C3000163B00206000002010B500F091FB00F072
-:102C40008DF810BD10B500F097F810BD10B500203C
-:102C50000F49086000F0C0FB00F0DEFA0D4807C81D
-:102C6000FFF7E8FE00F0E2F900BF00BF0A48006885
-:102C7000012108430849086000BF00BF0846C0683A
-:102C8000012108430449C86000BF00BF10BD000017
-:102C90007C000020880000200010004070B5054630
-:102CA0000E461446002E01D0012100E00021084606
-:102CB0000949FEF7CFF8002C01D0012100E00021E6
-:102CC000084685218900FEF7C5F885223146204651
-:102CD00000F03AFA657070BD13020000FEB50446BC
-:102CE00000250026204600F059F80746FDF7FAFFB8
-:102CF00005468B21C9052846FDF700FF0746124906
-:102D000001F00AFB06461149304601F0DBFA04D314
-:102D10000D49304601F058FB02D202200C490870E0
-:102D20000A49304601F07CFB0A490090FDF7E6FEB7
-:102D300007468321C905FDF7E1FE0749019001F02F
-:102D4000EBFA06463046FEBD00803B4500001644C7
-:102D50008400002000001643000096430020034931
-:102D600008600349086003490860704708000020B4
-:102D7000100000201800002010B50548FFF7C6FE1F
-:102D8000044800F0F1FD044800F07EF910BD000099
-:102D900008000020100000201800002070B5044634
-:102DA00000252300FFF77EFC0504090E13181D0003
-:102DB0000420FFF723FE054613E00020FFF71EFE68
-:102DC00005460EE00220FFF719FE054609E0012046
-:102DD000FFF714FE054604E00320FFF70FFE05464B
-:102DE00000BF00BF284670BDF8B505460E4618273F
-:102DF0003946002000F08CFB0446002C01D0012154
-:102E000000E0002108463621FEF724F82560A68060
-:102E10000448A0600448E060044820610448606100
-:102E20002046F8BD6F2900085F2900087F290008A7
-:102E30004329000870B504460D46002C01D001213D
-:102E400000E0002108464521FEF704F8002D01D0DE
-:102E5000012100E0002108464621FDF7FBFFA07894
-:102E6000002802D001280AD104E02946204600F0BB
-:102E7000CDFB0AE02946204600F020FA05E02A466C
-:102E800021460320FFF70AFF00BF00BF70BD00000E
-:102E9000F8B504460F46002C01D0012100E00021C6
-:102EA00008463921FDF7D6FF2579681DC6B232469E
-:102EB0002146024800F048F9F8BD00001C39002006
-:102EC000F8B50646002E01D0012100E00021084699
-:102ED0005921FDF7BFFF104C0027002000903079EA
-:102EE000401DC5B22A463146204600F02DF978191A
-:102EF000C7B2681E81B2601C01F08FF9E055781CE2
-:102F0000C7B23C20E055A81CC0B2009020460099F2
-:102F100000F080F8F8BD0000263A0020FEB5044617
-:102F20000D46012001900026002700200090207807
-:102F3000FF2806D16078002803D1681E205C3C2859
-:102F400003D0002001900198FEBD2079C01DC6B2BB
-:102F5000AE4203D0002001900198F5E7A81E275C3F
-:102F6000E81E81B2601C01F058F900900098874279
-:102F700003D0002001900198E6E70198E4E7000003
-:102F8000F8B507460C461546002629462046FFF7A9
-:102F9000C5FF0646012E0AD105480078002806D153
-:102FA00029462046FFF774FF012001490870F8BD4B
-:102FB0007800002070B512480078002800D170BD5C
-:102FC000104D114C21462846FFF734FF2046FFF7ED
-:102FD00077FFF02200210D48FFF7A9FC8522002190
-:102FE0002846FFF7A4FC852200212046FFF79FFC1E
-:102FF0000020034908700649087000BFDFE70000A1
-:10300000780000201C390020A1390020263A002039
-:103010008400002070B504460D4603492A4608681E
-:10302000214601F089F870BD083900200EB512481C
-:10303000006800281FD1F0210122104B009201915D
-:1030400002900A4601210E4800F0C2FD0A490860BC
-:103050000020096808700B48074909688860032048
-:1030600005490968C86002200349096808610249E6
-:10307000086800F0E1FF0EBD08390020812F00082C
-:10308000003801400000024038B50446002000909E
-:103090002068002802D0402819D110E000BF00F0BD
-:1030A000D7FC7D20C00000F091FA0B49087000BFEA
-:1030B0000A480068606000BF4020206000BF0749E8
-:1030C00060680968081A00D138BD00BFE7E7002032
-:1030D000206000900320F7E704000020600000203B
-:1030E00008B501201749496B0143164A516311463F
-:1030F000496B0140009100BF00BF00071146896B7A
-:10310000014391631146896B0140009100BF00BFEC
-:103110000321081FFFF7ECFAFFF7E8F9FEF7B8FC08
-:10312000FEF798FCFEF736FBFEF7A6FFFEF768FFFA
-:10313000FEF7B4FEFFF78AFDFFF77EFD01E0FFF723
-:1031400081FDFCE70010024010B503E00B7803702E
-:10315000491C401C1346541EA2B2002BF6D110BDD0
-:1031600070B5054648263146002000F0D1F90446E6
-:10317000002C01D0012100E0002108466621FDF766
-:1031800069FE20460021482201E00170401C1346E0
-:10319000561EB2B2002BF8D100BF2570012D0AD106
-:1031A00007492163074961630749A1630749E1634F
-:1031B0000749616401E0002070BD00BF2046FBE7C5
-:1031C00089360008E3360008AF380008493800089F
-:1031D000AD380008F8B505460C460D480068061DD8
-:1031E0000C480778012D0DD1007800280AD1601C09
-:1031F000FDF710F80090227801460548B36B00688F
-:10320000984703E00248716B006888473846F8BD6C
-:103210007C0000208400002010B598B00120FFF74A
-:103220009FFF134908601822124912A8FCF79AFF61
-:103230001822104918310CA8FCF794FF10200E49F1
-:103240000E4A09920A910B9018220CA903A8FCF7C8
-:1032500089FF15A807C86B4607C305480068046BBB
-:10326000034812A90EC90068A04718B010BD00009D
-:103270007C00002018460008000801406F12833BC4
-:10328000F8B505460C4600262879052802DA0326FB
-:103290003046F8BD687920700422A91D601CFFF734
-:1032A00053FF601CFCF7B6FF0090FFF707F90746D5
-:1032B000611CFCF7BAFF3046EBE70000F8B50546A5
-:1032C0000C46002D01D0012100E000210846F2212A
-:1032D000FDF7C0FD002C01D0012100E000210846CF
-:1032E000F321FDF7B7FD1D4807680026E8780028A0
-:1032F00006D0012805D0022816D0032825D11FE0CA
-:1033000029E039462846FFF7BBFF0646002E04D1C8
-:1033100039460120FFF75EFF0646852229462046F2
-:10332000FFF712FF667016E039460020FFF752FFE4
-:103330000646852229462046FFF706FF66700AE00A
-:103340002146284600F028F805E0224629460320B9
-:10335000FFF7A4FC00BF00BFF8BD00008000002004
-:1033600010B505242146002000F0D2F80949086074
-:103370000968002901D0012100E000210846EB2165
-:10338000FDF768FD0522002102480068FFF7CFFA2B
-:1033900010BD000080000020F8B505460C46002C4A
-:1033A00001D0012100E000210846DA21FDF752FD9D
-:1033B00008480068061D0027FF2020706770A87865
-:1033C000A070E878E070012020712820805D607195
-:1033D000F8BD00007C00002010B50446A1000C4B95
-:1033E00059584A00A3000B49C858002100F0A4F81E
-:1033F000A100094B5A58A30006490839C8580021B2
-:1034000000F09AF8012103480830015510BD000072
-:103410009445000854000020A4450008F3B581B08D
-:1034200004460025002000902548005D002804D1B6
-:10343000234818380168204688470298002801D19F
-:10344000401EFEBDA0001F4A11580298FCF7F5FE71
-:103450000646A0001B4A11580298FCF7EEFE002910
-:1034600000D0761CA00018490858451E22E0A10093
-:103470001348083840586900405A002803D1009882
-:10348000401C009001E0002000900098B04210D154
-:10349000002707E0A2000A4808388058EA195200BD
-:1034A00086527F1CB742F5D3A000064908586843EE
-:1034B000C7E76D1E002DDADA0020C043C1E7000027
-:1034C0005C0000209C4500089445000870B5044647
-:1034D0000026002508E0A1000B4840586900405A2A
-:1034E000002800D0761C6D1CA00008490858A8428E
-:1034F000F1D8A2000B469958642272431046FCF79B
-:103500009CFEC0B270BD000054000020944500082D
-:1035100070B504460E4631462046FFF77FFF05464C
-:10352000681C002800D170BDA10002484058401915
-:10353000F9E700004C00002030B5034601E01970A7
-:103540005B1C1446521E002CF9D130BDFEB504465A
-:10355000002500262046FFF721FC0746FDF7C2FBA9
-:1035600005468B21C9052846FDF7C8FA07461249CA
-:1035700000F0D2FE06461149304600F0A3FE04D307
-:103580000D49304600F020FF02D202200C4908709D
-:103590000A49304600F044FF0A490090FDF7AEFAB0
-:1035A00007468321C905FDF7A9FA0749019000F0F4
-:1035B000B3FE06463046FEBD00803B450000164483
-:1035C000840000200000164300007A44F8B5044649
-:1035D00000252046FDF786FB06460A480068FDF7F1
-:1035E00081FB07463146FDF789FA0546002005496B
-:1035F00008600549284600F08FFE0646FDF72EFBC1
-:10360000F8BD0000700000200000C84270B50546FB
-:103610000C46002D01D0012100E000210846FF21C9
-:103620007231FDF717FC002C01D0012100E00021D0
-:103630000846FF217331FDF70DFC0026E8780528C8
-:1036400001DD032600E000BFFF2020706670A8782F
-:10365000A070E878E070E878052807DB0A20207180
-:1036600022790849601DFFF76FFD09E002202071F3
-:103670002279E0784000034BC118601DFFF764FD1C
-:1036800070BD0000163B00200FB4F8B5044613AD22
-:10369000E0CD002C01D0012100E0002108460621E8
-:1036A000FDF7D8FB6A46118C0798FFF79DFB606019
-:1036B0006A46118F0D98FFF797FBA060E6602761BF
-:1036C000656100BFE068FDF701FF2169E068FDF773
-:1036D000F5FEE068FDF7F6FE00BFF8BC08BC04B0DC
-:1036E0001847F3B585B00546002D01D0012100E053
-:1036F000002108461121FDF7ADFB2C1D002C01D047
-:10370000012100E0002108461321FDF7A3FB0698E4
-:10371000207601216176069801283ED1216808694A
-:1037200049690191009020680490206880680390A6
-:103730000C21049841180A7813464A781202134360
-:103740008A7812041343C97809060B4308214118EB
-:103750000E7832464E78360232438E783604324343
-:10376000C97809060A430779394647793F02394340
-:1037700087793F043943C6793606314306463778A0
-:10378000384677783F023843B7783F043843F678B5
-:1037900036063043039EB0473DE021680869496919
-:1037A00001910090206804902068C06803900C216B
-:1037B000049841180A7813464A78120213438A780B
-:1037C00012041343C97809060B43082141180E78E7
-:1037D00032464E78360232438E7836043243C97808
-:1037E00009060A430779394647793F023943877901
-:1037F0003F043943C67936063143064637783846A2
-:1038000077783F023843B7783F043843F678360676
-:103810003043039EB04700BFA068016801221143F6
-:10382000016000BFE168A068026A0A43026200BF4B
-:10383000A068C16801221143C16000BF00BF01211F
-:103840002820015507B0F0BDF8B505460E461746CD
-:10385000002D01D0012100E0002108462D21FDF7B7
-:10386000F9FA2C1D002C01D0012100E000210846AE
-:103870002F21FDF7EFFA607E012800D1F8BD304618
-:103880002169FDF73BF90090FDF7E8F9E0610021BF
-:103890006162E069002803D12846616B884703E034
-:1038A00039462846226B904700BFE7E7704770B55E
-:1038B0000546002D01D0012100E0002108461D2110
-:1038C000FDF7C8FA2C1D002C01D0012100E00021D9
-:1038D00008461F21FDF7BEFA002161766161E161B2
-:1038E00000BFA068FDF7F2FDE168A068FDF7E6FD06
-:1038F000A068FDF7E7FD00BF002128200155E06B1F
-:10390000002802D02846E16B884770BD70B5054697
-:10391000002D01D0012100E0002108464D21FDF7D6
-:1039200099FA2C1D002C01D0012100E0002108464D
-:103930004F21FDF78FFAE069401EE061606A401C8C
-:103940006062207E002803D1206A401C206202E0D1
-:10395000206A401E2062E069002804D100BF00BF39
-:103960002846616B884770BD38B50446002000903A
-:103970002068002802D0342813D10AE000BFFFF7E6
-:1039800019FB00BF09480068606000BF3420206058
-:1039900000BF064960680968081A00D138BD00BF39
-:1039A000EDE70020206000900320F7E76000002092
-:1039B000F0B5A7B006460D4600270024FF21684653
-:1039C00001750021417501218175C675012E02D056
-:1039D000022E08D103E005206946087603E00020A6
-:1039E0006946087600BF00BF0524224605A928467F
-:1039F000FFF7AAFB012E12D10020694608730D3192
-:103A00001248FCF712FC03A80130FCF703FC0190FC
-:103A1000FEF754FD03A901310290FCF706FC2819BA
-:103A2000052203A9FFF790FB601DC4B2601E81B29E
-:103A3000681C00F0F2FB2855601CC4B23C202855DD
-:103A4000601CC4B22746384627B0F0BD0000B4421F
-:103A500070B50025124C13480078032800DB70BDB8
-:103A600010480078012802D002280ED106E00D4946
-:103A70004878214600F032F8054607E009494878C1
-:103A80002146FFF795FF054600E000BF00BF29462D
-:103A9000204600F009F800200249087000BFDEE768
-:103AA000203B00209400002070B504460D460026FF
-:103AB00029462046FFF732FA0646012E0AD106486B
-:103AC0000078002806D129462046FFF7E1F90120B9
-:103AD0000149087070BD000078000020F0B5A3B067
-:103AE00006460D46F02200212846FEF720FF00275B
-:103AF0000024FF2168460171002141718171C67166
-:103B000001720524224601A92846FFF71DFB601E0D
-:103B100081B2681C00F081FB2855641C3C202855AC
-:103B2000641C2746384623B0F0BD0000F0B587B0CE
-:103B3000002400200690FFF731F90546FDF7D2F882
-:103B400004468B21C9052046FCF7D8FF05461749D6
-:103B500000F0E2FB06901649069800F0B3FB04D390
-:103B60001449069800F030FC02D202201249087075
-:103B70001249069800F054FC11490190FCF7BEFF71
-:103B80000746FCF791FF05460E4A0F4BFCF744FC35
-:103B900000220E4B03910290FCF762FE0591049007
-:103BA000FCF7FCFB0690069807B0F0BD00803B4593
-:103BB0000080644400600245840000200080BB4413
-:103BC0000000CA426891ED7C3F3517400000244058
-:103BD000FFB581B0064615460B9F002E01D001218E
-:103BE00000E0002108468421FDF734F93420FEF777
-:103BF00097FE0446002C01D0012100E00021084678
-:103C00008721FDF727F90498E062A5830C982063CB
-:103C10002785002D0DDD2846FEF782FEA061A169F3
-:103C2000002901D0012100E0002108469621FDF77E
-:103C300011F9002F0DDD3846FEF772FE6062616AF1
-:103C4000002901D0012100E0002108469D21FDF757
-:103C500001F90298A07520210A980855666020464F
-:103C600005B0F0BD70B50446002C01D0012100E084
-:103C700000210846FF216B31FDF7ECF82169A068AF
-:103C8000FDF762F920690300FEF70CFD08730514C7
-:103C900023334353637300BFA068016802221140BD
-:103CA0004908002904D0A0680221416000BF00BF7C
-:103CB00000BF5FE000BFA0680168202211404909F1
-:103CC000002904D0A0682021416000BF00BF00BFD0
-:103CD00050E000BFA0680168012252021140490A69
-:103CE000002904D0A0681146416000BF00BF00BF9A
-:103CF00040E000BFA0680168012252031140490B57
-:103D0000002904D0A0681146416000BF00BF00BF79
-:103D100030E000BFA0680168012252041140490C44
-:103D2000002904D0A0681146416000BF00BF00BF59
-:103D300020E000BFA0680168012252051140490D32
-:103D4000002904D0A0681146416000BF00BF00BF39
-:103D500010E000BFA0680168012252061140490E20
-:103D6000002904D0A0681146416000BF00BF00BF19
-:103D700000E000BF00BF656800BF00BFFEF7A8FD00
-:103D800006460120FEF7A7FD286840210843286069
-:103D90003046FEF7A0FD00BF00BF01212A200155DB
-:103DA00020690300FEF77EFC087305142333435398
-:103DB000637300BFA068016808221140C908002988
-:103DC00004D0A0680821416000BF00BF00BF5FE0D1
-:103DD00000BFA068016880221140C909002904D0F1
-:103DE000A0688021416000BF00BF00BF50E000BF5D
-:103DF000A06801680122D2021140C90A002904D03A
-:103E0000A0681146416000BF00BF00BF40E000BF96
-:103E1000A06801680122D2031140C90B002904D017
-:103E2000A0681146416000BF00BF00BF30E000BF86
-:103E3000A06801680122D2041140C90C002904D0F5
-:103E4000A0681146416000BF00BF00BF20E000BF76
-:103E5000A06801680122D2051140C90D002904D0D3
-:103E6000A0681146416000BF00BF00BF10E000BF66
-:103E7000A06801680122D2061140C90E002904D0B1
-:103E8000A0681146416000BF00BF00BF00E000BF56
-:103E900000BF70BD70B50446002C01D0012100E0C8
-:103EA00000210846FF212431FCF7D4FF6068016837
-:103EB00020221140490900291BD06068C1691140C6
-:103EC0004909002915D06068416AC9B2A28A501C0C
-:103ED000A082A0698154A07D002851D1E06A002809
-:103EE00004D0A28A2078E36AA16998470020A082C2
-:103EF00046E06068016810221140090900293FD09E
-:103F00006068C16911400909002939D0A07D0128E4
-:103F100031D1E168A068FDF717F8E168A0684A1E92
-:103F2000444B9A5C12185268A08B801AA082E06AF7
-:103F3000002817D0A08A002814DDA08AA18B88420F
-:103F400010DCA28A2078E36AA16998470021A28B3D
-:103F5000A06901E00170401C1346551EAAB2002B57
-:103F6000F8D100BFA28BE168A068FDF727F8E168EF
-:103F7000A068FCF7F7FF0020A0826068FDF72CFB2B
-:103F80006068016840221140890900290ED06068EC
-:103F9000FDF7DAFB002809D0206B002801D0206B48
-:103FA000804760684021016200BF00BF606801680F
-:103FB000FF2201321140090A00290DD06068C16951
-:103FC000C907C90F012251405140002904D060683F
-:103FD0000121016200BF00BF6068FDF7A3FB00285C
-:103FE00009D06068FDF79EFB002804D060680221BC
-:103FF000016200BF00BF6068FDF79AFB002809D08E
-:104000006068FDF795FB002804D060680421016218
-:1040100000BF00BF6068FDF791FB002809D0606811
-:10402000FDF78CFB002804D060680821016200BF06
-:1040300000BF70BDCF45000870B50446A07D0028C4
-:1040400003D16068FDF7D4FA75E06068FDF7C4FA43
-:104050006068FDF7CDFA2169A068FCF775FFE1689B
-:10406000A068FCF771FF01216068FDF7B8FA05460A
-:104070002A46E168A068FCF7FFFFA269E168A06832
-:10408000FCF7C0FFA28BE168A068FCF797FFE1682E
-:10409000A068FCF775FFE168A068FCF763FF65683E
-:1040A00000BF00BFFEF714FC06460120FEF713FC1C
-:1040B000A86840210843A8603046FEF70CFC00BF0A
-:1040C00000BF656800BF00BFFEF702FC0646012086
-:1040D000FEF701FC28681021084328603046FEF7EF
-:1040E000FAFB00BF00BF00216068FDF778FA0546C3
-:1040F0002A462169A068FCF7BFFF626A2169A068AF
-:10410000FCF780FF2169A068FCF73AFF656800BFF3
-:1041100000BFFEF7DDFB06460120FEF7DCFBA868CA
-:1041200080210843A8603046FEF7D5FB00BF00BFE2
-:1041300001212A20015570BDF8B504460D461646EA
-:10414000002C01D0012100E000210846F321FCF7FA
-:1041500081FE002D01D0012100E000210846F4215C
-:10416000FCF778FE002E01DD012100E00021084669
-:10417000F521FCF76FFE00272020005D012823D1E8
-:104180002A20005D01281FD100212A20015529463F
-:10419000606A009603E00A780270491C401C009A8D
-:1041A000531E9BB20093002AF5D100BF2169A0687D
-:1041B000FCF7CAFE32462169A068FCF7FFFE2169C0
-:1041C000A068FCF7CFFE26E00027002014E00027BF
-:1041D00005E039467A1CD7B2FE2900DBF8BD6168DC
-:1041E000CA6980231A40D209002AF2D02A5C616889
-:1041F0008A6200BF411C88B2B042E8DB002705E0BC
-:104200003846791CCFB2FE2800DBE7E76068FDF78F
-:104210009BFA0028F4D000BFE0E730B50246144610
-:104220000020002304E025786840641C5D1CABB2CC
-:104230008B42F8DB30BD000070B501250400ED07AE
-:104240004C4020D4441A01D2001B0919C60D4B0062
-:10425000F2B2FF2A29D01B0E2CD000020C02D31A76
-:104260002C43DC402843051910D2280A02D3401CF5
-:104270006D0611D0761EF6058019FF2A00DA70BD92
-:10428000C00DC00570BD694000F0D0F801200543A5
-:10429000C541521C761CE8E764089C40C901614096
-:1042A0008900E7D10124A043E4E71B0E440200D0BB
-:1042B000034870BD002AFCD1C00FC00770BD00BF0D
-:1042C0000000C07F01230200DB050A430DD4DA425F
-:1042D00003D49A4207D488427047D84214D4D942B2
-:1042E00012D48842704780427047DA4203D59A421E
-:1042F000F9D5814270475B004200DA4204D24A009D
-:10430000DA4201D28142704710B5024AFCF7EEFC56
-:1043100010BD00BF0900160470B5420064414B0097
-:104320005C41120E39D01B0E38D0FF2A3CD0FF2B37
-:104330003AD040024902400A490A060045184E4355
-:10434000000A090AD2184843ED017F3A0104731AA2
-:104350004019190C4318990F04D001215B08490733
-:104360005B1A521CD80904D3401CF50301D19D06E9
-:1043700007D0FF2A08D2D50506D0E407204340190C
-:1043800070BD0125A843F4E7002A01DCE00770BDF9
-:104390002402FF202043C00570BD1B0EFF2A03D05E
-:1043A000FF2B01D0E00770BDFF2645003606B54261
-:1043B00006D84D00B54203D8D218FF2A00D0E7E74F
-:1043C000004870BD0000C07F01230A00DB050243E6
-:1043D0000DD4DA4203D49A4207D481427047D942BD
-:1043E00014D4D84212D48142704789427047DA42CD
-:1043F00003D59A42F9D5884270475B004A00DA42F9
-:1044000004D24200DA4201D288427047484041401B
-:1044100010B5024A4840FCF769FC10BD09001604BB
-:1044200070B501250400ED074C4022D4441A02D295
-:104430006C40001B0919C60D4B00F2B2FF2A4BD08D
-:104440001B0E50D000020C02D31A2C43DC40A843B0
-:10445000051B05D5AD0019D36D08761E521E37D049
-:10446000F605280A01D2801970BD70416D0603D08F
-:1044700070BD6940FFF7E6FE9C40090261404900BB
-:1044800001D0401E70BD0124A04370BD6D081DD039
-:1044900001202B0C01D12D0410302B0E01D12D0247
-:1044A00008302B0F01D12D01001DAB0F01D1AD0044
-:1044B000801CEB0F01D16D00401C6D00361A121AE2
-:1044C000680AF5054019012A02DB70BD002070BDA5
-:1044D000C036300AC00770BD1B0E440201D1FF2B4D
-:1044E00000D1024870BD002AF0D070BD0000C07F2E
-:1044F000081C3044586C80000000000400040000D8
-:104500000800000008000008000000080000040087
-:1045100008000C081C3044586C80000000000400A7
-:104520000400000800000008000008000000080067
-:1045300000040008000C081C3044586C8000000087
-:10454000000400040000080000000800000800004B
-:1045500000080000040008000C000000000000003B
-:10456000000102030406070809000000000102031D
-:1045700004030406080C101820305F6C6973740083
-:104580006C69737420616C6C20636F6D6D616E6417
-:1045900000000000A0010000010000002000000059
-:1045A000200000000034000020000000081C3044FF
-:1045B000586C8000000000040004000008000000A7
-:1045C00008000008000000080000040008000C08B3
-:1045D0001C3044586C8000000000040004000008F7
-:1045E00000000008000008000000080000040008A7
-:1045F000000C0000081C3044586C800000000004CF
-:104600000004000008000000080000080000000886
-:104610000000040008000C0000040050002000000E
-:10462000000000000000000000000000000000008A
-:104630000004005000100000000000000000000016
-:10464000000000000000000080807F7E7D7C7B7A7F
-:104650007978777676757473727171706F6E6E6D2E
-:104660006C6C6B6A6A6968686766666564646363D4
-:1046700062616160605F5F5E5E5D5D5C5C5B5B5A5A
-:104680005A595958585757565655555554545353C7
-:1046900052525251515050504F4F4F4E4E4D4D4D22
-:1046A0004C4C4C4B4B4B4A4A4A494949484848476D
-:1046B00047474746464645454544444444434343AB
-:1046C00043424242424141418182838485868788B8
-:1046D000898B8C8D8E8F919293959697999A9C9DAC
-:1046E0009FA0A2A3A5A7A8AAACAEB0B2B3B5B7B914
-:1046F000BCBEC0C2C5C7C9CCCED1D4D7D9DCDFE2DD
-:10470000E6E9ECF0F3F7FAFE284700080000002085
-:10471000A800000004010008D0470008A8000020FD
-:10472000C845000020010008000020000000000033
-:104730000000000000000000000000000000000079
+:102B0000E8FFFF7FB84500084038002038B504468C
+:102B1000002000902068002802D02B287ED177E08A
+:102B200000BF00204149087000F03CF9404988602E
+:102B300001F002F83E49486008468068FF2109021A
+:102B4000084000123A49896809024018394908804A
+:102B5000012000F027F936494861012000F0FAFC15
+:102B60003349086108464069FF2109020840011203
+:102B70002F484069000208182E494880022000F0C2
+:102B800011F92B49C862022000F0E4FC2849886250
+:102B90000846C06AFF210902084001122448C06AA1
+:102BA0000002081823498880032000F0FBF8204920
+:102BB0000862032000F094F81D49C8610846006AC5
+:102BC000FF210902084001121948006A0002081892
+:102BD0001849C880042000F0E5F8154988630420EE
+:102BE00000F07EF8124948630846806BFF21090215
+:102BF000084001120E48806B000208180D49088138
+:102C000000BF0D480068606000BF2B20206000BF3F
+:102C1000094960680968081A01D138BD01E000BFA0
+:102C20007FE70020206000900320F6E7840000206A
+:102C3000A8000020163B00206000002010B500F026
+:102C400093FB00F08FF810BD10B500F099F810BD9F
+:102C500010B500200F49086000F0C2FB00F0E0FA58
+:102C60000D4807C8FFF7E6FE00F0E4F900BF00BF1B
+:102C70000A480068012108430849086000BF00BFF6
+:102C80000846C068012108430449C86000BF00BF6E
+:102C900010BD00007C0000208800002000100040D3
+:102CA00070B505460E461446002E01D0012100E005
+:102CB000002108460949FEF7CDF8002C01D001217A
+:102CC00000E00021084685218900FEF7C3F885222F
+:102CD0003146204600F03CFA657070BD13020000DA
+:102CE000FEB5044600250026204600F05BF80746A6
+:102CF000FDF7F8FF05468B21C9052846FDF7FEFEC6
+:102D00000746124901F00EFB06461149304601F014
+:102D1000DFFA04D30D49304601F05CFB02D20220F9
+:102D20000C4908700C49304601F080FB0B490090BB
+:102D3000FDF7E4FE07468321C905FDF7DFFE0849DC
+:102D4000019001F0EFFA06463046FEBD00803B459B
+:102D50000000FA43840000200000164400001643DF
+:102D600000009643002003490860034908600349B6
+:102D700008607047080000201000002018000020A4
+:102D800010B50548FFF7C2FE044800F0F3FD044803
+:102D900000F07EF910BD00000800002010000020A7
+:102DA0001800002070B5044600252300FFF77AFCC8
+:102DB0000504090E13181D000420FFF71FFE054629
+:102DC00013E00020FFF71AFE05460EE00220FFF791
+:102DD00015FE054609E00120FFF710FE054604E058
+:102DE0000320FFF70BFE054600BF00BF284670BD5D
+:102DF000F8B505460E4618273946002000F08CFB32
+:102E00000446002C01D0012100E0002108463621B3
+:102E1000FEF720F82560A6800448A0600448E06022
+:102E200004482061044860612046F8BD6F2900080D
+:102E30005F2900087F2900084329000870B504466F
+:102E40000D46002C01D0012100E00021084645215B
+:102E5000FEF700F8002D01D0012100E00021084616
+:102E60004621FDF7F7FFA078002802D001280AD1FB
+:102E700004E02946204600F0CFFB0AE02946204620
+:102E800000F020FA05E02A4621460320FFF708FF5C
+:102E900000BF00BF70BD0000F8B504460F46002C0F
+:102EA00001D0012100E0002108463921FDF7D2FFC1
+:102EB0002579681DC6B232462146024800F048F91D
+:102EC000F8BD00001C390020F8B50646002E01D0E0
+:102ED000012100E0002108465921FDF7BBFF104CFD
+:102EE0000027002000903079401DC5B22A463146A7
+:102EF000204600F02DF97819C7B2681E81B2601C17
+:102F000001F091F9E055781CC7B23C20E055A81CAF
+:102F1000C0B200902046009900F080F8F8BD000093
+:102F2000263A0020FEB504460D46012001900026F9
+:102F30000027002000902078FF2806D16078002824
+:102F400003D1681E205C3C2803D00020019001982A
+:102F5000FEBD2079C01DC6B2AE4203D00020019054
+:102F60000198F5E7A81E275CE81E81B2601C01F0FD
+:102F70005AF900900098874203D0002001900198F0
+:102F8000E6E70198E4E70000F8B507460C46154669
+:102F9000002629462046FFF7C5FF0646012E0AD126
+:102FA00005480078002806D129462046FFF774FF1F
+:102FB000012001490870F8BD7800002070B5124862
+:102FC0000078002800D170BD104D114C21462846D4
+:102FD000FFF734FF2046FFF777FFF02200210D486E
+:102FE000FFF7A5FC852200212846FFF7A0FC8522DB
+:102FF00000212046FFF79BFC00200349087006498A
+:10300000087000BFDFE70000780000201C390020B6
+:10301000A1390020263A00208400002070B5044623
+:103020000D4603492A460868214601F08BF870BD19
+:10303000083900200EB51248006800281FD1F02181
+:103040000122104B0092019102900A4601210E4884
+:1030500000F0C4FD0A4908600020096808700B48A8
+:10306000074909688860032005490968C86002208B
+:103070000349096808610249086800F0E3FF0EBDD2
+:1030800008390020892F0008003801400000024064
+:1030900038B50446002000902068002802D042285D
+:1030A00019D110E000BF00F0D9FC7D20C00000F075
+:1030B00093FA0B49087000BF0A480068606000BFBF
+:1030C0004220206000BF074960680968081A00D1E3
+:1030D00038BD00BFE7E70020206000900320F7E73D
+:1030E000040000206000002008B501201749496B4A
+:1030F0000143164A51631146496B0140009100BFDC
+:1031000000BF00071146896B014391631146896B2B
+:103110000140009100BF00BF0321081FFFF7E8FA3C
+:10312000FFF7E4F9FEF7B4FCFEF794FCFEF732FB80
+:10313000FEF7A2FFFEF764FFFEF7B0FEFFF788FD83
+:10314000FFF77CFD01E0FFF77FFDFCE70010024088
+:1031500010B503E00B780370491C401C1346541E45
+:10316000A2B2002BF6D110BD70B5054648263146F7
+:10317000002000F0D1F90446002C01D0012100E02C
+:10318000002108466621FDF765FE20460021482201
+:1031900001E00170401C1346561EB2B2002BF8D15C
+:1031A00000BF2570012D0AD10749216307496163DA
+:1031B0000749A1630749E1630749616401E0002011
+:1031C00070BD00BF2046FBE795360008EF360008CB
+:1031D000BB38000855380008B9380008F8B505466E
+:1031E0000C460D480068061D0C480778012D0DD1CE
+:1031F000007800280AD1601CFDF70CF800902278B6
+:1032000001460548B36B0068984703E00248716BBC
+:10321000006888473846F8BD7C0000208400002004
+:1032200010B598B00120FFF79FFF134908601822DE
+:10323000124912A8FCF796FF1822104918310CA861
+:10324000FCF790FF10200E490E4A09920A910B904C
+:1032500018220CA903A8FCF785FF15A807C86B4620
+:1032600007C305480068046B034812A90EC900682B
+:10327000A04718B010BD00007C00002024460008C4
+:10328000000801406F12833BF8B505460C46002646
+:103290002879052802DA03263046F8BD68792070BF
+:1032A0000422A91D601CFFF753FF601CFCF7B2FF4E
+:1032B0000090FFF703F90746611CFCF7B6FF3046A4
+:1032C000EBE70000F8B505460C46002D01D00121C2
+:1032D00000E000210846F221FDF7BCFD002C01D0E2
+:1032E000012100E000210846F321FDF7B3FD1D4850
+:1032F00007680026E878002806D0012805D00228B3
+:1033000016D0032825D11FE029E039462846FFF7CB
+:10331000BBFF0646002E04D139460120FFF75EFFB1
+:103320000646852229462046FFF712FF667016E002
+:1033300039460020FFF752FF0646852229462046DF
+:10334000FFF706FF66700AE02146284600F028F8DD
+:1033500005E0224629460320FFF7A2FC00BF00BF7C
+:10336000F8BD00008000002010B505242146002093
+:1033700000F0D2F8094908600968002901D001214C
+:1033800000E000210846EB21FDF764FD0522002145
+:1033900002480068FFF7CBFA10BD00008000002053
+:1033A000F8B505460C46002C01D0012100E00021B3
+:1033B0000846DA21FDF74EFD08480068061D002783
+:1033C000FF2020706770A878A070E878E070012076
+:1033D00020712820805D6071F8BD00007C00002015
+:1033E00010B50446A1000C4B59584A00A3000B49E4
+:1033F000C858002100F0A4F8A100094B5A58A300B6
+:1034000006490839C858002100F09AF801210348FC
+:103410000830015510BD0000A045000854000020F0
+:10342000B0450008F3B581B00446002500200090A7
+:103430002548005D002804D123481838016820463B
+:1034400088470298002801D1401EFEBDA0001F4AF7
+:1034500011580298FCF7F1FE0646A0001B4A1158CD
+:103460000298FCF7EAFE002900D0761CA00018495B
+:103470000858451E22E0A10013480838405869004A
+:10348000405A002803D10098401C009001E0002021
+:1034900000900098B04210D1002707E0A2000A482F
+:1034A00008388058EA19520086527F1CB742F5D37B
+:1034B000A000064908586843C7E76D1E002DDADAF8
+:1034C0000020C043C1E700005C000020A8450008C0
+:1034D000A045000870B504460026002508E0A100BC
+:1034E0000B4840586900405A002800D0761C6D1CDB
+:1034F000A00008490858A842F1D8A2000B469958E4
+:10350000642272431046FCF798FEC0B270BD000002
+:1035100054000020A045000870B504460E46314610
+:103520002046FFF77FFF0546681C002800D170BDCC
+:10353000A100024840584019F9E700004C00002063
+:1035400030B5034601E019705B1C1446521E002C76
+:10355000F9D130BDFEB50446002500262046FFF710
+:1035600021FC0746FDF7BEFB05468B21C905284611
+:10357000FDF7C4FA0746124900F0D4FE0646114989
+:10358000304600F0A5FE04D30D49304600F022FF7E
+:1035900002D202200C4908700C49304600F046FF68
+:1035A0000B490090FDF7AAFA07468321C905FDF7EC
+:1035B000A5FA0849019000F0B5FE06463046FEBD6A
+:1035C00000803B450000FA438400002000001644C0
+:1035D0000000164300007A44F8B504460025204652
+:1035E000FDF780FB06460A480068FDF77BFB0746AF
+:1035F0003146FDF783FA0546002005490860054974
+:10360000284600F08FFE0646FDF728FBF8BD0000B7
+:10361000700000200000C84270B505460C46002D21
+:1036200001D0012100E000210846FF217231FDF7A1
+:1036300011FC002C01D0012100E000210846FF21EF
+:103640007331FDF707FC0026E878052801DD032625
+:1036500000E000BFFF2020706670A878A070E878B6
+:10366000E070E878052807DB0A20207122790849F4
+:10367000601DFFF76DFD09E0022020712279E078DE
+:103680004000034BC118601DFFF762FD70BD0000D4
+:10369000163B00200FB4F8B5044613ADE0CD002C66
+:1036A00001D0012100E0002108460621FDF7D2FBF0
+:1036B0006A46118C0798FFF79BFB60606A46118F82
+:1036C0000D98FFF795FBA060E6602761656100BF7C
+:1036D000E068FDF7FBFE2169E068FDF7EFFEE068BA
+:1036E000FDF7F0FE00BFF8BC08BC04B01847F3B506
+:1036F00085B00546002D01D0012100E000210846DB
+:103700001121FDF7A7FB2C1D002C01D0012100E0A9
+:10371000002108461321FDF79DFB06982076012124
+:103720006176069801283ED12168086949690191AE
+:103730000090206804902068806803900C21049811
+:1037400041180A7813464A78120213438A78120401
+:103750001343C97809060B43082141180E783246F5
+:103760004E78360232438E7836043243C9780906E1
+:103770000A430779394647793F02394387793F043D
+:103780003943C67936063143064637783846777866
+:103790003F023843B7783F043843F6783606304363
+:1037A000039EB0473DE02168086949690191009096
+:1037B000206804902068C06803900C210498411888
+:1037C0000A7813464A78120213438A781204134384
+:1037D000C97809060B43082141180E7832464E7805
+:1037E000360232438E7836043243C97809060A43DA
+:1037F0000779394647793F02394387793F0439438E
+:10380000C6793606314306463778384677783F0220
+:103810003843B7783F043843F67836063043039E82
+:10382000B04700BFA068016801221143016000BFDA
+:10383000E168A068026A0A43026200BFA068C1682A
+:1038400001221143C16000BF00BF012128200155A2
+:1038500007B0F0BDF8B505460E461746002D01D05D
+:10386000012100E0002108462D21FDF7F3FA2C1D6F
+:10387000002C01D0012100E0002108462F21FDF796
+:10388000E9FA607E012800D1F8BD30462169FDF7D4
+:1038900035F90090FDF7E2F9E06100216162E0692D
+:1038A000002803D12846616B884703E03946284643
+:1038B000226B904700BFE7E7704770B50546002DC3
+:1038C00001D0012100E0002108461D21FDF7C2FAC8
+:1038D0002C1D002C01D0012100E0002108461F21F1
+:1038E000FDF7B8FA002161766161E16100BFA0686F
+:1038F000FDF7ECFDE168A068FDF7E0FDA068FDF7CD
+:10390000E1FD00BF002128200155E06B002802D016
+:103910002846E16B884770BD70B50546002D01D083
+:10392000012100E0002108464D21FDF793FA2C1DEE
+:10393000002C01D0012100E0002108464F21FDF7B5
+:1039400089FAE069401EE061606A401C6062207E86
+:10395000002803D1206A401C206202E0206A401E39
+:103960002062E069002804D100BF00BF2846616BD7
+:10397000884770BD38B504460020009020680028B4
+:1039800002D0362813D10AE000BFFFF717FB00BFB3
+:1039900009480068606000BF3620206000BF06490B
+:1039A00060680968081A00D138BD00BFEDE7002043
+:1039B000206000900320F7E760000020F0B5A7B07A
+:1039C00006460D4600270024FF21684601750021A8
+:1039D000417501218175C675012E02D0022E08D1D4
+:1039E00003E005206946087603E000206946087672
+:1039F00000BF00BF0524224605A92846FFF7A8FB03
+:103A0000012E12D10020694608730D311248FCF7CF
+:103A10000CFC03A80130FCF7FDFB0190FEF74EFD06
+:103A200003A901310290FCF700FC2819052203A923
+:103A3000FFF78EFB601DC4B2601E81B2681C00F0EF
+:103A4000F2FB2855601CC4B23C202855601CC4B24F
+:103A50002746384627B0F0BD0000B44270B50025B7
+:103A6000124C13480078032800DB70BD1048007822
+:103A7000012802D002280ED106E00D4948782146DF
+:103A800000F032F8054607E0094948782146FFF77B
+:103A900095FF054600E000BF00BF2946204600F024
+:103AA00009F800200249087000BFDEE7203B002033
+:103AB0009400002070B504460D4600262946204695
+:103AC000FFF730FA0646012E0AD106480078002892
+:103AD00006D129462046FFF7DFF901200149087089
+:103AE00070BD000078000020F0B5A3B006460D467A
+:103AF000F02200212846FEF71AFF00270024FF21AC
+:103B000068460171002141718171C67101720524FD
+:103B1000224601A92846FFF71BFB601E81B2681CE4
+:103B200000F081FB2855641C3C202855641C274666
+:103B3000384623B0F0BD0000F0B587B00024002067
+:103B40000690FFF72FF90546FDF7CCF804468B21C8
+:103B5000C9052046FCF7D2FF0546174900F0E2FBF5
+:103B600006901649069800F0B3FB04D31449069852
+:103B700000F030FC02D20220124908701249069867
+:103B800000F054FC11490190FCF7B8FF0746FCF720
+:103B90008BFF05460E4A0F4BFCF73EFC00220E4BF6
+:103BA00003910290FCF75CFE05910490FCF7F6FB94
+:103BB0000690069807B0F0BD00803B450080644445
+:103BC00000600245840000200080BB440000CA421F
+:103BD0006891ED7C3F35174000002440FFB581B06F
+:103BE000064615460B9F002E01D0012100E0002162
+:103BF00008468421FDF72EF93420FEF791FE044695
+:103C0000002C01D0012100E0002108468721FDF7AA
+:103C100021F90498E062A5830C9820632785002D84
+:103C20000DDD2846FEF77CFEA061A169002901D0C8
+:103C3000012100E0002108469621FDF70BF9002F35
+:103C40000DDD3846FEF76CFE6062616A002901D026
+:103C5000012100E0002108469D21FDF7FBF80298B4
+:103C6000A07520210A9808556660204605B0F0BD71
+:103C700070B50446002C01D0012100E00021084667
+:103C8000FF216B31FDF7E6F82169A068FDF75CF9CB
+:103C900020690300FEF706FD087305142333435320
+:103CA000637300BFA068016802221140490800291F
+:103CB00004D0A0680221416000BF00BF00BF5FE0E8
+:103CC00000BFA0680168202211404909002904D0E2
+:103CD000A0682021416000BF00BF00BF50E000BFCE
+:103CE000A0680168012252021140490A002904D04B
+:103CF000A0681146416000BF00BF00BF40E000BFA8
+:103D0000A0680168012252031140490B002904D028
+:103D1000A0681146416000BF00BF00BF30E000BF97
+:103D2000A0680168012252041140490C002904D006
+:103D3000A0681146416000BF00BF00BF20E000BF87
+:103D4000A0680168012252051140490D002904D0E4
+:103D5000A0681146416000BF00BF00BF10E000BF77
+:103D6000A0680168012252061140490E002904D0C2
+:103D7000A0681146416000BF00BF00BF00E000BF67
+:103D800000BF656800BF00BFFEF7A2FD0646012028
+:103D9000FEF7A1FD28684021084328603046FEF761
+:103DA0009AFD00BF00BF01212A20015520690300B0
+:103DB000FEF778FC0873051423334353637300BF85
+:103DC000A068016808221140C908002904D0A06831
+:103DD0000821416000BF00BF00BF5FE000BFA068D6
+:103DE000016880221140C909002904D0A0688021FF
+:103DF000416000BF00BF00BF50E000BFA068016885
+:103E00000122D2021140C90A002904D0A06811463B
+:103E1000416000BF00BF00BF40E000BFA068016874
+:103E20000122D2031140C90B002904D0A068114619
+:103E3000416000BF00BF00BF30E000BFA068016864
+:103E40000122D2041140C90C002904D0A0681146F7
+:103E5000416000BF00BF00BF20E000BFA068016854
+:103E60000122D2051140C90D002904D0A0681146D5
+:103E7000416000BF00BF00BF10E000BFA068016844
+:103E80000122D2061140C90E002904D0A0681146B3
+:103E9000416000BF00BF00BF00E000BF00BF70BDB9
+:103EA00070B50446002C01D0012100E00021084635
+:103EB000FF212431FCF7CEFF606801682022114009
+:103EC000490900291BD06068C169114049090029CE
+:103ED00015D06068416AC9B2A28A501CA082A0694C
+:103EE0008154A07D002851D1E06A002804D0A28A24
+:103EF0002078E36AA16998470020A08246E06068C4
+:103F0000016810221140090900293FD06068C16989
+:103F100011400909002939D0A07D012831D1E1687B
+:103F2000A068FDF711F8E168A0684A1E444B9A5C4E
+:103F300012185268A08B801AA082E06A002817D05D
+:103F4000A08A002814DDA08AA18B884210DCA28AF6
+:103F50002078E36AA16998470021A28BA06901E05B
+:103F60000170401C1346551EAAB2002BF8D100BFA9
+:103F7000A28BE168A068FDF721F8E168A068FCF772
+:103F8000F1FF0020A0826068FDF726FB60680168F1
+:103F900040221140890900290ED06068FDF7D4FB4A
+:103FA000002809D0206B002801D0206B8047606872
+:103FB0004021016200BF00BF60680168FF2201323A
+:103FC0001140090A00290DD06068C169C907C90FED
+:103FD000012251405140002904D060680121016252
+:103FE00000BF00BF6068FDF79DFB002809D0606836
+:103FF000FDF798FB002804D060680221016200BF31
+:1040000000BF6068FDF794FB002809D06068FDF7E9
+:104010008FFB002804D060680421016200BF00BF4C
+:104020006068FDF78BFB002809D06068FDF786FB10
+:10403000002804D060680821016200BF00BF70BD85
+:10404000DB45000870B50446A07D002803D16068F8
+:10405000FDF7CEFA75E06068FDF7BEFA6068FDF71F
+:10406000C7FA2169A068FCF76FFFE168A068FCF758
+:104070006BFF01216068FDF7B2FA05462A46E16848
+:10408000A068FCF7F9FFA269E168A068FCF7BAFF35
+:10409000A28BE168A068FCF791FFE168A068FCF7DB
+:1040A0006FFFE168A068FCF75DFF656800BF00BFB7
+:1040B000FEF70EFC06460120FEF70DFCA868402125
+:1040C0000843A8603046FEF706FC00BF00BF6568E5
+:1040D00000BF00BFFEF7FCFB06460120FEF7FBFB1E
+:1040E00028681021084328603046FEF7F4FB00BF23
+:1040F00000BF00216068FDF772FA05462A46216973
+:10410000A068FCF7B9FF626A2169A068FCF77AFF32
+:104110002169A068FCF734FF656800BF00BFFEF7A7
+:10412000D7FB06460120FEF7D6FBA868802108438E
+:10413000A8603046FEF7CFFB00BF00BF01212A2058
+:10414000015570BDF8B504460D461646002C01D049
+:10415000012100E000210846F321FCF77BFE002D41
+:1041600001D0012100E000210846F421FCF772FE95
+:10417000002E01DD012100E000210846F521FCF7B9
+:1041800069FE00272020005D012823D12A20005D40
+:1041900001281FD100212A2001552946606A009676
+:1041A00003E00A780270491C401C009A531E9BB21F
+:1041B0000093002AF5D100BF2169A068FCF7C4FE76
+:1041C00032462169A068FCF7F9FE2169A068FCF776
+:1041D000C9FE26E00027002014E0002705E039464C
+:1041E0007A1CD7B2FE2900DBF8BD6168CA6980235A
+:1041F0001A40D209002AF2D02A5C61688A6200BFA4
+:10420000411C88B2B042E8DB002705E03846791C43
+:10421000CFB2FE2800DBE7E76068FDF795FA0028DB
+:10422000F4D000BFE0E730B502461446002000237A
+:1042300004E025786840641C5D1CABB28B42F8DB5F
+:1042400030BD000070B501250400ED074C4020D4BE
+:10425000441A01D2001B0919C60D4B00F2B2FF2A05
+:1042600029D01B0E2CD000020C02D31A2C43DC40A8
+:104270002843051910D2280A02D3401C6D0611D01C
+:10428000761EF6058019FF2A00DA70BDC00DC00544
+:1042900070BD694000F0D0F801200543C541521CB3
+:1042A000761CE8E764089C40C90161408900E7D1B9
+:1042B0000124A043E4E71B0E440200D0034870BD74
+:1042C000002AFCD1C00FC00770BD00BF0000C07F36
+:1042D00001230200DB050A430DD4DA4203D49A42DB
+:1042E00007D488427047D84214D4D94212D48842A5
+:1042F000704780427047DA4203D59A42F9D581422D
+:1043000070475B004200DA4204D24A00DA4201D22E
+:104310008142704710B5024AFCF7E8FC10BD00BFAF
+:104320000900160470B5420064414B005C41120E56
+:1043300039D01B0E38D0FF2A3CD0FF2B3AD0400298
+:104340004902400A490A060045184E43000A090A74
+:10435000D2184843ED017F3A0104731A4019190C31
+:104360004318990F04D001215B0849075B1A521CBE
+:10437000D80904D3401CF50301D19D0607D0FF2ABC
+:1043800008D2D50506D0E4072043401970BD0125A9
+:10439000A843F4E7002A01DCE00770BD2402FF20F7
+:1043A0002043C00570BD1B0EFF2A03D0FF2B01D098
+:1043B000E00770BDFF2645003606B54206D84D0021
+:1043C000B54203D8D218FF2A00D0E7E7004870BDF5
+:1043D0000000C07F01230A00DB0502430DD4DA424E
+:1043E00003D49A4207D481427047D94214D4D842A8
+:1043F00012D48142704789427047DA4203D59A420B
+:10440000F9D5884270475B004A00DA4204D2420084
+:10441000DA4201D2884270474840414010B5024A12
+:104420004840FCF763FC10BD0900160470B5012577
+:104430000400ED074C4022D4441A02D26C40001B09
+:104440000919C60D4B00F2B2FF2A4BD01B0E50D0FB
+:1044500000020C02D31A2C43DC40A843051B05D5EF
+:10446000AD0019D36D08761E521E37D0F605280A06
+:1044700001D2801970BD70416D0603D070BD6940D6
+:10448000FFF7E6FE9C4009026140490001D0401E52
+:1044900070BD0124A04370BD6D081DD001202B0C00
+:1044A00001D12D0410302B0E01D12D0208302B0F1D
+:1044B00001D12D01001DAB0F01D1AD00801CEB0F10
+:1044C00001D16D00401C6D00361A121A680AF505FC
+:1044D0004019012A02DB70BD002070BDC036300AD1
+:1044E000C00770BD1B0E440201D1FF2B00D1024852
+:1044F00070BD002AF0D070BD0000C07F081C3044A1
+:10450000586C800000000004000400000800000057
+:1045100008000008000000080000040008000C0863
+:104520001C3044586C8000000000040004000008A7
+:104530000000000800000800000008000004000857
+:10454000000C081C3044586C80000000000400047B
+:10455000000008000000080000080000000800003B
+:10456000040008000C00000000000000000102032D
+:104570000406070809000000000102030403040602
+:10458000080C101820305F6C697374006C697374C8
+:1045900020616C6C20636F6D6D616E6400000000C3
+:1045A000A001000001000000200000002000000029
+:1045B0000034000020000000081C3044586C8000CB
+:1045C00000000004000400000800000008000008CB
+:1045D000000000080000040008000C081C304458CB
+:1045E0006C800000000004000400000800000008C7
+:1045F000000008000000080000040008000C000093
+:10460000081C3044586C80000000000400040000C6
+:104610000800000008000008000000080000040076
+:1046200008000C0000040050002000000000000002
+:104630000000000000000000000000000004005026
+:10464000001000000000000000000000000000005A
+:104650000000000080807F7E7D7C7B7A7978777691
+:1046600076757473727171706F6E6E6D6C6C6B6A4F
+:104670006A696868676666656464636362616160ED
+:10468000605F5F5E5E5D5D5C5C5B5B5A5A5959586A
+:1046900058575756565555555454535352525251D4
+:1046A000515050504F4F4F4E4E4D4D4D4C4C4C4B2A
+:1046B0004B4B4A4A4A494949484848474747474671
+:1046C00046464545454444444443434343424242AD
+:1046D000424141418182838485868788898B8C8D84
+:1046E0008E8F919293959697999A9C9D9FA0A2A345
+:1046F000A5A7A8AAACAEB0B2B3B5B7B9BCBEC0C28C
+:10470000C5C7C9CCCED1D4D7D9DCDFE2E6E9ECF01D
+:10471000F3F7FAFE3447000800000020A80000006C
+:1047200004010008DC470008A8000020C84500007C
+:104730002001000800002000000000000000000030
:104740000000000000000000000000000000000069
:104750000000000000000000000000000000000059
-:10476000000000000000000000000000D933000835
-:10477000CD3400080001002040000020003500205A
-:1047800042000020000000000000000000000000C7
+:104760000000000000000000000000000000000049
+:104770000000000000000000E1330008D53400080C
+:1047800000010020400000200035002042000020F1
:104790000000000000000000000000000000000019
:1047A0000000000000000000000000000000000009
-:1047B0000024014000000240010000000000000051
-:1047C0007A45000880450008C6E533B4FD28000896
+:1047B0000000000000000000000000000024014094
+:1047C00000000240010000000000000086450008D3
+:0C47D0008C450008C6E533B4FD28000845
:04000005080000C12E
:00000001FF
diff --git a/User/app_flow.c b/User/app_flow.c
index ae105b3..8a201c3 100644
--- a/User/app_flow.c
+++ b/User/app_flow.c
@@ -7,6 +7,7 @@
extern __IO app_t app;
extern motor_t *motor;
+extern uint8_t detect_result;
static struct flow fl_adc_inspection; // ADC
static struct flow fl_systom_inspection; // 系统
@@ -17,6 +18,7 @@ static uint8_t adc_inspection(struct flow *fl)
FL_HEAD(fl);
for (;;)
{
+ detect_result = ST_DEV_NORMAL;
// 扭力
app.adc.torsion_in13.original_value = get_sensor_adc(GET_TORSION_VALUE);
app.adc.torsion_in13.calibration_value = torsion_detect();
@@ -38,7 +40,7 @@ static uint8_t adc_inspection(struct flow *fl)
app.adc.oflow_in10.calibration_value = flow_detect(GET_OUTPUT_FLOW_VALUE);
sensor_adc[GET_OUTPUT_FLOW_VALUE] = S2B_UINT16(app.adc.oflow_in10.original_value);
- FL_LOCK_DELAY(fl, FL_CLOCK_100MSEC); /* 延时100毫秒 */
+ FL_LOCK_DELAY(fl, FL_CLOCK_10MSEC); /* 延时10毫秒 */
}
FL_TAIL(fl);
}
diff --git a/User/board/board.c b/User/board/board.c
index 8bfcc90..f5d8c62 100644
--- a/User/board/board.c
+++ b/User/board/board.c
@@ -339,7 +339,7 @@ float32 pressure_detect(uint8_t id)
adc = get_sensor_adc(id);
val = adc / 4096 * 3000;
- if (val < 600 || val > 3000)
+ if (val < 500 || val > 3000)
{
detect_result = ST_DEV_MISS;
}
@@ -354,7 +354,7 @@ float32 flow_detect(uint8_t id)
adc = get_sensor_adc(id);
val = adc / 4096 * 3000;
- if (val < 600 || val > 3000)
+ if (val < 500 || val > 3000)
{
detect_result = ST_DEV_MISS;
}