From a619bab16763b716453abddc20f5a3bbfdc28954 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 15 Nov 2022 20:01:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20=D0=98?=
 =?UTF-8?q?=D0=94=5F=20=D0=B2=20Uart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/sensors/UART/Uart.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/sensors/UART/Uart.cpp b/src/modules/sensors/UART/Uart.cpp
index df2501f5..a6d5040e 100644
--- a/src/modules/sensors/UART/Uart.cpp
+++ b/src/modules/sensors/UART/Uart.cpp
@@ -106,6 +106,7 @@ class UART : public IoTItem {
             case 2:             // формат событий для Nextion ID=Value0xFF0xFF0xFF
                 printStr += eventItem->getID();
                 int indexOf_ = printStr.indexOf("_");
+                //Serial.println(printStr + " fff " + indexOf_);
                 if (indexOf_ == -1) return;  // пропускаем событие, если нет используемого признака типа данных - _txt или _vol
                 
                 if (printStr.indexOf("_txt") > 0) {
@@ -113,11 +114,11 @@ class UART : public IoTItem {
                     printStr += eventItem->getValue();
                     printStr += "\"";
                 } else if (printStr.indexOf("_val") > 0) { 
+                    printStr += eventItem->getValue();
                     printStr.replace(".", "");
                     printStr.replace("_val", ".val=");
-                    printStr += eventItem->getValue();
                 } else {
-                    if (indexOf_ == printStr.length()) printStr.replace("_", "");
+                    if (indexOf_ == printStr.length()-1) printStr.replace("_", "");
                     else printStr.replace("_", ".");
                     printStr += "=";
                     printStr += eventItem->getValue();