diff --git a/STM32CubeIDE/Release/STS_RR_R125.bin b/STM32CubeIDE/Release/STS_RR_R125.bin index 649ba29..fac7594 100644 Binary files a/STM32CubeIDE/Release/STS_RR_R125.bin and b/STM32CubeIDE/Release/STS_RR_R125.bin differ diff --git a/STM32CubeIDE/Release/STS_RR_R125.hex b/STM32CubeIDE/Release/STS_RR_R125.hex index ddd275f..4f0db81 100644 --- a/STM32CubeIDE/Release/STS_RR_R125.hex +++ b/STM32CubeIDE/Release/STS_RR_R125.hex @@ -1027,7 +1027,7 @@ :1040080002E0D458C4500433C4188C42F9D30A4A85 :104018000A4C002301E013600432A242FBD30FF0E4 :10402800C7FDFEF7F3FAFEE70000012000000020BC -:10403800BC0800207C490108BC0800205C2C00203A +:10403800BC0800207C490108BC080020602C002036 :10404800FEE74FF0B04382B0DA6C42F00102DA6466 :10405800DB6C03F001030193019B02B07047000081 :1040680030B587B0FFF7EDFF4FF4805101224FF0D4 @@ -1061,18 +1061,18 @@ :1042280010B5044600F008F810F0FF001CBFEE239C :104238002370AA23637010BD2DE9F74300242D4E87 :104248002D4D346021462046FFF7B6FF2146012058 -:10425800FFF7B2FF5227A046012195F8640185F8BF -:104268006071C5F86881FFF7A7FF0320FEF70EFC11 -:1042780000228821284602F0BBFB0DF10602C0216E -:10428800284602F005FC78BBBDF806204EF6AA6366 -:104298009A4229D14FEA440909F154094946284666 -:1042A80000F030F900BB85F860910DF10602C021DD -:1042B800284602F0EDFBB8B9284600F0DFFA98B9B5 +:10425800FFF7B2FF21460220FFF7AEFF5227A04624 +:10426800012195F8640185F86071C5F86881FFF748 +:10427800A3FF0320FEF70AFC0DF10602C021284621 +:1042880002F006FC80BBBDF806204EF6AA639A42EF +:104298002AD14FEA440909F154095FFA89F94946D4 +:1042A800284600F02FF9F8B985F860910DF106025B +:1042B800C021284602F0ECFB284600F0DFFA98B946 :1042C800326801231A4432600C4AC5F86831116813 -:1042D800A3400B43136005F5C8751CB1306803B0E3 -:1042E800BDE8F0830124B7E700212046FFF764FF0B -:1042F800F1E700BF740E0020B8000020700E002007 -:104308002DE9F74F344C054604F5487B4FF00A0A6F +:1042D800A3400B4313600134032C05F5C875BFD107 +:1042E800306803B0BDE8F0830021E0B2FFF764FF57 +:1042F800F1E700BF780E0020B8000020740E0020FF +:104308002DE9F74F344C054604F5966B4FF00A0A31 :104318004FF00E0948F2E8084FF490174FF4804622 :10432800D4F86831002B50D0204600F097FD0DF1ED :1043380002020DF10101204600F058FB0DF10302C5 @@ -1093,7 +1093,7 @@ :10442800C0F87C31EDE700BF680500202DE9F84FA2 :10443800DFF8B8A02E4DFFF7BDFEDAF800300BB15B :104448002B6813B9FFF7F8FE28602B68294F002462 -:10445800A3423C607C6042DDDFF89C80274D02204F +:10445800A3423C607C6044DDDFF89C80274D02204D :10446800FFF74EFF88F80040D5F86831012B2ED1B0 :10447800DFF88CB003FA04F90A262149284600F02F :104488004DFCB0B959462846FFF7B2FF9BF81830E3 @@ -1101,10 +1101,10 @@ :1044A8000903CAF8003098F8003043F0010388F88F :1044B80000300120FEF7EAFA9BF818309BB1013E64 :1044C80016F0FF06D9D14FF47A7347F8243001204B -:1044D800FEF7DCFA05F5C8751CB198F80030BDE8A0 -:1044E800F88F0124C0E7D5F87831EEE7700E002088 -:1044F8006C0E0020640E0020E30D0020B8000020A0 -:10450800780E00204A088A2102F072BA152906D8C6 +:1044D8000134FEF7DBFA032C05F5C875C4D198F84A +:1044E8000030BDE8F88FD5F87831EEE7740E00207B +:1044F800700E0020640E0020E30D0020B80000209C +:104508007C0E00204A088A2102F072BA152906D8C2 :10451800044BCB40DB0702D50174002070476FF0D5 :10452800070070470B00300010B50A460C460921F9 :1045380002F080FA18B9237803F00103237010BD44 @@ -1691,15 +1691,15 @@ :1069880002B010BD3F2BF8B50E46054611461C4611 :1069980011D80A4F38461A4600F8016B0DF039F93C :1069A800621C39462846FFF7CEFF002814BF6FF057 -:1069B80013000020F8BD6FF00300FBE7940E0020E1 +:1069B80013000020F8BD6FF00300FBE7980E0020DD :1069C80073B515468DF8071001220DF1070104462D :1069D8001E46FFF7B8FF18B16FF0130002B070BD84 :1069E800324629462046FFF7BDFF0028F6D0F3E7D8 :1069F80008B5064B19705A7019460222FFF7A3FF13 -:106A0800002814BF6FF01300002008BD940E00206A +:106A0800002814BF6FF01300002008BD980E002066 :106A180008B5074B1970110A59709A701946032264 :106A2800FFF791FF002814BF6FF01300002008BD86 -:106A3800940E002037B515468DF8071001220DF188 +:106A3800980E002037B515468DF8071001220DF184 :106A480007010446FFF77FFF18B16FF0130003B08A :106A580030BD012229462046FFF784FF0028F6D0E2 :106A6800F3E7F7B515460DF1070206460F461C4633 @@ -1708,11 +1708,11 @@ :106A980073B514468DF8071001220DF1070105465C :106AA800FFF751FF18B16FF0130002B070BD064E2A :106AB800022231462846FFF755FF0028F3D13388D4 -:106AC8005BBA2380F1E700BF940E002073B514462B +:106AC8005BBA2380F1E700BF980E002073B5144627 :106AD8008DF8071001220DF107010546FFF733FF76 :106AE80018B16FF0130002B070BD064E0422314693 :106AF8002846FFF737FF0028F3D133681BBA236015 -:106B0800F1E700BF940E002008B50220FBF7BEFF96 +:106B0800F1E700BF980E002008B50220FBF7BEFF92 :106B1800002008BD7047000010B5032000F056FCA7 :106B280001F092FD064B18600F20FBF7A5FF044605 :106B380018B9FBF716FE204610BD0124FBE700BF7D @@ -1943,13 +1943,13 @@ :1079480010F480200BD0FBF799F8001BA842F6D35F :1079580004E0FBF793F8001BA842E3D3032070BDB3 :10796800024A1361024A01205360F8E700400058B8 -:10797800D40E00202DE9F041184D98462B78012BA4 +:10797800D80E00202DE9F041184D98462B78012BA0 :1079880006460C46174626D001232B704FF47A7012 :1079980000236B60FFF7C0FFA0B9012E16D1104A73 :1079A800536943F0010353612760BFF36F8FC4F835 :1079B80004804FF47A70FFF7AFFF094A536923EA4E :1079C8000603536100232B70BDE8F0813946204639 -:1079D800FFF76CFFEDE70220F6E700BFD40E0020AA +:1079D800FFF76CFFEDE70220F6E700BFD80E0020A6 :1079E80000400058054A536923F47E7343EAC000F7 :1079F80040F4803040F00200506170470040005869 :107A08002DE9F041234F3B78012B054688463FD0AE @@ -1961,7 +1961,7 @@ :107A68001344B3420AD93046FFF7BCFF4FF47A708B :107A7800FFF752FF50B1C8F800600446064A536940 :107A880023F47E7323F002035361DAE70136E5E756 -:107A98000224DBE7D40E0020004000582DE9F04F07 +:107A98000224DBE7D80E0020004000582DE9F04F03 :107AA800524C00234FF00F090A6832FA03F501D14E :107AB800BDE8F08F012505FA03F818EA020200F084 :107AC8008E804E68032706F003054FEA430E07FA37 @@ -2723,10 +2723,10 @@ :10AA080084F8840070BD0220FCE7000038B5084DCA :10AA1800052455F8043B2BB9013C14F0FF04F8D188 :10AA2800204638BDDB6898470028F5D0F9E700BF15 -:10AA380028100020034BD870034B1B681B6C03B114 -:10AA480018477047101000200C100020034B187492 -:10AA5800034B1B685B6C03B118477047101000204C -:10AA68000C100020F0B5314D314B95F90420314ED2 +:10AA38002C100020034BD870034B1B681B6C03B110 +:10AA4800184770471410002010100020034B18748A +:10AA5800034B1B685B6C03B1184770471410002048 +:10AA680010100020F0B5314D314B95F90420314ECE :10AA780091B00C46012795F905108DF8047002284D :10AA88008DF809208DF80A1010D18DF80800D871BA :10AA98001C7202F063FD337803B114B101A803F00E @@ -2738,23 +2738,23 @@ :10AAF80002F012FF21238DF8183006A86B798DF823 :10AB08001C3002F009FF29238DF8183006A80B4BDA :10AB1800079302F001FF02F021FD012306A88DF83A -:10AB280018308DF81C3002F0F7FEB4E71010002042 -:10AB380060080020EC0E0020E00F00200004000157 +:10AB280018308DF81C3002F0F7FEB4E7141000203E +:10AB380060080020F00E0020E40F0020000400014F :10AB48007FB5092301A88DF8043003F06BF90038AC :10AB5800044B059A1A6018BF0120404207B05DF8FF -:10AB680004FB00BFE00F002070B504460B461449F3 +:10AB680004FB00BFE40F002070B504460B461449EF :10AB780062784A700020A2780A7208701A884A72AD :10AB88009A788A72DB780B746368CB600D4B1B680C :10AB9800DA6A2AB1237803F0FB030A2B00D0904726 :10ABA800094E002556F8043B1BB15B6A0BB12046E1 :10ABB80098470135EBB2052B6DB2F3D170BD00BFDC -:10ABC800300800200C1000202810002070B5044622 +:10ABC80030080020101000202C10002070B504461A :10ABD80011480123037063784370A3788372E36894 :10ABE800C360E378037623694376237943720B4B7A :10ABF8001B689B6A03B19847094E002556F8043B29 :10AC08001BB19B690BB1204698470135EBB2052B68 -:10AC18006DB2F3D170BD00BF440800200C100020B5 -:10AC280028100020014B1868704700BFE00F002073 +:10AC18006DB2F3D170BD00BF4408002010100020B1 +:10AC28002C100020014B1868704700BFE40F00206B :10AC380000B58BB0012368468DF8003002F046FD60 :10AC480038B99DF80400003818BF01200BB05DF832 :10AC580004FB0020FAE7000008B501F037FE40B910 @@ -2778,14 +2778,14 @@ :10AD78006B6803934FF0FF34BBE76FF005049AE765 :10AD88006FF0010497E70B4B00221A70E31D18BF00 :10AD9800144690E74FF0FF348DE76FF004048AE71C -:10ADA80060080020440800201010002054080020EB -:10ADB800E00F0020DF0F002037B501F0A9FD134D8B +:10ADA80060080020440800201410002054080020E7 +:10ADB800E40F0020E30F002037B501F0A9FD134D83 :10ADC800052455F8043B4BB11A693AB19B682BB17D :10ADD800984718B155F8043C1B699847013C14F092 :10ADE800FF04EED1FFF712FE68B9094D2B7853B175 :10ADF800084BADF80040D978019422466846FFF721 -:10AE080041FF00B92C7003B030BD00BF28100020EE -:10AE1800DF0F00201010002030B58BB0044601F081 +:10AE080041FF00B92C7003B030BD00BF2C100020EA +:10AE1800E30F00201410002030B58BB0044601F079 :10AE280055FD0546002835D1FFF702FF012834D12A :10AE380068468DF8005002F049FC40BB9DF804308C :10AE4800A34204D0012C22D0022C12D014B100202D @@ -2794,7 +2794,7 @@ :10AE7800EDE763B968468DF8044002F04DFD30B93E :10AE8800074B1B681B6B002BE1D02046EFE74FF008 :10AE9800FF30DDE76FF00100DAE76FF00200D7E777 -:10AEA8000C10002010B504468AB018B94FF0FF30D6 +:10AEA8001010002010B504468AB018B94FF0FF30D2 :10AEB8000AB010BD002368468DF8003002F006FC89 :10AEC8000028F3D19DF804302370F1E77FB5002204 :10AED8000B4620498DF8072001220A7042784A70F3 @@ -2805,11 +2805,11 @@ :10AF280098470E4E052556F8043B1BB1DB690BB15B :10AF380020469847013D15F0FF05F4D10DF10700B3 :10AF4800FFF7B0FF637913B1054B01221A7004B003 -:10AF580070BD00BF300800200C1000202810002011 -:10AF6800DF0F002010B504468AB018B94FF0FF3043 +:10AF580070BD00BF30080020101000202C10002009 +:10AF6800E30F002010B504468AB018B94FF0FF303F :10AF78000AB010BD202368468DF8003002F0A6FB09 :10AF88000028F3D1024A9DF9043023701371EFE7CA -:10AF98001010002000B58BB02323019068468DF86F +:10AF98001410002000B58BB02323019068468DF86B :10AFA800003002F0B9FC003818BF012040420BB055 :10AFB8005DF804FB70B5654C01468EB0182220463A :10AFC80006F0C0F8624B00221A70F8F79FFF23784A @@ -2836,24 +2836,24 @@ :10B1180004A88DF8103002F0FFFB50B9012304A8F1 :10B128008DF8103002F0D2FA9DF81430002B7FF41D :10B138006EAF3378002B7FF46CAF052204A88DF82E -:10B148001020059302F0E8FB78E700BF10100020FC -:10B15800DF0F0020783F0108E40F0020FC0F0020DB -:10B16800EC0E00200C1000204C10002037B50023F6 +:10B148001020059302F0E8FB78E700BF14100020F8 +:10B15800E30F0020783F0108E80F002000100020CE +:10B16800F00E0020101000205010002037B50023EA :10B178000D4601930446D0B900F0A8FB0190019B4D :10B18800D3B10F4A42F824300E4A9A620E4A126826 :10B19800916B1963916C596392690C49D9625A6130 :10B1A80028465B680A49F2229847002006E001A970 :10B1B80000F092FB0028E2D04FF0FF3003B030BD22 -:10B1C800281000206DAA00080C10002049AB0008C8 -:10B1D800ED0E0020194B07B51860194B194A1A6073 +:10B1C8002C1000206DAA00081010002049AB0008C0 +:10B1D800F10E0020194B07B51860194B194A1A606F :10B1E800194A5A60194A9A60194ADA60194B026872 :10B1F8001A6042685A6082689A60C268DA60164AC1 :10B208001A6182695A61154BC26B5A60144A0191DE :10B2180019609A601946134ADA600020FFF7A6FF02 :10B2280048B901A800F056FB003818BF0120404279 -:10B2380003B05DF804FB4FF0FF30F9E70C10002075 -:10B24800FC0F0020D5AB0008D5AE0008E9B2000815 -:10B2580071AB0008E40F0020C9F100083C10002081 +:10B2380003B05DF804FB4FF0FF30F9E71010002071 +:10B2480000100020D5AB0008D5AE0008E9B2000810 +:10B2580071AB0008E80F0020C9F100084010002079 :10B268003DAA000855AA000849B118B1012804D020 :10B2780000207047034B0B60FAE7034BFBE74FF0E6 :10B28800FF307047000400010100010208B503F017 @@ -2861,7 +2861,7 @@ :10B2A80002F084F9002814BF6FF00100002008BDE7 :10B2B80010B504468AB018B94FF0FF300AB010BD77 :10B2C800212368468DF8003002F000FA0028F3D1F7 -:10B2D800024A9DF9043023705371EFE710100020E3 +:10B2D800024A9DF9043023705371EFE714100020DF :10B2E8002DE9F0412F4D304F00232B7043786B70C0 :10B2F8003B689B6A8AB004460BB128469847DFF83A :10B30800AC80002658F8043B1BB11B6A0BB12046E1 @@ -2874,19 +2874,19 @@ :10B37800E07905F0AFFE0AB0BDE8F081FF23A371C4 :10B38800EFE7104B01225A74227A9A74627ADA74BF :10B39800F1E76378002BEED00AB0BDE8F041FFF783 -:10B3A800CFBB00BF440800200C100020281000204C -:10B3B800600800204C100020640800206508002068 -:10B3C800101000203008002030B58BB0FFF767FF61 +:10B3A800CFBB00BF44080020101000202C10002044 +:10B3B8006008002050100020640800206508002064 +:10B3C800141000203008002030B58BB0FFF767FF5D :10B3D8000446F0B903F0FCFE831C1DD0F8B9134DE8 :10B3E8002B685B69DBB1272368468DF8003002F0D3 :10B3F8006DF92B6801985B694FF4B961984703F0C0 :10B40800F9FE78B92CB9094B1B68DB690BB101202F :10B41800984720460BB030BD6FF00704EFE74FF0B8 -:10B42800FF34ECE74FF0FF34F3E700BF0C100020C7 -:10B43800014B1878704700BF80100020014B5878E6 -:10B44800704700BF8010002070470000044B9A7AB4 +:10B42800FF34ECE74FF0FF34F3E700BF10100020C3 +:10B43800014B1878704700BF84100020014B5878E2 +:10B44800704700BF8410002070470000044B9A7AB0 :10B458000AB101225A70034B5B6903B11847704760 -:10B46800801000206C08002073B5224C6378002BF4 +:10B46800841000206C08002073B5224C6378002BF0 :10B4780033D008F03BF966680546FFF7D3FB06446E :10B48800AE4214D2A37A93B1E0228DF800208DF851 :10B498000130217AE368019301226846FFF7F2FB45 @@ -2895,13 +2895,13 @@ :10B4C80002B0BDE87040184740F2DC510B4808F064 :10B4D800D9F90A4808F09CF9E8E794F83520002AD9 :10B4E800E5D094F8360084F83530FFF795FCDEE7B0 -:10B4F80002B070BD801000206C080020641000208D +:10B4F80002B070BD841000206C0800206810002085 :10B5080037B5104D104CC8B1C1B162720123002289 :10B518002860E16023700D480D4B00924FF0FF3119 :10B5280008F0CAF800250B4825822022294605F094 :10B538001DFE6570A574A58603B030BD00232B6081 -:10B548002370EFE77C10002080100020641000209A -:10B5580055B40008941000202DE9F0478E4C23784C +:10B548002370EFE78010002084100020681000208E +:10B5580055B40008981000202DE9F0478E4C237848 :10B568008CB0002B56D0C2780AB9837B13B1238ADA :10B5780001332382437B002B4CD0E02A4AD100239D :10B58800A372876897F80080B8F1220F27D8B8F11E @@ -2937,8 +2937,8 @@ :10B7680008307B793A791B0443EA0223FA781343B9 :10B77800642253430393BB798DF81030D8E73B22FA :10B7880001A88DF804208DF8083002F0C5F80123CF -:10B7980084F834302FE700BF8010002064100020A8 -:10B7A8006C080020643D01087C1000202A2301A8B1 +:10B7980084F834302FE700BF8410002068100020A0 +:10B7A8006C080020643D0108801000202A2301A8AD :10B7B8008DF8043001F08AFF94F80A90E6689DF845 :10B7C80008009DF809509DF80A709DF80BC09DF877 :10B7D8000D309DF80E209DF80F109DF80CE009F132 @@ -2956,22 +2956,22 @@ :10B898002954A17AE0684D1CA5724254A27AE16845 :10B8A800501CA0728B54A37AE268591CA17202F84A :10B8B80003E0A0E6034807F05DFF6570AAE600BF55 -:10B8C8007C1000206410002070470000004870477A +:10B8C8008010002068100020704700000048704772 :10B8D8006C080020002070474FF0FF3070470000D0 :10B8E800044B054A93F81831022B18BF062382F837 -:10B8F8009034704724170020E81C0020034BD3F82D -:10B90800483313B15B6903B118477047E81C00203E +:10B8F8009034704728170020EC1C0020034BD3F825 +:10B90800483313B15B6903B118477047EC1C00203A :10B91800034A137843F004031370FFF7EFBF00BF27 -:10B92800CC1000201FB50A4B8DF8090093F87C2035 +:10B92800D01000201FB50A4B8DF8090093F87C2031 :10B938008DF80A2093F88C2093F848000D3202A95C :10B948008DF8082003F064FCC0B205B05DF804FB74 -:10B958002417002008B5074807F00CFF064B93F89A +:10B958002817002008B5074807F00CFF064B93F896 :10B968001A2412B1012283F81924BDE80840FFF710 -:10B97800C5BF00BFE8200020E81C002010B50C4C13 +:10B97800C5BF00BFEC200020EC1C002010B50C4C0B :10B98800D4F8403343F08003C4F8403394F81A34B1 :10B9980013B10020FFF7DEFF94F8913423F012036F :10B9A80043F0120384F89134BDE81040FFF798BFC4 -:10B9B800E81C00202DE9F041DFF8AC8098F8183138 +:10B9B800EC1C00202DE9F041DFF8AC8098F8183134 :10B9C800022B06460D4602D0284BDB6A984702F048 :10B9D800A6FD044628B1022002F097FD002002F0DF :10B9E80099FD98F81831012B17D102F09AFD0746F6 @@ -2982,22 +2982,22 @@ :10BA3800304602F017FFD8F82C0007F061FED4F862 :10BA4800B4339842E5D30B4807F094FE94F8913448 :10BA580043F0100384F89134DBE70BB184F84154C8 -:10BA6800284602F0FFFEF1E724170020F4460108FB -:10BA7800E81C002080200020074A10B5137843F006 +:10BA6800284602F0FFFEF1E728170020F4460108F7 +:10BA7800EC1C002084200020074A10B5137843F0FE :10BA880002031370FFF73AFFBDE81040034B012291 -:10BA98000021022007F042BBCC100020C13F010862 +:10BA98000021022007F042BBD0100020C13F01085E :10BAA800074A10B5137843F008031370FFF726FF11 :10BAB800BDE81040034B01220021022007F02EBBF5 -:10BAC800CC100020D13F01082DE9F0410F46164661 +:10BAC800D0100020D13F01082DE9F0410F4616465D :10BAD8001D46804607F00AFE0B4A0C4C1378278156 :10BAE80023F0110343F01103C4E9000813706681C1 :10BAF8002573FFF703FFBDE8F041054B0122002144 -:10BB0800022007F00BBB00BFCC100020B8100020AB +:10BB0800022007F00BBB00BFD0100020BC100020A3 :10BB1800E13F010813B507F0E9FD0D4B6C461860CD :10BB2800204607F037FD94E803000A4A0A4B83E8E9 :10BB38000300137843F020031370FFF7DFFE074B71 :10BB480001220021022002B0BDE8104007F0E6BA49 -:10BB5800C8100020CC10002020200020EE3F010853 +:10BB5800CC100020D010002024200020EE3F010847 :10BB68002DE9F04192B0064602F0D9FC002840F0D9 :10BB78005881AD4D95F81831012B09D02B6BAB4C82 :10BB880093B194F80431BBB1042B6FD0032003E0C8 @@ -3042,15 +3042,15 @@ :10BDF80094F80C11218043F00203C4F8403394F8FE :10BE0800183411480133DBB284F8183484F8453407 :10BE18000E4B00259B6AC4F89854984724E71220D3 -:10BE2800BAE60E20B8E600BF24170020E81C002060 -:10BE3800F01D0020541700207C21002050200020F5 -:10BE4800A020002004210020EA1C0020F44601085C +:10BE2800BAE60E20B8E600BF28170020EC1C002058 +:10BE3800F41D0020581700208021002054200020E5 +:10BE4800A420002008210020EE1C0020F446010850 :10BE580073B5134D134E0096EB6C95F8502095F979 :10BE6800781095F8480003F0F9F995F830313375F2 :10BE780095F8480040F2012306F13C0231467382EE :10BE880003F0F8F950B196F83C3086F88230064B4A :10BE980000205B6B9847F37C86F8A83002B070BD31 -:10BEA80024170020D0200020F4460108F8B5324CB1 +:10BEA80028170020D4200020F4460108F8B5324CA9 :10BEB80094F81831012B05460ED0022B4ED0002BDA :10BEC80057D138B9D4E91B0104F1740383E803009E :10BED8000020F8BD012806D102F02CFB0028F8D17B @@ -3063,7 +3063,7 @@ :10BF4800E82340F20133A6F8FA33002386F81A34BE :10BF58000B4BDB6A9847FFF77BFFB9E748B9074BFC :10BF680084F81801062283F89024054BDB6A984769 -:10BF7800AEE70320ADE700BF24170020E81C00202F +:10BF7800AEE70320ADE700BF28170020EC1C002027 :10BF8800F4460108F0B5504C504EB4F8DC20228736 :10BF9800D4E92D0194F8B12084F8692004F16C02E9 :10BFA80082E80300D4E92F0104F1740282E8030057 @@ -3084,22 +3084,22 @@ :10C0980048020892A3F1140209920F4A0B9229331D :10C0A8000A93A2F19C030C93A2F198030D93131D1C :10C0B8000E9301A902F14C0307A802F599620F93A8 -:10C0C80002F022FA11B0F0BD24170020E81C00206D -:10C0D800D01000205021002008180020F8B50D4F7E +:10C0C80002F022FA11B0F0BD28170020EC1C002065 +:10C0D800D4100020542100200C180020F8B50D4F72 :10C0E8000D4E0C4607F046FB3B6B98470B4A96F8FB :10C0F8004800214603F0BEF850B1094D706D95F81F :10C10800243485F86A347B6B9847E37C85F890344F -:10C11800F8BD00BFF4460108241700200C210020B8 -:10C12800E81C00200F4890F81B3480F8B8330E4BF9 +:10C11800F8BD00BFF44601082817002010210020B0 +:10C12800EC1C00200F4890F81B3480F8B8330E4BF5 :10C1380093F8692080F8BB2393F87D2080F8C82302 :10C1480093F88C2080F8C92393F8303180F8CC33E9 :10C158000022A0F8CA2300F56E7100F56070FFF7A1 -:10C16800BDBF00BFE81C002024170020114890F82C +:10C16800BDBF00BFEC1C002028170020114890F824 :10C178009034EBB190F81B3480F8D0330E4BDA6E64 :10C18800C0F8D42393F87D2080F8E02393F88C201E :10C1980080F8E12393F8303180F8E4334FF480726B :10C1A800A0F8E22300F5747100F56670FFF796BFFA -:10C1B800704700BFE81C00202417002070B5344CDD +:10C1B800704700BFEC1C00202817002070B5344CD5 :10C1C8002421204604F0D4FF636A984218BF6062B5 :10C1D8004FF01C012F4814BF0125002504F0C8FFAB :10C1E800636C984218BF60644FF480712A4818BF86 @@ -3113,8 +3113,8 @@ :10C2680045F0200504F084FFD4F8C03598420F4B00 :10C2780018BFC4F8C005D3F8483318BF45F04005C7 :10C288002BB11B691BB12846BDE87040184770BD2B -:10C29800241700204C1700206C170020701800206D -:10C2A800481900204C190020D01C0020E81C002050 +:10C29800281700205017002070170020741800205D +:10C2A8004C19002050190020D41C0020EC1C002040 :10C2B8002DE9F04F8FB04FF00009012B06460F46CD :10C2C80090468DF80D90ADF8109002D84C46BC42BF :10C2D80002D30FB0BDE8F08F305D02F033FA20448E @@ -3171,8 +3171,8 @@ :10C608009DF814A0D05CF5F701FA0223C5F8800064 :10C618000AA995F848008DF828308DF82AA002F06C :10C62800F7FD95F93930069040B29842B8BF1846E0 -:10C6380085F83900002204A9092025E7E81C002014 -:10C6480024170020FB3F010803238DF80D30735D8C +:10C6380085F83900002204A9092025E7EC1C002010 +:10C6480028170020FB3F010803238DF80D30735D88 :10C658008DF82830E31CDBB2651DF25C231DDBB2CC :10C668000234F35CE4B21B0443EA0223325D134351 :10C67800642253430B93644B0AA993F8480002F0D1 @@ -3200,23 +3200,23 @@ :10C7D800EDB201F0B8FEC6E5725DA31C251D033459 :10C7E800DBB2E4B2F15C335D1B0443EA012313437B :10C7F8006420584301F0A9FEEDB28DF81000012223 -:10C8080004A9132080E600BF24170020E81C00209C -:10C81800803DD512B81000200E4B93F89124920752 +:10C8080004A9132080E600BF28170020EC1C002094 +:10C81800803DD512BC1000200E4B93F8912492074E :10C8280003D593F88F24012A08D90B4991F81A21C6 :10C8380022B18A6A501C18BF01328A620022A3F80A :10C84800182483F81A24D3F8402322F00202C3F8EC -:10C8580040237047E81C00202417002070B5184CAE +:10C8580040237047EC1C00202817002070B5184CA6 :10C868001848194D06F086FFD4F84033D4F89804D8 :10C87800D5F8906023F02003C4F8403338B106F0AF :10C888003FFF864203D2002385F83A3070BD01206D :10C89800FFF766F90028F9D00B28F7D095F839305A :10C8A80084F84234092094F8183484F8453484F81C :10C8B800410401F0D7FFBDE87040FFF7ADBF00BFEE -:10C8C800E81C00205020002024170020094BD3F832 +:10C8C800EC1C00205420002028170020094BD3F826 :10C8D8004023012A0AD008490978C90708D43AB977 :10C8E80093F89204013818BF012070470020704760 -:10C8F80001207047E81C0020CC100020034BD3F81F -:10C908004003431E58425841704700BFE81C0020AE +:10C8F80001207047EC1C0020D0100020034BD3F817 +:10C908004003431E58425841704700BFEC1C0020AA :10C918002DE9F04FA9B0EFF3108272B6DFF8F0B24C :10C928000021DBF80030CBF8001082F31088B94CF6 :10C93800002B00F0E180DAB29B06039264D5B64D75 @@ -3265,9 +3265,9 @@ :10CBE800984794F8913499070AD56FF3410313498C :10CBF80084F89134D4F84433A1F16C005B68984709 :10CC080094F89034022B1BD1FFF722F918E000BFEB -:10CC1800CC100020E81C002024170020F44601084E -:10CC2800C81000206820002080200020E820002074 -:10CC3800B8100020282100203C2100207421002069 +:10CC1800D0100020EC1C002028170020F446010842 +:10CC2800CC1000206C20002084200020EC20002064 +:10CC3800BC1000202C210020402100207821002059 :10CC480094F891349A0640F1C4826FF3451384F83E :10CC58009134D4F84033002B40F0BB8229B0BDE8B2 :10CC6800F04FFFF7ABBA84F84134A3E695F81831D2 @@ -3345,7 +3345,7 @@ :10D0E8002034C4F8285484F82C64E9E7012384F830 :10D0F8002134FEF743FC5BE694F84434002B3FF4FC :10D1080061AE0020FEF726FC94F88F34022B3FF422 -:10D118005FAE57E6201F002094F89134590715D5C3 +:10D118005FAE57E6241F002094F89134590715D5BF :10D12800012001F0B7FB60B1012001F08BFB08B9C9 :10D1380084F81804D4F8403323F00203C4F84033C9 :10D1480004E0062001F0A6FB0028F3D194F89134FE @@ -3357,7 +3357,7 @@ :10D1A8000D4A94F8181492F868209142E5D29F0726 :10D1B80003D594F84434002BDFD194F8913400203F :10D1C8006FF3041384F8913484F81904FFF746FBCD -:10D1D800BBE429B0BDE8F08F2417002050200020C0 +:10D1D800BBE429B0BDE8F08F2817002054200020B8 :10D1E8002DE9F04F89468DB090460746002800F09B :10D1F8008F81002900F08C810368002B00F0888162 :10D208004368002B00F084818368002B00F0808144 @@ -3409,22 +3409,22 @@ :10D4E800F5D101F039F8B8B91B4801F04DFB0646F3 :10D4F8000028ECD17B69984703F002FEBB6D94F8D5 :10D5080019019847FB6A9847012385F89234DFE7A9 -:10D518000326DDE70926DBE71326D9E724170020D1 -:10D52800E81C002000040001D010002065C8000895 -:10D538002DC1000875C100085DB90008CC10002095 +:10D518000326DDE70926DBE71326D9E728170020CD +:10D52800EC1C002000040001D410002065C800088D +:10D538002DC1000875C100085DB90008D010002091 :10D54800F44601081DBB0008D1BA000819B9000843 -:10D55800A9BA000881BA00080C18002008B5034BC6 -:10D568000020C3F84003FEF7BBF908BDE81C002003 +:10D55800A9BA000881BA00081018002008B5034BC2 +:10D568000020C3F84003FEF7BBF908BDEC1C0020FF :10D5780010B5FFF7ABF90A4C60B90A4B93F81831AC :10D58800022B02D1084BDB6A98470123C4F84033C9 :10D59800002010BDD4F84003013818BF0120F8E777 -:10D5A800E81C002024170020F446010838B5124C66 +:10D5A800EC1C002028170020F446010838B5124C5E :10D5B800204606F0DFF804F1180006F0DBF804F165 :10D5C800300006F0D7F804F1980006F0D3F800F020 :10D5D800AFFF0A4B0025DB6A984744F8285CFEF742 :10D5E800EDFD0749074840F2C45203F0ABFD0123A3 -:10D5F80044F8283C284638BD50200020F44601084D -:10D60800241700206011002070B52E4B8AB0054603 +:10D5F80044F8283C284638BD54200020F446010849 +:10D60800281700206411002070B52E4B8AB00546FB :10D6180093F8DD008DF8090093F8DC008DF80A0016 :10D6280029489A6A90F81804039200268DF80B008E :10D6380004960C46002940D00692D3F88820079219 @@ -3436,7 +3436,7 @@ :10D69800049A0F2A0DD863789A420AD81544AB42E7 :10D6A800A3EB02012CBF002001202170C0000AB0AA :10D6B80070BD002323700820F9E70320F7E7132043 -:10D6C800F5E700BF24170020E81C00201FB504461A +:10D6C800F5E700BF28170020EC1C00201FB5044612 :10D6D800002800F010810378412B00F20781DFE871 :10D6E80013F0420049004D005100550059005E00FA :10D6F80005010501050105010501050105010501F2 @@ -3472,8 +3472,8 @@ :10D8D800062A12D1B3F8A035E8E7094B93F8482097 :10D8E8000AB1062A09D1D3F8A43556E704B0BDE831 :10D8F800104000F021BE03203AE7182038E700BFA7 -:10D908002417002090170020D8170020981700200F -:10D91800E0170020601100207FB5044610B90320ED +:10D908002817002094170020DC1700209C170020FF +:10D91800E4170020641100207FB5044610B90320E5 :10D9280004B070BDA34DD5F840339A0700F16F825B :10D938000278412A00F26882DFE812F042004700CC :10D9480055005B005F006400690076008100870075 @@ -3515,7 +3515,7 @@ :10DB880001F059FB00283FF4CAAEBC36ADE7436844 :10DB9800029301238DF80C30074B02A993F8480033 :10DBA80001F056FB00287FF416AFB8E643680293ED -:10DBB8000023EFE7E81C002024170020F4460108A2 +:10DBB8000023EFE7EC1C002028170020F44601089A :10DBC80003795A1E0E2A3FF6AAAE934A82F86830A5 :10DBD80001E7914B42685A65FDE68F4B42689A65AA :10DBE800F9E68D4B4268DA65F5E68B4B42681A66B2 @@ -3553,7 +3553,7 @@ :10DDE8000D4B93F848200AB1062A12D1A288A3F84D :10DDF800A025F0E5084B93F848200AB1062A08D177 :10DE08006268C3F8A425E6E500F098FBDBE501208D -:10DE180086E5182084E500BF241700206011002043 +:10DE180086E5182084E500BF28170020641100203B :10DE2800F44601082DE9F04387B00023ADF800302F :10DE38000646002800F0EE800361FEF747FD20B19A :10DE48000124204607B0BDE8F08300F065FD0028F6 @@ -3585,8 +3585,8 @@ :10DFE8001020D2E7002269461220CEE78DF80720DC :10DFF80000F08EFA044638B900F087FA204600F09F :10E0080089FABDE702248AE7012488E701A800F01D -:10E01800D1FB16E7032414E73C210020E81C00206C -:10E0280024170020EA1C0020F44601082DE9F04FCF +:10E01800D1FB16E7032414E740210020EC1C002064 +:10E0280028170020EE1C0020F44601082DE9F04FC7 :10E0380099B08046059118B9032019B0BDE8F08F52 :10E0480000230361FEF742FC0446002840F0A58047 :10E0580046460FCE0EAD0FC51422524898F800A0C0 @@ -3610,7 +3610,7 @@ :10E17800F980002A00F0F6804946E01C02F0E2FF30 :10E1880094F8373201332380ECE01220D6E70220DE :10E19800D4E70720D4E71320D2E701204DE7FCB9E4 -:10E1A8000220F6E02821002024170020E81C002087 +:10E1A8000220F6E02C21002028170020EC1C00207B :10E1B800002CF5D05845B8BF584696F87C308DF8F5 :10E1C8002000052296F848008DF8223008A901F0B1 :10E1D80032F800283FF430AF9DF8203086F8393007 @@ -3642,15 +3642,15 @@ :10E37800099B86F83A00B36200F080F900287FF420 :10E388000AAF94F8913484F840A443F0010384F868 :10E398009134034BD3F89434C8F810304DE600BFDD -:10E3A800E81C0020241700208C170020EA1C0020FD +:10E3A800EC1C00202817002090170020EE1C0020ED :10E3B80037B50B4D8DF8040004460F2295F8480038 :10E3C80001A900F038FF40B1064A85F81C4192F8CF :10E3D800913443F0200382F8913403B030BD00BF7C -:10E3E80024170020E81C002010B5FFF7C1F80446E8 +:10E3E80028170020EC1C002010B5FFF7C1F80446E0 :10E3F80088B90A4805F0BEF9094805F0BBF909488B :10E4080005F0B8F900F094F8FDF7BCFD064BDB6A9F -:10E418009847204610BD0124FBE700BF502000208C -:10E428006820002080200020F44601082DE9F04FE4 +:10E418009847204610BD0124FBE700BF5420002088 +:10E428006C20002084200020F44601082DE9F04FDC :10E438008BB047780093149B90F90C8090F90D608D :10E4480090F80EB08A464168196004469146002F3C :10E4580058D002238DF8103004A9C37B007C8DF8B6 @@ -3671,7 +3671,7 @@ :10E5480070470020704770477047002070470020D0 :10E55800704770477047704710B5054C4FF4037209 :10E568002046002102F002FE0020C4E9000010BD90 -:10E57800042200202DE9F8438146904600293CD02A +:10E57800082200202DE9F8438146904600293CD026 :10E588001F4C2023224604F1100012F8017F6FBBB4 :10E598008242FAD11B4E3368013403B93460736880 :10E5A80003B11C6000252560C4F8088074601FFA58 @@ -3680,57 +3680,57 @@ :10E5D80025FA09F503F1010398BF05F00105434445 :10E5E8002573C6F808323846BDE8F883013B13F0B6 :10E5F800FF030446C6D10227F5E70127F3E700BF6A -:10E608000B220020042200202007020010B518B3B6 +:10E608000F220020082200202007020010B518B3AE :10E61800124A1368984204D103681360002305E086 :10E628000B46002BFAD019688842F9D15168884204 :10E6380008BF53600BB101681960D2F808328168CD :10E64800013B00245B1A04602146C2F808321022FC -:10E6580002F08CFD204610BD0120FCE704220020BA +:10E6580002F08CFD204610BD0120FCE708220020B6 :10E66800054B1B6813B11A798242FAD1002B0B6053 -:10E678000CBF0320002070470422002010B5054B72 +:10E678000CBF0320002070470822002010B5054B6E :10E68800186800B910BD037B04680BB9FFF7BEFF1B -:10E698002046F6E70422002038B5084B084C1868D5 +:10E698002046F6E70822002038B5084B084C1868D1 :10E6A80000B938BD03790568112B05D824FA03F39E -:10E6B800DB0701D5FFF7AAFF2846F1E7042200206F +:10E6B800DB0701D5FFF7AAFF2846F1E7082200206B :10E6C8002007020028B1044BD3F808320360002069 -:10E6D80070470120704700BF042200202DE9F04157 +:10E6D80070470120704700BF082200202DE9F04153 :10E6E80007460E46154642B339B3154B1C6800233E :10E6F8002CB93046FFF7E6FF0020BDE8F081A2689C :10E70800F91A0132914215D32279EA54581C228908 :10E718005FFA80F8611D55FA80F002F013FDA368D6 :10E72800246898445FFA88F3E2E720462568FFF7F3 :10E738006DFF2C46002CF8D1DBE70120DDE700BF98 -:10E74800042200200238C0B211289ABF014B185C7D +:10E74800082200200238C0B211289ABF014B185C79 :10E75800002070470B40010830B50B4B93F8202080 :10E768000446084672B100211C330578A54208D03A :10E7780001319842CDB214BF04301038AA42F4D8FF -:10E78800002030BD1046FCE71024002010B5084CCE +:10E78800002030BD1046FCE71424002010B5084CCA :10E7980000232060142204F10C00FF2184F82030AB :10E7A800C4E9010002F0E2FC012384F8213010BD25 -:10E7B8001024002010B50E4A92F82010042915D80C +:10E7B8001424002010B50E4A92F82010042915D808 :10E7C800936804781C7044785C70C478807898707A :10E7D8000131DC7082F8201002F11C018B4214BF59 :10E7E800043302F10C039360012010BD0020FCE704 -:10E7F80010240020094B93F8200068B15A6803F1EF +:10E7F80014240020094B93F8200068B15A6803F1EB :10E808001C018A4200F1FF3014BF043203F10C02EC -:10E8180083F820005A600120704700BF10240020B0 +:10E8180083F820005A600120704700BF14240020AC :10E8280010B5074B93F820200446084632B15968C2 :10E83800FFF792FF10B101234470837010BD00BF31 -:10E848001024002008B5064B93F820202AB15968F7 +:10E848001424002008B5064B93F820202AB15968F3 :10E85800FFF782FF08B1407808BD0120FCE700BF40 -:10E868001024002030B50A4A92F82010536882F824 +:10E868001424002030B50A4A92F82010536882F820 :10E87800210061B1916801241C32DD78587005B916 :10E888009C70934214BF0433103B9942F5D130BDBC -:10E898001024002008B5044B5968FFF75DFF0038C5 -:10E8A80018BF012008BD00BF10240020F7B50422BE +:10E898001424002008B5044B5968FFF75DFF0038C1 +:10E8A80018BF012008BD00BF14240020F7B50422BA :10E8B800154E044600210DEB020096F8207002F078 :10E8C80055FC0025EBB29F4201D803B0F0BD736838 :10E8D800197821705A786270987838B13368204670 :10E8E8009B689847FFF786FF0135EBE7DB788DF8E3 :10E8F80004108DF805208DF80730FFF77BFF01A87D -:10E90800FFF758FFF0E700BF10240020014B93F8F1 -:10E918002000704710240020034B93F8200004289F -:10E9280094BF002001207047102400201FB5002448 +:10E90800FFF758FFF0E700BF14240020014B93F8ED +:10E918002000704714240020034B93F8200004289B +:10E9280094BF002001207047142400201FB5002444 :10E93800CDE90244C41F8DF800408DF801100C0A7F :10E94800ADF80420090C120C8DF803108DF8062080 :10E958008DF8073002461B0A012168468DF80240EF @@ -3749,7 +3749,7 @@ :10EA280015D8DFE800F002080C100A4B1B681B69B8 :10EA38000B6000207047074B1B685B69F8E7054BC4 :10EA48001B689B69F4E7034B1B68DB69F0E705204B -:10EA5800704700BF342400202DE9F041C4B00C46B3 +:10EA5800704700BF382400202DE9F041C4B00C46AF :10EA68004A9E17461D468046B8B3B1F5807F36D812 :10EA78004FF488720021684602F078FB492300931E :10EA88004FF48073ADF804302B0C8DF80830330C3C @@ -3761,21 +3761,21 @@ :10EAE800F8E7000010B590B10A4C282200212060F8 :10EAF80002F03CFB2368084A1A6000204FF0FF32FE :10EB0800C3E90302C3E90522C3E9072210BD0820AF -:10EB1800FCE700BF3424002000010101024B1B6800 -:10EB280018600020704700BF3424002030B1044B27 +:10EB1800FCE700BF3824002000010101024B1B68FC +:10EB280018600020704700BF3824002030B1044B23 :10EB38001B68DB68013303600020704709207047B9 -:10EB48003424002013B500230C460193CAB101A94F +:10EB48003824002013B500230C460193CAB101A94B :10EB5800FFF764FF18B9019B591C02D1146002B079 :10EB680010BD99B2611A002901DD5C18F6E702D1DF :10EB780013600720F3E71B0C1B0403F580331C44C8 :10EB8800ECE70920EBE7000028B1044B1B681C33B5 -:10EB98004362002070470920704700BF34240020DA +:10EB98004362002070470920704700BF38240020D6 :10EBA8001FB5044600B3002303A8039302F090F9AD :10EBB800104ABDF80C30126820469380E38200F0BA :10EBC8005EFA98B904F1180300932168012313220F :10EBD80002F09CF860B9204600F051FA003818BFDE :10EBE8000120000104B010BD0920FBE71020F9E75F -:10EBF8000E20F7E734240020F0B5054687B01C4600 +:10EBF8000E20F7E738240020F0B5054687B01C46FC :10EC080013B9092007B0F0BD2E4E3368DB68834284 :10EC180055D894F82020002A0CBF082209228342E4 :10EC280005D3204600F05FFA68B11020EAE7002318 @@ -3788,7 +3788,7 @@ :10EC9800CDF808E08DF810C0ADF812508DF8157059 :10ECA80002F034F808B10E20ACE7204600F01BFA59 :10ECB8000028BAD13368DD60A4E70D20A2E706205A -:10ECC800A0E700BF342400202DE9FF410A9D8046BB +:10ECC800A0E700BF382400202DE9FF410A9D8046B7 :10ECD8000F4616461C46002D5AD0002303A910469D :10ECE8000393FFF79BFE18B1062004B0BDE8F0813E :10ECF800039B9C4201D80133F6D1284600F064F901 @@ -3802,7 +3802,7 @@ :10ED78001B681C611C62B8E70A4B1B685C61F9E7F9 :10ED8800084B1B689C61F5E7064B1B68DC61ACE728 :10ED98000920AAE70F20A8E70B20A6E70220A4E78E -:10EDA800A4080020342400201FB50B294FF00003CD +:10EDA800A4080020382400201FB50B294FF00003C9 :10EDB800CDE90033CDE902330A4607D00C2914D037 :10EDC8000A2910D00A2005B05DF804FB012802D1F9 :10EDD80020238DF800300021684602F022F8002830 @@ -3810,7 +3810,7 @@ :10EDF80038B5054602F010F8044610B10E24204636 :10EE080038BD002DFBD1094B1B680B219878FFF703 :10EE1800CBFF0028F2D10C21FFF7C6FF0028EDD167 -:10EE28000A21FFF7C1FF0028E9D0E7E734240020D2 +:10EE28000A21FFF7C1FF0028E9D0E7E738240020CE :10EE38002DE9F04380468FB00C461746002A6BD068 :10EE4800002969D0002529461D2206A8059504F049 :10EE5800A7FE8DF81350344D2B680DF114099E88C8 @@ -3826,7 +3826,7 @@ :10EEF8000820FFF71BFD034650B92A689DF8131038 :10EF080091700021D1604FF0FF31C2E90411916185 :10EF180018460FB0BDE8F0830923F9E70E23F7E799 -:10EF28000F23F5E70323F3E73424002010B5044644 +:10EF28000F23F5E70323F3E73824002010B5044640 :10EF3800002845D00168002942D011F8013B4371EF :10EF48000322063002F0FEF82046032250F8091B7F :10EF5800043102F0F7F82168CB79E3600A7A43EAD2 @@ -3868,11 +3868,11 @@ :10F19800090A81549A1C2168E08D92B28854DA1CBD :10F1A800216894F82F0092B2043388542371002008 :10F1B80038BD0933A6E70120FAE70220F8E7000086 -:10F1C800024B1A8810431880704700BF382400206B +:10F1C800024B1A8810431880704700BF3C24002067 :10F1D80008B5074B1B883BB1FEF7CAF9002814BFD6 :10F1E8006FF00200002008BD6FF00100FBE700BFD0 -:10F1F8003824002010B5034B00241C80FEF7AEF91C -:10F20800204610BD38240020B0FA80F0400970472D +:10F1F8003C24002010B5034B00241C80FEF7AEF918 +:10F20800204610BD3C240020B0FA80F04009704729 :10F2180082B018B9084602B000F0CAB8002002B09F :10F22800704710B9084600F077B9704710B908461A :10F2380000F08EB970470346084611460BB900F036 @@ -3919,12 +3919,12 @@ :10F4C80000939EE7104BFBE7104B99E740F21113AE :10F4D800ADF8003095E7032392E790F901300C4A24 :10F4E800B9E70C4990F9010000F08CFFA8E700BFCC -:10F4F80040240020AD4001089D400108A5400108B6 +:10F4F80044240020AD4001089D400108A5400108B2 :10F5080018FCFFFF00EA06379A99094040F70937C7 :10F51800D8400108B840010837B50B4B02781B6882 :10F528000C2101FB02335B7A03EB4304074B1D6894 :10F5380003690093C3684278816805EBC40000F052 -:10F54800DDFC03B030BD00BF402400203C24002077 +:10F54800DDFC03B030BD00BF44240020402400206F :10F5580070B586B0027B6423ADF80030012A4FF005 :10F568000003CDE90133CDE903338DF802308DF87E :10F57800143030D0022A39D05ABB03684BB34368E1 @@ -3936,7 +3936,7 @@ :10F5D8007C2306B070BD0A4908684360036100F5E2 :10F5E8005B7100F5587000F07AFCF2E7044B1B6879 :10F5F800B3F86023B3F86C130A43A3F86023E8E771 -:10F60800402400203C240020903D010808B5034612 +:10F608004424002040240020903D010808B503460A :10F618000A2924D8DFE801F006232323230B161B2D :10F6280023212100BDE808400068FFF783BE90F958 :10F6380000009978052271B900F011FC003818BF54 @@ -3945,7 +3945,7 @@ :10F66800EFE7000008B502791AB1012A0BD0002093 :10F6780008BD084B01681B68012203F5587000F0AB :10F688002EFC0120F4E7034B01681B6803F55B704F -:10F69800F5E700BF40240020F7B50528144D1C46A7 +:10F69800F5E700BF44240020F7B50528144D1C46A3 :10F6A800A8BF052058700E462946174600F0AAFE46 :10F6B80094F90130A070072B13D1322000F0A2FD7D :10F6C8000C4BDB6D0546984704F10C0208340346E1 @@ -3965,7 +3965,7 @@ :10F7A80001200BB0BDE8F08F002101250823CDE929 :10F7B8000013CDE90715CDE90511CDE90311029232 :10F7C800A1782B465A462846D9E7074BDBE70020A5 -:10F7D800E7E700BFF446010840240020D8400108AC +:10F7D800E7E700BFF446010844240020D8400108A8 :10F7E80085450100A5400108AD4001082DE9F04F0D :10F7F8008DB090F90130DFF8FCA0DFF8FC90CDE97E :10F808000A123E4A12F903B00278DAF800300C25E1 @@ -3983,8 +3983,8 @@ :10F8C8005430284698470A9B01201E700DB0BDE8A9 :10F8D800F08F01200823CDE90350CDE901032A4622 :10F8E800CDF800B0654643463946A847012005468D -:10F8F800D3E700BF40240020F4460108D84001089F -:10F908003C240020B84001082DE9F04F8FB00024B6 +:10F8F800D3E700BF44240020F4460108D84001089B +:10F9080040240020B84001082DE9F04F8FB00024B2 :10F9180005468A46914698460494ADF81440ADF8D9 :10F92800024007264FF0010B2B7AA34206D96868DC :10F9380004A9204400F0F6FB00285ED102238DF8CC @@ -4007,7 +4007,7 @@ :10FA48003FF472AFADF802706EE75A1E042A01D96E :10FA5800062BDCD0062667E747FA00FE1EF0010FEA :10FA6800EAD00CFB00FE51F80EE0BEF1000F08BF13 -:10FA78000626E1E74024002038B505464068FFF730 +:10FA78000626E1E74424002038B505464068FFF72C :10FA880059FC0522841D002195F90000E4B200F01C :10FA9800E6F908B904F0FD0495F9010007220021F0 :10FAA80000F0DDF908B904F0FB04204638BD002059 @@ -4015,7 +4015,7 @@ :10FAC800FFF738FC22780B4902EB42020968831CD5 :10FAD80001EB820051F82220DBB21AB903F0FD03D2 :10FAE80058B210BD032B06BF626842600223F7E7D5 -:10FAF8000020F6E740240020022070472DE9F04F4F +:10FAF8000020F6E744240020022070472DE9F04F4B :10FB0800DFF838810446D8F8000099B089461746CE :10FB180000211E460122032300F55870CDE9061185 :10FB2800CDE908118DF814108DF81510ADF81630C0 @@ -4035,8 +4035,8 @@ :10FC08000C00DDF80CC0E4B2E04728B189F800A088 :10FC1800304619B0BDE8F08F013D15F0FF05D9D188 :10FC28000D26F5E70C2801BFD8F80020B2F860339C -:10FC380043F00303A2F86033EAE700BF4024002042 -:10FC48003C240020400D0300F4460108F8B506796D +:10FC380043F00303A2F86033EAE700BF442400203E +:10FC480040240020400D0300F4460108F8B5067969 :10FC5800012E054648D90F2E48D80368187A40F374 :10FC680003000522002140B200F0F9F82B68044691 :10FC7800187A40F303100522002140B200F0EFF893 @@ -4047,10 +4047,10 @@ :10FCC800460003EB80000C2201F03CFA3A680C2352 :10FCD80003FB062320465C72B2F860130123B3408D :10FCE8000B43A2F86033E3E70620E1E70320DFE7F0 -:10FCF8000420DDE74024002010B4017801290ED942 +:10FCF8000420DDE74424002010B4017801290ED93E :10FD0800084B18680C234B43C4180022C250C4E99E :10FD1800012200F5587010BC102200F0A9B800208C -:10FD280010BC7047402400202DE9F04186B05023D4 +:10FD280010BC7047442400202DE9F04186B05023D0 :10FD38008DF81430037A102B074630D14368DD7BE9 :10FD48006DBB0224A8466426062C14D87A68535D35 :10FD580003932A44517843EA01230393927843EAB0 @@ -4287,11 +4287,11 @@ :100BB0005340179AAA5C1EA853408DF88730FFF760 :100BC0009DFDB8E6FF2049E764430108644201083F :100BD0006441010808B538B1044A05491060D822BB -:100BE00000F0B4FA002008BD0220FCE744240020F5 +:100BE00000F0B4FA002008BD0220FCE748240020F1 :100BF000944801080A4B1A6870B5002302F11805E1 :100C000003EB03142E5D864204D1183422440A609B :100C1000002070BD01330B2BF2D10320F9E700BF98 -:100C2000442400202DE9F041CCB00646DDF848818F +:100C2000482400202DE9F041CCB00646DDF848818B :100C300017461C460D4631B3B8F1000F23D006A865 :100C4000FFF726FC204601A9FFF7D4FF0446B0B900 :100C5000019906A80131FFF72BFC26B1102231467D @@ -4322,7 +4322,7 @@ :100DE0000033CDE902330C2210216B46FFF7B3FF2D :100DF0000446306810226946284400F0A7F92046CE :100E000005B0F0BD01461022601900F09FF90024E2 -:100E1000F5E701330B2BD8D10324F0E7442400205D +:100E1000F5E701330B2BD8D10324F0E74824002059 :100E200009B1FFF7C9BF022070471FB51446A0B132 :100E30000C2A01D10B2912D10023CDE90033CDE9D1 :100E400002330A466B461021FFF785FF18B9694641 @@ -4337,21 +4337,21 @@ :100ED0000720F8E70420F6E710B5044628B1044BD4 :100EE0005B6998472060002010BD0220FCE700BF2E :100EF000F446010808B5014630B1044B08221868D1 -:100F000000F024F9002008BD0220FCE74424002062 +:100F000000F024F9002008BD0220FCE7482400205E :100F100008B530B1044B0822196800F017F9002019 -:100F200008BD0220FCE700BF442400207FB5124E1C +:100F200008BD0220FCE700BF482400207FB5124E18 :100F30000023044602A801930D46FFF7E9FF33683A :100F40005B6901936CB102AA082312F8011B41B935 :100F5000013B13F0FF03F8D102A8A04702A8FFF756 :100F6000C9FF35B1019B23B901A8A8473368019A8D -:100F70005A61002004B070BD4424002008B5014629 +:100F70005A61002004B070BD4824002008B5014625 :100F800038B1054B18680822104400F0DFF8002043 -:100F900008BD0220FCE700BF4424002008B538B19A +:100F900008BD0220FCE700BF4824002008B538B196 :100FA000044B19680822114400F0D0F8002008BD55 -:100FB0000220FCE744240020034B1B6802280CBFDE -:100FC00019615961002070474424002049B1064B43 +:100FB0000220FCE748240020034B1B6802280CBFDA +:100FC00019615961002070474824002049B1064B3F :100FD0001B68D3E90423022808BF13460B600020D6 -:100FE00070470220704700BF4424002030B58FB006 +:100FE00070470220704700BF4824002030B58FB002 :100FF000002405460CA80994FFF78AFF9DF83730B6 :1010000007939DF8363006939DF8353005939DF88B :10101000343004939DF8333003939DF832300293BB @@ -4381,22 +4381,22 @@ :101190005340082243F30004013A2C4092B284EAFF :1011A0005303002AF6D1EDE72083B8ED0120704704 :1011B000054B4FF400529A62044B1B6813B15B68F5 -:1011C00003B11847704700BF00040048D424002032 +:1011C00003B11847704700BF00040048D82400202E :1011D000054B4FF480529A62044B1B6813B1DB68D5 -:1011E00003B11847704700BF00040048D424002012 +:1011E00003B11847704700BF00040048D82400200E :1011F000012070470120704701F03EB901F02CB981 :1012000010B501F00FFE0E21044640F61F1001F04C :1012100023F92046012101F0EFFDBDE8104001F067 :10122000CDBA000070B50C4E01EB40030D46B3651E :101230004FF6FF71002304461A46084601F054FB9E :1012400096F85600002101F0D7FD29462046BDE85A -:10125000704001F08BBA00BF7824002010B504461E +:10125000704001F08BBA00BF7C24002010B504461A :1012600001F0A0FE01281CD101F0A4FE34B1124807 :10127000214602F00BFB104802F0CEFA0F4C104B47 :1012800000214FF48052A1659A6194F8560001F054 :10129000B3FD63786BB16FF07F40BDE8104001F0A3 :1012A00049BA002340F262211A46084601F01CFBAD -:1012B000DCE7A0688001F0E74824002078240020C3 +:1012B000DCE7A0688001F0E74C2400207C240020BB :1012C00000040048002001F0B5B9000008B501F0A5 :1012D000BDF80438C0B2032896BF024B0020185C4A :1012E00008BD00BFBE46010808B501F0B0FD0330DF @@ -4405,16 +4405,16 @@ :1013100001F088FD0E21054640F61F1001F09CF8F3 :1013200028460121074D01F067FD01F047FA4FF40F :101330007A716143284602F0A9FA2846BDE8384090 -:1013400002F06ABA6024002001F034BB08B5084BF3 +:1013400002F06ABA6424002001F034BB08B5084BEF :10135000002193F8560001F04FFD00234FF4C071B7 :101360001A46084601F0C0FABDE8084001F01ABA72 -:101370007824002010B5044601F014FE01281CD189 +:101370007C24002010B5044601F014FE01281CD185 :1013800001F018FE34B11248214602F07FFA1048ED :1013900002F042FA0F4C104B00214FF48052A1652D :1013A0009A6194F8560001F027FD63786BB16FF0F5 :1013B0007F40BDE8104001F073B9002340F2622184 :1013C0001A46084601F090FADCE7A0688001F0E7D1 -:1013D00048240020782400200004004808B54FF07D +:1013D0004C2400207C2400200004004808B54FF075 :1013E000040001F00DF9BDE808400220F1F752BBFE :1013F00008B500231A461946184601F075FABDE8EB :10140000084001F063B900001D4B73B51D4D186015 @@ -4425,19 +4425,19 @@ :10145000104B00944FF0FF31304602F031F90E4B43 :10146000009422464FF0FF31284602F029F9304619 :1014700002F084F9284602B0BDE8704002F07EB95F -:10148000D4240020782400203D240108602400207A -:1014900048240020B1110108D11101080128084891 +:10148000D82400207C2400203D240108642400206E +:101490004C240020B1110108D1110108012808488D :1014A00005D1084BC17719700E3001F09DBB437D0B :1014B000012B03D1034B81751970F5E7704700BF0D -:1014C00078240020B00800200D4B10B50446187396 +:1014C0007C240020B00800200D4B10B50446187392 :1014D0005873012000F016F85CB134214FF4E86035 :1014E00000F0BAFF4421BDE8104040F2417000F026 :1014F000B3BF14214FF4E86000F0AEFF2421F2E7FF -:101500007824002038B5114C0546207001F057FDB5 +:101500007C24002038B5114C0546207001F057FDB1 :10151000052D04D8DFE805F0090B03171709032090 :1015200001F066FA0023637338BD0020F8E701205C :1015300001F05EFA207B637B8342F5D06073BDE8E7 -:101540003840FFF7C1BF0220EAE700BF782400203F +:101540003840FFF7C1BF0220EAE700BF7C2400203B :101550002DE9F0431E4687B000230546CDE901334F :101560000C46174601F01DFD032D5BD8DFE815F092 :101570007A00C1000C010400A27C082A69D8A16885 @@ -4476,8 +4476,8 @@ :1017800040F00401C9B2F2E72368013BB3F57A7F68 :10179000BFF45FAF0320FFF7B5FE0648022380F8D1 :1017A000383023688364162380F84C30383001F0D9 -:1017B000AFF937E778240020D424002060240020EB -:1017C000B024002086240020F0B51E4687B00023F8 +:1017B000AFF937E77C240020D824002064240020DF +:1017C000B42400208A240020F0B51E4687B00023F0 :1017D000CDE90133144607460D4601F0E2FB002C2B :1017E000724C16BF012300230026637027B1012F1E :1017F0007AD0002007B0F0BDAB68002B00F0D2809B @@ -4507,8 +4507,8 @@ :101970003BF994F82130B34240F236700CD100F0BC :101980007BFD00F0FB0140F2367000F065FD4FF684 :10199000FF73A1E70023CFE700F06EFD40F00401E4 -:1019A000C9B2F0E74FF0FF3024E700BF78240020F1 -:1019B000D424002048240020B024002086240020C5 +:1019A000C9B2F0E74FF0FF3024E700BF7C240020ED +:1019B000D82400204C240020B42400208A240020B5 :1019C0002DE9F04F85B082460E9DBDF840809DF810 :1019D00044709DF84890019193461E4601F0E1FA4B :1019E000BAF1010F524C54D0BAF1040F00F09180BB @@ -4532,8 +4532,8 @@ :101B0000012E04D1A5F10C035D425D41CEE7002515 :101B1000CCE75046FFF7F6FC022384F8383004F196 :101B200038001623A56484F84C3000F0F1FF9DE7DF -:101B300078240020A83D0108F0460108B0080020E4 -:101B4000B0240020862400202DE9F04F87B0DFF874 +:101B30007C240020A83D0108F0460108B0080020E0 +:101B4000B42400208A2400202DE9F04F87B0DFF86C :101B5000B4B29DF864A09DF84C90029314469DF891 :101B600054309DF85020BDF84880039205468BF80C :101B700001A0BDF8446001930F4601F012FABAF1DA @@ -4577,8 +4577,8 @@ :101DD00053FB00F0FB0140F2367000F03DFB4FF684 :101DE000FF72A0E7012F04D1A4F10C035C425C4117 :101DF000AFE70024ADE700F03FFB40F00401C9B2BB -:101E0000E9E700BF78240020B0080020A83D0108C1 -:101E1000F0460108B024002086240020F0B58BB0E5 +:101E0000E9E700BF7C240020B0080020A83D0108BD +:101E1000F0460108B42400208A240020F0B58BB0DD :101E20000D46044617461E46FFF74CFA0020FFF702 :101E300069FB204600F0BEFD00240123CDE90843E4 :101E400003234FF4167229462046CDE90644CDE916 @@ -4613,8 +4613,8 @@ :102010000CF101F001014FEAE20C4B40D14310F802 :102020000CE001F0070103FA01F141EA0E0100F8AA :102030000C1071E7E121F32000F00EFA04218DE786 -:102040000004004878240020D824002086240020A2 -:102050006024002060460108F0B5BDF814409DF8EA +:10204000000400487C240020DC2400208A24002096 +:102050006424002060460108F0B5BDF814409DF8E6 :1020600018709DF81CE09DF8205040B1012814D054 :102070000122002398180138B0FBF2F0F0BD87F080 :102080000107E30003EBC70318330EEB450503EB31 @@ -4631,7 +4631,7 @@ :102130004B43034951F822209CE7FFDEF04601089B :10214000C446010808B5094B012193F8560000F078 :1021500053FE4FF4D7602D2100F07EF900F033FBE1 -:10216000BDE80840024800F07BBA00BF7824002098 +:10216000BDE80840024800F07BBA00BF7C24002094 :10217000FFFF0F0073B5A44CB4F854300025202B9A :102180008DF80350019500F01B8114D8082B0DD851 :102190007BB1013B072B0CD8DFE813F042005B005A @@ -4673,12 +4673,12 @@ :1023D0001B68002B3FF4EDAEDB68002B3FF4E9AE49 :1023E0009847144BE6E7144B01222946022000F0DF :1023F00099FE607808B900F01DF9044B1B68002BAA -:102400003FF4D7AE1B6920E778240020D4240020B5 -:10241000754601080004004860240020482400207C -:10242000D82400209C2400208946010892460108F7 +:102400003FF4D7AE1B6920E77C240020D8240020AD +:102410007546010800040048642400204C24002074 +:10242000DC240020A02400208946010892460108EF :102430009C460108A5460108AE460108024BA3F8D8 -:102440005400FFF797BE00BF78240020014B187896 -:10245000704700BFE625002007B501238DF807105F +:102440005400FFF797BE00BF7C240020014B187892 +:10245000704700BFEA25002007B501238DF807105B :102460000DF1070201460348F7F7DEF803B05DF807 :1024700004FB00BFBC0A002007B5012301460DF193 :1024800007020448F7F709F99DF8070003B05DF863 @@ -4688,15 +4688,15 @@ :1024C00010B50C4B1B7804469BB94FF4D760FFF74F :1024D000D3FFC4F3002100F0FE0001434FF4D760A6 :1024E000FFF7BAFFE1B240F2B960BDE81040FFF774 -:1024F000B3BF10BDE525002010B51346EFF31084DF +:1024F000B3BF10BDE925002010B51346EFF31084DB :1025000072B60A4601460348F7F78EF884F310883E :1025100010BD00BFBC0A002008B5014608224FF4D8 :10252000D860FFF7E9FF002008BD000007B5074BA2 :102530001B7840BAADF804002BB9022201A940F281 -:10254000BC60FFF7D9FF03B05DF804FBE525002070 +:10254000BC60FFF7D9FF03B05DF804FBE92500206C :1025500007B5074B1B7840BAADF804002BB902222F :1025600001A940F2BE60FFF7C7FF03B05DF804FBAE -:10257000E525002010B51346EFF3108472B60A4625 +:10257000E925002010B51346EFF3108472B60A4621 :1025800001460348F7F789F884F3108810BD00BFAF :10259000BC0A002010B51346EFF3108472B60A4649 :1025A00001460348F7F76BF984F3108810BD00BFAC @@ -4708,16 +4708,16 @@ :1026000013B504460020F1F7C9FC0220FFF744FF90 :1026100004F0070401220DF1070184208DF8074022 :10262000FFF7DEFF024B00221A7002B010BD00BFA0 -:10263000E625002007B501228DF807000DF10701FE +:10263000EA25002007B501228DF807000DF10701FA :102640008020FFF7CDFF9DF80730002B034B14BF10 -:10265000022201221A7003B05DF804FBE625002077 +:10265000022201221A7003B05DF804FBEA25002073 :1026600007B5094B8DF8060004221A70030C8DF88B :1026700004300322030A01A983208DF80530FFF7F7 -:10268000AFFF03B05DF804FBE625002010B514464B +:10268000AFFF03B05DF804FBEA25002010B5144647 :10269000FFF790FF2046BDE81040FFF7E1BF0000C4 :1026A00007B5094B8DF8060005221A70030C8DF84A :1026B00004300322030A01A982208DF80530FFF7B8 -:1026C0008FFF03B05DF804FBE625002073B50026FC +:1026C0008FFF03B05DF804FBEA25002073B50026F8 :1026D00040F6E2000196FFF7CFFE00F0FE0105464E :1026E00040F6E200FFF7B8FE40F6E500FFF7C4FE53 :1026F00000F07F01044640F6E500FFF7ADFE6FF005 @@ -4727,12 +4727,12 @@ :1027300002B070BD13B50C4B04460522972140F63C :10274000AC001A70FFF788FE230C8DF804300322CA :10275000230A01A982208DF805308DF80640FFF785 -:102760003FFF02B010BD00BFE625002007B5030CF7 +:102760003FFF02B010BD00BFEA25002007B5030CF3 :102770008DF80030030A8DF801300B0C49BA8DF842 :102780000200ADF804100622694694208DF803304B :10279000FFF726FF024B06221A7003B05DF804FB18 -:1027A000E6250020002208B51146C520FFF718FFD6 -:1027B000014B07221A7008BDE625002000221146B1 +:1027A000EA250020002208B51146C520FFF718FFD2 +:1027B000014B07221A7008BDEA25002000221146AD :1027C000D120FFF70DBF00221146D220FFF708BF2E :1027D00007B501228DF807000DF107019F20FFF7D3 :1027E000FFFE03B05DF804FB07B501228DF807007A @@ -4763,14 +4763,14 @@ :10297000FFF772FD4FF07F00FFF75FFF0E2140F67B :102980001F10FFF769FDF1F7D5FA094B01221A7004 :1029900010BD102140F61110FFF75EFD102140F62A -:1029A0001210FFF759FDE9E7D8250020DC250020AB -:1029B000E625002037B50C4D2B7804461BB9FFF7F0 +:1029A0001210FFF759FDE9E7DC250020E0250020A3 +:1029B000EA25002037B50C4D2B7804461BB9FFF7EC :1029C0004BFF01232B700023084A6006E109EFF753 :1029D0009FF8042200BA01900DEB02018620FFF758 -:1029E000FFFD03B030BD00BFDC2500200048E8013A +:1029E000FFFD03B030BD00BFE02500200048E80136 :1029F00007B5094B8DF807000146187018B940F269 :102A0000AC60FFF729FD01220DF107018A20FFF7D5 -:102A1000E7FD03B05DF804FBE5250020012873B550 +:102A1000E7FD03B05DF804FBE9250020012873B54C :102A20000C46164637D10020F1F7E0FAA042B8BFB5 :102A300044B20E2805461AD101231A46002104206B :102A4000FFF740FF6FF010039C42B8BF1C461821EF @@ -4798,7 +4798,7 @@ :102BA0008DF803300422E8E7A3690093FAE762682E :102BB0000B4BB3FBF2F31A0C8DF800208DF80230AA :102BC0001A0A237B8DF80330637B8DF801208DF882 -:102BD00004300522D1E700BFB83D0108E5250020FB +:102BD00004300522D1E700BFB83D0108E9250020F7 :102BE0000000093D0048E8011FB52E4A0446D1689F :102BF0009068127C01AB03C31A702B4B20781B78B2 :102C0000834201D0FFF7F4FE2378032B26D8DFE8B8 @@ -4811,7 +4811,7 @@ :102C7000FFF76EFC0623DAE7237B8DF80430012290 :102C8000E8E7E389094A5BBAADF80430237C1370A6 :102C90008DF80630637C8DF80730638AADF8083014 -:102CA0000622D7E7B83D0108E5250020E4250020ED +:102CA0000622D7E7B83D0108E9250020E8250020E5 :102CB00007B502228DF804008DF805108F2001A9B8 :102CC000FFF78EFC03B05DF804FB000010B513465F :102CD000EFF3108472B60A4601460348F6F750FD3A @@ -4821,7 +4821,7 @@ :102D100001A91320FFF7DAFF0A4B1B78012B0DD115 :102D2000094B1B78012B09D140F20270FFF7A4FB7D :102D30009DF805302870237003B030BD9DF8040065 -:102D4000F6E700BFE5250020E4250020F7B50D4695 +:102D4000F6E700BFE9250020E8250020F7B50D468D :102D5000064600240DF10701284617468DF8074066 :102D6000FFF7D2FF2A78BA4207D89DF8070031460C :102D7000FFF726FC204603B0F0BD0120FBE7000072 @@ -4832,22 +4832,22 @@ :102DC0005B425B10637102B010BD9DF804305B4242 :102DD0005B1023739DF9053002339B1063739DF8DC :102DE00006305B425B10A373024B1B682361EAE76A -:102DF000E5250020E0250020012908B50346084606 +:102DF000E9250020E4250020012908B503460846FE :102E00000ED1012B07D10420FFF746FB0220BDE8BD :102E10000840F1F7C3B8022B14BF08460320F6E7B9 :102E20000120F4E738B50446F1F7DAF850B102288A :102E30000CBF02250125284602222146FFF7EEFDA0 :102E4000284638BD102CB4BF01250225F3E70A201F -:102E500070470000014B01201B681847D82500204F -:102E6000014B02201B681847D8250020014B402049 -:102E70001B681847D825002011B1012904D07047DC +:102E500070470000014B01201B681847DC2500204B +:102E6000014B02201B681847DC250020014B402045 +:102E70001B681847DC25002011B1012904D07047D8 :102E8000044B1B6880201847024B4FF480701B686E -:102E9000F9E700BFD8250020024B4FF400701B68F3 -:102EA000184700BFD8250020014B20201B68184779 -:102EB000D8250020014B04201B681847D825002086 -:102EC000014B08201B681847D8250020014B102013 -:102ED0001B681847D8250020024B4FF480401B6820 -:102EE000184700BFD825002010B568B1074A002355 +:102E9000F9E700BFDC250020024B4FF400701B68EF +:102EA000184700BFDC250020014B20201B68184775 +:102EB000DC250020014B04201B681847DC2500207E +:102EC000014B08201B681847DC250020014B10200F +:102ED0001B681847DC250020024B4FF480401B681C +:102EE000184700BFDC25002010B568B1074A002351 :102EF00052F83340844202EBC30101D9087910BD76 :102F00000133162BF4D1FEE71F20F8E780470108B4 :102F100073B51D4B0193044640F607000D46FFF7BD @@ -4866,15 +4866,15 @@ :102FE00001229A7000221C805A825A8A0A80024466 :102FF000C2F309025A8200200DE006D9C4F58065AB :10300000ADB28542F1D88242E9E7121B92B2824208 -:10301000EBD84FF0FF3086F3108870BDE82B00200E +:10301000EBD84FF0FF3086F3108870BDEC2B00200A :10302000EFF3108172B6034AD38A0133D38281F35E -:1030300010887047E82B0020EFF3108172B6034A26 -:10304000D38A013BD38281F310887047E82B00209C +:1030300010887047EC2B0020EFF3108172B6034A22 +:10304000D38A013BD38281F310887047EC2B002098 :1030500010B508481822002100F074F906484FF412 :103060008062002100F06EF9044B05481B68BDE842 -:1030700010401847E82B0020E7270020583E0108A1 -:10308000ED310108014B5860704700BFE82B00206C -:10309000014B1872704700BFE82B002073B5EFF3A7 +:1030700010401847EC2B0020EB270020583E010899 +:10308000ED310108014B5860704700BFEC2B002068 +:10309000014B1872704700BFEC2B002073B5EFF3A3 :1030A000108572B61C4CE08A00282FD1FFF7B8FFBC :1030B000218A628A914227D0A378012B12D12388DA :1030C00020805B1A9BB20221A382A17063B9A37016 @@ -4882,7 +4882,7 @@ :1030E000A38201E0002BF4D0268A0C4B1E4485F30A :1030F0001088EFF7BDFC0A4BA18ADB6801933046CC :1031000002B0BDE870401847FFF796FF85F31088BE -:10311000002002B070BD00BFE82B0020E727002090 +:10311000002002B070BD00BFEC2B0020EB27002088 :10312000583E010808B4F0B586B00023ADF8003071 :103130002B4B0B9C1D7A85424CD3D86881434CD1D4 :103140005B681BB112B1694602A898470CAB2246D6 @@ -4895,7 +4895,7 @@ :1031B000FFF774FF06B0BDE8F04001B070471CF89F :1031C000011B415501330127DDE7FFF735FF6FF0A4 :1031D0000200EFE76FF00400ECE76FF00500E9E7AD -:1031E000E82B0020E7250020E727002013B5EFF3A8 +:1031E000EC2B0020EB250020EB27002013B5EFF39C :1031F000108472B6204B9A78588A022A1DBF1A8A08 :10320000998A5218002214BFC2F309029A709042A0 :103210001A8228D0D98A012925D19978012913D178 @@ -4904,23 +4904,23 @@ :10324000806298829A8201E00029F4D0188A0B4AA1 :10325000104484F310880A4A998AD368019302B013 :10326000BDE81040184784F31088EFF705FC02B062 -:10327000BDE81040FFF7E0BEE82B0020E727002064 +:10327000BDE81040FFF7E0BEEC2B0020EB2700205C :10328000583E0108024A00231360024A1360704747 -:10329000042C0020002C002010B5EFF3108472B62F +:10329000082C0020042C002010B5EFF3108472B627 :1032A00041B1012903D1064A13680343136084F333 :1032B000108810BD024A136823EA0003F6E700BF36 -:1032C000042C002010B5EFF3108472B641B101292F +:1032C000082C002010B5EFF3108472B641B101292B :1032D00003D1064A13680343136084F3108810BDBA -:1032E000024A136823EA0003F6E700BF002C00201F +:1032E000024A136823EA0003F6E700BF042C00201B :1032F00038B5EFF3108572B60A4B0B4C1B6833B12F :10330000236898476368984785F3108838BD074B52 :103310001B681BB1A3689847E368F4E723699847E3 -:103320006369F0E7042C0020E43D0108002C002034 +:103320006369F0E7082C0020E43D0108042C00202C :1033300001380A44914200D1704711F8013B00F86E :10334000013FF7E700F030BC10B5EFF3108472B620 :10335000064A136803431360054A52F831300343A9 -:1033600042F8313084F3108810BD00BF542C002087 -:10337000082C002070477047B0F5803F3ABF00042A +:1033600042F8313084F3108810BD00BF582C002083 +:103370000C2C002070477047B0F5803F3ABF000426 :1033800010230023B0F1807F3EBF08330002DBB280 :10339000B0F1805F38BF00014FEA1070054A38BFB6 :1033A0000433125C38BFDBB2C3F11F03981AC0B2FA @@ -4939,10 +4939,10 @@ :1034700022EA03023260226822EA0303236081F316 :1034800010880E4A3B6852F823309847D6F800C09F :10349000DBF80010DAF80020D9F80030A5E700BF0B -:1034A000B4080020542C0020502C0020B808002024 -:1034B0004C2C0020482C0020082C0020102C002030 +:1034A000B4080020582C0020542C0020B80800201C +:1034B000502C00204C2C00200C2C0020142C002020 :1034C00010B51146EFF3108472B6FFF755FF034BAA -:1034D00043F8201084F3108810BD00BF102C00208A +:1034D00043F8201084F3108810BD00BF142C002086 :1034E00082B082B00DF1080C0CE90600BDF8042092 :1034F00003930B44BDF810100A4491B212B2B2F516 :103500007A7FA2BFA1F57A72013312B20360828082 @@ -4972,7 +4972,7 @@ :10368000043007469847E31999B21BB2B3F57A7F25 :103690002844A2BFA1F57A7301301BB23060B38019 :1036A0003046BDE8F08100BF183E0108024B002201 -:1036B0001A60024B1B681847582C00202C3E01084A +:1036B0001A60024B1B6818475C2C00202C3E010846 :1036C000F8B50446174608461E467CB173B1084B50 :1036D00000255B6A25609847069B60602581A5727E :1036E000E6602361E77265612846F8BD0120FCE7CA @@ -4981,7 +4981,7 @@ :1037100098476B6A044630469847AB6A201ABDE862 :10372000704018472C3E0108054B1B680BB9184622 :103730007047834201D05B69F8E70120704700BF02 -:10374000582C00202DE9F3410B4E336A044698476C +:103740005C2C00202DE9F3410B4E336A0446984768 :103750000123B7692372D4F800800546B84728448E :10376000804502D2B84728442060B368206801939E :1037700002B0BDE8F04118472C3E010870B520B3F7 @@ -4990,18 +4990,18 @@ :1037A0002C60FFF7CFFF86F31088002070BD094B17 :1037B000DB6898472C60F6E71A465B69002BF2D06D :1037C0009842F9D143695361EDE70120EEE700BF6C -:1037D000582C00202C3E0108084B10B51A6853697C +:1037D0005C2C00202C3E0108084B10B51A68536978 :1037E000516911B95061416110BD046819688C427A -:1037F00002D91A465B69F3E71946F3E7582C002013 +:1037F00002D91A465B69F3E71946F3E75C2C00200F :10380000044A13680BB10021197243611060FFF77D -:1038100099BF00BF582C00202DE9F0410446002834 +:1038100099BF00BF5C2C00202DE9F0410446002830 :103820002DD0FFF781FF50BB657A45BBEFF31088C1 :1038300072B6144E6768336A984787422CBF276078 :103840002060114FA5724FF4807323813B684BB900 :10385000336998472046FFF7D3FF88F3108828463E :10386000BDE8F081B3699847236818443B6820603D :103870001B6898422046EED3FFF7AEFFEDE7012527 -:10388000EDE700BF2C3E0108582C002010B504467F +:10388000EDE700BF2C3E01085C2C002010B504467B :1038900008467CB1084B5B6A984760602046FFF79A :1038A00043FF40B12046FFF769FF2046BDE81040C6 :1038B000FFF7B2BF012010BD2C3E01082DE9F041F9 @@ -5013,7 +5013,7 @@ :103910002C6863692B60A4F80880D4E903309847C9 :103920006389B3F5807FD9D12046FFF775FFD5E7CE :10393000037A002BD6D1FFF705FFD3E72C3E010811 -:10394000582C00202DE9F04F002997B081461E46E3 +:103940005C2C00202DE9F04F002997B081461E46DF :1039500040F3118104464F1E1378A4EB090023B9EC :103960000023237017B0BDE8F08FB842F8DA252B9A :1039700005D004F8013B904608F10102ECE792F80B @@ -5407,10 +5407,10 @@ :10517C000101F801FF01018E0101000101FF000195 :10518C0080000000000000000A0000000500000084 :10519C00000000000500000000093D0010000000A8 -:1051AC00000000004C100020000000000000000077 -:1051BC00FF000000000000004C1000200000000068 +:1051AC000000000050100020000000000000000073 +:1051BC00FF00000000000000501000200000000064 :1051CC0000000000000000000000000000000000D3 -:1051DC004C1000200000FF0000000000E000000068 +:1051DC00501000200000FF0000000000E000000064 :1051EC0009B5000839B4000845B4000871B40008CA :1051FC00000000000000000061B5000851B4000878 :10520C00D1B8000800000000000000000000000001 diff --git a/TOF/App/X-WL55_WLE5_53L0X.h b/TOF/App/X-WL55_WLE5_53L0X.h index 234a94b..e144950 100644 --- a/TOF/App/X-WL55_WLE5_53L0X.h +++ b/TOF/App/X-WL55_WLE5_53L0X.h @@ -20,7 +20,7 @@ /** @ingroup VL53L0X_config * @{*/ -#define MAX_TOF_COUNT 2 +#define MAX_TOF_COUNT 3 #ifndef VL53L0X_HAVE_UART /** @@ -119,7 +119,7 @@ extern void XNUCLEO53L1A1_USART2_UART_Init(void); * Must be set to non 0 for shared interrupt line * see @sa VL53L0X_GPIO1_C_OPTION */ -#define VL53L0X_GPIO1_SHARED 0 +#define VL53L0X_GPIO1_SHARED 1 #endif diff --git a/TOF/App/app_tof_vl53l0x_range.c b/TOF/App/app_tof_vl53l0x_range.c index 86a6b8c..f4d938f 100644 --- a/TOF/App/app_tof_vl53l0x_range.c +++ b/TOF/App/app_tof_vl53l0x_range.c @@ -161,7 +161,7 @@ int sts_tof_vl53l0x_DetectSensors(void) do { /* Set I2C standard mode (400 KHz) before doing the first register access */ //if (status == VL53L0X_ERROR_NONE) - status = VL53L0X_WrByte(pDev, 0x88, 0x00); + //status = VL53L0X_WrByte(pDev, 0x88, 0x00); /* Try to read one register using default 0x52 address */ status = VL53L0X_RdWord(pDev, VL53L0X_REG_IDENTIFICATION_MODEL_ID, &Id); @@ -180,26 +180,24 @@ int sts_tof_vl53l0x_DetectSensors(void) pDev->I2cDevAddr = FinalAddress; /* Check all is OK with the new I2C address and initialize the sensor */ status = VL53L0X_RdWord(pDev, VL53L0X_REG_IDENTIFICATION_MODEL_ID, &Id); - if (status !=0) - { - APP_LOG(TS_OFF, VLEVEL_H, "#i VL53L0X_RdWord fail\r\n"); - break; - } + // if (status !=0) + //{ + // APP_LOG(TS_OFF, VLEVEL_H, "#i VL53L0X_RdWord fail\r\n"); + //break; + //} status = VL53L0X_DataInit(pDev); if( status == 0 ){ pDev->Present = 1; //APP_LOG(TS_OFF, VLEVEL_H, "#%u VL53L0X_SetDeviceAddress to 0x%02x\r\n",i, pDev->I2cDevAddr); - - + nDevPresent++; + nDevMask |= 1 << i; + pDev->Present = 1; + APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X %d Present and initiated to final 0x%2x, Position Mask=0x%02x\r\n", pDev->Id, pDev->I2cDevAddr, nDevMask); } else{ APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_DataInit %d fail\r\n", Id); break; } - nDevPresent++; - nDevMask |= 1 << i; - pDev->Present = 1; - APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X %d Present and initiated to final 0x%2x, Position Mask=0x%02x\r\n", pDev->Id, pDev->I2cDevAddr, nDevMask); } else { APP_LOG(TS_OFF, VLEVEL_H, "# unknown ID %x\r\n", Id);