From 542cf86941aac5a76abe1f5b042390285bfd3d02 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 11 Aug 2022 15:56:57 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BA=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/classes/IoTItem.cpp | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp index e36a6b50..31946aa5 100644 --- a/src/classes/IoTItem.cpp +++ b/src/classes/IoTItem.cpp @@ -68,6 +68,15 @@ void IoTItem::setValue(String valStr) { setValue(value); } +void IoTItem::setValue(IoTValue Value) { + value = Value; + if (value.isDecimal) + regEvent(value.valD, ""); + else + regEvent(value.valS, ""); +} + +//когда событие случилось void IoTItem::regEvent(String value, String consoleInfo = "") { generateEvent(_id, value); publishStatusMqtt(_id, value); @@ -103,22 +112,6 @@ void IoTItem::doByInterval() {} IoTValue IoTItem::execute(String command, std::vector& param) { return {}; } -IoTGpio* IoTItem::getGpioDriver() { - return nullptr; -} - -iarduino_RTC_BASE* IoTItem::getRtcDriver() { - return nullptr; -} - -void IoTItem::setValue(IoTValue Value) { - value = Value; - if (value.isDecimal) - regEvent(value.valD, ""); - else - regEvent(value.valS, ""); -} - //==========================всякая херня============================================================================================== //захрена эта хрень? // String IoTItem::getSubtype() { @@ -133,6 +126,16 @@ void IoTItem::setInterval(unsigned long interval) { _interval = interval; } +IoTGpio* IoTItem::getGpioDriver() { + return nullptr; +} + +iarduino_RTC_BASE* IoTItem::getRtcDriver() { + return nullptr; +} + +//сетевое общение==================================================================================================================================== + externalVariable::externalVariable(String parameters) : IoTItem(parameters) { prevMillis = millis(); // запоминаем текущее значение таймера для выполения doByInterval после int сек iAmLocal = false; // указываем, что это сущность прилетела из сети