diff --git a/humdifier_controller/humdifier_controller.ino b/humdifier_controller/humdifier_controller.ino index e6f1912..65a3da0 100644 --- a/humdifier_controller/humdifier_controller.ino +++ b/humdifier_controller/humdifier_controller.ino @@ -4,6 +4,9 @@ Modified by MehranMaleki from Arduino Examples Home */ +// this is using the HiLetgo 5V 4 Channel Relay Shield +// pinout is apparently 7,6,5,4 + #include #include "DFRobot_SHT20.h" @@ -32,12 +35,21 @@ void setup() //sht20.checkSHT20(); // Check SHT20 Sensor } +// relay 4 void toggle() { digitalWrite(4, HIGH); delay(100); digitalWrite(4, LOW); } +// relay 3 +void toggle2() { + digitalWrite(5, HIGH); + delay(100); + digitalWrite(5, LOW); +} + + void loop() { while (Serial.available()) { @@ -47,13 +59,18 @@ void loop() float humd = sht20.readHumidity(); // Read Humidity float temp = sht20.readTemperature(); // Read Temperature float volts = (5.0f/1024.0f)*analogRead(A2); + float volts2 = (5.0f/1024.0f)*analogRead(A0); Serial.print(humd); Serial.print(","); Serial.print(temp); Serial.print(","); - Serial.println(volts); + Serial.print(volts); + Serial.print(","); + Serial.println(volts2); } else if (c == 'h') { toggle(); + } else if (c == 'i') { + toggle2(); } } delay(1); diff --git a/humdifier_controller/humdifier_controller.ino.standard.hex b/humdifier_controller/humdifier_controller.ino.standard.hex index 3288e1b..1309add 100644 --- a/humdifier_controller/humdifier_controller.ino.standard.hex +++ b/humdifier_controller/humdifier_controller.ino.standard.hex @@ -2,19 +2,19 @@ :100010000C9485000C9485000C9485000C9485004C :100020000C9485000C9485000C9485000C9485003C :100030000C9485000C9485000C9485000C9485002C -:100040000C9440070C9485000C940E070C94E80661 +:100040000C9452070C9485000C9420070C94FA062B :100050000C9485000C9485000C9485000C9485000C -:100060000C948A070C94850000000008000201002F +:100060000C949C070C94850000000008000201001D :100070000003040700000000000000000000000072 :10008000250028002B0000000000240027002A0083 :10009000040404040404040402020202020203032E :1000A0000303030301020408102040800102040836 -:1000B0001020010204081020A90811241FBECFEF50 -:1000C000D8E0DEBFCDBF11E0A0E0B1E0E8E3F9E1A8 +:1000B0001020010204081020BB0811241FBECFEF3E +:1000C000D8E0DEBFCDBF11E0A0E0B1E0ECE8F9E19F :1000D00002C005900D92A633B107D9F722E0A6E33E :1000E000B1E001C01D92A53AB207E1F710E0CDE5FD -:1000F000D0E004C02197FE010E94940CCC35D107BA -:10010000C9F70E94EA080C949A0C0C94000090E045 +:1000F000D0E004C02197FE010E94BE0CCC35D10790 +:10010000C9F70E94FC080C94C40C0C94000090E009 :10011000FC01EC55FF4F249180579F4FFC018491C7 :10012000882399F090E0880F991FFC01EA57FF4F50 :10013000A591B491FC01E458FF4F859194918FB73C @@ -62,348 +62,353 @@ :1003D000809180008F7780938000DFCF84B58F7706 :1003E00084BDDBCF84B58F7DFBCF8091B0008F774C :1003F0008093B000D2CF8091B0008F7DF9CF3E2B9B -:10040000DACF3FB7F89480917F0190918001A0915D -:100410008101B091820126B5A89B05C02F3F19F03C -:100420000196A11DB11D3FBFBA2FA92F982F882774 -:10043000BC01CD01620F711D811D911D42E0660F4F -:10044000771F881F991F4A95D1F708958F929F9221 -:10045000AF92BF92CF92DF92EF92FF924B015C017D -:100460000E9401026B017C010E9401026C197D094E -:100470008E099F09683E734081059105A8F321E02C -:10048000821A9108A108B10888EEC80E83E0D81E30 -:10049000E11CF11C81149104A104B10429F7FF901F -:1004A000EF90DF90CF90BF90AF909F908F90089586 -:1004B00020915701260F3327331F21323105ECF4E9 -:1004C0002091CF01FC0190E080E0243069F082E0CF -:1004D0000895A09157012191AC01495C5E4FA40F92 -:1004E000B52FB11D2C930196861798F38091570173 -:1004F000680F6093570180E0089581E0089510929D -:10050000CF0181E08093CE011092A90161E082E1E8 -:100510000E94B50161E083E10E94B501E9EBF0E0E2 -:1005200080818E7F808380818D7F808388E480932B -:10053000B80085E48093BC000895CF93DF9391E0E9 -:10054000909336018823B9F0C091B800D091BA00D9 -:100550008091BC008A7B8093BC0060E082E10E94B5 -:10056000B50160E083E10E94B5010E947F02D09353 -:10057000BA00C093B800DF91CF9108950895E0913B -:10058000880180918701E81730F4F0E0E757FE4FCB -:10059000808190E008958FEF9FEF089590918801FA -:1005A000809187012FEF3FEF981748F4E92FF0E093 -:1005B000E757FE4F208130E09F5F90938801C9018B -:1005C00008958091870190918801891B990B089566 -:1005D000CF92DF92EF92FF920F931F93CF93DF930F -:1005E0007C01CB018A012091F801222389F0EB01E3 -:1005F0006B01C40ED51ECC15DD0569F06991D701DC -:10060000ED91FC910190F081E02DC7010995F3CFA8 -:10061000642F0E945802C801DF91CF911F910F9162 -:10062000FF90EF90DF90CF900895CF93DF931F92CC -:10063000CDB7DEB769832091F8012223F9F020912C -:10064000F501203258F021E030E0FC0133832283B1 -:1006500090E080E00F90DF91CF9108958091F601B6 -:10066000E82FF0E0EB52FE4F998190838F5F8093EB -:10067000F6018093F50181E090E0ECCF61E0CE01DE -:1006800001960E945802F7CF90E080E00895FC01A7 -:1006900001900020E9F73197AF01481B590BBC01CD -:1006A00089EF91E00C94A8008F929F92AF92BF9235 -:1006B0000F931F93CF93DF93CDB7DEB7A1970FB6FC -:1006C000F894DEBF0FBECDBF19A2423008F44AE055 -:1006D0008E010F5D1F4F842E912CB12CA12CA501F2 -:1006E00094010E94720CE62FB901CA01EA30F4F4B9 -:1006F000E05DD801EE938D01232B242B252B79F778 -:1007000090E080E0109719F0CD010E944703A19678 -:100710000FB6F894DEBF0FBECDBFDF91CF911F9112 -:100720000F91BF90AF909F908F900895E95CE1CFBB -:100730004F925F926F927F928F929F92AF92BF92F1 -:10074000CF92DF92EF92FF920F931F93CF936B01A3 -:100750007C01742EAC019B010E946D0C882399F0E2 -:1007600084E291E0CF911F910F91FF90EF90DF9085 -:10077000CF90BF90AF909F908F907F906F905F9041 -:100780004F900C94470346015701E894B7F82FEFB8 -:100790003FEF4FE75FE7C501B4010E946D0C811187 -:1007A0000DC02FEF3FEF4FE75FE7C501B4010E9497 -:1007B000A30A18161CF488E291E0D4CF2FEF3FEF84 -:1007C0004FE75FE4C701B6010E94FB0B18161CF44B -:1007D0008CE291E0C7CF2FEF3FEF4FE75FECC7010F -:1007E000B6010E94A30A87FDF3CF20E030E0A90103 -:1007F000C701B6010E94A30A10E000E087FF0AC00B -:100800006DE289EF91E00E9448018C01F7FAF094C3 -:10081000F7F8F094C0E060E070E080E09FE37C16C1 -:1008200041F020E030E040E251E40E94A80ACF5FAE -:10083000F6CFA70196010E94370A2B013C010E94C6 -:100840001A0B4B015C014AE00E9454037C01E00E4C -:10085000F11ECC23C1F1C501B4010E94490B9B01DB -:10086000AC01C301B2010E94360A4B015C016EE289 -:1008700089EF91E00E944801E80EF91EC15018F17D -:1008800020E030E040E251E4C501B4010E94000CD8 -:100890002B013C010E941A0B4B01B12CA12C4AE008 -:1008A000C501B4010E945403E80EF91EC501B4014C -:1008B0000E94490B9B01AC01C301B2010E94360AA0 -:1008C0004B015C01DBCFC701CF911F910F91FF90CE -:1008D000EF90DF90CF90BF90AF909F908F907F90E0 -:1008E0006F905F904F9008954F925F926F927F92BA -:1008F0008F929F92AF92BF92CF92DF92EF92FF9230 -:100900000F931F93CF93DF93A091A302B091A40202 -:100910009091A20221E02093F8019093F7011092A8 -:10092000F6011092F501ED91FC9111970190F08183 -:10093000E02D682FCD010995D091F50181E0D132EC -:1009400008F09CC0C091F7010E9401026B017C017C -:100950008091CF0181116CC082E08093CF0181E052 -:100960008093CE018FEF8093CD011092CC01D09374 -:10097000CB01E5EDF1E0ABEAB1E080E0D8139AC03D -:100980001092AA018091AA01CC0FC82BC093AA0192 -:100990008091A901813009F091C01092A9010E94B3 -:1009A00001026B017C018091AA018093BB008091C0 -:1009B000D1019091D201A091D301B091D401892BA2 -:1009C0008A2B8B2BA1F00E9401020091D101109182 -:1009D000D2012091D3013091D4016C197D098E0987 -:1009E0009F09061717072807390708F442C08091A6 -:1009F000BC0083FDD8CF85EC8093BC000E9401022F -:100A00006B017C018091CF01823009F459C0809143 -:100A1000CD018F3F09F476C08091CD01803209F479 -:100A200073C08091CD01803309F470C084E026C08A -:100A30008091D1019091D201A091D301B091D401C4 -:100A4000892B8A2B8B2B09F483CF0E940102009102 -:100A5000D1011091D2012091D3013091D4016C19B0 -:100A60007D098E099F09061717072807390708F01F -:100A70006FCF8091D0010E949D0285E01092F60117 -:100A80001092F5011092F801882309F441C086EE16 -:100A900093E0DF91CF911F910F91FF90EF90DF9046 -:100AA000CF90BF90AF909F908F907F906F905F900E -:100AB0004F90089591919D938F5F60CF85EE9CCF6D -:100AC0008091D1019091D201A091D301B091D40134 -:100AD000892B8A2B8B2B09F495CF0E940102009160 -:100AE000D1011091D2012091D3013091D4016C1920 -:100AF0007D098E099F09061717072807390708F08F -:100B000081CFB7CF80E0BACF82E0B8CF83E0B6CF55 -:100B1000DAE011E00FEFA2E0FA2EB5EEEB2EC5EC15 -:100B2000DC2E6AE070E080E090E00E942602C09136 -:100B3000A2020E9401024B015C018091CF01811150 -:100B400062C01093CF011093CE010093CD0110929B -:100B5000CC01F092CB011093AA018091AA01CC0F95 -:100B6000C82BC093AA018091A901813009F0D1C09E -:100B70001092A9010E9401024B015C018091AA011F -:100B80008093BB008091D1019091D201A091D301BB -:100B9000B091D401892B8A2B8B2BA1F00E940102EA -:100BA0004090D1015090D2016090D3017090D40157 -:100BB000681979098A099B09461657066806790655 -:100BC00008F442C08091BC0083FDD8CFD092BC0015 -:100BD0000E9401024B015C018091CF01813009F438 -:100BE0009BC08091CC01833008F0B8C08091CC01CB -:100BF000ABEAB1E0E9E8F1E090E0981751F12D910E -:100C000021939F5FFACF8091D1019091D201A09161 -:100C1000D301B091D401892B8A2B8B2B09F48DCF72 -:100C20000E9401024090D1015090D2016090D30106 -:100C30007090D401681979098A099B0946165706EC -:100C40006806790608F079CF8091D0010E949D0254 -:100C500080E01092880180938701D15009F417CF6A -:100C6000833009F05ECF8091A3029091A402DC0151 -:100C7000ED91FC910284F385E02D0995D82F8091A8 -:100C8000A3029091A402DC01ED91FC910284F38512 -:100C9000E02D0995C82F8091A3029091A402DC0158 -:100CA000ED91FC910284F385E02D099520E03D2F24 -:100CB0002C2BA90170E060E0762F652F542F44277C -:100CC000482B87E190E0C12CE0E8DE2EE8E9EE2E2B -:100CD000F12C4A015B01082E04C0B694A7949794A6 -:100CE00087940A94D2F780FE04C04C255D256E25BA -:100CF0007F25F694E794D794C794019787309105A0 -:100D000041F7C9018C7F442309F4C3CE87EE93E0F9 -:100D1000C0CEE092BC005CCF8091D1019091D20115 -:100D2000A091D301B091D401892B8A2B8B2B09F48C -:100D300053CF0E9401024090D1015090D2016090A7 -:100D4000D3017090D401681979098A099B09461664 -:100D500057066806790608F03FCF76CF83E048CF84 -:100D600085ED8093BC008091D1019091D201A0913A -:100D7000D301B091D4010796A11DB11D23E0B69512 -:100D8000A795979587952A95D1F72091BC0024FDCA -:100D900003C01092CF0108954091D1015091D2012A -:100DA0006091D3017091D401452B462B472B69F3F9 -:100DB0000097A105B10541F025E32A95F1F7000060 -:100DC0000197A109B109E1CF8091D0010C949D0256 -:100DD0001F920F920FB60F9211242F933F934F93B0 -:100DE0005F936F937F938F939F93AF93BF93EF9393 -:100DF000FF9389EF91E00E942601FF91EF91BF914F -:100E0000AF919F918F917F916F915F914F913F91A2 -:100E10002F910F900FBE0F901F9018951F920F9259 -:100E20000FB60F9211242F938F939F93EF93FF93FD -:100E3000E0910902F0910A028081E0910F02F091A5 -:100E4000100282FD1BC09081809112028F5F8F7310 -:100E500020911302821741F0E0911202F0E0E75076 -:100E6000FE4F958F80931202FF91EF919F918F918A -:100E70002F910F900FBE0F901F9018958081F4CF87 -:100E80001F920F920FB60F9211242F933F938F93BF -:100E90009F93AF93BF9380917B0190917C01A09130 -:100EA0007D01B0917E0130917A0123E0230F2D372F -:100EB00058F50196A11DB11D20937A0180937B0105 -:100EC00090937C01A0937D01B0937E0180917F017E -:100ED00090918001A0918101B09182010196A11DA4 -:100EE000B11D80937F0190938001A0938101B09305 -:100EF0008201BF91AF919F918F913F912F910F9060 -:100F00000FBE0F901F90189526E8230F0296A11D83 -:100F1000B11DD2CF1F920F920FB60F9211242F93B3 -:100F20003F934F935F936F937F938F939F93AF9371 -:100F3000BF93EF93FF938091B900887F803609F4C7 -:100F40004AC0F0F5883209F4A7C018F5803109F4D9 -:100F50009BC0B8F4882309F4F9C0883009F494C020 -:100F6000FF91EF91BF91AF919F918F917F916F9181 -:100F70005F914F913F912F910F900FBE0F901F9057 -:100F80001895883109F488C0803251F78093CD01DB -:100F900014C0803409F49DC040F48033B9F3883321 -:100FA000F9F68093CD0185ECB0C0803509F485C099 -:100FB000883509F496C0883499F60E94B006D0CFDF -:100FC000883909F48CC038F5883729F050F4883610 -:100FD00011F0803729F683E08093CF0110927901D8 -:100FE00057C0883809F47BC0803919F0803809F07F -:100FF000B7CF80917901803208F071C0E09179011A -:1010000081E08E0F809379018091BB00F0E0E75A78 -:10101000FE4F80833DC0803B39F0E0F4803A09F414 -:1010200079C0883A09F09CCF84E08093CF01109278 -:10103000580110925701E0918501F09186010995C0 -:101040008091570181110FC081E080935701109268 -:10105000370109C0803C09F4A6CF883C09F4A3CF2E -:10106000883B09F07DCFE091580181E08E0F80939D -:101070005801F0E0E95CFE4F80818093BB009091C5 -:1010800058018091570129C08091AA018093BB002B -:1010900085EC8093BC0064CF9091CC018091CB0112 -:1010A000981758F5E091CC0181E08E0F8093CC0128 -:1010B000F0E0E555FE4F8081E9CFE091CC0181E081 -:1010C0008E0F8093CC018091BB00F0E0E555FE4F80 -:1010D00080839091CC018091CB019817C8F285E86C -:1010E000D8CFE091CC0181E08E0F8093CC0180912C -:1010F000BB00F0E0E555FE4F80838091CE01811169 -:101100005CCF81E08093A90184EA8093BC001092B7 -:10111000CF0126CF85EC8093BC001092CF01809147 -:101120007901803230F4E0917901F0E0E75AFE4F26 -:1011300010826091790170E0E0918301F091840167 -:1011400089E591E00995109279010ACF1092CD01BD -:1011500034CFE9EFF1E01382128288EE93E0A0E051 -:10116000B0E084839583A683B78324E031E03183A4 -:10117000208325EC30E03587248724EC30E0378766 -:10118000268720EC30E0318B208B21EC30E0338B54 -:10119000228B22EC30E0358B248B26EC30E0378B31 -:1011A000268B118E128E138E148EE6E9F2E01382D6 -:1011B000128284839583A683B78386E191E091832D -:1011C0008083A2EAB2E080E48C931296FC93EE93C3 -:1011D00011970895789484B5826084BD84B5816048 -:1011E00084BD85B5826085BD85B5816085BD8091F2 -:1011F0006E00816080936E0010928100809181006A -:101200008260809381008091810081608093810061 -:10121000809180008160809380008091B100846023 -:101220008093B1008091B00081608093B000809184 -:101230007A00846080937A0080917A008260809343 -:101240007A0080917A00816080937A0080917A00A0 -:10125000806880937A001092C10084E00E94870029 -:1012600087E00E94870060E087E00E94B501E0917E -:101270000902F0910A0282E08083E0910502F09178 -:1012800006021082E0910702F091080280E180835B -:1012900010921102E0910D02F0910E0286E080831F -:1012A000E0910B02F0910C02808180618083E091DB -:1012B0000B02F0910C02808188608083E0910B0228 -:1012C000F0910C02808180688083E0910B02F091A4 -:1012D0000C0280818F7D808310928801109287019B -:1012E0001092F6011092F5010E947F0286EA90E0CA -:1012F000909386018093850187EA90E09093840122 -:101300008093830164E670E080E090E00E94260212 -:10131000D2E400E010E089EF91E00E940601892B01 -:1013200009F492C089EF91E00E94E40083379105AF -:1013300009F077C085EF0E9474049C01265E33405B -:10134000BC0190E080E02230310508F04CC00E94E2 -:10135000490B6B017C0183EF0E9474049C01265EA3 -:101360003340BC0190E080E02230310508F04AC0F3 -:101370000E94490B4B015C01D0937C0080917A0064 -:10138000806480937A0080917A0086FDFCCF709013 -:101390007800C091790042E0C701B6010E9498032D -:1013A00080E391E00E94470342E0C501B4010E943E -:1013B000980380E391E00E9447037C2F672D072E5E -:1013C000000C880B990B0E944B0B20E030E040EAA8 -:1013D0005BE30E94000C42E00E94980382E391E0EC -:1013E0000E94470398CF0E94490B20E030E04AEF6B -:1013F0005AE30E94000C20E030E040EC50E40E94F0 -:10140000360AA7CF0E94490B22E538EB4FE25BE397 -:101410000E94000C26E636E64BE352E40E94360AB0 -:10142000A9CF8836910509F076CF61E084E00E946B -:10143000B50164E670E080E090E00E94260260E082 -:1014400084E00E94B50167CF61E070E080E090E049 -:101450000E9426020115110509F45DCF0E941201B8 -:10146000882309F458CF0E94000055CF5058BB275D -:10147000AA270E944E0A0C94C10B0E94B30B38F0AD -:101480000E94BA0B20F039F49F3F19F426F40C9413 -:10149000B00B0EF4E095E7FB0C94AA0BE92F0E9429 -:1014A000D20B58F3BA17620773078407950720F029 -:1014B00079F4A6F50C94F40B0EF4E0950B2EBA2FEC -:1014C000A02D0B01B90190010C01CA01A00111244A -:1014D000FF27591B99F0593F50F4503E68F11A16F6 -:1014E000F040A22F232F342F4427585FF3CF469587 -:1014F00037952795A795F0405395C9F77EF41F16A9 -:10150000BA0B620B730B840BBAF09150A1F0FF0F72 -:10151000BB1F661F771F881FC2F70EC0BA0F621F5E -:10152000731F841F48F4879577956795B795F7954E -:101530009E3F08F0B0CF9395880F08F09927EE0FE3 -:101540009795879508950E94860B08F481E0089589 -:101550000E94BC0A0C94C10B0E94BA0B58F00E9466 -:10156000B30B40F029F45F3F29F00C94AA0B511102 -:101570000C94F50B0C94B00B0E94D20B68F39923DA -:10158000B1F3552391F3951B550BBB27AA2762177F -:101590007307840738F09F5F5F4F220F331F441F8C -:1015A000AA1FA9F335D00E2E3AF0E0E832D09150C0 -:1015B0005040E695001CCAF72BD0FE2F29D0660FAD -:1015C000771F881FBB1F261737074807AB07B0E8F0 -:1015D00009F0BB0B802DBF01FF2793585F4F3AF0F6 -:1015E0009E3F510578F00C94AA0B0C94F50B5F3FCD -:1015F000E4F3983ED4F3869577956795B795F7957C -:101600009F5FC9F7880F911D9695879597F9089563 -:10161000E1E0660F771F881FBB1F621773078407FF -:10162000BA0720F0621B730B840BBA0BEE1F88F70E -:10163000E09508950E94DA0B88F09F5798F0B92F33 -:101640009927B751B0F0E1F0660F771F881F991FF7 -:101650001AF0BA95C9F714C0B13091F00E94F40B9A -:10166000B1E008950C94F40B672F782F8827B85FAA -:1016700039F0B93FCCF3869577956795B395D9F74F -:101680003EF490958095709561957F4F8F4F9F4F59 -:101690000895E89409C097FB3EF490958095709565 -:1016A00061957F4F8F4F9F4F9923A9F0F92F96E9AE -:1016B000BB279395F695879577956795B795F11123 -:1016C000F8CFFAF4BB0F11F460FF1BC06F5F7F4FC0 -:1016D0008F4F9F4F16C0882311F096E911C07723D2 -:1016E00021F09EE8872F762F05C0662371F096E8DB -:1016F000862F70E060E02AF09A95660F771F881FAA -:10170000DAF7880F9695879597F90895990F00084D -:10171000550FAA0BE0E8FEEF16161706E807F907C3 -:10172000C0F012161306E407F50798F0621B730B5E -:10173000840B950B39F40A2661F0232B242B252BDF -:1017400021F408950A2609F4A140A6958FEF811D82 -:10175000811D089597F99F6780E870E060E0089523 -:101760009FEF80EC089500240A94161617061806B9 -:101770000906089500240A94121613061406050695 -:101780000895092E0394000C11F4882352F0BB0F26 -:1017900040F4BF2B11F460FF04C06F5F7F4F8F4F89 -:1017A0009F4F089557FD9058440F551F59F05F3FC4 -:1017B00071F04795880F97FB991F61F09F3F79F073 -:1017C00087950895121613061406551FF2CF4695F5 -:1017D000F1DF08C0161617061806991FF1CF869577 -:1017E0007105610508940895E894BB27662777275B -:1017F000CB0197F908950E94860B08F48FEF0895A6 -:101800000E94130C0C94C10B0E94B30B38F00E9481 -:10181000BA0B20F0952311F00C94AA0B0C94B00B8A -:1018200011240C94F50B0E94D20B70F3959FC1F319 -:10183000950F50E0551F629FF001729FBB27F00D7E -:10184000B11D639FAA27F00DB11DAA1F649F6627D3 -:10185000B00DA11D661F829F2227B00DA11D621F22 -:10186000739FB00DA11D621F839FA00D611D221FDC -:10187000749F3327A00D611D231F849F600D211DC0 -:10188000822F762F6A2F11249F5750409AF0F1F043 -:1018900088234AF0EE0FFF1FBB1F661F771F881FAC -:1018A00091505040A9F79E3F510580F00C94AA0B2F -:1018B0000C94F50B5F3FE4F3983ED4F3869577954F -:1018C0006795B795F795E7959F5FC1F7FE2B880F52 -:1018D000911D9695879597F908950E94860B880B20 -:1018E000990B0895A1E21A2EAA1BBB1BFD010DC086 -:1018F000AA1FBB1FEE1FFF1FA217B307E407F507C0 -:1019000020F0A21BB30BE40BF50B661F771F881F9B -:10191000991F1A9469F760957095809590959B0131 -:10192000AC01BD01CF010895EE0FFF1F0590F491AA -:08193000E02D0994F894FFCFAB -:10193800000000004801A800D50095010601E40058 -:10194800F800000000001503E8024403BE02E102AB -:10195800CE02BF026E616E00696E66006F76660029 -:061968002C000D0A000036 +:10040000DACF8E50806480937C0080917A00806483 +:1004100080937A0080917A0086FDFCCF80917800ED +:100420009091790008953FB7F89480917F01909161 +:100430008001A0918101B091820126B5A89B05C0E1 +:100440002F3F19F00196A11DB11D3FBFBA2FA92F53 +:10045000982F8827BC01CD01620F711D811D911D50 +:1004600042E0660F771F881F991F4A95D1F70895BC +:100470008F929F92AF92BF92CF92DF92EF92FF92B4 +:100480004B015C010E9413026B017C010E9413026C +:100490006C197D098E099F09683E7340810591059D +:1004A000A8F321E0821A9108A108B10888EEC80ECD +:1004B00083E0D81EE11CF11C81149104A104B10455 +:1004C00029F7FF90EF90DF90CF90BF90AF909F9073 +:1004D0008F90089520915701260F3327331F213223 +:1004E0003105ECF42091CF01FC0190E080E0243054 +:1004F00069F082E00895A09157012191AC01495C17 +:100500005E4FA40FB52FB11D2C930196861798F35B +:1005100080915701680F6093570180E0089581E052 +:1005200008951092CF0181E08093CE011092A9012D +:1005300061E082E10E94B50161E083E10E94B501C2 +:10054000E9EBF0E080818E7F808380818D7F8083E6 +:1005500088E48093B80085E48093BC000895CF932D +:10056000DF9391E0909336018823B9F0C091B800F1 +:10057000D091BA008091BC008A7B8093BC0060E07F +:1005800082E10E94B50160E083E10E94B5010E9412 +:100590009102D093BA00C093B800DF91CF91089533 +:1005A0000895E091880180918701E81730F4F0E028 +:1005B000E757FE4F808190E008958FEF9FEF0895F9 +:1005C00090918801809187012FEF3FEF981748F4B1 +:1005D000E92FF0E0E757FE4F208130E09F5F9093D6 +:1005E0008801C90108958091870190918801891B34 +:1005F000990B0895CF92DF92EF92FF920F931F9382 +:10060000CF93DF937C01CB018A012091F801222353 +:1006100089F0EB016B01C40ED51ECC15DD0569F028 +:100620006991D701ED91FC910190F081E02DC70116 +:100630000995F3CF642F0E946A02C801DF91CF9120 +:100640001F910F91FF90EF90DF90CF900895CF937F +:10065000DF931F92CDB7DEB769832091F801222383 +:10066000F9F02091F501203258F021E030E0FC0152 +:100670003383228390E080E00F90DF91CF91089543 +:100680008091F601E82FF0E0EB52FE4F99819083C4 +:100690008F5F8093F6018093F50181E090E0ECCFCD +:1006A00061E0CE0101960E946A02F7CF90E080E0FF +:1006B0000895FC0101900020E9F73197AF01481B34 +:1006C000590BBC0189EF91E00C94A8008F929F9286 +:1006D000AF92BF920F931F93CF93DF93CDB7DEB747 +:1006E000A1970FB6F894DEBF0FBECDBF19A242305E +:1006F00008F44AE08E010F5D1F4F842E912CB12C1F +:10070000A12CA50194010E949C0CE62FB901CA01FD +:10071000EA30F4F4E05DD801EE938D01232B242B15 +:10072000252B79F790E080E0109719F0CD010E9419 +:100730005903A1960FB6F894DEBF0FBECDBFDF916F +:10074000CF911F910F91BF90AF909F908F90089580 +:10075000E95CE1CF4F925F926F927F928F929F926E +:10076000AF92BF92CF92DF92EF92FF920F931F93BF +:10077000CF936B017C01742EAC019B010E94970CFE +:10078000882399F084E291E0CF911F910F91FF901F +:10079000EF90DF90CF90BF90AF909F908F907F9021 +:1007A0006F905F904F900C94590346015701E89465 +:1007B000B7F82FEF3FEF4FE75FE7C501B4010E94A5 +:1007C000970C81110DC02FEF3FEF4FE75FE7C50199 +:1007D000B4010E94CD0A18161CF488E291E0D4CF2F +:1007E0002FEF3FEF4FE75FE4C701B6010E94250CF2 +:1007F00018161CF48CE291E0C7CF2FEF3FEF4FE7C4 +:100800005FECC701B6010E94CD0A87FDF3CF20E05F +:1008100030E0A901C701B6010E94CD0A10E000E056 +:1008200087FF0AC06DE289EF91E00E9448018C01C8 +:10083000F7FAF094F7F8F094C0E060E070E080E040 +:100840009FE37C1641F020E030E040E251E40E945A +:10085000D20ACF5FF6CFA70196010E94610A2B0151 +:100860003C010E94440B4B015C014AE00E9466037C +:100870007C01E00EF11ECC23C1F1C501B4010E9440 +:10088000730B9B01AC01C301B2010E94600A4B01D2 +:100890005C016EE289EF91E00E944801E80EF91ECA +:1008A000C15018F120E030E040E251E4C501B4014C +:1008B0000E942A0C2B013C010E94440B4B01B12CDD +:1008C000A12C4AE0C501B4010E946603E80EF91E9E +:1008D000C501B4010E94730B9B01AC01C301B201BD +:1008E0000E94600A4B015C01DBCFC701CF911F91D1 +:1008F0000F91FF90EF90DF90CF90BF90AF909F90BF +:100900008F907F906F905F904F9008954F925F927D +:100910006F927F928F929F92AF92BF92CF92DF920F +:10092000EF92FF920F931F93CF93DF93A091A302B7 +:10093000B091A4029091A20221E02093F80190933B +:10094000F7011092F6011092F501ED91FC911197CB +:100950000190F081E02D682FCD010995D091F5012E +:1009600081E0D13208F09CC0C091F7010E941302CF +:100970006B017C018091CF0181116CC082E080937A +:10098000CF0181E08093CE018FEF8093CD01109253 +:10099000CC01D093CB01E5EDF1E0ABEAB1E080E032 +:1009A000D8139AC01092AA018091AA01CC0FC82B2B +:1009B000C093AA018091A901813009F091C01092E1 +:1009C000A9010E9413026B017C018091AA0180930E +:1009D000BB008091D1019091D201A091D301B0913F +:1009E000D401892B8A2B8B2BA1F00E94130200913A +:1009F000D1011091D2012091D3013091D4016C1911 +:100A00007D098E099F09061717072807390708F47B +:100A100042C08091BC0083FDD8CF85EC8093BC00A0 +:100A20000E9413026B017C018091CF01823009F496 +:100A300059C08091CD018F3F09F476C08091CD01DE +:100A4000803209F473C08091CD01803309F470C005 +:100A500084E026C08091D1019091D201A091D30170 +:100A6000B091D401892B8A2B8B2B09F483CF0E9460 +:100A700013020091D1011091D2012091D301309144 +:100A8000D4016C197D098E099F09061717072807DD +:100A9000390708F06FCF8091D0010E94AF0285E046 +:100AA0001092F6011092F5011092F801882309F4D2 +:100AB00041C086EE93E0DF91CF911F910F91FF909F +:100AC000EF90DF90CF90BF90AF909F908F907F90EE +:100AD0006F905F904F90089591919D938F5F60CF3D +:100AE00085EE9CCF8091D1019091D201A091D3014C +:100AF000B091D401892B8A2B8B2B09F495CF0E94BE +:100B000013020091D1011091D2012091D3013091B3 +:100B1000D4016C197D098E099F090617170728074C +:100B2000390708F081CFB7CF80E0BACF82E0B8CFE5 +:100B300083E0B6CFDAE011E00FEFA2E0FA2EB5EED7 +:100B4000EB2EC5ECDC2E6AE070E080E090E00E94C5 +:100B50003802C091A2020E9413024B015C018091F5 +:100B6000CF01811162C01093CF011093CE01009389 +:100B7000CD011092CC01F092CB011093AA0180918B +:100B8000AA01CC0FC82BC093AA018091A901813082 +:100B900009F0D1C01092A9010E9413024B015C011F +:100BA0008091AA018093BB008091D1019091D201E4 +:100BB000A091D301B091D401892B8A2B8B2BA1F06A +:100BC0000E9413024090D1015090D2016090D30155 +:100BD0007090D401681979098A099B09461657064D +:100BE0006806790608F442C08091BC0083FDD8CF26 +:100BF000D092BC000E9413024B015C018091CF0196 +:100C0000813009F49BC08091CC01833008F0B8C0DA +:100C10008091CC01ABEAB1E0E9E8F1E090E098170F +:100C200051F12D9121939F5FFACF8091D101909145 +:100C3000D201A091D301B091D401892B8A2B8B2BA7 +:100C400009F48DCF0E9413024090D1015090D2013F +:100C50006090D3017090D401681979098A099B09C1 +:100C6000461657066806790608F079CF8091D001BC +:100C70000E94AF0280E01092880180938701D150DA +:100C800009F417CF833009F05ECF8091A3029091D1 +:100C9000A402DC01ED91FC910284F385E02D09951D +:100CA000D82F8091A3029091A402DC01ED91FC91D8 +:100CB0000284F385E02D0995C82F8091A3029091BD +:100CC000A402DC01ED91FC910284F385E02D0995ED +:100CD00020E03D2F2C2BA90170E060E0762F652FDE +:100CE000542F4427482B87E190E0C12CE0E8DE2E0A +:100CF000E8E9EE2EF12C4A015B01082E04C0B694FF +:100D0000A794979487940A94D2F780FE04C04C2548 +:100D10005D256E257F25F694E794D794C7940197B7 +:100D20008730910541F7C9018C7F442309F4C3CE74 +:100D300087EE93E0C0CEE092BC005CCF8091D10101 +:100D40009091D201A091D301B091D401892B8A2B2B +:100D50008B2B09F453CF0E9413024090D101509085 +:100D6000D2016090D3017090D401681979098A0981 +:100D70009B09461657066806790608F03FCF76CFDE +:100D800083E048CF85ED8093BC008091D1019091A4 +:100D9000D201A091D301B091D4010796A11DB11D3C +:100DA00023E0B695A795979587952A95D1F7209139 +:100DB000BC0024FD03C01092CF0108954091D101E1 +:100DC0005091D2016091D3017091D401452B462BF3 +:100DD000472B69F30097A105B10541F025E32A955A +:100DE000F1F700000197A109B109E1CF8091D0018D +:100DF0000C94AF021F920F920FB60F9211242F93F3 +:100E00003F934F935F936F937F938F939F93AF9392 +:100E1000BF93EF93FF9389EF91E00E942601FF912A +:100E2000EF91BF91AF919F918F917F916F915F9162 +:100E30004F913F912F910F900FBE0F901F901895DB +:100E40001F920F920FB60F9211242F938F939F939F +:100E5000EF93FF93E0910902F0910A028081E09103 +:100E60000F02F091100282FD1BC09081809112024E +:100E70008F5F8F7320911302821741F0E09112026D +:100E8000F0E0E750FE4F958F80931202FF91EF91B3 +:100E90009F918F912F910F900FBE0F901F901895DB +:100EA0008081F4CF1F920F920FB60F9211242F93CF +:100EB0003F938F939F93AF93BF9380917B019091CA +:100EC0007C01A0917D01B0917E0130917A0123E0F7 +:100ED000230F2D3758F50196A11DB11D20937A01DE +:100EE00080937B0190937C01A0937D01B0937E0160 +:100EF00080917F0190918001A0918101B091820148 +:100F00000196A11DB11D80937F0190938001A09354 +:100F10008101B0938201BF91AF919F918F913F91D9 +:100F20002F910F900FBE0F901F90189526E8230F5A +:100F30000296A11DB11DD2CF1F920F920FB60F9234 +:100F400011242F933F934F935F936F937F938F93CE +:100F50009F93AF93BF93EF93FF938091B900887FE6 +:100F6000803609F44AC0F0F5883209F4A7C018F5B4 +:100F7000803109F49BC0B8F4882309F4F9C08830A3 +:100F800009F494C0FF91EF91BF91AF919F918F9120 +:100F90007F916F915F914F913F912F910F900FBE75 +:100FA0000F901F901895883109F488C0803251F74E +:100FB0008093CD0114C0803409F49DC040F4803387 +:100FC000B9F38833F9F68093CD0185ECB0C0803554 +:100FD00009F485C0883509F496C0883499F60E94D2 +:100FE000C206D0CF883909F48CC038F5883729F08B +:100FF00050F4883611F0803729F683E08093CF01D2 +:101000001092790157C0883809F47BC0803919F0F3 +:10101000803809F0B7CF80917901803208F071C033 +:10102000E091790181E08E0F809379018091BB007E +:10103000F0E0E75AFE4F80833DC0803B39F0E0F49A +:10104000803A09F479C0883A09F09CCF84E0809313 +:10105000CF011092580110925701E0918501F09153 +:10106000860109958091570181110FC081E080931D +:1010700057011092370109C0803C09F4A6CF883C83 +:1010800009F4A3CF883B09F07DCFE091580181E0BE +:101090008E0F80935801F0E0E95CFE4F80818093D1 +:1010A000BB00909158018091570129C08091AA01FD +:1010B0008093BB0085EC8093BC0064CF9091CC0101 +:1010C0008091CB01981758F5E091CC0181E08E0F0B +:1010D0008093CC01F0E0E555FE4F8081E9CFE091AF +:1010E000CC0181E08E0F8093CC018091BB00F0E0B9 +:1010F000E555FE4F80839091CC018091CB019817EC +:10110000C8F285E8D8CFE091CC0181E08E0F8093C2 +:10111000CC018091BB00F0E0E555FE4F80838091CB +:10112000CE0181115CCF81E08093A90184EA809394 +:10113000BC001092CF0126CF85EC8093BC001092AA +:10114000CF0180917901803230F4E0917901F0E0B3 +:10115000E75AFE4F10826091790170E0E0918301BF +:10116000F091840189E591E00995109279010ACF07 +:101170001092CD0134CFE9EFF1E01382128288EEB4 +:1011800093E0A0E0B0E084839583A683B78324E056 +:1011900031E03183208325EC30E03587248724EC4F +:1011A00030E03787268720EC30E0318B208B21EC34 +:1011B00030E0338B228B22EC30E0358B248B26EC15 +:1011C00030E0378B268B118E128E138E148EE6E94B +:1011D000F2E01382128284839583A683B78386E12B +:1011E00091E091838083A2EAB2E080E48C9312962E +:1011F000FC93EE9311970895789484B5826084BD32 +:1012000084B5816084BD85B5826085BD85B581600A +:1012100085BD80916E00816080936E001092810088 +:101220008091810082608093810080918100816043 +:101230008093810080918000816080938000809104 +:10124000B10084608093B1008091B0008160809390 +:10125000B00080917A00846080937A0080917A0057 +:10126000826080937A0080917A00816080937A0016 +:1012700080917A00806880937A001092C10084E0A7 +:101280000E94870087E00E94870060E087E00E945C +:10129000B501E0910902F0910A0282E08083E091B9 +:1012A0000502F09106021082E0910702F091080217 +:1012B00080E1808310921102E0910D02F0910E0204 +:1012C00086E08083E0910B02F0910C0280818061C6 +:1012D0008083E0910B02F0910C0280818860808312 +:1012E000E0910B02F0910C02808180688083E09194 +:1012F0000B02F0910C0280818F7D80831092880117 +:10130000109287011092F6011092F5010E9491024D +:1013100086EA90E0909386018093850187EA90E0C9 +:10132000909384018093830164E670E080E090E014 +:101330000E943802C0E0D0E089EF91E00E940601EF +:10134000892B09F4ACC089EF91E00E94E400833757 +:10135000910509F081C085EF0E9486049C01265EFC +:101360003340BC0190E080E02230310508F056C0E7 +:101370000E94730B6B017C0183EF0E9486049C0129 +:10138000265E3340BC0190E080E02230310508F059 +:1013900054C00E94730B2B013C0180E10E940102AA +:1013A0005C018EE00E9401028C0142E0C701B6019F +:1013B0000E94AA0380E391E00E94590342E0C30126 +:1013C000B2010E94AA0380E391E00E945903B50193 +:1013D000BB0C880B990B0E94750B20E030E040EAB3 +:1013E0005BE30E942A0C42E00E94AA0380E391E0A2 +:1013F0000E945903B801110F880B990B0E94750BBD +:1014000020E030E040EA5BE30E942A0C42E00E94C8 +:10141000AA0382E391E00E9459038ECF0E94730BCE +:1014200020E030E04AEF5AE30E942A0C20E030E04E +:1014300040EC50E40E94600A9DCF0E94730B22E5AD +:1014400038EB4FE25BE30E942A0C26E636E64BE3DC +:1014500052E40E94600A9FCF8836910579F461E0DA +:1014600084E00E94B50164E670E080E090E00E94B4 +:10147000380260E084E00E94B5015ECF89369105B4 +:1014800009F05ACF61E085E00E94B50164E670E0A2 +:1014900080E090E00E94380260E085E0ECCF61E0FF +:1014A00070E080E090E00E943802209709F444CF79 +:1014B0000E941201882309F43FCF0E9400003CCF14 +:1014C0005058BB27AA270E94780A0C94EB0B0E9465 +:1014D000DD0B38F00E94E40B20F039F49F3F19F443 +:1014E00026F40C94DA0B0EF4E095E7FB0C94D40B85 +:1014F000E92F0E94FC0B58F3BA17620773078407A1 +:10150000950720F079F4A6F50C941E0C0EF4E095E6 +:101510000B2EBA2FA02D0B01B90190010C01CA01AD +:10152000A0011124FF27591B99F0593F50F4503E58 +:1015300068F11A16F040A22F232F342F4427585F4A +:10154000F3CF469537952795A795F0405395C9F762 +:101550007EF41F16BA0B620B730B840BBAF091501A +:10156000A1F0FF0FBB1F661F771F881FC2F70EC0B9 +:10157000BA0F621F731F841F48F48795779567958C +:10158000B795F7959E3F08F0B0CF9395880F08F078 +:101590009927EE0F9795879508950E94B00B08F450 +:1015A00081E008950E94E60A0C94EB0B0E94E40B84 +:1015B00058F00E94DD0B40F029F45F3F29F00C94B5 +:1015C000D40B51110C941F0C0C94DA0B0E94FC0BE1 +:1015D00068F39923B1F3552391F3951B550BBB2762 +:1015E000AA2762177307840738F09F5F5F4F220FA7 +:1015F000331F441FAA1FA9F335D00E2E3AF0E0E89E +:1016000032D091505040E695001CCAF72BD0FE2FE7 +:1016100029D0660F771F881FBB1F2617370748077B +:10162000AB07B0E809F0BB0B802DBF01FF27935833 +:101630005F4F3AF09E3F510578F00C94D40B0C9418 +:101640001F0C5F3FE4F3983ED4F38695779567953A +:10165000B795F7959F5FC9F7880F911D9695879568 +:1016600097F90895E1E0660F771F881FBB1F621787 +:1016700073078407BA0720F0621B730B840BBA0B45 +:10168000EE1F88F7E09508950E94040C88F09F579C +:1016900098F0B92F9927B751B0F0E1F0660F771F96 +:1016A000881F991F1AF0BA95C9F714C0B13091F08C +:1016B0000E941E0CB1E008950C941E0C672F782F29 +:1016C0008827B85F39F0B93FCCF386957795679551 +:1016D000B395D9F73EF490958095709561957F4FBD +:1016E0008F4F9F4F0895E89409C097FB3EF4909563 +:1016F0008095709561957F4F8F4F9F4F9923A9F0EB +:10170000F92F96E9BB279395F69587957795679579 +:10171000B795F111F8CFFAF4BB0F11F460FF1BC0BD +:101720006F5F7F4F8F4F9F4F16C0882311F096E950 +:1017300011C0772321F09EE8872F762F05C06623FE +:1017400071F096E8862F70E060E02AF09A95660FB7 +:10175000771F881FDAF7880F9695879597F9089570 +:10176000990F0008550FAA0BE0E8FEEF16161706B2 +:10177000E807F907C0F012161306E407F50798F01A +:10178000621B730B840B950B39F40A2661F0232B33 +:10179000242B252B21F408950A2609F4A140A695AF +:1017A0008FEF811D811D089597F99F6780E870E094 +:1017B00060E008959FEF80EC089500240A941616C7 +:1017C000170618060906089500240A94121613062F +:1017D000140605060895092E0394000C11F48823BD +:1017E00052F0BB0F40F4BF2B11F460FF04C06F5FD9 +:1017F0007F4F8F4F9F4F089557FD9058440F551FAF +:1018000059F05F3F71F04795880F97FB991F61F082 +:101810009F3F79F087950895121613061406551FF9 +:10182000F2CF4695F1DF08C0161617061806991F65 +:10183000F1CF86957105610508940895E894BB275A +:1018400066277727CB0197F908950E94B00B08F41B +:101850008FEF08950E943D0C0C94EB0B0E94DD0B62 +:1018600038F00E94E40B20F0952311F00C94D40B77 +:101870000C94DA0B11240C941F0C0E94FC0B70F3D7 +:10188000959FC1F3950F50E0551F629FF001729F25 +:10189000BB27F00DB11D639FAA27F00DB11DAA1F34 +:1018A000649F6627B00DA11D661F829F2227B00D81 +:1018B000A11D621F739FB00DA11D621F839FA00D0C +:1018C000611D221F749F3327A00D611D231F849F5C +:1018D000600D211D822F762F6A2F11249F575040B3 +:1018E0009AF0F1F088234AF0EE0FFF1FBB1F661F2E +:1018F000771F881F91505040A9F79E3F510580F0F7 +:101900000C94D40B0C941F0C5F3FE4F3983ED4F37B +:10191000869577956795B795F795E7959F5FC1F79A +:10192000FE2B880F911D9695879597F908950E9433 +:10193000B00B880B990B0895A1E21A2EAA1BBB1BB2 +:10194000FD010DC0AA1FBB1FEE1FFF1FA217B3078B +:10195000E407F50720F0A21BB30BE40BF50B661FA1 +:10196000771F881F991F1A9469F760957095809565 +:1019700090959B01AC01BD01CF010895EE0FFF1FB3 +:0C1980000590F491E02D0994F894FFCF3D +:10198C00000000004801A800D50095010601E40004 +:10199C00F800000000002703FA025603D002F302FD +:1019AC00E002D1026E616E00696E66006F766600B1 +:0619BC002C000D0A0000E2 :00000001FF diff --git a/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex b/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex index b290d3a..61edf7c 100644 --- a/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex +++ b/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex @@ -3,19 +3,19 @@ :100010000C9485000C9485000C9485000C9485004C :100020000C9485000C9485000C9485000C9485003C :100030000C9485000C9485000C9485000C9485002C -:100040000C9440070C9485000C940E070C94E80661 +:100040000C9452070C9485000C9420070C94FA062B :100050000C9485000C9485000C9485000C9485000C -:100060000C948A070C94850000000008000201002F +:100060000C949C070C94850000000008000201001D :100070000003040700000000000000000000000072 :10008000250028002B0000000000240027002A0083 :10009000040404040404040402020202020203032E :1000A0000303030301020408102040800102040836 -:1000B0001020010204081020A90811241FBECFEF50 -:1000C000D8E0DEBFCDBF11E0A0E0B1E0E8E3F9E1A8 +:1000B0001020010204081020BB0811241FBECFEF3E +:1000C000D8E0DEBFCDBF11E0A0E0B1E0ECE8F9E19F :1000D00002C005900D92A633B107D9F722E0A6E33E :1000E000B1E001C01D92A53AB207E1F710E0CDE5FD -:1000F000D0E004C02197FE010E94940CCC35D107BA -:10010000C9F70E94EA080C949A0C0C94000090E045 +:1000F000D0E004C02197FE010E94BE0CCC35D10790 +:10010000C9F70E94FC080C94C40C0C94000090E009 :10011000FC01EC55FF4F249180579F4FFC018491C7 :10012000882399F090E0880F991FFC01EA57FF4F50 :10013000A591B491FC01E458FF4F859194918FB73C @@ -63,349 +63,355 @@ :1003D000809180008F7780938000DFCF84B58F7706 :1003E00084BDDBCF84B58F7DFBCF8091B0008F774C :1003F0008093B000D2CF8091B0008F7DF9CF3E2B9B -:10040000DACF3FB7F89480917F0190918001A0915D -:100410008101B091820126B5A89B05C02F3F19F03C -:100420000196A11DB11D3FBFBA2FA92F982F882774 -:10043000BC01CD01620F711D811D911D42E0660F4F -:10044000771F881F991F4A95D1F708958F929F9221 -:10045000AF92BF92CF92DF92EF92FF924B015C017D -:100460000E9401026B017C010E9401026C197D094E -:100470008E099F09683E734081059105A8F321E02C -:10048000821A9108A108B10888EEC80E83E0D81E30 -:10049000E11CF11C81149104A104B10429F7FF901F -:1004A000EF90DF90CF90BF90AF909F908F90089586 -:1004B00020915701260F3327331F21323105ECF4E9 -:1004C0002091CF01FC0190E080E0243069F082E0CF -:1004D0000895A09157012191AC01495C5E4FA40F92 -:1004E000B52FB11D2C930196861798F38091570173 -:1004F000680F6093570180E0089581E0089510929D -:10050000CF0181E08093CE011092A90161E082E1E8 -:100510000E94B50161E083E10E94B501E9EBF0E0E2 -:1005200080818E7F808380818D7F808388E480932B -:10053000B80085E48093BC000895CF93DF9391E0E9 -:10054000909336018823B9F0C091B800D091BA00D9 -:100550008091BC008A7B8093BC0060E082E10E94B5 -:10056000B50160E083E10E94B5010E947F02D09353 -:10057000BA00C093B800DF91CF9108950895E0913B -:10058000880180918701E81730F4F0E0E757FE4FCB -:10059000808190E008958FEF9FEF089590918801FA -:1005A000809187012FEF3FEF981748F4E92FF0E093 -:1005B000E757FE4F208130E09F5F90938801C9018B -:1005C00008958091870190918801891B990B089566 -:1005D000CF92DF92EF92FF920F931F93CF93DF930F -:1005E0007C01CB018A012091F801222389F0EB01E3 -:1005F0006B01C40ED51ECC15DD0569F06991D701DC -:10060000ED91FC910190F081E02DC7010995F3CFA8 -:10061000642F0E945802C801DF91CF911F910F9162 -:10062000FF90EF90DF90CF900895CF93DF931F92CC -:10063000CDB7DEB769832091F8012223F9F020912C -:10064000F501203258F021E030E0FC0133832283B1 -:1006500090E080E00F90DF91CF9108958091F601B6 -:10066000E82FF0E0EB52FE4F998190838F5F8093EB -:10067000F6018093F50181E090E0ECCF61E0CE01DE -:1006800001960E945802F7CF90E080E00895FC01A7 -:1006900001900020E9F73197AF01481B590BBC01CD -:1006A00089EF91E00C94A8008F929F92AF92BF9235 -:1006B0000F931F93CF93DF93CDB7DEB7A1970FB6FC -:1006C000F894DEBF0FBECDBF19A2423008F44AE055 -:1006D0008E010F5D1F4F842E912CB12CA12CA501F2 -:1006E00094010E94720CE62FB901CA01EA30F4F4B9 -:1006F000E05DD801EE938D01232B242B252B79F778 -:1007000090E080E0109719F0CD010E944703A19678 -:100710000FB6F894DEBF0FBECDBFDF91CF911F9112 -:100720000F91BF90AF909F908F900895E95CE1CFBB -:100730004F925F926F927F928F929F92AF92BF92F1 -:10074000CF92DF92EF92FF920F931F93CF936B01A3 -:100750007C01742EAC019B010E946D0C882399F0E2 -:1007600084E291E0CF911F910F91FF90EF90DF9085 -:10077000CF90BF90AF909F908F907F906F905F9041 -:100780004F900C94470346015701E894B7F82FEFB8 -:100790003FEF4FE75FE7C501B4010E946D0C811187 -:1007A0000DC02FEF3FEF4FE75FE7C501B4010E9497 -:1007B000A30A18161CF488E291E0D4CF2FEF3FEF84 -:1007C0004FE75FE4C701B6010E94FB0B18161CF44B -:1007D0008CE291E0C7CF2FEF3FEF4FE75FECC7010F -:1007E000B6010E94A30A87FDF3CF20E030E0A90103 -:1007F000C701B6010E94A30A10E000E087FF0AC00B -:100800006DE289EF91E00E9448018C01F7FAF094C3 -:10081000F7F8F094C0E060E070E080E09FE37C16C1 -:1008200041F020E030E040E251E40E94A80ACF5FAE -:10083000F6CFA70196010E94370A2B013C010E94C6 -:100840001A0B4B015C014AE00E9454037C01E00E4C -:10085000F11ECC23C1F1C501B4010E94490B9B01DB -:10086000AC01C301B2010E94360A4B015C016EE289 -:1008700089EF91E00E944801E80EF91EC15018F17D -:1008800020E030E040E251E4C501B4010E94000CD8 -:100890002B013C010E941A0B4B01B12CA12C4AE008 -:1008A000C501B4010E945403E80EF91EC501B4014C -:1008B0000E94490B9B01AC01C301B2010E94360AA0 -:1008C0004B015C01DBCFC701CF911F910F91FF90CE -:1008D000EF90DF90CF90BF90AF909F908F907F90E0 -:1008E0006F905F904F9008954F925F926F927F92BA -:1008F0008F929F92AF92BF92CF92DF92EF92FF9230 -:100900000F931F93CF93DF93A091A302B091A40202 -:100910009091A20221E02093F8019093F7011092A8 -:10092000F6011092F501ED91FC9111970190F08183 -:10093000E02D682FCD010995D091F50181E0D132EC -:1009400008F09CC0C091F7010E9401026B017C017C -:100950008091CF0181116CC082E08093CF0181E052 -:100960008093CE018FEF8093CD011092CC01D09374 -:10097000CB01E5EDF1E0ABEAB1E080E0D8139AC03D -:100980001092AA018091AA01CC0FC82BC093AA0192 -:100990008091A901813009F091C01092A9010E94B3 -:1009A00001026B017C018091AA018093BB008091C0 -:1009B000D1019091D201A091D301B091D401892BA2 -:1009C0008A2B8B2BA1F00E9401020091D101109182 -:1009D000D2012091D3013091D4016C197D098E0987 -:1009E0009F09061717072807390708F442C08091A6 -:1009F000BC0083FDD8CF85EC8093BC000E9401022F -:100A00006B017C018091CF01823009F459C0809143 -:100A1000CD018F3F09F476C08091CD01803209F479 -:100A200073C08091CD01803309F470C084E026C08A -:100A30008091D1019091D201A091D301B091D401C4 -:100A4000892B8A2B8B2B09F483CF0E940102009102 -:100A5000D1011091D2012091D3013091D4016C19B0 -:100A60007D098E099F09061717072807390708F01F -:100A70006FCF8091D0010E949D0285E01092F60117 -:100A80001092F5011092F801882309F441C086EE16 -:100A900093E0DF91CF911F910F91FF90EF90DF9046 -:100AA000CF90BF90AF909F908F907F906F905F900E -:100AB0004F90089591919D938F5F60CF85EE9CCF6D -:100AC0008091D1019091D201A091D301B091D40134 -:100AD000892B8A2B8B2B09F495CF0E940102009160 -:100AE000D1011091D2012091D3013091D4016C1920 -:100AF0007D098E099F09061717072807390708F08F -:100B000081CFB7CF80E0BACF82E0B8CF83E0B6CF55 -:100B1000DAE011E00FEFA2E0FA2EB5EEEB2EC5EC15 -:100B2000DC2E6AE070E080E090E00E942602C09136 -:100B3000A2020E9401024B015C018091CF01811150 -:100B400062C01093CF011093CE010093CD0110929B -:100B5000CC01F092CB011093AA018091AA01CC0F95 -:100B6000C82BC093AA018091A901813009F0D1C09E -:100B70001092A9010E9401024B015C018091AA011F -:100B80008093BB008091D1019091D201A091D301BB -:100B9000B091D401892B8A2B8B2BA1F00E940102EA -:100BA0004090D1015090D2016090D3017090D40157 -:100BB000681979098A099B09461657066806790655 -:100BC00008F442C08091BC0083FDD8CFD092BC0015 -:100BD0000E9401024B015C018091CF01813009F438 -:100BE0009BC08091CC01833008F0B8C08091CC01CB -:100BF000ABEAB1E0E9E8F1E090E0981751F12D910E -:100C000021939F5FFACF8091D1019091D201A09161 -:100C1000D301B091D401892B8A2B8B2B09F48DCF72 -:100C20000E9401024090D1015090D2016090D30106 -:100C30007090D401681979098A099B0946165706EC -:100C40006806790608F079CF8091D0010E949D0254 -:100C500080E01092880180938701D15009F417CF6A -:100C6000833009F05ECF8091A3029091A402DC0151 -:100C7000ED91FC910284F385E02D0995D82F8091A8 -:100C8000A3029091A402DC01ED91FC910284F38512 -:100C9000E02D0995C82F8091A3029091A402DC0158 -:100CA000ED91FC910284F385E02D099520E03D2F24 -:100CB0002C2BA90170E060E0762F652F542F44277C -:100CC000482B87E190E0C12CE0E8DE2EE8E9EE2E2B -:100CD000F12C4A015B01082E04C0B694A7949794A6 -:100CE00087940A94D2F780FE04C04C255D256E25BA -:100CF0007F25F694E794D794C794019787309105A0 -:100D000041F7C9018C7F442309F4C3CE87EE93E0F9 -:100D1000C0CEE092BC005CCF8091D1019091D20115 -:100D2000A091D301B091D401892B8A2B8B2B09F48C -:100D300053CF0E9401024090D1015090D2016090A7 -:100D4000D3017090D401681979098A099B09461664 -:100D500057066806790608F03FCF76CF83E048CF84 -:100D600085ED8093BC008091D1019091D201A0913A -:100D7000D301B091D4010796A11DB11D23E0B69512 -:100D8000A795979587952A95D1F72091BC0024FDCA -:100D900003C01092CF0108954091D1015091D2012A -:100DA0006091D3017091D401452B462B472B69F3F9 -:100DB0000097A105B10541F025E32A95F1F7000060 -:100DC0000197A109B109E1CF8091D0010C949D0256 -:100DD0001F920F920FB60F9211242F933F934F93B0 -:100DE0005F936F937F938F939F93AF93BF93EF9393 -:100DF000FF9389EF91E00E942601FF91EF91BF914F -:100E0000AF919F918F917F916F915F914F913F91A2 -:100E10002F910F900FBE0F901F9018951F920F9259 -:100E20000FB60F9211242F938F939F93EF93FF93FD -:100E3000E0910902F0910A028081E0910F02F091A5 -:100E4000100282FD1BC09081809112028F5F8F7310 -:100E500020911302821741F0E0911202F0E0E75076 -:100E6000FE4F958F80931202FF91EF919F918F918A -:100E70002F910F900FBE0F901F9018958081F4CF87 -:100E80001F920F920FB60F9211242F933F938F93BF -:100E90009F93AF93BF9380917B0190917C01A09130 -:100EA0007D01B0917E0130917A0123E0230F2D372F -:100EB00058F50196A11DB11D20937A0180937B0105 -:100EC00090937C01A0937D01B0937E0180917F017E -:100ED00090918001A0918101B09182010196A11DA4 -:100EE000B11D80937F0190938001A0938101B09305 -:100EF0008201BF91AF919F918F913F912F910F9060 -:100F00000FBE0F901F90189526E8230F0296A11D83 -:100F1000B11DD2CF1F920F920FB60F9211242F93B3 -:100F20003F934F935F936F937F938F939F93AF9371 -:100F3000BF93EF93FF938091B900887F803609F4C7 -:100F40004AC0F0F5883209F4A7C018F5803109F4D9 -:100F50009BC0B8F4882309F4F9C0883009F494C020 -:100F6000FF91EF91BF91AF919F918F917F916F9181 -:100F70005F914F913F912F910F900FBE0F901F9057 -:100F80001895883109F488C0803251F78093CD01DB -:100F900014C0803409F49DC040F48033B9F3883321 -:100FA000F9F68093CD0185ECB0C0803509F485C099 -:100FB000883509F496C0883499F60E94B006D0CFDF -:100FC000883909F48CC038F5883729F050F4883610 -:100FD00011F0803729F683E08093CF0110927901D8 -:100FE00057C0883809F47BC0803919F0803809F07F -:100FF000B7CF80917901803208F071C0E09179011A -:1010000081E08E0F809379018091BB00F0E0E75A78 -:10101000FE4F80833DC0803B39F0E0F4803A09F414 -:1010200079C0883A09F09CCF84E08093CF01109278 -:10103000580110925701E0918501F09186010995C0 -:101040008091570181110FC081E080935701109268 -:10105000370109C0803C09F4A6CF883C09F4A3CF2E -:10106000883B09F07DCFE091580181E08E0F80939D -:101070005801F0E0E95CFE4F80818093BB009091C5 -:1010800058018091570129C08091AA018093BB002B -:1010900085EC8093BC0064CF9091CC018091CB0112 -:1010A000981758F5E091CC0181E08E0F8093CC0128 -:1010B000F0E0E555FE4F8081E9CFE091CC0181E081 -:1010C0008E0F8093CC018091BB00F0E0E555FE4F80 -:1010D00080839091CC018091CB019817C8F285E86C -:1010E000D8CFE091CC0181E08E0F8093CC0180912C -:1010F000BB00F0E0E555FE4F80838091CE01811169 -:101100005CCF81E08093A90184EA8093BC001092B7 -:10111000CF0126CF85EC8093BC001092CF01809147 -:101120007901803230F4E0917901F0E0E75AFE4F26 -:1011300010826091790170E0E0918301F091840167 -:1011400089E591E00995109279010ACF1092CD01BD -:1011500034CFE9EFF1E01382128288EE93E0A0E051 -:10116000B0E084839583A683B78324E031E03183A4 -:10117000208325EC30E03587248724EC30E0378766 -:10118000268720EC30E0318B208B21EC30E0338B54 -:10119000228B22EC30E0358B248B26EC30E0378B31 -:1011A000268B118E128E138E148EE6E9F2E01382D6 -:1011B000128284839583A683B78386E191E091832D -:1011C0008083A2EAB2E080E48C931296FC93EE93C3 -:1011D00011970895789484B5826084BD84B5816048 -:1011E00084BD85B5826085BD85B5816085BD8091F2 -:1011F0006E00816080936E0010928100809181006A -:101200008260809381008091810081608093810061 -:10121000809180008160809380008091B100846023 -:101220008093B1008091B00081608093B000809184 -:101230007A00846080937A0080917A008260809343 -:101240007A0080917A00816080937A0080917A00A0 -:10125000806880937A001092C10084E00E94870029 -:1012600087E00E94870060E087E00E94B501E0917E -:101270000902F0910A0282E08083E0910502F09178 -:1012800006021082E0910702F091080280E180835B -:1012900010921102E0910D02F0910E0286E080831F -:1012A000E0910B02F0910C02808180618083E091DB -:1012B0000B02F0910C02808188608083E0910B0228 -:1012C000F0910C02808180688083E0910B02F091A4 -:1012D0000C0280818F7D808310928801109287019B -:1012E0001092F6011092F5010E947F0286EA90E0CA -:1012F000909386018093850187EA90E09093840122 -:101300008093830164E670E080E090E00E94260212 -:10131000D2E400E010E089EF91E00E940601892B01 -:1013200009F492C089EF91E00E94E40083379105AF -:1013300009F077C085EF0E9474049C01265E33405B -:10134000BC0190E080E02230310508F04CC00E94E2 -:10135000490B6B017C0183EF0E9474049C01265EA3 -:101360003340BC0190E080E02230310508F04AC0F3 -:101370000E94490B4B015C01D0937C0080917A0064 -:10138000806480937A0080917A0086FDFCCF709013 -:101390007800C091790042E0C701B6010E9498032D -:1013A00080E391E00E94470342E0C501B4010E943E -:1013B000980380E391E00E9447037C2F672D072E5E -:1013C000000C880B990B0E944B0B20E030E040EAA8 -:1013D0005BE30E94000C42E00E94980382E391E0EC -:1013E0000E94470398CF0E94490B20E030E04AEF6B -:1013F0005AE30E94000C20E030E040EC50E40E94F0 -:10140000360AA7CF0E94490B22E538EB4FE25BE397 -:101410000E94000C26E636E64BE352E40E94360AB0 -:10142000A9CF8836910509F076CF61E084E00E946B -:10143000B50164E670E080E090E00E94260260E082 -:1014400084E00E94B50167CF61E070E080E090E049 -:101450000E9426020115110509F45DCF0E941201B8 -:10146000882309F458CF0E94000055CF5058BB275D -:10147000AA270E944E0A0C94C10B0E94B30B38F0AD -:101480000E94BA0B20F039F49F3F19F426F40C9413 -:10149000B00B0EF4E095E7FB0C94AA0BE92F0E9429 -:1014A000D20B58F3BA17620773078407950720F029 -:1014B00079F4A6F50C94F40B0EF4E0950B2EBA2FEC -:1014C000A02D0B01B90190010C01CA01A00111244A -:1014D000FF27591B99F0593F50F4503E68F11A16F6 -:1014E000F040A22F232F342F4427585FF3CF469587 -:1014F00037952795A795F0405395C9F77EF41F16A9 -:10150000BA0B620B730B840BBAF09150A1F0FF0F72 -:10151000BB1F661F771F881FC2F70EC0BA0F621F5E -:10152000731F841F48F4879577956795B795F7954E -:101530009E3F08F0B0CF9395880F08F09927EE0FE3 -:101540009795879508950E94860B08F481E0089589 -:101550000E94BC0A0C94C10B0E94BA0B58F00E9466 -:10156000B30B40F029F45F3F29F00C94AA0B511102 -:101570000C94F50B0C94B00B0E94D20B68F39923DA -:10158000B1F3552391F3951B550BBB27AA2762177F -:101590007307840738F09F5F5F4F220F331F441F8C -:1015A000AA1FA9F335D00E2E3AF0E0E832D09150C0 -:1015B0005040E695001CCAF72BD0FE2F29D0660FAD -:1015C000771F881FBB1F261737074807AB07B0E8F0 -:1015D00009F0BB0B802DBF01FF2793585F4F3AF0F6 -:1015E0009E3F510578F00C94AA0B0C94F50B5F3FCD -:1015F000E4F3983ED4F3869577956795B795F7957C -:101600009F5FC9F7880F911D9695879597F9089563 -:10161000E1E0660F771F881FBB1F621773078407FF -:10162000BA0720F0621B730B840BBA0BEE1F88F70E -:10163000E09508950E94DA0B88F09F5798F0B92F33 -:101640009927B751B0F0E1F0660F771F881F991FF7 -:101650001AF0BA95C9F714C0B13091F00E94F40B9A -:10166000B1E008950C94F40B672F782F8827B85FAA -:1016700039F0B93FCCF3869577956795B395D9F74F -:101680003EF490958095709561957F4F8F4F9F4F59 -:101690000895E89409C097FB3EF490958095709565 -:1016A00061957F4F8F4F9F4F9923A9F0F92F96E9AE -:1016B000BB279395F695879577956795B795F11123 -:1016C000F8CFFAF4BB0F11F460FF1BC06F5F7F4FC0 -:1016D0008F4F9F4F16C0882311F096E911C07723D2 -:1016E00021F09EE8872F762F05C0662371F096E8DB -:1016F000862F70E060E02AF09A95660F771F881FAA -:10170000DAF7880F9695879597F90895990F00084D -:10171000550FAA0BE0E8FEEF16161706E807F907C3 -:10172000C0F012161306E407F50798F0621B730B5E -:10173000840B950B39F40A2661F0232B242B252BDF -:1017400021F408950A2609F4A140A6958FEF811D82 -:10175000811D089597F99F6780E870E060E0089523 -:101760009FEF80EC089500240A94161617061806B9 -:101770000906089500240A94121613061406050695 -:101780000895092E0394000C11F4882352F0BB0F26 -:1017900040F4BF2B11F460FF04C06F5F7F4F8F4F89 -:1017A0009F4F089557FD9058440F551F59F05F3FC4 -:1017B00071F04795880F97FB991F61F09F3F79F073 -:1017C00087950895121613061406551FF2CF4695F5 -:1017D000F1DF08C0161617061806991FF1CF869577 -:1017E0007105610508940895E894BB27662777275B -:1017F000CB0197F908950E94860B08F48FEF0895A6 -:101800000E94130C0C94C10B0E94B30B38F00E9481 -:10181000BA0B20F0952311F00C94AA0B0C94B00B8A -:1018200011240C94F50B0E94D20B70F3959FC1F319 -:10183000950F50E0551F629FF001729FBB27F00D7E -:10184000B11D639FAA27F00DB11DAA1F649F6627D3 -:10185000B00DA11D661F829F2227B00DA11D621F22 -:10186000739FB00DA11D621F839FA00D611D221FDC -:10187000749F3327A00D611D231F849F600D211DC0 -:10188000822F762F6A2F11249F5750409AF0F1F043 -:1018900088234AF0EE0FFF1FBB1F661F771F881FAC -:1018A00091505040A9F79E3F510580F00C94AA0B2F -:1018B0000C94F50B5F3FE4F3983ED4F3869577954F -:1018C0006795B795F795E7959F5FC1F7FE2B880F52 -:1018D000911D9695879597F908950E94860B880B20 -:1018E000990B0895A1E21A2EAA1BBB1BFD010DC086 -:1018F000AA1FBB1FEE1FFF1FA217B307E407F507C0 -:1019000020F0A21BB30BE40BF50B661F771F881F9B -:10191000991F1A9469F760957095809590959B0131 -:10192000AC01BD01CF010895EE0FFF1F0590F491AA -:10193000E02D0994F894FFCF000000004801A800B2 -:10194000D50095010601E400F80000000000150331 -:10195000E8024403BE02E102CE02BF026E616E00E5 -:0E196000696E66006F7666002C000D0A0000AE +:10040000DACF8E50806480937C0080917A00806483 +:1004100080937A0080917A0086FDFCCF80917800ED +:100420009091790008953FB7F89480917F01909161 +:100430008001A0918101B091820126B5A89B05C0E1 +:100440002F3F19F00196A11DB11D3FBFBA2FA92F53 +:10045000982F8827BC01CD01620F711D811D911D50 +:1004600042E0660F771F881F991F4A95D1F70895BC +:100470008F929F92AF92BF92CF92DF92EF92FF92B4 +:100480004B015C010E9413026B017C010E9413026C +:100490006C197D098E099F09683E7340810591059D +:1004A000A8F321E0821A9108A108B10888EEC80ECD +:1004B00083E0D81EE11CF11C81149104A104B10455 +:1004C00029F7FF90EF90DF90CF90BF90AF909F9073 +:1004D0008F90089520915701260F3327331F213223 +:1004E0003105ECF42091CF01FC0190E080E0243054 +:1004F00069F082E00895A09157012191AC01495C17 +:100500005E4FA40FB52FB11D2C930196861798F35B +:1005100080915701680F6093570180E0089581E052 +:1005200008951092CF0181E08093CE011092A9012D +:1005300061E082E10E94B50161E083E10E94B501C2 +:10054000E9EBF0E080818E7F808380818D7F8083E6 +:1005500088E48093B80085E48093BC000895CF932D +:10056000DF9391E0909336018823B9F0C091B800F1 +:10057000D091BA008091BC008A7B8093BC0060E07F +:1005800082E10E94B50160E083E10E94B5010E9412 +:100590009102D093BA00C093B800DF91CF91089533 +:1005A0000895E091880180918701E81730F4F0E028 +:1005B000E757FE4F808190E008958FEF9FEF0895F9 +:1005C00090918801809187012FEF3FEF981748F4B1 +:1005D000E92FF0E0E757FE4F208130E09F5F9093D6 +:1005E0008801C90108958091870190918801891B34 +:1005F000990B0895CF92DF92EF92FF920F931F9382 +:10060000CF93DF937C01CB018A012091F801222353 +:1006100089F0EB016B01C40ED51ECC15DD0569F028 +:100620006991D701ED91FC910190F081E02DC70116 +:100630000995F3CF642F0E946A02C801DF91CF9120 +:100640001F910F91FF90EF90DF90CF900895CF937F +:10065000DF931F92CDB7DEB769832091F801222383 +:10066000F9F02091F501203258F021E030E0FC0152 +:100670003383228390E080E00F90DF91CF91089543 +:100680008091F601E82FF0E0EB52FE4F99819083C4 +:100690008F5F8093F6018093F50181E090E0ECCFCD +:1006A00061E0CE0101960E946A02F7CF90E080E0FF +:1006B0000895FC0101900020E9F73197AF01481B34 +:1006C000590BBC0189EF91E00C94A8008F929F9286 +:1006D000AF92BF920F931F93CF93DF93CDB7DEB747 +:1006E000A1970FB6F894DEBF0FBECDBF19A242305E +:1006F00008F44AE08E010F5D1F4F842E912CB12C1F +:10070000A12CA50194010E949C0CE62FB901CA01FD +:10071000EA30F4F4E05DD801EE938D01232B242B15 +:10072000252B79F790E080E0109719F0CD010E9419 +:100730005903A1960FB6F894DEBF0FBECDBFDF916F +:10074000CF911F910F91BF90AF909F908F90089580 +:10075000E95CE1CF4F925F926F927F928F929F926E +:10076000AF92BF92CF92DF92EF92FF920F931F93BF +:10077000CF936B017C01742EAC019B010E94970CFE +:10078000882399F084E291E0CF911F910F91FF901F +:10079000EF90DF90CF90BF90AF909F908F907F9021 +:1007A0006F905F904F900C94590346015701E89465 +:1007B000B7F82FEF3FEF4FE75FE7C501B4010E94A5 +:1007C000970C81110DC02FEF3FEF4FE75FE7C50199 +:1007D000B4010E94CD0A18161CF488E291E0D4CF2F +:1007E0002FEF3FEF4FE75FE4C701B6010E94250CF2 +:1007F00018161CF48CE291E0C7CF2FEF3FEF4FE7C4 +:100800005FECC701B6010E94CD0A87FDF3CF20E05F +:1008100030E0A901C701B6010E94CD0A10E000E056 +:1008200087FF0AC06DE289EF91E00E9448018C01C8 +:10083000F7FAF094F7F8F094C0E060E070E080E040 +:100840009FE37C1641F020E030E040E251E40E945A +:10085000D20ACF5FF6CFA70196010E94610A2B0151 +:100860003C010E94440B4B015C014AE00E9466037C +:100870007C01E00EF11ECC23C1F1C501B4010E9440 +:10088000730B9B01AC01C301B2010E94600A4B01D2 +:100890005C016EE289EF91E00E944801E80EF91ECA +:1008A000C15018F120E030E040E251E4C501B4014C +:1008B0000E942A0C2B013C010E94440B4B01B12CDD +:1008C000A12C4AE0C501B4010E946603E80EF91E9E +:1008D000C501B4010E94730B9B01AC01C301B201BD +:1008E0000E94600A4B015C01DBCFC701CF911F91D1 +:1008F0000F91FF90EF90DF90CF90BF90AF909F90BF +:100900008F907F906F905F904F9008954F925F927D +:100910006F927F928F929F92AF92BF92CF92DF920F +:10092000EF92FF920F931F93CF93DF93A091A302B7 +:10093000B091A4029091A20221E02093F80190933B +:10094000F7011092F6011092F501ED91FC911197CB +:100950000190F081E02D682FCD010995D091F5012E +:1009600081E0D13208F09CC0C091F7010E941302CF +:100970006B017C018091CF0181116CC082E080937A +:10098000CF0181E08093CE018FEF8093CD01109253 +:10099000CC01D093CB01E5EDF1E0ABEAB1E080E032 +:1009A000D8139AC01092AA018091AA01CC0FC82B2B +:1009B000C093AA018091A901813009F091C01092E1 +:1009C000A9010E9413026B017C018091AA0180930E +:1009D000BB008091D1019091D201A091D301B0913F +:1009E000D401892B8A2B8B2BA1F00E94130200913A +:1009F000D1011091D2012091D3013091D4016C1911 +:100A00007D098E099F09061717072807390708F47B +:100A100042C08091BC0083FDD8CF85EC8093BC00A0 +:100A20000E9413026B017C018091CF01823009F496 +:100A300059C08091CD018F3F09F476C08091CD01DE +:100A4000803209F473C08091CD01803309F470C005 +:100A500084E026C08091D1019091D201A091D30170 +:100A6000B091D401892B8A2B8B2B09F483CF0E9460 +:100A700013020091D1011091D2012091D301309144 +:100A8000D4016C197D098E099F09061717072807DD +:100A9000390708F06FCF8091D0010E94AF0285E046 +:100AA0001092F6011092F5011092F801882309F4D2 +:100AB00041C086EE93E0DF91CF911F910F91FF909F +:100AC000EF90DF90CF90BF90AF909F908F907F90EE +:100AD0006F905F904F90089591919D938F5F60CF3D +:100AE00085EE9CCF8091D1019091D201A091D3014C +:100AF000B091D401892B8A2B8B2B09F495CF0E94BE +:100B000013020091D1011091D2012091D3013091B3 +:100B1000D4016C197D098E099F090617170728074C +:100B2000390708F081CFB7CF80E0BACF82E0B8CFE5 +:100B300083E0B6CFDAE011E00FEFA2E0FA2EB5EED7 +:100B4000EB2EC5ECDC2E6AE070E080E090E00E94C5 +:100B50003802C091A2020E9413024B015C018091F5 +:100B6000CF01811162C01093CF011093CE01009389 +:100B7000CD011092CC01F092CB011093AA0180918B +:100B8000AA01CC0FC82BC093AA018091A901813082 +:100B900009F0D1C01092A9010E9413024B015C011F +:100BA0008091AA018093BB008091D1019091D201E4 +:100BB000A091D301B091D401892B8A2B8B2BA1F06A +:100BC0000E9413024090D1015090D2016090D30155 +:100BD0007090D401681979098A099B09461657064D +:100BE0006806790608F442C08091BC0083FDD8CF26 +:100BF000D092BC000E9413024B015C018091CF0196 +:100C0000813009F49BC08091CC01833008F0B8C0DA +:100C10008091CC01ABEAB1E0E9E8F1E090E098170F +:100C200051F12D9121939F5FFACF8091D101909145 +:100C3000D201A091D301B091D401892B8A2B8B2BA7 +:100C400009F48DCF0E9413024090D1015090D2013F +:100C50006090D3017090D401681979098A099B09C1 +:100C6000461657066806790608F079CF8091D001BC +:100C70000E94AF0280E01092880180938701D150DA +:100C800009F417CF833009F05ECF8091A3029091D1 +:100C9000A402DC01ED91FC910284F385E02D09951D +:100CA000D82F8091A3029091A402DC01ED91FC91D8 +:100CB0000284F385E02D0995C82F8091A3029091BD +:100CC000A402DC01ED91FC910284F385E02D0995ED +:100CD00020E03D2F2C2BA90170E060E0762F652FDE +:100CE000542F4427482B87E190E0C12CE0E8DE2E0A +:100CF000E8E9EE2EF12C4A015B01082E04C0B694FF +:100D0000A794979487940A94D2F780FE04C04C2548 +:100D10005D256E257F25F694E794D794C7940197B7 +:100D20008730910541F7C9018C7F442309F4C3CE74 +:100D300087EE93E0C0CEE092BC005CCF8091D10101 +:100D40009091D201A091D301B091D401892B8A2B2B +:100D50008B2B09F453CF0E9413024090D101509085 +:100D6000D2016090D3017090D401681979098A0981 +:100D70009B09461657066806790608F03FCF76CFDE +:100D800083E048CF85ED8093BC008091D1019091A4 +:100D9000D201A091D301B091D4010796A11DB11D3C +:100DA00023E0B695A795979587952A95D1F7209139 +:100DB000BC0024FD03C01092CF0108954091D101E1 +:100DC0005091D2016091D3017091D401452B462BF3 +:100DD000472B69F30097A105B10541F025E32A955A +:100DE000F1F700000197A109B109E1CF8091D0018D +:100DF0000C94AF021F920F920FB60F9211242F93F3 +:100E00003F934F935F936F937F938F939F93AF9392 +:100E1000BF93EF93FF9389EF91E00E942601FF912A +:100E2000EF91BF91AF919F918F917F916F915F9162 +:100E30004F913F912F910F900FBE0F901F901895DB +:100E40001F920F920FB60F9211242F938F939F939F +:100E5000EF93FF93E0910902F0910A028081E09103 +:100E60000F02F091100282FD1BC09081809112024E +:100E70008F5F8F7320911302821741F0E09112026D +:100E8000F0E0E750FE4F958F80931202FF91EF91B3 +:100E90009F918F912F910F900FBE0F901F901895DB +:100EA0008081F4CF1F920F920FB60F9211242F93CF +:100EB0003F938F939F93AF93BF9380917B019091CA +:100EC0007C01A0917D01B0917E0130917A0123E0F7 +:100ED000230F2D3758F50196A11DB11D20937A01DE +:100EE00080937B0190937C01A0937D01B0937E0160 +:100EF00080917F0190918001A0918101B091820148 +:100F00000196A11DB11D80937F0190938001A09354 +:100F10008101B0938201BF91AF919F918F913F91D9 +:100F20002F910F900FBE0F901F90189526E8230F5A +:100F30000296A11DB11DD2CF1F920F920FB60F9234 +:100F400011242F933F934F935F936F937F938F93CE +:100F50009F93AF93BF93EF93FF938091B900887FE6 +:100F6000803609F44AC0F0F5883209F4A7C018F5B4 +:100F7000803109F49BC0B8F4882309F4F9C08830A3 +:100F800009F494C0FF91EF91BF91AF919F918F9120 +:100F90007F916F915F914F913F912F910F900FBE75 +:100FA0000F901F901895883109F488C0803251F74E +:100FB0008093CD0114C0803409F49DC040F4803387 +:100FC000B9F38833F9F68093CD0185ECB0C0803554 +:100FD00009F485C0883509F496C0883499F60E94D2 +:100FE000C206D0CF883909F48CC038F5883729F08B +:100FF00050F4883611F0803729F683E08093CF01D2 +:101000001092790157C0883809F47BC0803919F0F3 +:10101000803809F0B7CF80917901803208F071C033 +:10102000E091790181E08E0F809379018091BB007E +:10103000F0E0E75AFE4F80833DC0803B39F0E0F49A +:10104000803A09F479C0883A09F09CCF84E0809313 +:10105000CF011092580110925701E0918501F09153 +:10106000860109958091570181110FC081E080931D +:1010700057011092370109C0803C09F4A6CF883C83 +:1010800009F4A3CF883B09F07DCFE091580181E0BE +:101090008E0F80935801F0E0E95CFE4F80818093D1 +:1010A000BB00909158018091570129C08091AA01FD +:1010B0008093BB0085EC8093BC0064CF9091CC0101 +:1010C0008091CB01981758F5E091CC0181E08E0F0B +:1010D0008093CC01F0E0E555FE4F8081E9CFE091AF +:1010E000CC0181E08E0F8093CC018091BB00F0E0B9 +:1010F000E555FE4F80839091CC018091CB019817EC +:10110000C8F285E8D8CFE091CC0181E08E0F8093C2 +:10111000CC018091BB00F0E0E555FE4F80838091CB +:10112000CE0181115CCF81E08093A90184EA809394 +:10113000BC001092CF0126CF85EC8093BC001092AA +:10114000CF0180917901803230F4E0917901F0E0B3 +:10115000E75AFE4F10826091790170E0E0918301BF +:10116000F091840189E591E00995109279010ACF07 +:101170001092CD0134CFE9EFF1E01382128288EEB4 +:1011800093E0A0E0B0E084839583A683B78324E056 +:1011900031E03183208325EC30E03587248724EC4F +:1011A00030E03787268720EC30E0318B208B21EC34 +:1011B00030E0338B228B22EC30E0358B248B26EC15 +:1011C00030E0378B268B118E128E138E148EE6E94B +:1011D000F2E01382128284839583A683B78386E12B +:1011E00091E091838083A2EAB2E080E48C9312962E +:1011F000FC93EE9311970895789484B5826084BD32 +:1012000084B5816084BD85B5826085BD85B581600A +:1012100085BD80916E00816080936E001092810088 +:101220008091810082608093810080918100816043 +:101230008093810080918000816080938000809104 +:10124000B10084608093B1008091B0008160809390 +:10125000B00080917A00846080937A0080917A0057 +:10126000826080937A0080917A00816080937A0016 +:1012700080917A00806880937A001092C10084E0A7 +:101280000E94870087E00E94870060E087E00E945C +:10129000B501E0910902F0910A0282E08083E091B9 +:1012A0000502F09106021082E0910702F091080217 +:1012B00080E1808310921102E0910D02F0910E0204 +:1012C00086E08083E0910B02F0910C0280818061C6 +:1012D0008083E0910B02F0910C0280818860808312 +:1012E000E0910B02F0910C02808180688083E09194 +:1012F0000B02F0910C0280818F7D80831092880117 +:10130000109287011092F6011092F5010E9491024D +:1013100086EA90E0909386018093850187EA90E0C9 +:10132000909384018093830164E670E080E090E014 +:101330000E943802C0E0D0E089EF91E00E940601EF +:10134000892B09F4ACC089EF91E00E94E400833757 +:10135000910509F081C085EF0E9486049C01265EFC +:101360003340BC0190E080E02230310508F056C0E7 +:101370000E94730B6B017C0183EF0E9486049C0129 +:10138000265E3340BC0190E080E02230310508F059 +:1013900054C00E94730B2B013C0180E10E940102AA +:1013A0005C018EE00E9401028C0142E0C701B6019F +:1013B0000E94AA0380E391E00E94590342E0C30126 +:1013C000B2010E94AA0380E391E00E945903B50193 +:1013D000BB0C880B990B0E94750B20E030E040EAB3 +:1013E0005BE30E942A0C42E00E94AA0380E391E0A2 +:1013F0000E945903B801110F880B990B0E94750BBD +:1014000020E030E040EA5BE30E942A0C42E00E94C8 +:10141000AA0382E391E00E9459038ECF0E94730BCE +:1014200020E030E04AEF5AE30E942A0C20E030E04E +:1014300040EC50E40E94600A9DCF0E94730B22E5AD +:1014400038EB4FE25BE30E942A0C26E636E64BE3DC +:1014500052E40E94600A9FCF8836910579F461E0DA +:1014600084E00E94B50164E670E080E090E00E94B4 +:10147000380260E084E00E94B5015ECF89369105B4 +:1014800009F05ACF61E085E00E94B50164E670E0A2 +:1014900080E090E00E94380260E085E0ECCF61E0FF +:1014A00070E080E090E00E943802209709F444CF79 +:1014B0000E941201882309F43FCF0E9400003CCF14 +:1014C0005058BB27AA270E94780A0C94EB0B0E9465 +:1014D000DD0B38F00E94E40B20F039F49F3F19F443 +:1014E00026F40C94DA0B0EF4E095E7FB0C94D40B85 +:1014F000E92F0E94FC0B58F3BA17620773078407A1 +:10150000950720F079F4A6F50C941E0C0EF4E095E6 +:101510000B2EBA2FA02D0B01B90190010C01CA01AD +:10152000A0011124FF27591B99F0593F50F4503E58 +:1015300068F11A16F040A22F232F342F4427585F4A +:10154000F3CF469537952795A795F0405395C9F762 +:101550007EF41F16BA0B620B730B840BBAF091501A +:10156000A1F0FF0FBB1F661F771F881FC2F70EC0B9 +:10157000BA0F621F731F841F48F48795779567958C +:10158000B795F7959E3F08F0B0CF9395880F08F078 +:101590009927EE0F9795879508950E94B00B08F450 +:1015A00081E008950E94E60A0C94EB0B0E94E40B84 +:1015B00058F00E94DD0B40F029F45F3F29F00C94B5 +:1015C000D40B51110C941F0C0C94DA0B0E94FC0BE1 +:1015D00068F39923B1F3552391F3951B550BBB2762 +:1015E000AA2762177307840738F09F5F5F4F220FA7 +:1015F000331F441FAA1FA9F335D00E2E3AF0E0E89E +:1016000032D091505040E695001CCAF72BD0FE2FE7 +:1016100029D0660F771F881FBB1F2617370748077B +:10162000AB07B0E809F0BB0B802DBF01FF27935833 +:101630005F4F3AF09E3F510578F00C94D40B0C9418 +:101640001F0C5F3FE4F3983ED4F38695779567953A +:10165000B795F7959F5FC9F7880F911D9695879568 +:1016600097F90895E1E0660F771F881FBB1F621787 +:1016700073078407BA0720F0621B730B840BBA0B45 +:10168000EE1F88F7E09508950E94040C88F09F579C +:1016900098F0B92F9927B751B0F0E1F0660F771F96 +:1016A000881F991F1AF0BA95C9F714C0B13091F08C +:1016B0000E941E0CB1E008950C941E0C672F782F29 +:1016C0008827B85F39F0B93FCCF386957795679551 +:1016D000B395D9F73EF490958095709561957F4FBD +:1016E0008F4F9F4F0895E89409C097FB3EF4909563 +:1016F0008095709561957F4F8F4F9F4F9923A9F0EB +:10170000F92F96E9BB279395F69587957795679579 +:10171000B795F111F8CFFAF4BB0F11F460FF1BC0BD +:101720006F5F7F4F8F4F9F4F16C0882311F096E950 +:1017300011C0772321F09EE8872F762F05C06623FE +:1017400071F096E8862F70E060E02AF09A95660FB7 +:10175000771F881FDAF7880F9695879597F9089570 +:10176000990F0008550FAA0BE0E8FEEF16161706B2 +:10177000E807F907C0F012161306E407F50798F01A +:10178000621B730B840B950B39F40A2661F0232B33 +:10179000242B252B21F408950A2609F4A140A695AF +:1017A0008FEF811D811D089597F99F6780E870E094 +:1017B00060E008959FEF80EC089500240A941616C7 +:1017C000170618060906089500240A94121613062F +:1017D000140605060895092E0394000C11F48823BD +:1017E00052F0BB0F40F4BF2B11F460FF04C06F5FD9 +:1017F0007F4F8F4F9F4F089557FD9058440F551FAF +:1018000059F05F3F71F04795880F97FB991F61F082 +:101810009F3F79F087950895121613061406551FF9 +:10182000F2CF4695F1DF08C0161617061806991F65 +:10183000F1CF86957105610508940895E894BB275A +:1018400066277727CB0197F908950E94B00B08F41B +:101850008FEF08950E943D0C0C94EB0B0E94DD0B62 +:1018600038F00E94E40B20F0952311F00C94D40B77 +:101870000C94DA0B11240C941F0C0E94FC0B70F3D7 +:10188000959FC1F3950F50E0551F629FF001729F25 +:10189000BB27F00DB11D639FAA27F00DB11DAA1F34 +:1018A000649F6627B00DA11D661F829F2227B00D81 +:1018B000A11D621F739FB00DA11D621F839FA00D0C +:1018C000611D221F749F3327A00D611D231F849F5C +:1018D000600D211D822F762F6A2F11249F575040B3 +:1018E0009AF0F1F088234AF0EE0FFF1FBB1F661F2E +:1018F000771F881F91505040A9F79E3F510580F0F7 +:101900000C94D40B0C941F0C5F3FE4F3983ED4F37B +:10191000869577956795B795F795E7959F5FC1F79A +:10192000FE2B880F911D9695879597F908950E9433 +:10193000B00B880B990B0895A1E21A2EAA1BBB1BB2 +:10194000FD010DC0AA1FBB1FEE1FFF1FA217B3078B +:10195000E407F50720F0A21BB30BE40BF50B661FA1 +:10196000771F881F991F1A9469F760957095809565 +:1019700090959B01AC01BD01CF010895EE0FFF1FB3 +:101980000590F491E02D0994F894FFCF0000000039 +:101990004801A800D50095010601E400F800000008 +:1019A00000002703FA025603D002F302E002D1023C +:1019B0006E616E00696E66006F7666002C000D0A1F +:0219C000000025 :107E0000112484B714BE81FFF0D085E080938100F7 :107E100082E08093C00088E18093C10086E0809377 :107E2000C20080E18093C4008EE0C9D0259A86E02C diff --git a/shroom_controller.py b/shroom_controller.py index ae4d832..c04187a 100644 --- a/shroom_controller.py +++ b/shroom_controller.py @@ -134,6 +134,56 @@ class Humidifier: s.flush() self.switch_timeout = time.time() + self.toggle_cooldown +# the wiring's a little different so the thresholds for detecting on/off are inverted but hopefully a lot more reliable than the original +class HumidifierV2: + def __init__(self): + self.on_threshold = 1.5 + self.off_threshold = 2.5 + self.toggle_cooldown = 7 + + self._on = False + self.history = np.zeros(10) + self.switch_timeout = 0 + + @property + def on(self): + return self._on + + @on.setter + def on(self, nv): + old_on = self._on + self._on = nv + if nv: + print("send hum on") + else: + print("send hum off") + send_update({"status": {"humidifier": nv}}) + + @property + def off(self): + return not self.on + + def update(self, volts): + self.history[1:] = self.history[:-1] + self.history[0] = volts + #print(self.history) + avg = np.sum(self.history)/self.history.shape[0] + if self.on: + if avg > self.off_threshold: + self.on = False + self.switch_timeout = time.time() + 1 + else: + if avg < self.on_threshold: + self.on = True + self.switch_timeout = time.time() + 1 + + def toggle(self, s): + if time.time() > self.switch_timeout: + s.write(b"i") + s.flush() + self.switch_timeout = time.time() + self.toggle_cooldown + + class Controller: def __init__(self): self.target_lower = 85 @@ -157,7 +207,7 @@ class Controller: self._manual_mode = on send_update({"status": {"manual_mode": on}}) - def update(self, humidifier, humidity): + def update(self, humidifier, humidifier2, humidity): if self.first_sample: self.humidifier_history[:] = humidity self.first_sample = False @@ -179,12 +229,19 @@ class Controller: elif humidifier.on and not self.manual_on: humidifier.toggle(s) else: - if comp_humidity < self.target_lower and humidifier.off: - humidifier.toggle(s) - elif comp_humidity > self.target_upper and humidifier.on: - humidifier.toggle(s) + if comp_humidity < self.target_lower: + if humidifier.off: + humidifier.toggle(s) + if humidifer2.off: + humidifier2.toggle(s) + elif comp_humidity > self.target_upper: + if humidifier.on: + humidifier.toggle(s) + if humidifer2.on: + humidifier2.toggle(s) humidifier = Humidifier() +humidifier2 = Humidifier2() controller = Controller() exiting = False @@ -271,10 +328,12 @@ try: humidity = float(parts[0]) temp = float(parts[1]) volts = float(parts[2]) + volts2 = float(parts[3]) try: humidifier.update(volts) - controller.update(humidifier, humidity) + humidifier2.update(volts2) + controller.update(humidifier, humidifier2, humidity) if frame_num == 0: #print(humidity, temp, volts) @@ -283,7 +342,8 @@ try: "time": int(now*1000), "temp": temp, "hum": humidity, - "hv": volts + "hv": volts, + "hv2": volts2, } } send_update(update)