From f69ae9eed263c0542aafc693263a4e74392e0871 Mon Sep 17 00:00:00 2001 From: Kelvin Ly Date: Mon, 4 Sep 2023 13:56:26 -0400 Subject: [PATCH] Lower I2C speed to reduce errors due to longer cable --- humdifier_controller/humdifier_controller.ino | 4 +- .../humdifier_controller.ino.standard.hex | 276 +++++++++--------- ...ontroller.ino.with_bootloader.standard.hex | 275 ++++++++--------- 3 files changed, 279 insertions(+), 276 deletions(-) diff --git a/humdifier_controller/humdifier_controller.ino b/humdifier_controller/humdifier_controller.ino index 05bd501..c1cd0cc 100644 --- a/humdifier_controller/humdifier_controller.ino +++ b/humdifier_controller/humdifier_controller.ino @@ -10,7 +10,8 @@ Home #include #include "DFRobot_SHT20.h" -DFRobot_SHT20 sht20; +TwoWire twowire; +DFRobot_SHT20 sht20(&twowire); void fanOn() { digitalWrite(7, HIGH); @@ -31,6 +32,7 @@ void setup() Serial.begin(115200); //Serial.println("SHT20 Example!"); //Serial.println("temperature,humidity"); + twowire.setClock(10000); sht20.initSHT20(); // Init SHT20 Sensor delay(100); //sht20.checkSHT20(); // Check SHT20 Sensor diff --git a/humdifier_controller/humdifier_controller.ino.standard.hex b/humdifier_controller/humdifier_controller.ino.standard.hex index d38c2a9..fb1ff13 100644 --- a/humdifier_controller/humdifier_controller.ino.standard.hex +++ b/humdifier_controller/humdifier_controller.ino.standard.hex @@ -10,11 +10,11 @@ :10009000040404040404040402020202020203032E :1000A0000303030301020408102040800102040836 :1000B0001020010204081020BB0811241FBECFEF3E -:1000C000D8E0DEBFCDBF11E0A0E0B1E0EAEBF9E19E +:1000C000D8E0DEBFCDBF11E0A0E0B1E0E0ECF9E1A7 :1000D00002C005900D92A633B107D9F722E0A6E33E :1000E000B1E001C01D92A53AB207E1F710E0CDE5FD -:1000F000D0E004C02197FE010E94D50CCC35D10779 -:10010000C9F70E94FC080C94DB0C0C94000090E0F2 +:1000F000D0E004C02197FE010E94D80CCC35D10776 +:10010000C9F70E94FC080C94DE0C0C94000090E0EF :10011000FC01EC55FF4F249180579F4FFC018491C7 :10012000882399F090E0880F991FFC01EA57FF4F50 :10013000A591B491FC01E458FF4F859194918FB73C @@ -110,42 +110,42 @@ :1006D000AF92BF920F931F93CF93DF93CDB7DEB747 :1006E000A1970FB6F894DEBF0FBECDBF19A242305E :1006F00008F44AE08E010F5D1F4F842E912CB12C1F -:10070000A12CA50194010E94B30CE62FB901CA01E6 +:10070000A12CA50194010E94B60CE62FB901CA01E3 :10071000EA30F4F4E05DD801EE938D01232B242B15 :10072000252B79F790E080E0109719F0CD010E9419 :100730005903A1960FB6F894DEBF0FBECDBFDF916F :10074000CF911F910F91BF90AF909F908F90089580 :10075000E95CE1CF4F925F926F927F928F929F926E :10076000AF92BF92CF92DF92EF92FF920F931F93BF -:10077000CF936B017C01742EAC019B010E94AE0CE7 +:10077000CF936B017C01742EAC019B010E94B10CE4 :10078000882399F084E291E0CF911F910F91FF901F :10079000EF90DF90CF90BF90AF909F908F907F9021 :1007A0006F905F904F900C94590346015701E89465 :1007B000B7F82FEF3FEF4FE75FE7C501B4010E94A5 -:1007C000AE0C81110DC02FEF3FEF4FE75FE7C50182 -:1007D000B4010E94E40A18161CF488E291E0D4CF18 -:1007E0002FEF3FEF4FE75FE4C701B6010E943C0CDB +:1007C000B10C81110DC02FEF3FEF4FE75FE7C5017F +:1007D000B4010E94E70A18161CF488E291E0D4CF15 +:1007E0002FEF3FEF4FE75FE4C701B6010E943F0CD8 :1007F00018161CF48CE291E0C7CF2FEF3FEF4FE7C4 -:100800005FECC701B6010E94E40A87FDF3CF20E048 -:1008100030E0A901C701B6010E94E40A10E000E03F +:100800005FECC701B6010E94E70A87FDF3CF20E045 +:1008100030E0A901C701B6010E94E70A10E000E03C :1008200087FF0AC06DE289EF91E00E9448018C01C8 :10083000F7FAF094F7F8F094C0E060E070E080E040 :100840009FE37C1641F020E030E040E251E40E945A -:10085000E90ACF5FF6CFA70196010E94780A2B0123 -:100860003C010E945B0B4B015C014AE00E94660365 +:10085000EC0ACF5FF6CFA70196010E947B0A2B011D +:100860003C010E945E0B4B015C014AE00E94660362 :100870007C01E00EF11ECC23C1F1C501B4010E9440 -:100880008A0B9B01AC01C301B2010E94770A4B01A4 +:100880008D0B9B01AC01C301B2010E947A0A4B019E :100890005C016EE289EF91E00E944801E80EF91ECA :1008A000C15018F120E030E040E251E4C501B4014C -:1008B0000E94410C2B013C010E945B0B4B01B12CAF +:1008B0000E94440C2B013C010E945E0B4B01B12CA9 :1008C000A12C4AE0C501B4010E946603E80EF91E9E -:1008D000C501B4010E948A0B9B01AC01C301B201A6 -:1008E0000E94770A4B015C01DBCFC701CF911F91BA +:1008D000C501B4010E948D0B9B01AC01C301B201A3 +:1008E0000E947A0A4B015C01DBCFC701CF911F91B7 :1008F0000F91FF90EF90DF90CF90BF90AF909F90BF :100900008F907F906F905F904F9008954F925F927D :100910006F927F928F929F92AF92BF92CF92DF920F -:10092000EF92FF920F931F93CF93DF93A091A302B7 -:10093000B091A4029091A20221E02093F80190933B +:10092000EF92FF920F931F93CF93DF93A0919702C3 +:10093000B09198029091960221E02093F801909353 :10094000F7011092F6011092F501ED91FC911197CB :100950000190F081E02D682FCD010995D091F5012E :1009600081E0D13208F09CC0C091F7010E941302CF @@ -179,7 +179,7 @@ :100B2000390708F081CFB7CF80E0BACF82E0B8CFE5 :100B300083E0B6CFDAE011E00FEFA2E0FA2EB5EED7 :100B4000EB2EC5ECDC2E6AE070E080E090E00E94C5 -:100B50003802C091A2020E9413024B015C018091F5 +:100B50003802C09196020E9413024B015C01809101 :100B6000CF01811162C01093CF011093CE01009389 :100B7000CD011092CC01F092CB011093AA0180918B :100B8000AA01CC0FC82BC093AA018091A901813082 @@ -198,11 +198,11 @@ :100C50006090D3017090D401681979098A099B09C1 :100C6000461657066806790608F079CF8091D001BC :100C70000E94AF0280E01092880180938701D150DA -:100C800009F417CF833009F05ECF8091A3029091D1 -:100C9000A402DC01ED91FC910284F385E02D09951D -:100CA000D82F8091A3029091A402DC01ED91FC91D8 -:100CB0000284F385E02D0995C82F8091A3029091BD -:100CC000A402DC01ED91FC910284F385E02D0995ED +:100C800009F417CF833009F05ECF809197029091DD +:100C90009802DC01ED91FC910284F385E02D099529 +:100CA000D82F8091970290919802DC01ED91FC91F0 +:100CB0000284F385E02D0995C82F809197029091C9 +:100CC0009802DC01ED91FC910284F385E02D0995F9 :100CD00020E03D2F2C2BA90170E060E0762F652FDE :100CE000542F4427482B87E190E0C12CE0E8DE2E0A :100CF000E8E9EE2EF12C4A015B01082E04C0B694FF @@ -282,9 +282,9 @@ :1011900031E03183208325EC30E03587248724EC4F :1011A00030E03787268720EC30E0318B208B21EC34 :1011B00030E0338B228B22EC30E0358B248B26EC15 -:1011C00030E0378B268B118E128E138E148EE6E94B +:1011C00030E0378B268B118E128E138E148EE9E948 :1011D000F2E01382128284839583A683B78386E12B -:1011E00091E091838083A2EAB2E080E48C9312962E +:1011E00091E091838083A6E9B2E080E48C9312962B :1011F000FC93EE9311970895789484B5826084BD32 :1012000084B5816084BD85B5826085BD85B581600A :1012100085BD80916E00816080936E001092810088 @@ -302,116 +302,116 @@ :1012D0000C02808180618083E0910B02F0910C020E :1012E000808188608083E0910B02F0910C02808104 :1012F00080688083E0910B02F0910C0280818F7DE9 -:10130000808310928801109287011092F60110924A -:10131000F5010E94910286EA90E090938601809305 -:10132000850187EA90E0909384018093830164E6CD -:1013300070E080E090E00E94380200E010E089EF69 -:1013400091E00E940601892B09F4BFC089EF91E06A -:101350000E94E4008337910509F081C085EF0E9467 -:1013600086049C01265E3340BC0190E080E0223080 -:10137000310508F056C00E948A0B6B017C0183EF97 -:101380000E9486049C01265E3340BC0190E080E010 -:101390002230310508F054C00E948A0B2B013C0119 -:1013A00080E10E9401025C018EE00E940102EC01DA -:1013B00042E0C701B6010E94AA0380E391E00E94C7 -:1013C000590342E0C301B2010E94AA0380E391E005 -:1013D0000E945903B501BB0C880B990B0E948C0B22 -:1013E00020E030E040EA5BE30E94410C42E00E94D2 -:1013F000AA0380E391E00E945903BE01DD0F880B30 -:10140000990B0E948C0B20E030E040EA5BE30E94E5 -:10141000410C42E00E94AA0382E391E00E9459033A -:101420008ECF0E948A0B20E030E04AEF5AE30E9400 -:10143000410C20E030E040EC50E40E94770A9DCF60 -:101440000E948A0B22E538EB4FE25BE30E94410CDD -:1014500026E636E64BE352E40E94770A9FCF8836B1 -:10146000910579F461E084E00E94B50164E670E0E2 -:1014700080E090E00E94380260E084E00E94B501C4 -:101480005ECF8936910569F461E085E00E94B5017F -:1014900064E670E080E090E00E94380260E085E061 -:1014A000EDCFEC01C154D109CA31D10508F047CFC5 -:1014B00061E08C2F0E94B50164E670E080E090E06E -:1014C0000E94380260E08C2FD9CF61E070E080E0AC -:1014D00090E00E9438020115110509F430CF0E94F6 -:1014E0001201882309F42BCF0E94000028CF505806 -:1014F000BB27AA270E948F0A0C94020C0E94F40BAF -:1015000038F00E94FB0B20F039F49F3F19F426F4C9 -:101510000C94F10B0EF4E095E7FB0C94EB0BE92F28 -:101520000E94130C58F3BA176207730784079507D4 -:1015300020F079F4A6F50C94350C0EF4E0950B2E02 -:10154000BA2FA02D0B01B90190010C01CA01A00115 -:101550001124FF27591B99F0593F50F4503E68F170 -:101560001A16F040A22F232F342F4427585FF3CFB1 -:10157000469537952795A795F0405395C9F77EF482 -:101580001F16BA0B620B730B840BBAF09150A1F0CB -:10159000FF0FBB1F661F771F881FC2F70EC0BA0F51 -:1015A000621F731F841F48F4879577956795B795D9 -:1015B000F7959E3F08F0B0CF9395880F08F09927D4 -:1015C000EE0F9795879508950E94C70B08F481E068 -:1015D00008950E94FD0A0C94020C0E94FB0B58F027 -:1015E0000E94F40B40F029F45F3F29F00C94EB0BC0 -:1015F00051110C94360C0C94F10B0E94130C68F3EF -:101600009923B1F3552391F3951B550BBB27AA27BB -:1016100062177307840738F09F5F5F4F220F331FF5 -:10162000441FAA1FA9F335D00E2E3AF0E0E832D0BD -:1016300091505040E695001CCAF72BD0FE2F29D0C0 -:10164000660F771F881FBB1F261737074807AB0792 -:10165000B0E809F0BB0B802DBF01FF2793585F4F07 -:101660003AF09E3F510578F00C94EB0B0C94360C3D -:101670005F3FE4F3983ED4F3869577956795B795E9 -:10168000F7959F5FC9F7880F911D9695879597F9F4 -:101690000895E1E0660F771F881FBB1F621773076D -:1016A0008407BA0720F0621B730B840BBA0BEE1F82 -:1016B00088F7E09508950E941B0C88F09F5798F0DA -:1016C000B92F9927B751B0F0E1F0660F771F881F47 -:1016D000991F1AF0BA95C9F714C0B13091F00E9461 -:1016E000350CB1E008950C94350C672F782F8827BE -:1016F000B85F39F0B93FCCF3869577956795B39588 -:10170000D9F73EF490958095709561957F4F8F4FF6 -:101710009F4F0895E89409C097FB3EF490958095FB -:10172000709561957F4F8F4F9F4F9923A9F0F92FA7 -:1017300096E9BB279395F695879577956795B79525 -:10174000F111F8CFFAF4BB0F11F460FF1BC06F5F0B -:101750007F4F8F4F9F4F16C0882311F096E911C01D -:10176000772321F09EE8872F762F05C0662371F03E -:1017700096E8862F70E060E02AF09A95660F771F52 -:10178000881FDAF7880F9695879597F90895990F2E -:101790000008550FAA0BE0E8FEEF16161706E8073B -:1017A000F907C0F012161306E407F50798F0621B5C -:1017B000730B840B950B39F40A2661F0232B242B31 -:1017C000252B21F408950A2609F4A140A6958FEF50 -:1017D000811D811D089597F99F6780E870E060E0A2 -:1017E00008959FEF80EC089500240A9416161706BA -:1017F00018060906089500240A9412161306140602 -:1018000005060895092E0394000C11F4882352F064 -:10181000BB0F40F4BF2B11F460FF04C06F5F7F4F1C -:101820008F4F9F4F089557FD9058440F551F59F003 -:101830005F3F71F04795880F97FB991F61F09F3FBD -:1018400079F087950895121613061406551FF2CFE6 -:101850004695F1DF08C0161617061806991FF1CF36 -:1018600086957105610508940895E894BB2766275D -:101870007727CB0197F908950E94C70B08F48FEFE3 -:1018800008950E94540C0C94020C0E94F40B38F042 -:101890000E94FB0B20F0952311F00C94EB0B0C94A1 -:1018A000F10B11240C94360C0E94130C70F3959FCD -:1018B000C1F3950F50E0551F629FF001729FBB2747 -:1018C000F00DB11D639FAA27F00DB11DAA1F649FE3 -:1018D0006627B00DA11D661F829F2227B00DA11D96 -:1018E000621F739FB00DA11D621F839FA00D611D1C -:1018F000221F749F3327A00D611D231F849F600D3D -:10190000211D822F762F6A2F11249F5750409AF065 -:10191000F1F088234AF0EE0FFF1FBB1F661F771FF1 -:10192000881F91505040A9F79E3F510580F00C94BC -:10193000EB0B0C94360C5F3FE4F3983ED4F38695A2 -:1019400077956795B795F795E7959F5FC1F7FE2B5C -:10195000880F911D9695879597F908950E94C70B5A -:10196000880B990B0895A1E21A2EAA1BBB1BFD013F -:101970000DC0AA1FBB1FEE1FFF1FA217B307E4076E -:10198000F50720F0A21BB30BE40BF50B661F771FC6 -:10199000881F991F1A9469F76095709580959095A6 -:1019A0009B01AC01BD01CF010895EE0FFF1F059013 -:0A19B000F491E02D0994F894FFCFA4 -:1019BA00000000004801A800D50095010601E400D6 -:1019CA00F800000000002703FA025603D002F302CF -:1019DA00E002D1026E616E00696E66006F76660083 -:0619EA002C000D0A0000B4 +:10130000808388E18093B800109288011092870151 +:101310001092F6011092F5010E94910286EA90E087 +:10132000909386018093850187EA90E090938401F1 +:101330008093830164E670E080E090E00E943802D0 +:1013400000E010E089EF91E00E940601892B09F48A +:10135000BFC089EF91E00E94E4008337910509F056 +:1013600081C085EF0E9486049C01265E3340BC014B +:1013700090E080E02230310508F056C00E948D0BCD +:101380006B017C0183EF0E9486049C01265E334042 +:10139000BC0190E080E02230310508F054C00E948A +:1013A0008D0B2B013C0180E10E9401025C018EE06B +:1013B0000E940102EC0142E0C701B6010E94AA03AB +:1013C00080E391E00E94590342E0C301B2010E9410 +:1013D000AA0380E391E00E945903B501BB0C880B7E +:1013E000990B0E948F0B20E030E040EA5BE30E9403 +:1013F000440C42E00E94AA0380E391E00E9459035A +:10140000BE01DD0F880B990B0E948F0B20E030E0AE +:1014100040EA5BE30E94440C42E00E94AA0382E39C +:1014200091E00E9459038ECF0E948D0B20E030E0A6 +:101430004AEF5AE30E94440C20E030E040EC50E4D4 +:101440000E947A0A9DCF0E948D0B22E538EB4FE275 +:101450005BE30E94440C26E636E64BE352E40E942E +:101460007A0A9FCF8836910579F461E084E00E9482 +:10147000B50164E670E080E090E00E94380260E030 +:1014800084E00E94B5015ECF8936910569F461E080 +:1014900085E00E94B50164E670E080E090E00E9483 +:1014A000380260E085E0EDCFEC01C154D109CA31CA +:1014B000D10508F047CF61E08C2F0E94B50164E6AA +:1014C00070E080E090E00E94380260E08C2FD9CF7D +:1014D00061E070E080E090E00E94380201151105A3 +:1014E00009F430CF0E941201882309F42BCF0E9407 +:1014F000000028CF5058BB27AA270E94920A0C94BC +:10150000050C0E94F70B38F00E94FE0B20F039F416 +:101510009F3F19F426F40C94F40B0EF4E095E7FBCE +:101520000C94EE0BE92F0E94160C58F3BA176207C1 +:1015300073078407950720F079F4A6F50C94380C0E +:101540000EF4E0950B2EBA2FA02D0B01B9019001DE +:101550000C01CA01A0011124FF27591B99F0593F22 +:1015600050F4503E68F11A16F040A22F232F342F6A +:101570004427585FF3CF469537952795A795F040B8 +:101580005395C9F77EF41F16BA0B620B730B840BCD +:10159000BAF09150A1F0FF0FBB1F661F771F881F85 +:1015A000C2F70EC0BA0F621F731F841F48F48795DD +:1015B00077956795B795F7959E3F08F0B0CF9395CF +:1015C000880F08F09927EE0F9795879508950E9448 +:1015D000CA0B08F481E008950E94000B0C94050CDE +:1015E0000E94FE0B58F00E94F70B40F029F45F3F79 +:1015F00029F00C94EE0B51110C94390C0C94F40B53 +:101600000E94160C68F39923B1F3552391F3951BAF +:10161000550BBB27AA2762177307840738F09F5F13 +:101620005F4F220F331F441FAA1FA9F335D00E2E80 +:101630003AF0E0E832D091505040E695001CCAF7ED +:101640002BD0FE2F29D0660F771F881FBB1F2617B0 +:1016500037074807AB07B0E809F0BB0B802DBF0187 +:10166000FF2793585F4F3AF09E3F510578F00C9456 +:10167000EE0B0C94390C5F3FE4F3983ED4F386955F +:1016800077956795B795F7959F5FC9F7880F911D77 +:101690009695879597F90895E1E0660F771F881F63 +:1016A000BB1F621773078407BA0720F0621B730B16 +:1016B000840BBA0BEE1F88F7E09508950E941E0C6C +:1016C00088F09F5798F0B92F9927B751B0F0E1F003 +:1016D000660F771F881F991F1AF0BA95C9F714C0B3 +:1016E000B13091F00E94380CB1E008950C94380CA0 +:1016F000672F782F8827B85F39F0B93FCCF38695EC +:1017000077956795B395D9F73EF490958095709548 +:1017100061957F4F8F4F9F4F0895E89409C097FBC5 +:101720003EF490958095709561957F4F8F4F9F4FB8 +:101730009923A9F0F92F96E9BB279395F6958795FC +:1017400077956795B795F111F8CFFAF4BB0F11F4BF +:1017500060FF1BC06F5F7F4F8F4F9F4F16C0882366 +:1017600011F096E911C0772321F09EE8872F762F9C +:1017700005C0662371F096E8862F70E060E02AF0DD +:101780009A95660F771F881FDAF7880F96958795C9 +:1017900097F90895990F0008550FAA0BE0E8FEEF9E +:1017A00016161706E807F907C0F012161306E40725 +:1017B000F50798F0621B730B840B950B39F40A261E +:1017C00061F0232B242B252B21F408950A2609F4FC +:1017D000A140A6958FEF811D811D089597F99F6700 +:1017E00080E870E060E008959FEF80EC08950024A9 +:1017F0000A941616170618060906089500240A9476 +:1018000012161306140605060895092E0394000CFB +:1018100011F4882352F0BB0F40F4BF2B11F460FF8A +:1018200004C06F5F7F4F8F4F9F4F089557FD9058B3 +:10183000440F551F59F05F3F71F04795880F97FB94 +:10184000991F61F09F3F79F087950895121613064E +:101850001406551FF2CF4695F1DF08C0161617067D +:101860001806991FF1CF86957105610508940895B2 +:10187000E894BB2766277727CB0197F908950E9444 +:10188000CA0B08F48FEF08950E94570C0C94050CB6 +:101890000E94F70B38F00E94FE0B20F0952311F008 +:1018A0000C94EE0B0C94F40B11240C94390C0E9444 +:1018B000160C70F3959FC1F3950F50E0551F629F72 +:1018C000F001729FBB27F00DB11D639FAA27F00D99 +:1018D000B11DAA1F649F6627B00DA11D661F829FC0 +:1018E0002227B00DA11D621F739FB00DA11D621FA5 +:1018F000839FA00D611D221F749F3327A00D611DC2 +:10190000231F849F600D211D822F762F6A2F1124A3 +:101910009F5750409AF0F1F088234AF0EE0FFF1FD6 +:10192000BB1F661F771F881F91505040A9F79E3F2D +:10193000510580F00C94EE0B0C94390C5F3FE4F3EE +:10194000983ED4F3869577956795B795F795E79583 +:101950009F5FC1F7FE2B880F911D9695879597F98C +:1019600008950E94CA0B880B990B0895A1E21A2EC4 +:10197000AA1BBB1BFD010DC0AA1FBB1FEE1FFF1F33 +:10198000A217B307E407F50720F0A21BB30BE40B83 +:10199000F50B661F771F881F991F1A9469F76095CA +:1019A0007095809590959B01AC01BD01CF01089584 +:1019B000EE0FFF1F0590F491E02D0994F894FFCFEE +:1019C000000000004801A800D50095010601E400D0 +:1019D000F800000000002703FA025603D002F302C9 +:1019E000E002D1026E616E00696E66006F7666007D +:0619F0002C000D0A0000AE :00000001FF diff --git a/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex b/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex index 00552a5..da10c6a 100644 --- a/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex +++ b/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex @@ -11,11 +11,11 @@ :10009000040404040404040402020202020203032E :1000A0000303030301020408102040800102040836 :1000B0001020010204081020BB0811241FBECFEF3E -:1000C000D8E0DEBFCDBF11E0A0E0B1E0EAEBF9E19E +:1000C000D8E0DEBFCDBF11E0A0E0B1E0E0ECF9E1A7 :1000D00002C005900D92A633B107D9F722E0A6E33E :1000E000B1E001C01D92A53AB207E1F710E0CDE5FD -:1000F000D0E004C02197FE010E94D50CCC35D10779 -:10010000C9F70E94FC080C94DB0C0C94000090E0F2 +:1000F000D0E004C02197FE010E94D80CCC35D10776 +:10010000C9F70E94FC080C94DE0C0C94000090E0EF :10011000FC01EC55FF4F249180579F4FFC018491C7 :10012000882399F090E0880F991FFC01EA57FF4F50 :10013000A591B491FC01E458FF4F859194918FB73C @@ -111,42 +111,42 @@ :1006D000AF92BF920F931F93CF93DF93CDB7DEB747 :1006E000A1970FB6F894DEBF0FBECDBF19A242305E :1006F00008F44AE08E010F5D1F4F842E912CB12C1F -:10070000A12CA50194010E94B30CE62FB901CA01E6 +:10070000A12CA50194010E94B60CE62FB901CA01E3 :10071000EA30F4F4E05DD801EE938D01232B242B15 :10072000252B79F790E080E0109719F0CD010E9419 :100730005903A1960FB6F894DEBF0FBECDBFDF916F :10074000CF911F910F91BF90AF909F908F90089580 :10075000E95CE1CF4F925F926F927F928F929F926E :10076000AF92BF92CF92DF92EF92FF920F931F93BF -:10077000CF936B017C01742EAC019B010E94AE0CE7 +:10077000CF936B017C01742EAC019B010E94B10CE4 :10078000882399F084E291E0CF911F910F91FF901F :10079000EF90DF90CF90BF90AF909F908F907F9021 :1007A0006F905F904F900C94590346015701E89465 :1007B000B7F82FEF3FEF4FE75FE7C501B4010E94A5 -:1007C000AE0C81110DC02FEF3FEF4FE75FE7C50182 -:1007D000B4010E94E40A18161CF488E291E0D4CF18 -:1007E0002FEF3FEF4FE75FE4C701B6010E943C0CDB +:1007C000B10C81110DC02FEF3FEF4FE75FE7C5017F +:1007D000B4010E94E70A18161CF488E291E0D4CF15 +:1007E0002FEF3FEF4FE75FE4C701B6010E943F0CD8 :1007F00018161CF48CE291E0C7CF2FEF3FEF4FE7C4 -:100800005FECC701B6010E94E40A87FDF3CF20E048 -:1008100030E0A901C701B6010E94E40A10E000E03F +:100800005FECC701B6010E94E70A87FDF3CF20E045 +:1008100030E0A901C701B6010E94E70A10E000E03C :1008200087FF0AC06DE289EF91E00E9448018C01C8 :10083000F7FAF094F7F8F094C0E060E070E080E040 :100840009FE37C1641F020E030E040E251E40E945A -:10085000E90ACF5FF6CFA70196010E94780A2B0123 -:100860003C010E945B0B4B015C014AE00E94660365 +:10085000EC0ACF5FF6CFA70196010E947B0A2B011D +:100860003C010E945E0B4B015C014AE00E94660362 :100870007C01E00EF11ECC23C1F1C501B4010E9440 -:100880008A0B9B01AC01C301B2010E94770A4B01A4 +:100880008D0B9B01AC01C301B2010E947A0A4B019E :100890005C016EE289EF91E00E944801E80EF91ECA :1008A000C15018F120E030E040E251E4C501B4014C -:1008B0000E94410C2B013C010E945B0B4B01B12CAF +:1008B0000E94440C2B013C010E945E0B4B01B12CA9 :1008C000A12C4AE0C501B4010E946603E80EF91E9E -:1008D000C501B4010E948A0B9B01AC01C301B201A6 -:1008E0000E94770A4B015C01DBCFC701CF911F91BA +:1008D000C501B4010E948D0B9B01AC01C301B201A3 +:1008E0000E947A0A4B015C01DBCFC701CF911F91B7 :1008F0000F91FF90EF90DF90CF90BF90AF909F90BF :100900008F907F906F905F904F9008954F925F927D :100910006F927F928F929F92AF92BF92CF92DF920F -:10092000EF92FF920F931F93CF93DF93A091A302B7 -:10093000B091A4029091A20221E02093F80190933B +:10092000EF92FF920F931F93CF93DF93A0919702C3 +:10093000B09198029091960221E02093F801909353 :10094000F7011092F6011092F501ED91FC911197CB :100950000190F081E02D682FCD010995D091F5012E :1009600081E0D13208F09CC0C091F7010E941302CF @@ -180,7 +180,7 @@ :100B2000390708F081CFB7CF80E0BACF82E0B8CFE5 :100B300083E0B6CFDAE011E00FEFA2E0FA2EB5EED7 :100B4000EB2EC5ECDC2E6AE070E080E090E00E94C5 -:100B50003802C091A2020E9413024B015C018091F5 +:100B50003802C09196020E9413024B015C01809101 :100B6000CF01811162C01093CF011093CE01009389 :100B7000CD011092CC01F092CB011093AA0180918B :100B8000AA01CC0FC82BC093AA018091A901813082 @@ -199,11 +199,11 @@ :100C50006090D3017090D401681979098A099B09C1 :100C6000461657066806790608F079CF8091D001BC :100C70000E94AF0280E01092880180938701D150DA -:100C800009F417CF833009F05ECF8091A3029091D1 -:100C9000A402DC01ED91FC910284F385E02D09951D -:100CA000D82F8091A3029091A402DC01ED91FC91D8 -:100CB0000284F385E02D0995C82F8091A3029091BD -:100CC000A402DC01ED91FC910284F385E02D0995ED +:100C800009F417CF833009F05ECF809197029091DD +:100C90009802DC01ED91FC910284F385E02D099529 +:100CA000D82F8091970290919802DC01ED91FC91F0 +:100CB0000284F385E02D0995C82F809197029091C9 +:100CC0009802DC01ED91FC910284F385E02D0995F9 :100CD00020E03D2F2C2BA90170E060E0762F652FDE :100CE000542F4427482B87E190E0C12CE0E8DE2E0A :100CF000E8E9EE2EF12C4A015B01082E04C0B694FF @@ -283,9 +283,9 @@ :1011900031E03183208325EC30E03587248724EC4F :1011A00030E03787268720EC30E0318B208B21EC34 :1011B00030E0338B228B22EC30E0358B248B26EC15 -:1011C00030E0378B268B118E128E138E148EE6E94B +:1011C00030E0378B268B118E128E138E148EE9E948 :1011D000F2E01382128284839583A683B78386E12B -:1011E00091E091838083A2EAB2E080E48C9312962E +:1011E00091E091838083A6E9B2E080E48C9312962B :1011F000FC93EE9311970895789484B5826084BD32 :1012000084B5816084BD85B5826085BD85B581600A :1012100085BD80916E00816080936E001092810088 @@ -303,117 +303,118 @@ :1012D0000C02808180618083E0910B02F0910C020E :1012E000808188608083E0910B02F0910C02808104 :1012F00080688083E0910B02F0910C0280818F7DE9 -:10130000808310928801109287011092F60110924A -:10131000F5010E94910286EA90E090938601809305 -:10132000850187EA90E0909384018093830164E6CD -:1013300070E080E090E00E94380200E010E089EF69 -:1013400091E00E940601892B09F4BFC089EF91E06A -:101350000E94E4008337910509F081C085EF0E9467 -:1013600086049C01265E3340BC0190E080E0223080 -:10137000310508F056C00E948A0B6B017C0183EF97 -:101380000E9486049C01265E3340BC0190E080E010 -:101390002230310508F054C00E948A0B2B013C0119 -:1013A00080E10E9401025C018EE00E940102EC01DA -:1013B00042E0C701B6010E94AA0380E391E00E94C7 -:1013C000590342E0C301B2010E94AA0380E391E005 -:1013D0000E945903B501BB0C880B990B0E948C0B22 -:1013E00020E030E040EA5BE30E94410C42E00E94D2 -:1013F000AA0380E391E00E945903BE01DD0F880B30 -:10140000990B0E948C0B20E030E040EA5BE30E94E5 -:10141000410C42E00E94AA0382E391E00E9459033A -:101420008ECF0E948A0B20E030E04AEF5AE30E9400 -:10143000410C20E030E040EC50E40E94770A9DCF60 -:101440000E948A0B22E538EB4FE25BE30E94410CDD -:1014500026E636E64BE352E40E94770A9FCF8836B1 -:10146000910579F461E084E00E94B50164E670E0E2 -:1014700080E090E00E94380260E084E00E94B501C4 -:101480005ECF8936910569F461E085E00E94B5017F -:1014900064E670E080E090E00E94380260E085E061 -:1014A000EDCFEC01C154D109CA31D10508F047CFC5 -:1014B00061E08C2F0E94B50164E670E080E090E06E -:1014C0000E94380260E08C2FD9CF61E070E080E0AC -:1014D00090E00E9438020115110509F430CF0E94F6 -:1014E0001201882309F42BCF0E94000028CF505806 -:1014F000BB27AA270E948F0A0C94020C0E94F40BAF -:1015000038F00E94FB0B20F039F49F3F19F426F4C9 -:101510000C94F10B0EF4E095E7FB0C94EB0BE92F28 -:101520000E94130C58F3BA176207730784079507D4 -:1015300020F079F4A6F50C94350C0EF4E0950B2E02 -:10154000BA2FA02D0B01B90190010C01CA01A00115 -:101550001124FF27591B99F0593F50F4503E68F170 -:101560001A16F040A22F232F342F4427585FF3CFB1 -:10157000469537952795A795F0405395C9F77EF482 -:101580001F16BA0B620B730B840BBAF09150A1F0CB -:10159000FF0FBB1F661F771F881FC2F70EC0BA0F51 -:1015A000621F731F841F48F4879577956795B795D9 -:1015B000F7959E3F08F0B0CF9395880F08F09927D4 -:1015C000EE0F9795879508950E94C70B08F481E068 -:1015D00008950E94FD0A0C94020C0E94FB0B58F027 -:1015E0000E94F40B40F029F45F3F29F00C94EB0BC0 -:1015F00051110C94360C0C94F10B0E94130C68F3EF -:101600009923B1F3552391F3951B550BBB27AA27BB -:1016100062177307840738F09F5F5F4F220F331FF5 -:10162000441FAA1FA9F335D00E2E3AF0E0E832D0BD -:1016300091505040E695001CCAF72BD0FE2F29D0C0 -:10164000660F771F881FBB1F261737074807AB0792 -:10165000B0E809F0BB0B802DBF01FF2793585F4F07 -:101660003AF09E3F510578F00C94EB0B0C94360C3D -:101670005F3FE4F3983ED4F3869577956795B795E9 -:10168000F7959F5FC9F7880F911D9695879597F9F4 -:101690000895E1E0660F771F881FBB1F621773076D -:1016A0008407BA0720F0621B730B840BBA0BEE1F82 -:1016B00088F7E09508950E941B0C88F09F5798F0DA -:1016C000B92F9927B751B0F0E1F0660F771F881F47 -:1016D000991F1AF0BA95C9F714C0B13091F00E9461 -:1016E000350CB1E008950C94350C672F782F8827BE -:1016F000B85F39F0B93FCCF3869577956795B39588 -:10170000D9F73EF490958095709561957F4F8F4FF6 -:101710009F4F0895E89409C097FB3EF490958095FB -:10172000709561957F4F8F4F9F4F9923A9F0F92FA7 -:1017300096E9BB279395F695879577956795B79525 -:10174000F111F8CFFAF4BB0F11F460FF1BC06F5F0B -:101750007F4F8F4F9F4F16C0882311F096E911C01D -:10176000772321F09EE8872F762F05C0662371F03E -:1017700096E8862F70E060E02AF09A95660F771F52 -:10178000881FDAF7880F9695879597F90895990F2E -:101790000008550FAA0BE0E8FEEF16161706E8073B -:1017A000F907C0F012161306E407F50798F0621B5C -:1017B000730B840B950B39F40A2661F0232B242B31 -:1017C000252B21F408950A2609F4A140A6958FEF50 -:1017D000811D811D089597F99F6780E870E060E0A2 -:1017E00008959FEF80EC089500240A9416161706BA -:1017F00018060906089500240A9412161306140602 -:1018000005060895092E0394000C11F4882352F064 -:10181000BB0F40F4BF2B11F460FF04C06F5F7F4F1C -:101820008F4F9F4F089557FD9058440F551F59F003 -:101830005F3F71F04795880F97FB991F61F09F3FBD -:1018400079F087950895121613061406551FF2CFE6 -:101850004695F1DF08C0161617061806991FF1CF36 -:1018600086957105610508940895E894BB2766275D -:101870007727CB0197F908950E94C70B08F48FEFE3 -:1018800008950E94540C0C94020C0E94F40B38F042 -:101890000E94FB0B20F0952311F00C94EB0B0C94A1 -:1018A000F10B11240C94360C0E94130C70F3959FCD -:1018B000C1F3950F50E0551F629FF001729FBB2747 -:1018C000F00DB11D639FAA27F00DB11DAA1F649FE3 -:1018D0006627B00DA11D661F829F2227B00DA11D96 -:1018E000621F739FB00DA11D621F839FA00D611D1C -:1018F000221F749F3327A00D611D231F849F600D3D -:10190000211D822F762F6A2F11249F5750409AF065 -:10191000F1F088234AF0EE0FFF1FBB1F661F771FF1 -:10192000881F91505040A9F79E3F510580F00C94BC -:10193000EB0B0C94360C5F3FE4F3983ED4F38695A2 -:1019400077956795B795F795E7959F5FC1F7FE2B5C -:10195000880F911D9695879597F908950E94C70B5A -:10196000880B990B0895A1E21A2EAA1BBB1BFD013F -:101970000DC0AA1FBB1FEE1FFF1FA217B307E4076E -:10198000F50720F0A21BB30BE40BF50B661F771FC6 -:10199000881F991F1A9469F76095709580959095A6 -:1019A0009B01AC01BD01CF010895EE0FFF1F059013 -:1019B000F491E02D0994F894FFCF00000000480155 -:1019C000A800D50095010601E400F8000000000021 -:1019D0002703FA025603D002F302E002D1026E613D -:1019E0006E00696E66006F7666002C000D0A0000BE +:10130000808388E18093B800109288011092870151 +:101310001092F6011092F5010E94910286EA90E087 +:10132000909386018093850187EA90E090938401F1 +:101330008093830164E670E080E090E00E943802D0 +:1013400000E010E089EF91E00E940601892B09F48A +:10135000BFC089EF91E00E94E4008337910509F056 +:1013600081C085EF0E9486049C01265E3340BC014B +:1013700090E080E02230310508F056C00E948D0BCD +:101380006B017C0183EF0E9486049C01265E334042 +:10139000BC0190E080E02230310508F054C00E948A +:1013A0008D0B2B013C0180E10E9401025C018EE06B +:1013B0000E940102EC0142E0C701B6010E94AA03AB +:1013C00080E391E00E94590342E0C301B2010E9410 +:1013D000AA0380E391E00E945903B501BB0C880B7E +:1013E000990B0E948F0B20E030E040EA5BE30E9403 +:1013F000440C42E00E94AA0380E391E00E9459035A +:10140000BE01DD0F880B990B0E948F0B20E030E0AE +:1014100040EA5BE30E94440C42E00E94AA0382E39C +:1014200091E00E9459038ECF0E948D0B20E030E0A6 +:101430004AEF5AE30E94440C20E030E040EC50E4D4 +:101440000E947A0A9DCF0E948D0B22E538EB4FE275 +:101450005BE30E94440C26E636E64BE352E40E942E +:101460007A0A9FCF8836910579F461E084E00E9482 +:10147000B50164E670E080E090E00E94380260E030 +:1014800084E00E94B5015ECF8936910569F461E080 +:1014900085E00E94B50164E670E080E090E00E9483 +:1014A000380260E085E0EDCFEC01C154D109CA31CA +:1014B000D10508F047CF61E08C2F0E94B50164E6AA +:1014C00070E080E090E00E94380260E08C2FD9CF7D +:1014D00061E070E080E090E00E94380201151105A3 +:1014E00009F430CF0E941201882309F42BCF0E9407 +:1014F000000028CF5058BB27AA270E94920A0C94BC +:10150000050C0E94F70B38F00E94FE0B20F039F416 +:101510009F3F19F426F40C94F40B0EF4E095E7FBCE +:101520000C94EE0BE92F0E94160C58F3BA176207C1 +:1015300073078407950720F079F4A6F50C94380C0E +:101540000EF4E0950B2EBA2FA02D0B01B9019001DE +:101550000C01CA01A0011124FF27591B99F0593F22 +:1015600050F4503E68F11A16F040A22F232F342F6A +:101570004427585FF3CF469537952795A795F040B8 +:101580005395C9F77EF41F16BA0B620B730B840BCD +:10159000BAF09150A1F0FF0FBB1F661F771F881F85 +:1015A000C2F70EC0BA0F621F731F841F48F48795DD +:1015B00077956795B795F7959E3F08F0B0CF9395CF +:1015C000880F08F09927EE0F9795879508950E9448 +:1015D000CA0B08F481E008950E94000B0C94050CDE +:1015E0000E94FE0B58F00E94F70B40F029F45F3F79 +:1015F00029F00C94EE0B51110C94390C0C94F40B53 +:101600000E94160C68F39923B1F3552391F3951BAF +:10161000550BBB27AA2762177307840738F09F5F13 +:101620005F4F220F331F441FAA1FA9F335D00E2E80 +:101630003AF0E0E832D091505040E695001CCAF7ED +:101640002BD0FE2F29D0660F771F881FBB1F2617B0 +:1016500037074807AB07B0E809F0BB0B802DBF0187 +:10166000FF2793585F4F3AF09E3F510578F00C9456 +:10167000EE0B0C94390C5F3FE4F3983ED4F386955F +:1016800077956795B795F7959F5FC9F7880F911D77 +:101690009695879597F90895E1E0660F771F881F63 +:1016A000BB1F621773078407BA0720F0621B730B16 +:1016B000840BBA0BEE1F88F7E09508950E941E0C6C +:1016C00088F09F5798F0B92F9927B751B0F0E1F003 +:1016D000660F771F881F991F1AF0BA95C9F714C0B3 +:1016E000B13091F00E94380CB1E008950C94380CA0 +:1016F000672F782F8827B85F39F0B93FCCF38695EC +:1017000077956795B395D9F73EF490958095709548 +:1017100061957F4F8F4F9F4F0895E89409C097FBC5 +:101720003EF490958095709561957F4F8F4F9F4FB8 +:101730009923A9F0F92F96E9BB279395F6958795FC +:1017400077956795B795F111F8CFFAF4BB0F11F4BF +:1017500060FF1BC06F5F7F4F8F4F9F4F16C0882366 +:1017600011F096E911C0772321F09EE8872F762F9C +:1017700005C0662371F096E8862F70E060E02AF0DD +:101780009A95660F771F881FDAF7880F96958795C9 +:1017900097F90895990F0008550FAA0BE0E8FEEF9E +:1017A00016161706E807F907C0F012161306E40725 +:1017B000F50798F0621B730B840B950B39F40A261E +:1017C00061F0232B242B252B21F408950A2609F4FC +:1017D000A140A6958FEF811D811D089597F99F6700 +:1017E00080E870E060E008959FEF80EC08950024A9 +:1017F0000A941616170618060906089500240A9476 +:1018000012161306140605060895092E0394000CFB +:1018100011F4882352F0BB0F40F4BF2B11F460FF8A +:1018200004C06F5F7F4F8F4F9F4F089557FD9058B3 +:10183000440F551F59F05F3F71F04795880F97FB94 +:10184000991F61F09F3F79F087950895121613064E +:101850001406551FF2CF4695F1DF08C0161617067D +:101860001806991FF1CF86957105610508940895B2 +:10187000E894BB2766277727CB0197F908950E9444 +:10188000CA0B08F48FEF08950E94570C0C94050CB6 +:101890000E94F70B38F00E94FE0B20F0952311F008 +:1018A0000C94EE0B0C94F40B11240C94390C0E9444 +:1018B000160C70F3959FC1F3950F50E0551F629F72 +:1018C000F001729FBB27F00DB11D639FAA27F00D99 +:1018D000B11DAA1F649F6627B00DA11D661F829FC0 +:1018E0002227B00DA11D621F739FB00DA11D621FA5 +:1018F000839FA00D611D221F749F3327A00D611DC2 +:10190000231F849F600D211D822F762F6A2F1124A3 +:101910009F5750409AF0F1F088234AF0EE0FFF1FD6 +:10192000BB1F661F771F881F91505040A9F79E3F2D +:10193000510580F00C94EE0B0C94390C5F3FE4F3EE +:10194000983ED4F3869577956795B795F795E79583 +:101950009F5FC1F7FE2B880F911D9695879597F98C +:1019600008950E94CA0B880B990B0895A1E21A2EC4 +:10197000AA1BBB1BFD010DC0AA1FBB1FEE1FFF1F33 +:10198000A217B307E407F50720F0A21BB30BE40B83 +:10199000F50B661F771F881F991F1A9469F76095CA +:1019A0007095809590959B01AC01BD01CF01089584 +:1019B000EE0FFF1F0590F491E02D0994F894FFCFEE +:1019C000000000004801A800D50095010601E400D0 +:1019D000F800000000002703FA025603D002F302C9 +:1019E000E002D1026E616E00696E66006F7666007D +:0619F0002C000D0A0000AE :107E0000112484B714BE81FFF0D085E080938100F7 :107E100082E08093C00088E18093C10086E0809377 :107E2000C20080E18093C4008EE0C9D0259A86E02C