From 5a9ee8ac6eeca2e0be71b69b6417e4e80071058a Mon Sep 17 00:00:00 2001 From: biver Date: Thu, 22 Dec 2022 22:13:35 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D0=BC=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=B5=D1=82=D1=8C=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=BF=D1=80=D0=B8=D0=B7=D0=BD=D0=B0=D0=BA=D1=83?= =?UTF-8?q?=20global=20=D1=83=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=20mqttin=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=D0=B5=D0=BC=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/classes/IoTItem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp index 702e96aa..c39ee125 100644 --- a/src/classes/IoTItem.cpp +++ b/src/classes/IoTItem.cpp @@ -106,7 +106,7 @@ void IoTItem::regEvent(const String& value, const String& consoleInfo, bool erro } // отправка события другим устройствам в сети если не было ошибки - if (jsonReadBool(settingsFlashJson, "mqttin") && _global && !error) { + if (_global && !error) { String json = "{}"; jsonWriteStr_(json, "id", _id); jsonWriteStr_(json, "val", value); From b2d4d211c7ebed7a7eed0d12287e3eaf03c6f837 Mon Sep 17 00:00:00 2001 From: biver Date: Fri, 23 Dec 2022 20:35:07 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A3=D1=82=D0=BE=D1=87=D0=BD=D1=8F=D0=B5?= =?UTF-8?q?=D0=BC,=20=D1=87=D1=82=D0=BE=20=D0=B2=20=D1=82=D0=B0=D0=B9?= =?UTF-8?q?=D0=BC=D0=B5=D1=80=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B5=20int=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D1=83=D1=8E=D1=82=D1=81=D1=8F=20=D0=BC=D0=B8=D0=BB?= =?UTF-8?q?=D0=BB=D0=B8=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/virtual/Timer/modinfo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/virtual/Timer/modinfo.json b/src/modules/virtual/Timer/modinfo.json index 7f097b29..e817b398 100644 --- a/src/modules/virtual/Timer/modinfo.json +++ b/src/modules/virtual/Timer/modinfo.json @@ -32,7 +32,7 @@ "title": "Таймер обратного отсчета", "moduleDesc": "Добавляет инструмент таймеров обратного отсчета для организации периодичных операций или логических конструкций. Часто используется как вспомогательный элемент для автоматизации.", "propInfo": { - "int": "Задает размер в секундах одного шага(тика) таймера.", + "int": "Задает размер в миллисекундах (1000 = 1сек) одного шага(тика) таймера.", "countDown": "Начальное значение таймера, с которого начинается обратный отсчет. countDown=0 - бесконечный счет (имеет смысл при ticker=1, иначе таймер будет выключен), countDown=-1 - отключает таймер совсем (используется для запуска системы с выключенным таймером)", "ticker": "Генерировать(1) или нет(0) события при каждом тике таймера.", "repeat": "Сбрасывать(1) или нет(0) таймер в начальное состояние при достижении нуля.", From 33bc338449d8ba6e387f1eec7359c78fb70c6e7d Mon Sep 17 00:00:00 2001 From: biver Date: Fri, 23 Dec 2022 20:36:16 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D1=83=D0=B5=D0=BC=20PZEMSensor=20=D0=B2=20=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src => src/modules/sensors/Pzem004t}/PZEMSensor.cpp | 0 .../include => src/modules/sensors/Pzem004t}/PZEMSensor.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {lib/PZEMSensor/src => src/modules/sensors/Pzem004t}/PZEMSensor.cpp (100%) rename {lib/PZEMSensor/include => src/modules/sensors/Pzem004t}/PZEMSensor.h (100%) diff --git a/lib/PZEMSensor/src/PZEMSensor.cpp b/src/modules/sensors/Pzem004t/PZEMSensor.cpp similarity index 100% rename from lib/PZEMSensor/src/PZEMSensor.cpp rename to src/modules/sensors/Pzem004t/PZEMSensor.cpp diff --git a/lib/PZEMSensor/include/PZEMSensor.h b/src/modules/sensors/Pzem004t/PZEMSensor.h similarity index 100% rename from lib/PZEMSensor/include/PZEMSensor.h rename to src/modules/sensors/Pzem004t/PZEMSensor.h From 51909624af5471caea6526a93cd5fe200f30a6d4 Mon Sep 17 00:00:00 2001 From: biver Date: Sat, 24 Dec 2022 13:07:09 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D1=83=D0=B5=D0=BC=20=D0=B2=D1=81=D0=B5=20=D1=83=D0=BF=D0=BE?= =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BE=20MySensors?= =?UTF-8?q?=20=D0=B2=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/Const.h | 7 ------- src/modules/exec/MySensors/MySensorsGate.h | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/Const.h b/include/Const.h index 9e571944..e80ae50e 100644 --- a/include/Const.h +++ b/include/Const.h @@ -19,13 +19,6 @@ #define FIRMWARE_NAME "esp32_4mb" #endif -#define MYSENSORS - -//#ifdef esp32_4mb_ms -//#define FIRMWARE_NAME "esp32_4mb_ms" -//#define MYSENSORS -//#endif - //Размер буфера json #define JSON_BUFFER_SIZE 2048 //держим 2 кб не меняем #define WEB_SOCKETS_FRAME_SIZE 2048 diff --git a/src/modules/exec/MySensors/MySensorsGate.h b/src/modules/exec/MySensors/MySensorsGate.h index 5cacdadc..f12a8fc8 100644 --- a/src/modules/exec/MySensors/MySensorsGate.h +++ b/src/modules/exec/MySensors/MySensorsGate.h @@ -1,5 +1,7 @@ #pragma once #include "Const.h" +#define MYSENSORS + #ifdef MYSENSORS /*