From 94c591d9d846af65ddce411b7806e1a7747ab787 Mon Sep 17 00:00:00 2001 From: DmitriyTychina Date: Fri, 8 Dec 2023 10:56:29 +0300 Subject: [PATCH 1/2] =?UTF-8?q?bugfix=20pulse()=20in=20ButtonOut=20(+?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D1=81=D0=B5=D1=82=20Blink)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/exec/ButtonOut/ButtonOut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/exec/ButtonOut/ButtonOut.cpp b/src/modules/exec/ButtonOut/ButtonOut.cpp index 65b8e42f..ab4a6116 100644 --- a/src/modules/exec/ButtonOut/ButtonOut.cpp +++ b/src/modules/exec/ButtonOut/ButtonOut.cpp @@ -53,8 +53,8 @@ class ButtonOut : public IoTItem { void setValue(const IoTValue& Value, bool genEvent = true) { value = Value; - if ((value.valD == !_inv?1:0) && (_interval != 0)) { - value.valD = !_inv?1:0; + if ((value.valD == 1) && (_interval != 0)) { + // value.valD = !_inv?1:0; enableDoByInt = true; // SerialPrint("I", "ButtonOut","single pulse start"); suspendNextDoByInt(_interval); From 0e9d8b905b7cc3af8c705fc95abfcea18c16c5d9 Mon Sep 17 00:00:00 2001 From: DmitriyTychina Date: Fri, 8 Dec 2023 12:11:58 +0300 Subject: [PATCH 2/2] bugfix web settings mqtt --- src/MqttClient.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp index c6edb6e7..727473ad 100644 --- a/src/MqttClient.cpp +++ b/src/MqttClient.cpp @@ -104,6 +104,8 @@ void getMqttData() { mqttPort = jsonReadInt(settingsFlashJson, F("mqttPort")); mqttUser = jsonReadStr(settingsFlashJson, F("mqttUser")); mqttPass = jsonReadStr(settingsFlashJson, F("mqttPass")); + mqttPrefix = jsonReadStr(settingsFlashJson, F("mqttPrefix")); + mqttRootDevice = mqttPrefix + "/" + chipId; } void mqttSubscribe() {