iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-31 04:19:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

баг аналогового сенсора исправлен

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-12-20 17:44:40 +01:00
parent 1df87f8986
commit c5772f8451
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/items/items.txt
View File

@@ -6,7 +6,7 @@
6;0;inoutput;id;inputDigit;Ввод;Введите#цифру;order 6;0;inoutput;id;inputDigit;Ввод;Введите#цифру;order
7;0;inoutput;id;inputTime;Ввод;Введите#время;order 7;0;inoutput;id;inputTime;Ввод;Введите#время;order
8;0;inoutput;id;anydata;Вывод;Сигнализация;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] 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] 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] 12;0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;pin[2];type[dht11];c[1]

24
src/main.cpp
View File

@@ -1,28 +1,30 @@
#include <SSDP.h> #include <SSDP.h>
#include "BufferExecute.h" #include "BufferExecute.h"
#include "Bus.h" #include "Bus.h"
#include "Class/CallBackTest.h" #include "Class/CallBackTest.h"
#include "Class/NotAsync.h" #include "Class/NotAsync.h"
#include "Class/ScenarioClass3.h" #include "Class/ScenarioClass3.h"
#include "Cmd.h" #include "Cmd.h"
#include "FileSystem.h"
#include "Global.h" #include "Global.h"
#include "Init.h" #include "Init.h"
#include "ItemsList.h" #include "ItemsList.h"
#include "RemoteOrdersUdp.h" #include "RemoteOrdersUdp.h"
#include "SoftUART.h"
#include "Telegram.h"
#include "Tests.h"
#include "Utils/StatUtils.h" #include "Utils/StatUtils.h"
#include "Utils/Timings.h" #include "Utils/Timings.h"
#include "Utils/WebUtils.h" #include "Utils/WebUtils.h"
#include "items/ButtonInClass.h" #include "items/ButtonInClass.h"
#include "items/vLogging.h"
#include "items/vImpulsOut.h"
#include "items/vSensorDallas.h"
#include "items/vCountDown.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 "items/vSensorUltrasonic.h"
#include "Telegram.h"
#include "SoftUART.h"
#include "FileSystem.h"
#include "Tests.h"
void not_async_actions(); void not_async_actions();
@@ -75,9 +77,6 @@ void setup() {
initialized = true; initialized = true;
} }
void loop() { void loop() {
if (!initialized) { if (!initialized) {
return; return;
@@ -130,4 +129,9 @@ void loop() {
myCountDown->at(i).loop(); myCountDown->at(i).loop();
} }
} }
if (mySensorAnalog != nullptr) {
for (unsigned int i = 0; i < mySensorAnalog->size(); i++) {
mySensorAnalog->at(i).loop();
}
}
} }