From 4170c7d3e4d0ada239a0b35b4a6f5789d6e7e1c3 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Sun, 13 Nov 2022 20:45:10 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?=
 =?UTF-8?q?=D1=83=20=D0=BB=D1=8E=D0=B1=D1=8B=D1=85=20=D1=81=D1=83=D1=84?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B5=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20=D0=BD=D0=B0=20=D1=8D=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD.=20=D0=92=20=D0=BA=D0=B0=D0=B2=D1=8B=D1=87?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=85=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20.tx?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/sensors/UART/Uart.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/modules/sensors/UART/Uart.cpp b/src/modules/sensors/UART/Uart.cpp
index 884c7938..a55cfa13 100644
--- a/src/modules/sensors/UART/Uart.cpp
+++ b/src/modules/sensors/UART/Uart.cpp
@@ -106,15 +106,17 @@ class UART : public IoTItem {
             case 2:             // формат событий для Nextion ID=Value0xFF0xFF0xFF
                 printStr += eventItem->getID();
                 if (printStr.indexOf("_") == -1) return;  // пропускаем событие, если нет используемого признака типа данных - _txt или _vol
-                if (printStr.indexOf("_val") > 0) {
-                    printStr.replace("_val", ".val=");
-                    printStr += eventItem->getValue();
-                } else if (printStr.indexOf("_txt") > 0) {
-                    printStr.replace("_txt", ".txt=");
-                    printStr += "\"";
+                
+                if (printStr.indexOf("_txt") > 0) {
+                    printStr.replace("_txt", ".txt=\"");
                     printStr += eventItem->getValue();
                     printStr += "\"";
-                } else return;
+                } else {
+                    printStr.replace("_", ".");
+                    printStr += "=";
+                    printStr += eventItem->getValue();
+                }
+
                 uartPrintFFF(printStr);
             break;
         }