From 7f5b78b695e7552f2044c8dfd8b225ae409ed08a Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com>
Date: Sat, 15 Jan 2022 19:11:01 +0100
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B2=D0=B5=D0=BB=20=D0=B2=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=83=20mqtt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_svelte/settings.json | 12 +++++++++++-
 include/Main.h            |  1 +
 src/Main.cpp              |  6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/data_svelte/settings.json b/data_svelte/settings.json
index 0f8b460a..23424a61 100644
--- a/data_svelte/settings.json
+++ b/data_svelte/settings.json
@@ -7,5 +7,15 @@
     "timezone": 1,
     "ntp": "pool.ntp.org",
     "weblogin": "admin",
-    "webpass": "admin"
+    "webpass": "admin",
+    "mqttServer": "m2.wqtt.ru",
+    "mqttPort": 8021,
+    "mqttPrefix": "/ver4test",
+    "mqttUser": "rise",
+    "mqttPass": "hostel3333",
+    "mqttServer2": "",
+    "mqttPort2": 0,
+    "mqttPrefix2": "",
+    "mqttUser2": "",
+    "mqttPass2": ""
 }
\ No newline at end of file
diff --git a/include/Main.h b/include/Main.h
index 8fc7f22c..222a55be 100644
--- a/include/Main.h
+++ b/include/Main.h
@@ -8,3 +8,4 @@
 #include "classes/SendJson.h"
 #include "classes/NotAsync.h"
 #include "ESPConfiguration.h"
+#include "MqttClient.h"
diff --git a/src/Main.cpp b/src/Main.cpp
index 851ac1e7..5773f9ca 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -34,6 +34,9 @@ void setup() {
     standWebSocketsInit();
 #endif
 
+    //инициализация mqtt
+    mqttInit();
+
     //создаем объект класса выгружающего json массив из файла
     mySendJson = new SendJson;
 
@@ -70,6 +73,9 @@ void loop() {
     standWebSocket.loop();
 #endif
 
+    //обновление mqtt
+    mqttLoop();
+
     for (unsigned int i = 0; i < iotSensors.size(); i++) {
         iotSensors[i]->loop();
     }