diff --git a/data/items/items.txt b/data/items/items.txt index 3ff53afd..9e6be090 100644 --- a/data/items/items.txt +++ b/data/items/items.txt @@ -6,7 +6,7 @@ 6;0;inoutput;id;inputDigit;Ввод;Введите#цифру;order 7;0;inoutput;id;inputTime;Ввод;Введите#время;order 8;0;inoutput;id;anydata;Вывод;Сигнализация;order -9;0;analog-adc;id;fillgauge;Сенсоры;Аналоговый;order;gpio;map[0,1024,0,100];c[1] +9;0;analog-adc;id;fillgauge;Сенсоры;Аналоговый;order;pin[0];map[0,1024,0,100];c[1];int[10] 10;0;dallas-temp;id;anydataTemp;Сенсоры;Температура;order;pin[2];index[0];int[10] 11;0;ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[0,500,0,100];c[1];int[10] 12;0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;pin[2];type[dht11];c[1] diff --git a/src/main.cpp b/src/main.cpp index c4113bbb..d4673839 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,28 +1,30 @@ #include + #include "BufferExecute.h" #include "Bus.h" #include "Class/CallBackTest.h" #include "Class/NotAsync.h" #include "Class/ScenarioClass3.h" #include "Cmd.h" +#include "FileSystem.h" #include "Global.h" #include "Init.h" #include "ItemsList.h" #include "RemoteOrdersUdp.h" +#include "SoftUART.h" +#include "Telegram.h" +#include "Tests.h" #include "Utils/StatUtils.h" #include "Utils/Timings.h" #include "Utils/WebUtils.h" #include "items/ButtonInClass.h" -#include "items/vLogging.h" -#include "items/vImpulsOut.h" -#include "items/vSensorDallas.h" #include "items/vCountDown.h" +#include "items/vImpulsOut.h" +#include "items/vLogging.h" +#include "items/vSensorAnalog.h" +#include "items/vSensorDallas.h" #include "items/vSensorUltrasonic.h" -#include "Telegram.h" -#include "SoftUART.h" -#include "FileSystem.h" -#include "Tests.h" void not_async_actions(); @@ -47,7 +49,7 @@ void setup() { #endif clockInit(); timeInit(); - sensorsInit(); //Will be remooved + sensorsInit(); //Will be remooved itemsListInit(); espInit(); routerConnect(); @@ -69,15 +71,12 @@ void setup() { #endif getFSInfo(); - testsPerform(); + testsPerform(); just_load = false; initialized = true; } - - - void loop() { if (!initialized) { return; @@ -130,4 +129,9 @@ void loop() { myCountDown->at(i).loop(); } } + if (mySensorAnalog != nullptr) { + for (unsigned int i = 0; i < mySensorAnalog->size(); i++) { + mySensorAnalog->at(i).loop(); + } + } } \ No newline at end of file