DHT22 Input support, thermo and esp refactoring

This commit is contained in:
livello
2018-06-09 17:06:58 +03:00
parent 7b69482180
commit 7d09bc6ad0
18 changed files with 270 additions and 294 deletions

View File

@@ -1,29 +0,0 @@
{
"mqtt":["garden","192.168.10.115",1883,"test","test"],
"ow":{
"28FFADCE601705A3":{"emit":"t_soil1","item":"h_relay6"},
"286164123FF96F55":{"emit":"t_soil2"},
"28FFEF6D60170335":{"emit":"t_soil3"}
},
"items":{
"h_relay1":[6,39,1,1],
"h_relay2":[6,38,1,1],
"h_relay3":[6,37,1,1],
"h_relay4":[6,36,1,1],
"h_relay5":[6,35,1,1],
"h_relay6":[5,34,23],
"h_relay7":[6,33,1,1],
"h_relay8":[6,32,1,1],
"h_auto":[6,29,1,1]
},
"in":{
"40":{"emit":"/garden/s_in/1"},
"41":{"emit":"/garden/s_in/2"},
"42":{"emit":"/garden/s_in/3"},
"43":{"emit":"/garden/s_in/4"},
"44":{"emit":"/garden/s_in/5"},
"45":{"emit":"/garden/s_in/6"},
"46":{"emit":"/garden/s_in/7"},
"47":{"emit":"/garden/s_in/8"}
}
}

View File

@@ -1,46 +0,0 @@
{
"dmxin":["kuhm","kuhwin","gost","bthr"],
"dmx":[3,60],
"modbus": [96,97],
"items": {
"light":[7,["kuh","ktc","gst","gost"]],
"kuhwin":[1,5],
"kuhline":[1,13],
"kuhfre":[1,25],
"kuhwork":[1,1],
"gost":[1,47],
"sasha1":[1,17],
"sasha2":[1,21],
"vika1":[1,31],
"vika2":[1,35],
"bedr1":[1,39],
"bedr2":[1,43],
"kuhm":[7,["kuhline","kuhfre","kuhwork"]],
"kuh":[7,["kuhline","kuhfre","kuhwork","kuhwin"]],
"sasha":[7,["sasha1","sasha2"]],
"vika":[7,["vika1","vika2"]],
"bedr":[7,["bedr1","bedr2"]],
"balk1":[7,["balk11","balk12"]],
"balk2":[0,53],
"balk11":[0,51],
"balk12":[0,52],
"all":[7,["kuh","gost","vika","sasha","bedr","bth","gst","ktc","balk1","balk2","fm"]],
"bth1":[4,[96,0,0]],
"bth2":[4,[96,0,1]],
"bthr":[1,57],
"bth":[7,["bth1","bth2"]],
"ktc":[4,[97,0,0]],
"gst":[4,[97,0,1]],
"a_vika":[3,8],
"a_sasha":[3,7],
"a_bedr":[3,6],
"a_ext":[3,5],
"fm":[9,10],
"fm_t":[8,"fm"],
"fm_h":[8,"fm"]
},
"mqtt":["public_test2","m2m.eclipse.org"]
}

View File

@@ -1,43 +0,0 @@
{
"mqtt":["public_test1","m2m.eclipse.org"],
"ow":{
"2807FFD503000036":{"emit":"t_balk1","item":"h_balk1"},
"284811170400005B":{"emit":"t_entr"},
"28FFF95533160459":{"emit":"t_bath1","item":"h_bath1"},
"28D2FD1604000051":{"emit":"t_exbath2"},
"28EE634F13160255":{"emit":"t_bath2","item":"h_bath2"},
"28FFB3B02316030C":{"emit":"t_balk2","item":"h_balk2"},
"28EE4A571316027A":{"emit":"t_sasha"},
"28FF0C6A331604FF":{"emit":"t_ext"},
"28FFDD8C3316042C":{"emit":"t_abath2"},
"28FFAEAC3316047F":{"emit":"t_abath1"},
"28EE736E131602D6":{"emit":"t_vika"},
"28EED85C131602DA":{"emit":"t_kitchen"},
"28EE5A62131602CF":{"emit":"t_ac"},
"28EEA76713160204":{"emit":"t_aentr"},
"28EE8A5B1616019D":{"emit":"t_entr2","item":"h_entr"},
"28EED16A13160268":{"emit":"t_bedr"}
},
"items":{
"all":[7,["h_entr","h_bath1","h_bath2","h_balk1","h_balk2","h_boil1","h_boil2","h_polotenc","spots_en","light_en"]],
"h_bath1":[5,24,33],
"h_bath2":[5,34,32],
"h_entr":[5,35,32],
"h_balk1":[5,25,28],
"h_balk2":[5,27,28],
"h_boil1":[6,23],
"h_boil2":[6,28,1,1],
"h_polotenc":[6,26,1,1],
"spots_en":[6,22,1,1],
"light_en":[6,29,1,1],
"water":[6,36,1,1]
},
"in":{
"41":{"T":0,"emit":"/myhome/in/all","scmd":"HALT","rcmd":"REST"},
"37":{"item":"spots_en","scmd":"TOGGLE","rcmd":"TOGGLE"},
"38":{"emit":"/myhome/in/light","scmd":"TOGGLE","rcmd":"TOGGLE"},
"40":{"T":1,"emit":"/myhome/out/all","scmd":"HALT","rcmd":"REST"},
"39":{"emit":"/myhome/s_out/water_leak"}
}
}