From 5c664594af5de265fa9713d19a31eef68cbb5bc2 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 22 Dec 2020 12:38:05 +0100 Subject: [PATCH] in progress not working version!!! --- data/items/items.txt | 50 ++++---- data/set.device.json.gz | Bin 2770 -> 2681 bytes data_ungzip/set.device.json | 45 +++---- data_ungzip/set.device.json.gz | Bin 2770 -> 0 bytes include/Global.h | 3 +- include/ItemsList.h | 2 +- include/items/vSensorDht.h | 46 ++----- include/main.h | 3 - src/BufferExecute.cpp | 4 +- src/Global.cpp | 3 +- src/Init.cpp | 3 +- src/ItemsList.cpp | 33 ++--- src/Web.cpp | 2 +- src/items/vSensorDht.cpp | 216 +++++++++++++-------------------- src/main.cpp | 12 +- 15 files changed, 171 insertions(+), 251 deletions(-) delete mode 100644 data_ungzip/set.device.json.gz delete mode 100644 include/main.h diff --git a/data/items/items.txt b/data/items/items.txt index 19622ab8..f9d180b4 100644 --- a/data/items/items.txt +++ b/data/items/items.txt @@ -1,27 +1,27 @@ -1;0;button-out;id;toggle;Кнопки;Освещение;order;gpio -2;0;button-out;id;toggle;Кнопки;Освещение;order;gpio;inv[1] -3;0;button-out;id;toggle;Кнопки;Освещение;order -4;0;button-in;id;toggle;Кнопки;Освещение;order;gpio;db[20] -5;0;pwm-out;id;range;Ползунки;Яркость;order;gpio -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;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-temp;id;anydataTemp;Сенсоры;Температура;order;pin[2];type[dht11];c[1];int[10] -13;0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;pin[2];type[dht11];c[1];int[10] -14;0;dht-temp;id;anydataTemp;Сенсоры;Температура;order;pin[2];type[dht22];c[1];int[10] -15;0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;pin[2];type[dht22];c[1];int[10] -16;0;bme280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1] -17;0;bme280-hum;id;anydataHum;Сенсоры;Влажность;order;addr[0x76];c[1] -18;0;bme280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1] -19;0;bmp280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1] -20;0;bmp280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1] -21;0;impuls-out;id;na;na;na;order;gpio -22;0;count-down;id;anydata;Таймер;Обратный#отчет;order -23;0;inoutput;id;anydata;Вывод;Вывод#uart;order -24;0;logging;id;chart;Графики;История;order;val[any];int[60];cnt[100] -25;0;uptime;id;anydataTime;Системные;%name%#uptime;order +0;button-out;id;toggle;Кнопки;Освещение;order;gpio* +0;button-out;id;toggle;Кнопки;Освещение;order;gpio;inv[1]* +0;button-out;id;toggle;Кнопки;Освещение;order* +0;button-in;id;toggle;Кнопки;Освещение;order;gpio;db[20]* +0;pwm-out;id;range;Ползунки;Яркость;order;gpio* +0;inoutput;id;inputDigit;Ввод;Введите#цифру;order* +0;inoutput;id;inputTime;Ввод;Введите#время;order* +0;inoutput;id;anydata;Вывод;Сигнализация;order* +0;analog-adc;id;fillgauge;Сенсоры;Аналоговый;order;pin[0];map[0,1024,0,100];c[1];int[10]* +0;dallas-temp;id;anydataTemp;Сенсоры;Температура;order;pin[2];index[0];int[10]* +0;ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[0,500,0,100];c[1];int[10]* +0;dht-temp;id;anydataTemp;Сенсоры;Температура;order;pin[2];type[dht11];c[1];int[10] +0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;pin[2];type[dht11];c[1];int[10]* +0;dht-temp;id;anydataTemp;Сенсоры;Температура;order;pin[2];type[dht22];c[1];int[10] +0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;pin[2];type[dht22];c[1];int[10]* +0;bme280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1] +0;bme280-hum;id;anydataHum;Сенсоры;Влажность;order;addr[0x76];c[1] +0;bme280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1]* +0;bmp280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1] +0;bmp280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1]* +0;impuls-out;id;na;na;na;order;gpio* +0;count-down;id;anydata;Таймер;Обратный#отчет;order* +0;inoutput;id;anydata;Вывод;Вывод#uart;order* +0;logging;id;chart;Графики;История;order;val[any];int[60];cnt[100]* +0;uptime;id;anydataTime;Системные;%name%#uptime;order* diff --git a/data/set.device.json.gz b/data/set.device.json.gz index ab29128af32f371342a7642eb7b2fb90aee70eca..e769d3e93a9f7ac1c0894c6a61f5ed060d48393a 100644 GIT binary patch literal 2681 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 YZzQW7d(4MN7B4#c4R`m9P%kY20QtaSfdBvi diff --git a/data_ungzip/set.device.json b/data_ungzip/set.device.json index fcba5100..47d120a8 100644 --- a/data_ungzip/set.device.json +++ b/data_ungzip/set.device.json @@ -78,31 +78,26 @@ "style": "display:inline", "title": { "#": "Выберите элемент из списка", - "/set?addItem=1-btn": "1.Кнопка управляющая пином", - "/set?addItem=2-btn": "2.Кнопка управляющая пином (с инверсией)", - "/set?addItem=3-btn": "3.Кнопка виртуальная (не привязанная к пину, для использования в сценариях)", - "/set?addItem=4-btn": "4.Кнопка физическая, чтение состояния пина (подключается провдами к устройству)", - "/set?addItem=5-pwm": "5.Широтно импульсная модуляция pwm", - "/set?addItem=6-dgt": "6.Окно ввода цифровых значений", - "/set?addItem=7-tm": "7.Окно ввода времени", - "/set?addItem=8-txt": "8.Окно вывода любого текста, предупреждения, цифры", - "/set?addItem=9-adc": "9.Датчик аналоговый, чтение аналогового входа", - "/set?addItem=10-tmp": "10.Датчик температуры ds18b20", - "/set?addItem=11-rng": "11.Датчик расстояния ультрозвуковой JSN-SR04T, HC-SR04, HY-SRF05", - "/set?addItem=12-tmp": "12.Датчик температуры DHT11", - "/set?addItem=13-hmd": "13.Датчик влажности DHT11", - "/set?addItem=14-tmp": "14.Датчик температуры DHT22, DHT33, DHT44, AM2302, RHT03", - "/set?addItem=15-hmd": "15.Датчик влажности DHT22, DHT33, DHT44, AM2302, RHT03", - "/set?addItem=16-tmp": "16.Датчик температуры bme280", - "/set?addItem=17-hmd": "17.Датчик влажности bme280", - "/set?addItem=18-ps": "18.Датчик давления bme280", - "/set?addItem=19-tmp": "19.Датчик температуры bmp280", - "/set?addItem=20-ps": "20.Датчик давления bmp280", - "/set?addItem=21-ips": "21.Создать импульсы через заданный промежуток времени (управление шд)", - "/set?addItem=22-cnt": "22.Таймер обратного отчета", - "/set?addItem=23-txt": "23.Виджет для отображения информации полученной из uart, get-запроса, или по udp", - "/set?addItem=24-log": "24.Логгирование и вывод в график любой величины", - "/set?addItem=25-ut": "25.Отобразить время работы устройства" + "/set?addItem=1": "1.Кнопка управляющая пином", + "/set?addItem=2": "2.Кнопка управляющая пином (с инверсией)", + "/set?addItem=3": "3.Кнопка виртуальная (не привязанная к пину, для использования в сценариях)", + "/set?addItem=4": "4.Кнопка физическая, чтение состояния пина (подключается провдами к устройству)", + "/set?addItem=5": "5.Широтно импульсная модуляция pwm", + "/set?addItem=6": "6.Окно ввода цифровых значений", + "/set?addItem=7": "7.Окно ввода времени", + "/set?addItem=8": "8.Окно вывода любого текста, предупреждения, цифры", + "/set?addItem=9": "9.Датчик аналоговый, чтение аналогового входа", + "/set?addItem=10": "10.Датчик температуры ds18b20", + "/set?addItem=11": "11.Датчик расстояния ультрозвуковой JSN-SR04T, HC-SR04, HY-SRF05", + "/set?addItem=12": "12.Датчик температуры и влажности DHT11", + "/set?addItem=13": "13.Датчик температуры и влажности DHT22, DHT33, DHT44, AM2302, RHT03", + "/set?addItem=14": "14.Датчик температуры, влажности и давления bme280", + "/set?addItem=15": "15.Датчик температуры и давления bmp280", + "/set?addItem=16": "16.Создать импульсы через заданный промежуток времени (управление шд)", + "/set?addItem=17": "17.Таймер обратного отчета", + "/set?addItem=18": "18.Виджет для отображения информации полученной из uart, get-запроса, или по udp", + "/set?addItem=19": "19.Логгирование и вывод в график любой величины", + "/set?addItem=20": "20.Отобразить время работы устройства" } }, { diff --git a/data_ungzip/set.device.json.gz b/data_ungzip/set.device.json.gz deleted file mode 100644 index ab29128af32f371342a7642eb7b2fb90aee70eca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2770 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 YZzQW7d(4MN7B4#c4R`m9P%kY20QtaSfdBvi diff --git a/include/Global.h b/include/Global.h index db71e643..d018a37d 100644 --- a/include/Global.h +++ b/include/Global.h @@ -88,8 +88,7 @@ extern int countDown_EnterCounter; extern String logging_KeyList; extern int logging_EnterCounter; //========================================= -extern int dhtTmp_EnterCounter; -extern int dhtHum_EnterCounter; +extern int dht_EnterCounter; //========================================= // Sensors diff --git a/include/ItemsList.h b/include/ItemsList.h index 2961d9e1..573ad33a 100644 --- a/include/ItemsList.h +++ b/include/ItemsList.h @@ -4,7 +4,7 @@ #include "Global.h" extern void itemsListInit(); -extern void addItem2(String param); +extern void addItem2(int num); extern void addItem(String name); extern void addPreset(String name); extern void addPreset2(int num); diff --git a/include/items/vSensorDht.h b/include/items/vSensorDht.h index 744af653..c95992b3 100644 --- a/include/items/vSensorDht.h +++ b/include/items/vSensorDht.h @@ -1,6 +1,7 @@ #pragma once #include #include + #include "Global.h" #include "GyverFilters.h" @@ -10,51 +11,30 @@ class SensorDht; typedef std::vector MySensorDhtVector; -struct tmpParams { - unsigned long currentMillis; - unsigned long prevMillis; - unsigned long difference; - unsigned long interval; +struct params { + String type; + String value; String key; - unsigned int pin; - int map1; - int map2; - int map3; - int map4; - float c; -}; - -struct humParams { - unsigned long currentMillis; - unsigned long prevMillis; - unsigned long difference; unsigned long interval; - String key; unsigned int pin; - int map1; - int map2; - int map3; - int map4; float c; }; class SensorDht { public: - SensorDht(); + SensorDht(const params& paramsTmp, const params& paramsHum); ~SensorDht(); - void loopTmp(); - void loopHum(); - - void readTmp(); - void readHum(); - - void tmpInit(const tmpParams& tmpSet); - void humInit(const humParams& humSet); + void loop(); + void readTmpHum(); private: - tmpParams _tmpSet; - humParams _humSet; + params _paramsTmp; + params _paramsHum; + + unsigned long currentMillis; + unsigned long prevMillis; + unsigned long difference; }; extern MySensorDhtVector* mySensorDht; diff --git a/include/main.h b/include/main.h deleted file mode 100644 index 0d48dfc5..00000000 --- a/include/main.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -//void myCallback; \ No newline at end of file diff --git a/src/BufferExecute.cpp b/src/BufferExecute.cpp index 7d1c88ef..11cd2a00 100644 --- a/src/BufferExecute.cpp +++ b/src/BufferExecute.cpp @@ -75,10 +75,10 @@ void csvCmdExecute(String& cmdStr) { } #ifdef SensorDhtEnabled else if (order == F("dht-temp")) { - sCmd.addCommand(order.c_str(), dhtTmp); + //sCmd.addCommand(order.c_str(), dhtTmp); } else if (order == F("dht-hum")) { - sCmd.addCommand(order.c_str(), dhtHum); + //sCmd.addCommand(order.c_str(), dhtHum); } #endif #ifdef SensorBme280Enabled diff --git a/src/Global.cpp b/src/Global.cpp index 0e98c22a..39853d25 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -59,8 +59,7 @@ int countDown_EnterCounter = -1; String logging_KeyList = ""; int logging_EnterCounter = -1; //========================================= -int dhtTmp_EnterCounter = -1; -int dhtHum_EnterCounter = -1; +int dht_EnterCounter = -1; //========================================= // Sensors diff --git a/src/Init.cpp b/src/Init.cpp index 983dbc40..195464d1 100644 --- a/src/Init.cpp +++ b/src/Init.cpp @@ -92,8 +92,7 @@ void deviceInit() { countDown_KeyList = ""; countDown_EnterCounter = -1; //=================================== - dhtTmp_EnterCounter = -1; - dhtHum_EnterCounter = -1; + dht_EnterCounter = -1; //========================================= #ifdef LAYOUT_IN_RAM diff --git a/src/ItemsList.cpp b/src/ItemsList.cpp index aa046e99..2f810729 100644 --- a/src/ItemsList.cpp +++ b/src/ItemsList.cpp @@ -23,40 +23,43 @@ void itemsListInit() { SerialPrint("I", F("Items"), F("Items Init")); } -void addItem2(String param) { - int num = selectToMarker(param, "-").toInt(); +void addItem2(int num) { File configFile = FileFS.open("/items/items.txt", "r"); if (!configFile) { return; } configFile.seek(0, SeekSet); String seachingLine; - + int i = 0; while (configFile.position() != configFile.size()) { - String item = configFile.readStringUntil('\n'); - int tmpNum = selectToMarker(item, ";").toInt(); - if (tmpNum == num) { - seachingLine = item; + i++; + String item = configFile.readStringUntil('*'); + if (i == num) { + if (i == 1) { + seachingLine = "\n" + item; + } else { + seachingLine = item; + } break; } } configFile.close(); - String name = deleteBeforeDelimiter(param, "-"); + //while (seachingLine.length()) { + //String tmp = selectToMarker(seachingLine, "\n"); + randomSeed(micros()); unsigned int rnd = random(0, 1000); - seachingLine.replace("id", name + String(rnd)); + seachingLine.replace("id", String(rnd)); seachingLine.replace("order", String(getNewElementNumber("order.txt"))); - if (seachingLine.indexOf("gpio") != -1) { seachingLine.replace("gpio", "pin[" + String(getFreePinAll()) + "]"); } + + //seachingLine = deleteBeforeDelimiter(seachingLine, ","); + //} - seachingLine = deleteBeforeDelimiter(seachingLine, ";"); - seachingLine.replace("\r\n", ""); - seachingLine.replace("\r", ""); - seachingLine.replace("\n", ""); - addFile(DEVICE_CONFIG_FILE, "\n" + seachingLine); + addFile(DEVICE_CONFIG_FILE, seachingLine); Serial.println(seachingLine); } diff --git a/src/Web.cpp b/src/Web.cpp index a6cf2b84..b01713ce 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -20,7 +20,7 @@ void web_init() { server.on("/set", HTTP_GET, [](AsyncWebServerRequest* request) { //==============================set.device.json==================================================================================================== if (request->hasArg(F("addItem"))) { - addItem2(request->getParam("addItem")->value()); + addItem2(request->getParam("addItem")->value().toInt()); request->redirect("/?set.device"); } diff --git a/src/items/vSensorDht.cpp b/src/items/vSensorDht.cpp index 44920100..70fc3328 100644 --- a/src/items/vSensorDht.cpp +++ b/src/items/vSensorDht.cpp @@ -8,156 +8,104 @@ DHTesp* dht = nullptr; -SensorDht::SensorDht() {} +SensorDht::SensorDht(const params& paramsTmp, const params& paramsHum) { + _paramsTmp = params(paramsTmp); + _paramsHum = params(paramsHum); + + if (!dht) { + dht = new DHTesp(); + } + + dht->setup(_paramsTmp.pin, DHTesp::DHT11); + + //dht->getMinimumSamplingPeriod() +} SensorDht::~SensorDht() {} -void SensorDht::tmpInit(const tmpParams& tmpSet) { - _tmpSet = tmpParams(tmpSet); - if (!dht) { - dht = new DHTesp(); - } - dht->setup(_tmpSet.pin, DHTesp::DHT11); - _tmpSet.interval = dht->getMinimumSamplingPeriod() + _tmpSet.interval; -} - -void SensorDht::humInit(const humParams& humSet) { - _humSet = humParams(humSet); - if (!dht) { - dht = new DHTesp(); - } - dht->setup(_tmpSet.pin, DHTesp::DHT11); - _tmpSet.interval = dht->getMinimumSamplingPeriod() + _tmpSet.interval; -} - -void SensorDht::loopTmp() { - _tmpSet.currentMillis = millis(); - _tmpSet.difference = _tmpSet.currentMillis - _tmpSet.prevMillis; - if (_tmpSet.difference >= _tmpSet.interval) { - _tmpSet.prevMillis = millis(); - readTmp(); - } -} - -void SensorDht::loopHum() { - _humSet.currentMillis = millis(); - _humSet.difference = _humSet.currentMillis - _humSet.prevMillis; - if (_humSet.difference >= _humSet.interval) { - _humSet.prevMillis = millis(); - readHum(); - } -} - -void SensorDht::readTmp() { - float value; - static int counter; - //if (dht->getStatus() != 0 && counter < 5) { - // counter++; - // SerialPrint("E", "Sensor", "Disconnected " + String(counter) + " " + dht->getStatusString()); - //} else { - counter = 0; - value = dht->getTemperature(); - if (String(value) != "nan") { - //value = map(value, _tmpSet.map1, _tmpSet.map2, _tmpSet.map3, _tmpSet.map4); - value = value * _tmpSet.c; - eventGen2(_tmpSet.key, String(value)); - jsonWriteStr(configLiveJson, _tmpSet.key, String(value)); - publishStatus(_tmpSet.key, String(value)); - SerialPrint("I", "Sensor", "'" + _tmpSet.key + "' data: " + String(value)); - } else { - SerialPrint("E", "Sensor", "'" + _tmpSet.key + "' data: " + String(value)); - } +void SensorDht::loop() { + //currentMillis = millis(); + //difference = currentMillis - prevMillis; + //if (difference >= _myParams.interval) { + // prevMillis = millis(); + // readTmpHum(); //} } -void SensorDht::readHum() { - float value; - static int counter; - //if (dht->getStatus() != 0 && counter < 5) { - // counter++; - // SerialPrint("E", "Sensor", "Disconnected " + String(counter) + " " + dht->getStatusString()); +void SensorDht::readTmpHum() { + //float tmp; + //float hum; + //tmp = dht->getTemperature(); + //hum = dht->getHumidity(); + // + //if (String(tmp) != "nan" && String(hum) != "nan") { + // if (_myParams.type == "tmp") { + // } + // + // if (_myParams.type == "hum") { + // } + // + // tmp = tmp * _tmpSet.c; + // hum = hum * _humSet.c; + // + // if (_tmpSet.interval > 0) { + // eventGen2(_tmpSet.key, String(tmp)); + // jsonWriteStr(configLiveJson, _tmpSet.key, String(tmp)); + // publishStatus(_tmpSet.key, String(tmp)); + // SerialPrint("I", "Sensor", "'" + _tmpSet.key + "' data: " + String(tmp)); + // } + // + // if (_humSet.interval > 0) { + // eventGen2(_humSet.key, String(hum)); + // jsonWriteStr(configLiveJson, _humSet.key, String(hum)); + // publishStatus(_humSet.key, String(hum)); + // SerialPrint("I", "Sensor", "'" + _humSet.key + "' data: " + String(hum)); + // } + // //} else { - counter = 0; - value = dht->getHumidity(); - if (String(value) != "nan") { - //value = map(value, _humSet.map1, _humSet.map2, _humSet.map3, _humSet.map4); - value = value * _humSet.c; - eventGen2(_humSet.key, String(value)); - jsonWriteStr(configLiveJson, _humSet.key, String(value)); - publishStatus(_humSet.key, String(value)); - SerialPrint("I", "Sensor", "'" + _humSet.key + "' data: " + String(value)); - } else { - SerialPrint("E", "Sensor", "'" + _humSet.key + "' data: " + String(value)); - } + // SerialPrint("E", "Sensor DHT", "Error"); //} } +//if (dht->getStatus() != 0 && counter < 5) { +// counter++; +// SerialPrint("E", "Sensor", "Disconnected " + String(counter) + " " + dht->getStatusString()); +//} else { + MySensorDhtVector* mySensorDht = nullptr; -void dhtTmp() { +void dhtSensor() { myLineParsing.update(); + String type = myLineParsing.gtype(); + String value = myLineParsing.gval(); String interval = myLineParsing.gint(); String pin = myLineParsing.gpin(); String key = myLineParsing.gkey(); - String map = myLineParsing.gmap(); String c = myLineParsing.gc(); myLineParsing.clear(); - - int map1 = selectFromMarkerToMarker(map, ",", 0).toInt(); - int map2 = selectFromMarkerToMarker(map, ",", 1).toInt(); - int map3 = selectFromMarkerToMarker(map, ",", 2).toInt(); - int map4 = selectFromMarkerToMarker(map, ",", 3).toInt(); - - tmpParams buf; - - buf.interval = interval.toInt() * 1000; - buf.key = key; - buf.pin = pin.toInt(); - buf.map1 = map1; - buf.map2 = map2; - buf.map3 = map3; - buf.map4 = map4; - buf.c = c.toFloat(); - - dhtTmp_EnterCounter++; - - static bool firstTime = true; - if (firstTime) mySensorDht = new MySensorDhtVector(); - firstTime = false; - mySensorDht->push_back(SensorDht()); - mySensorDht->at(dhtTmp_EnterCounter).tmpInit(buf); -} - -void dhtHum() { - myLineParsing.update(); - String interval = myLineParsing.gint(); - String pin = myLineParsing.gpin(); - String key = myLineParsing.gkey(); - String map = myLineParsing.gmap(); - String c = myLineParsing.gc(); - myLineParsing.clear(); - - int map1 = selectFromMarkerToMarker(map, ",", 0).toInt(); - int map2 = selectFromMarkerToMarker(map, ",", 1).toInt(); - int map3 = selectFromMarkerToMarker(map, ",", 2).toInt(); - int map4 = selectFromMarkerToMarker(map, ",", 3).toInt(); - - humParams buf; - - buf.interval = interval.toInt() * 1000; - buf.key = key; - buf.pin = pin.toInt(); - buf.map1 = map1; - buf.map2 = map2; - buf.map3 = map3; - buf.map4 = map4; - buf.c = c.toFloat(); - - dhtHum_EnterCounter++; - - static bool firstTime = true; - if (firstTime) mySensorDht = new MySensorDhtVector(); - firstTime = false; - mySensorDht->push_back(SensorDht()); - mySensorDht->at(dhtHum_EnterCounter).humInit(buf); + static params paramsTmp; + static params paramsHum; + if (value = "tmp") { + paramsTmp.type = type; + paramsTmp.value = value; + paramsTmp.key = key; + paramsTmp.interval = interval.toInt() * 1000; + paramsTmp.pin = pin.toInt(); + paramsTmp.c = c.toFloat(); + } + if (value = "hum") { + paramsHum.type = type; + paramsHum.value = value; + paramsHum.key = key; + paramsHum.interval = interval.toInt() * 1000; + paramsHum.pin = pin.toInt(); + paramsHum.c = c.toFloat(); + } + dht_EnterCounter++; + if (dht_EnterCounter == 2) { + static bool firstTime = true; + if (firstTime) mySensorDht = new MySensorDhtVector(); + firstTime = false; + mySensorDht->push_back(SensorDht(paramsTmp, paramsHum)); + } } diff --git a/src/main.cpp b/src/main.cpp index b9981f51..350eca5c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -135,10 +135,10 @@ void loop() { mySensorAnalog->at(i).loop(); } } - if (mySensorDht != nullptr) { - for (unsigned int i = 0; i < mySensorDht->size(); i++) { - mySensorDht->at(i).loopTmp(); - mySensorDht->at(i).loopHum(); - } - } + //if (mySensorDht != nullptr) { + // for (unsigned int i = 0; i < mySensorDht->size(); i++) { + // mySensorDht->at(i).loopTmp(); + // mySensorDht->at(i).loopHum(); + // } + //} } \ No newline at end of file