From f8649e3a7e190ee65812fdc5d68b36964cc800f3 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 13 Sep 2022 21:46:58 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20=D1=80=D0=B0=D1=81=D0=BF=D0=BE=D0=B7=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D1=80=D0=B8?=
 =?UTF-8?q?=D1=86=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D1=87?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B5=D0=BB.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/StringUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/StringUtils.cpp b/src/utils/StringUtils.cpp
index 8d84ea64..3e00a4e9 100644
--- a/src/utils/StringUtils.cpp
+++ b/src/utils/StringUtils.cpp
@@ -160,7 +160,7 @@ boolean isDigitDotCommaStr(const String& str) {
     for (size_t i = 0; i < str.length(); i++) {
         char latter = str.charAt(i);
         //если символ не цифра и не точка и не тире
-        if (!isDigit(latter) && latter != '.') {
+        if (!isDigit(latter) && latter != '.' && latter != '-') {
             return false;
         }
     }

From 5ef81840eb90facac326a0b0ac3b998cc217bc16 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 13 Sep 2022 22:05:24 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B8=D0=BD=D0=B0=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=BE=D1=82=D0=BB=D0=B8=D1=87=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=82=D1=83=20=D0=BE=D1=82=20=D1=87=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/StringUtils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utils/StringUtils.cpp b/src/utils/StringUtils.cpp
index 3e00a4e9..0a2b06ac 100644
--- a/src/utils/StringUtils.cpp
+++ b/src/utils/StringUtils.cpp
@@ -157,12 +157,17 @@ boolean isDigitStr(const String& str) {
 }
 
 boolean isDigitDotCommaStr(const String& str) {
+    bool dotCountWas = false;
     for (size_t i = 0; i < str.length(); i++) {
         char latter = str.charAt(i);
         //если символ не цифра и не точка и не тире
         if (!isDigit(latter) && latter != '.' && latter != '-') {
             return false;
         }
+        if (latter == '.') {    // проверяем на две точки, чтоб исключить дату
+            if (dotCountWas) return false;
+            dotCountWas = true;
+        }
     }
     return true;
 }

From b5b1e2c5cf43b56953d642e627427d9071bcaf64 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 13 Sep 2022 22:53:08 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=A7=D0=B8=D1=82=D0=B0=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B5=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B8=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/exec/ButtonIn/ButtonIn.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/exec/ButtonIn/ButtonIn.cpp b/src/modules/exec/ButtonIn/ButtonIn.cpp
index 5f6e0967..1a00f59b 100644
--- a/src/modules/exec/ButtonIn/ButtonIn.cpp
+++ b/src/modules/exec/ButtonIn/ButtonIn.cpp
@@ -31,7 +31,10 @@ class ButtonIn : public IoTItem {
 
     
         // TODO: загрузить значение из памяти иначе пока просто считываем значение текущего состояния PIN
-        _lastButtonState = _buttonState = IoTgpio.digitalRead(_pin);
+        value.valD = _buttonState = IoTgpio.digitalRead(_pin);
+        // сообщаем всем о стартовом статусе без генерации события
+        publishStatusMqtt(_id, (String)_buttonState);
+        publishStatusWs(_id, (String)_buttonState);
     }
 
     void loop() {