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 a55eb128..07a38015 100644 Binary files a/data_esp/set.device.json.gz and b/data_esp/set.device.json.gz differ 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;