From a467117df9f5c7ffb619047a8e221a5b039b4f32 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Fri, 18 Dec 2020 00:53:39 +0100 Subject: [PATCH] change to 4mb --- data/dev_conf.txt | 0 data/edit.htm.gz | Bin 0 -> 5455 bytes data/presets/presets.c.txt | 46 ++++++++++++++++++++ data/presets/presets.s.txt | 84 ++++++++++++++++++++++++++++++++++++ data/set.device.json.gz | Bin 2741 -> 2741 bytes data_ungzip/set.device.json | 2 +- include/Consts.h | 2 +- platformio.ini | 2 +- 8 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 data/dev_conf.txt create mode 100644 data/edit.htm.gz create mode 100644 data/presets/presets.c.txt create mode 100644 data/presets/presets.s.txt diff --git a/data/dev_conf.txt b/data/dev_conf.txt new file mode 100644 index 00000000..e69de29b diff --git a/data/edit.htm.gz b/data/edit.htm.gz new file mode 100644 index 0000000000000000000000000000000000000000..5786121f98a84b5695314c9ad8e5537f57650ba4 GIT binary patch literal 5455 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 z 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 tUp1 +btn1 0 +telegram нагрев#выключен 1 +end +t1 < tLow1 +btn1 1 +telegram нагрев#включен 1 +end* +t2 > threshold+-2 +heater2 0 +end +t2 < threshold+-2 +heater2 1 +end +timenow = time21 +threshold threshold1 +end +timenow = time22 +threshold threshold2 +end +timenow = time23 +threshold threshold3 +end +timenow = time24 +threshold threshold4 +end* +h3 > hUp3 +hUp3 0 +telegram полив#выключен 1 +end +h3 < hLow3 +hUp3 1 +telegram полив#включен 1 +end* +timenow = time41 +btn41 1 +btn42 0 +end +timenow = time42 +btn41 0 +btn42 1 +end* +btn51 = 1 +btn52 1 +btn53 1 +btn54 1 +pwm51 200 +pwm52 800 +txt5 включено +end +btn51 = 0 +btn52 0 +btn53 0 +btn54 0 +pwm51 800 +pwm52 200 +txt5 выключено +end* +button = 1 +count input +end +count = 0 +button 0 +end* +sensor = 1 +text обнаружено +time %date% +telegram text обнаружено#движение 1 +end +reset = 1 +text не#обнаружено +time %date% +reset 0 +end* +sensor = 1 +light 1 +count period +end +count = 0 +light 0 +end* +switch = 1 +light change +end* \ No newline at end of file diff --git a/data/set.device.json.gz b/data/set.device.json.gz index 1a011335e6942d00fade3951557ccf17417ab83b..c0686cbfcac8b920c6914e072b8e89f3fe6d34e6 100644 GIT binary patch delta 2603 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 NUjYL4(k@{v005i$`IZ0x delta 2603 zcmV+`3e@$r6}1%xABzYGrNWU0B!4N+hLWX-A_PbjQ4RT9dj*nY`o91WqZ114qi9(lUkouLp6)^U(BiSWxjf3JP^uIU4IY>r88u= zEL(*FNFpaCah*&6!Iu1Z9AZgb0Zz6F|FKecC>ZfuzU?WweUZK%XCC=^uF6aCyR`+j8>n`)NU*ksF}v4v*!)8@$6~>(|C{di}Tj+xZM~(*`x4-;+QBDu1m6q?Hj# zOUwN!i7sXX7XFi4$v(jHf>>k? zA(B5cF0nb36@((_KNF1)7!2?M9-n4mTl|Y`o*qAkbN+=0B2NS&PjsPl9=96ET*Bl4 zQy|m0MHQMjdeXn!soVf%2yUM4KoQP2Th`lDzPIIGdGnzUU#F zl`;01H8_J=_y9Ffl}MfEO8Hm)3ljT43@-_wK8ABxC3~dDs(uV$$T-s|rx#9bwd|cH zc~`f|p=d3FxF_r_T)cx7+Rz4}UK{7TGmj{V(R+A;_`>$LRQ0chOR+{)^Es2C12zUJ z?uZgI?9f`1#5Pza7iBM4^QcTLaAPH{#jGS|h z2w&^U9v~*ha*Bo@B+AiqJWpfj3i4SKVoHIR= z6x{qdH3ChPM*>!FIh;U|$4Jb8B<*yRD5<1^RH1;U-(hvo>^(j#3JxL{aDkNoWGYL} z!{RxRq<@B40hAPl$qY|?B+*A+FIH5?8<&c3B!TFOPHGC$4K9BYk4lxi9YNv=*|3Tv zF~pIFs5N}*qNJz=38el_!o$*ty(65?qs_F_-$(SGd6a;xX(38lQ_^yUBbJ8j+C~R! zB{ZJa)&op5|CYAoYTv$otdrZ>U({GAe`8~TW`97X<^0cWEA}`VjMgPZQ}LWwHbro( z0WYdg@fuAO4Is$2^^I*(S%TFa^82et<5MxD5Cwi%bWEeh~O2_8%;8} zi=vBvi2_fPtSf*lu>5FZrGgd(xGZp+#8B5Km-LE+nepcXH6c2XJ3+$`kR(6unIsrL z(SPbU0hvUc|Hc8Ma88T<;ZB=P+mWY$+;ZNZ@sQi$(p?P~jAmCvVYyQD5_h^8HiG`k zp9z2u>T#}bA03CvHytDkoDNGDkz`*Lv?=}tB-PG>a~(+;8{QyaMB9heqG7o=gbt|P zZYZg7uk)j@S=0aqgqjGmH9D!QAxao>g@2tO6hN?nQ&GfPBRZHDz4^Pv7_&cIP!=P9 zz5->#jSkBt(C0-DFFJngZ`!*3SSlF#P%7u192mn7^?@Z<(sIYM*6F^OmAtaiXMrEW z{g#E!`6InqO!Y`@H-@iTVxaxtOm|Apd!n-<6x;ws%pvr5; z=8|Q(aOO&gEn6`O)BEAf-l}-Z3l)>7EniUuoKzgfN{&`ow=BK^Zj0r$lX^~DCQX9s z5^POk#pKyvkNKz&Lb@1&QUJq7!+-cqHZ%MTd~IGoDUsE$TUJ(`qHfBbWrN|{rzgdA z*77{7%%_&EUt55ehxks>a@H-&8fxx1%-I2ntmWi2CnF{8(~@f$dR|(xWix&zCB7s( zYF@9n87XC-hBBrje3+!dsn(mw z*Jjs4d-<5XWKY>G_K4kwlJt!P|J`D@*+aN|#a^t9XV=Fh7*k$Gf!asD4Q#V0+c!kw z{@9V_2gviKRczL<5c6kR4Sz~+BSQDLFs3ePAvmZOSR);A9DcclHr9AT_clpYH0$*Te>qj))k}|~Yo^=#m^$|%2iELog{5o=E zY+$0QR^g7(UnmxI5OYZOL!vQg`6Fe&lBO3+UM7_WHypMf>~l~Ia(_&sK%kqt_v-`T z$VoHQI(DA$yxkRV2pmti< z+Gm32L;KjPZzQ6)EPu+9J}}X97sev^Dj@JT`f4a(k1