From aad28b04bcfc3fa9c3cf9c99df79a8652dd4e0c0 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 14 Feb 2023 22:27:32 +0300
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=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B0=20{"status"?=
 =?UTF-8?q?:"0"}=20=D0=B2=20MQTT=20control=20=D0=B4=D0=BB=D1=8F=20=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B0=D1=82=D1=8C=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D1=82=D1=83=D1=81=20=D0=B8=20=D0=B7=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=BE=D0=B4=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B5,=20=D1=8D?=
 =?UTF-8?q?=D1=82=D0=BE=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BB=D0=B8=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=BD=D0=B0=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=80,=20=D0=90=D0=BB=D0=B8=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MqttClient.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp
index 8ec11fe8..c2480941 100644
--- a/src/MqttClient.cpp
+++ b/src/MqttClient.cpp
@@ -160,9 +160,14 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
 #endif
     }
 
-    else if (topicStr.indexOf("control") != -1) {
+    else if (topicStr.indexOf(F("control")) != -1) {
         String key = selectFromMarkerToMarker(topicStr, "/", 3);
-        generateOrder(key, payloadStr);
+        
+        String valueIfJson = "";    // проверяем формат, если json то берем статус, иначе - как есть
+        if (!jsonRead(payloadStr, F("status"), valueIfJson, false))
+            generateOrder(key, payloadStr);
+        else generateOrder(key, valueIfJson);
+
         SerialPrint("i", F("=>MQTT"), "Msg from iotmanager app: " + key + " " + payloadStr);
     }