From bd63e4e0fccf15e8e4b41af84c2f98ecaa652915 Mon Sep 17 00:00:00 2001 From: Kelvin Ly Date: Sun, 30 Jul 2023 23:08:57 -0400 Subject: [PATCH] Fix bugs; set pin 5 to OUPUT to make it usable, fix one bug in contrller code --- humdifier_controller/humdifier_controller.ino | 9 + .../humdifier_controller.ino.standard.hex | 269 +++++++++--------- ...ontroller.ino.with_bootloader.standard.hex | 268 ++++++++--------- shroom_controller.py | 8 +- 4 files changed, 284 insertions(+), 270 deletions(-) diff --git a/humdifier_controller/humdifier_controller.ino b/humdifier_controller/humdifier_controller.ino index 65a3da0..05bd501 100644 --- a/humdifier_controller/humdifier_controller.ino +++ b/humdifier_controller/humdifier_controller.ino @@ -24,6 +24,7 @@ void fanOff() { void setup() { pinMode(4, OUTPUT); + pinMode(5, OUTPUT); pinMode(7, OUTPUT); digitalWrite(7, LOW); @@ -49,6 +50,12 @@ void toggle2() { digitalWrite(5, LOW); } +void toggle_test(int p) { + digitalWrite(p, HIGH); + delay(100); + digitalWrite(p, LOW); +} + void loop() { @@ -71,6 +78,8 @@ void loop() toggle(); } else if (c == 'i') { toggle2(); + } else if (c >= 'A' && c <= 'Z') { + toggle_test(c - 'A'); } } delay(1); diff --git a/humdifier_controller/humdifier_controller.ino.standard.hex b/humdifier_controller/humdifier_controller.ino.standard.hex index 1309add..d38c2a9 100644 --- a/humdifier_controller/humdifier_controller.ino.standard.hex +++ b/humdifier_controller/humdifier_controller.ino.standard.hex @@ -10,11 +10,11 @@ :10009000040404040404040402020202020203032E :1000A0000303030301020408102040800102040836 :1000B0001020010204081020BB0811241FBECFEF3E -:1000C000D8E0DEBFCDBF11E0A0E0B1E0ECE8F9E19F +:1000C000D8E0DEBFCDBF11E0A0E0B1E0EAEBF9E19E :1000D00002C005900D92A633B107D9F722E0A6E33E :1000E000B1E001C01D92A53AB207E1F710E0CDE5FD -:1000F000D0E004C02197FE010E94BE0CCC35D10790 -:10010000C9F70E94FC080C94C40C0C94000090E009 +:1000F000D0E004C02197FE010E94D50CCC35D10779 +:10010000C9F70E94FC080C94DB0C0C94000090E0F2 :10011000FC01EC55FF4F249180579F4FFC018491C7 :10012000882399F090E0880F991FFC01EA57FF4F50 :10013000A591B491FC01E458FF4F859194918FB73C @@ -110,37 +110,37 @@ :1006D000AF92BF920F931F93CF93DF93CDB7DEB747 :1006E000A1970FB6F894DEBF0FBECDBF19A242305E :1006F00008F44AE08E010F5D1F4F842E912CB12C1F -:10070000A12CA50194010E949C0CE62FB901CA01FD +:10070000A12CA50194010E94B30CE62FB901CA01E6 :10071000EA30F4F4E05DD801EE938D01232B242B15 :10072000252B79F790E080E0109719F0CD010E9419 :100730005903A1960FB6F894DEBF0FBECDBFDF916F :10074000CF911F910F91BF90AF909F908F90089580 :10075000E95CE1CF4F925F926F927F928F929F926E :10076000AF92BF92CF92DF92EF92FF920F931F93BF -:10077000CF936B017C01742EAC019B010E94970CFE +:10077000CF936B017C01742EAC019B010E94AE0CE7 :10078000882399F084E291E0CF911F910F91FF901F :10079000EF90DF90CF90BF90AF909F908F907F9021 :1007A0006F905F904F900C94590346015701E89465 :1007B000B7F82FEF3FEF4FE75FE7C501B4010E94A5 -:1007C000970C81110DC02FEF3FEF4FE75FE7C50199 -:1007D000B4010E94CD0A18161CF488E291E0D4CF2F -:1007E0002FEF3FEF4FE75FE4C701B6010E94250CF2 +:1007C000AE0C81110DC02FEF3FEF4FE75FE7C50182 +:1007D000B4010E94E40A18161CF488E291E0D4CF18 +:1007E0002FEF3FEF4FE75FE4C701B6010E943C0CDB :1007F00018161CF48CE291E0C7CF2FEF3FEF4FE7C4 -:100800005FECC701B6010E94CD0A87FDF3CF20E05F -:1008100030E0A901C701B6010E94CD0A10E000E056 +:100800005FECC701B6010E94E40A87FDF3CF20E048 +:1008100030E0A901C701B6010E94E40A10E000E03F :1008200087FF0AC06DE289EF91E00E9448018C01C8 :10083000F7FAF094F7F8F094C0E060E070E080E040 :100840009FE37C1641F020E030E040E251E40E945A -:10085000D20ACF5FF6CFA70196010E94610A2B0151 -:100860003C010E94440B4B015C014AE00E9466037C +:10085000E90ACF5FF6CFA70196010E94780A2B0123 +:100860003C010E945B0B4B015C014AE00E94660365 :100870007C01E00EF11ECC23C1F1C501B4010E9440 -:10088000730B9B01AC01C301B2010E94600A4B01D2 +:100880008A0B9B01AC01C301B2010E94770A4B01A4 :100890005C016EE289EF91E00E944801E80EF91ECA :1008A000C15018F120E030E040E251E4C501B4014C -:1008B0000E942A0C2B013C010E94440B4B01B12CDD +:1008B0000E94410C2B013C010E945B0B4B01B12CAF :1008C000A12C4AE0C501B4010E946603E80EF91E9E -:1008D000C501B4010E94730B9B01AC01C301B201BD -:1008E0000E94600A4B015C01DBCFC701CF911F91D1 +:1008D000C501B4010E948A0B9B01AC01C301B201A6 +:1008E0000E94770A4B015C01DBCFC701CF911F91BA :1008F0000F91FF90EF90DF90CF90BF90AF909F90BF :100900008F907F906F905F904F9008954F925F927D :100910006F927F928F929F92AF92BF92CF92DF920F @@ -294,121 +294,124 @@ :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 +:101280000E94870085E00E94870087E00E94870017 +:1012900060E087E00E94B501E0910902F0910A0246 +:1012A00082E08083E0910502F09106021082E091D5 +:1012B0000702F091080280E1808310921102E09110 +:1012C0000D02F0910E0286E08083E0910B02F09116 +: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 :00000001FF diff --git a/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex b/humdifier_controller/humdifier_controller.ino.with_bootloader.standard.hex index 61edf7c..00552a5 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 -:1000C000D8E0DEBFCDBF11E0A0E0B1E0ECE8F9E19F +:1000C000D8E0DEBFCDBF11E0A0E0B1E0EAEBF9E19E :1000D00002C005900D92A633B107D9F722E0A6E33E :1000E000B1E001C01D92A53AB207E1F710E0CDE5FD -:1000F000D0E004C02197FE010E94BE0CCC35D10790 -:10010000C9F70E94FC080C94C40C0C94000090E009 +:1000F000D0E004C02197FE010E94D50CCC35D10779 +:10010000C9F70E94FC080C94DB0C0C94000090E0F2 :10011000FC01EC55FF4F249180579F4FFC018491C7 :10012000882399F090E0880F991FFC01EA57FF4F50 :10013000A591B491FC01E458FF4F859194918FB73C @@ -111,37 +111,37 @@ :1006D000AF92BF920F931F93CF93DF93CDB7DEB747 :1006E000A1970FB6F894DEBF0FBECDBF19A242305E :1006F00008F44AE08E010F5D1F4F842E912CB12C1F -:10070000A12CA50194010E949C0CE62FB901CA01FD +:10070000A12CA50194010E94B30CE62FB901CA01E6 :10071000EA30F4F4E05DD801EE938D01232B242B15 :10072000252B79F790E080E0109719F0CD010E9419 :100730005903A1960FB6F894DEBF0FBECDBFDF916F :10074000CF911F910F91BF90AF909F908F90089580 :10075000E95CE1CF4F925F926F927F928F929F926E :10076000AF92BF92CF92DF92EF92FF920F931F93BF -:10077000CF936B017C01742EAC019B010E94970CFE +:10077000CF936B017C01742EAC019B010E94AE0CE7 :10078000882399F084E291E0CF911F910F91FF901F :10079000EF90DF90CF90BF90AF909F908F907F9021 :1007A0006F905F904F900C94590346015701E89465 :1007B000B7F82FEF3FEF4FE75FE7C501B4010E94A5 -:1007C000970C81110DC02FEF3FEF4FE75FE7C50199 -:1007D000B4010E94CD0A18161CF488E291E0D4CF2F -:1007E0002FEF3FEF4FE75FE4C701B6010E94250CF2 +:1007C000AE0C81110DC02FEF3FEF4FE75FE7C50182 +:1007D000B4010E94E40A18161CF488E291E0D4CF18 +:1007E0002FEF3FEF4FE75FE4C701B6010E943C0CDB :1007F00018161CF48CE291E0C7CF2FEF3FEF4FE7C4 -:100800005FECC701B6010E94CD0A87FDF3CF20E05F -:1008100030E0A901C701B6010E94CD0A10E000E056 +:100800005FECC701B6010E94E40A87FDF3CF20E048 +:1008100030E0A901C701B6010E94E40A10E000E03F :1008200087FF0AC06DE289EF91E00E9448018C01C8 :10083000F7FAF094F7F8F094C0E060E070E080E040 :100840009FE37C1641F020E030E040E251E40E945A -:10085000D20ACF5FF6CFA70196010E94610A2B0151 -:100860003C010E94440B4B015C014AE00E9466037C +:10085000E90ACF5FF6CFA70196010E94780A2B0123 +:100860003C010E945B0B4B015C014AE00E94660365 :100870007C01E00EF11ECC23C1F1C501B4010E9440 -:10088000730B9B01AC01C301B2010E94600A4B01D2 +:100880008A0B9B01AC01C301B2010E94770A4B01A4 :100890005C016EE289EF91E00E944801E80EF91ECA :1008A000C15018F120E030E040E251E4C501B4014C -:1008B0000E942A0C2B013C010E94440B4B01B12CDD +:1008B0000E94410C2B013C010E945B0B4B01B12CAF :1008C000A12C4AE0C501B4010E946603E80EF91E9E -:1008D000C501B4010E94730B9B01AC01C301B201BD -:1008E0000E94600A4B015C01DBCFC701CF911F91D1 +:1008D000C501B4010E948A0B9B01AC01C301B201A6 +:1008E0000E94770A4B015C01DBCFC701CF911F91BA :1008F0000F91FF90EF90DF90CF90BF90AF909F90BF :100900008F907F906F905F904F9008954F925F927D :100910006F927F928F929F92AF92BF92CF92DF920F @@ -295,123 +295,125 @@ :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 +:101280000E94870085E00E94870087E00E94870017 +:1012900060E087E00E94B501E0910902F0910A0246 +:1012A00082E08083E0910502F09106021082E091D5 +:1012B0000702F091080280E1808310921102E09110 +:1012C0000D02F0910E0286E08083E0910B02F09116 +: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 :107E0000112484B714BE81FFF0D085E080938100F7 :107E100082E08093C00088E18093C10086E0809377 :107E2000C20080E18093C4008EE0C9D0259A86E02C diff --git a/shroom_controller.py b/shroom_controller.py index c04187a..bea24cc 100644 --- a/shroom_controller.py +++ b/shroom_controller.py @@ -154,10 +154,10 @@ class HumidifierV2: old_on = self._on self._on = nv if nv: - print("send hum on") + print("send hum 2 on") else: - print("send hum off") - send_update({"status": {"humidifier": nv}}) + print("send hum 2 off") + send_update({"status": {"humidifier2": nv}}) @property def off(self): @@ -241,7 +241,7 @@ class Controller: humidifier2.toggle(s) humidifier = Humidifier() -humidifier2 = Humidifier2() +humidifier2 = HumidifierV2() controller = Controller() exiting = False