From 8984a8d1430f395031a4a80b73341d17ca9452d5 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 14 Dec 2021 23:20:14 +0100 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=B0=D1=81=D1=82=D0=BE=D0=BC=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=81=D0=B5=D0=BD=D1=81=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_esp/items/items.txt | 3 ++- data_esp/set.device.json.gz | Bin 2976 -> 3020 bytes include/{sensors => }/YourSensor.h | 0 src/{sensors => }/YourSensor.cpp | 8 ++++---- src/items/vSensorAny.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) rename include/{sensors => }/YourSensor.h (100%) rename src/{sensors => }/YourSensor.cpp (53%) diff --git a/data_esp/items/items.txt b/data_esp/items/items.txt index bdacaa1a..3cf592d9 100644 --- a/data_esp/items/items.txt +++ b/data_esp/items/items.txt @@ -33,4 +33,5 @@ 0;logging;crtid;chart3;Графики;История;order;val[any];int[23:30];cnt[100];st[0]* 0;uptime;uptid;anydataTime;Системные;%name%#uptime;order;int[60]* 0;sht20;tmpid;anydataTemp;Сенсоры;Температура;1;c[1] -0;sht20;humid;anydataHum;Сенсоры;Влажность;2;c[1];int[50]* \ No newline at end of file +0;sht20;humid;anydataHum;Сенсоры;Влажность;2;c[1];int[50]* +0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[type1]* \ No newline at end of file diff --git a/data_esp/set.device.json.gz b/data_esp/set.device.json.gz index a55eb12817a27b39c9c7e0347d955359ea9d570a..07a380155340e3ed34c49d9b8e67d920ebd5bbf5 100644 GIT binary patch delta 3019 zcmV;+3pDhg7t9w2ABzYG1sA!I2O)p9Qr>CTE`1Wx9XUn^KwMOnQjW_yVsrVwYm zGu&Uiq@@b*7fdQz>ISx+Qq+H(G3oB6(*#{s>m}V8~Jt7kUm+H3==Hw;<($lVWLjhDHwmn0UCyY{b(Ho z?`}efN8;zn`w`jS0Z?z)UkD$_Z_31x9kK=pa>^~zl(VX+oUhUkNU1XXov|8#4&1_?y5|&i71_eM6MU~ZTbYK8h<-BM~ zX~9arQPf2>y`)}@6tREjLW=msN-^>jrVUL`YwK#4P+&ovqNM1-f}uo*Cn+a2b=_!M zHxDo}*X zM~+tpr#l6o|H{6{$`JdIC*4&aPBw;QV+W~ z6?*&@_Sri=#GQXaai==axs6i`B<`{b&Me9k5bV2X1Wq`F?lTO_@O>YP}GRD^F|(M3Fy1jy^VSZ zX)`*Tj75KZQ01{G+D?^dl{(Cx8ymM^tQg?B)-1{1zWz?|`g@V7<$&(qkAhtPO4 zGVMc(7)cTHr5k$F0hVDfiw*9a&~@dlk4uCHE=#Us%B z-doF&xDPR=NQ@~zVgz~#f&U-zu!9vEPieU6OSnS$4&i130i&*Cr(5vwwU6Go8jOG$Vp_u> z<#KgXdX3v}J0TxYI66bB%yg(yZyW)5J8+pwnX|sEa+at=WP8Y;CmvsP zM0tPE51CN_I~FL19`QVi5y#CrbqsI7pJ42Wu);)ZJ>ccI&)Jb53@($DmqE%_Xgj3D zkl?2A_Bo&t9fbypWqjx;1`47_baUh>j;AYl=iu?vW62;(GECIUu2_17NXxC z2zZ3{h-O4oT;iUQ3NGA~2%Yj|8@aiiyi$KGh=vsqvakt-$~o()5?OQ=P_NRXLLsgD z5Rlh&5Ey?X1rK=<(7If!wq!wQ0;mMZZA9G5i6;nr1-a8)G(gD-((V|a!BCEE&zg9d zg$@H_4OE<~T%i)~%$L2y;v{_hsfC9?L00pGm*r?*9On*Y+Egi#?bm#Hb!>_xgfM^n zz?*O^2+{kRz5_E){rgUk=`Q4a+1fPm@)dP^hWzW0cZ!fzm*0;S1z5xh*X5Z=u{buA z@g-u6Q5aS1@O^gVNdpn9v*_lyV+oJZn9BptxP%;}?2=Okc=pDvr$OcOtw|8FUChl3 zT298E$K@n1IuVfbT})mxBxp64lfQo=OPnTm8;Lwfz-wsGj+R>(f&c_zV1f|ck%fx-R2oKVo@H)<@k{XOlJ7tZ+f8hnM_NMt;@q4PG8% z)mHdDl%6TQjJ&;>GS~X%g_Rz_q;gW~Mp7&GL@j6Kl^z4#d%s?)k`yUrCD!FMRGB6n zi;hO%|1r?szuKMfMT=(B4B;7c2qv|EQ2aut4d~Nd5=qTSOGZM7>P5lS6ge%tbmevY%n5ub zXozXKV8S7;UW7h)JZoqLH628X@Zd{tPUB}z&>^pYnE)xym;HZ?wHjJu+s-f5*W5nc z+`!ZPKF!G;d$+@ev9b%aB}dxp#98!`RTwV2*G|n+p#}ti9p2(>=vFb4K_}Ii=*VmoWXt%)%%|Ue0|NnVL!s<@9fchIJp=SpiP?_D3EtPQp05x)g?7& z_v56kVCy5#lV*QiUdEc$-fk{-yBD=|e-mR`lQ-N`9S3Wqs0e6i4rbR{uF$ZKnBpR}cmapuWljLm9O3XyS4F`YC2Rn1CT#kt!2xL{ZE)nDi0FIxz<2hUDWyeU!L3iyfXLpet@(_Ks=N=QQ55v%r11!mD4K^m{ zrjhOGVgOuH2jNG4)Ie-{q6e2P0NOh}0Q3Xi5_%zT42N!MbWa=^xnu!y?I2(tA}r)- zX9Ul&x5Jfv{mYGAdt zcL4bT`vKN+JUpNu!0(+QsW)d?x|s-vv$B;dBw>FMm=7;$%U4Ae-mEpQ8QQ0?$ZqKg zugf>&i^pSRlh4Kb#?|~yE>8c zO*K1-=gNwU>+0&i%N}T7?mur5KaaG^85YlB+u}WhZHP$_v`=Lf@Q)j$wmIg_)fZpb N{0mG8!c%%N002m)%$NWG delta 2975 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 V9`g_3>hsTS{sAly$M@4P002{ixzzvw diff --git a/include/sensors/YourSensor.h b/include/YourSensor.h similarity index 100% rename from include/sensors/YourSensor.h rename to include/YourSensor.h diff --git a/src/sensors/YourSensor.cpp b/src/YourSensor.cpp similarity index 53% rename from src/sensors/YourSensor.cpp rename to src/YourSensor.cpp index 445251ab..e88da3c1 100644 --- a/src/sensors/YourSensor.cpp +++ b/src/YourSensor.cpp @@ -1,12 +1,12 @@ -#include "sensors/YourSensor.h" +#include "YourSensor.h" float yourSensorReading(String type) { float value; - if (type == "name1") { + if (type == "type1") { value++; - } else if (type == "name2") { + } else if (type == "type2") { value--; - } else if (type == "name3") { + } else if (type == "type3") { value = value + 10; } return value; diff --git a/src/items/vSensorAny.cpp b/src/items/vSensorAny.cpp index b34a9581..280a3382 100644 --- a/src/items/vSensorAny.cpp +++ b/src/items/vSensorAny.cpp @@ -5,8 +5,8 @@ #include "BufferExecute.h" #include "Class/LineParsing.h" #include "Global.h" +#include "YourSensor.h" #include "items/vSensorAny.h" -#include "sensors/SensorYour.h" SensorAny::SensorAny(const String& paramsAny) { _paramsAny = paramsAny;