From cd6008435e0ba23cc09fa399d3f478f879109cc6 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Thu, 25 Jun 2020 19:11:43 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B1=D1=80=D0=BE=D0=BA=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=20mqtt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/config.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/config.json b/data/config.json
index 6114577a..3cae98c6 100644
--- a/data/config.json
+++ b/data/config.json
@@ -3,15 +3,15 @@
     "chipID": "",
     "apssid": "IoTmanager",
     "appass": "",
-    "routerssid": "HomeNet",
-    "routerpass": "#19821111_",
+    "routerssid": "rise",
+    "routerpass": "hostel3333",
     "timezone": 2,
     "ntp": "pool.ntp.org",
-    "mqttServer": "192.168.1.30",
+    "mqttServer": "91.204.228.124",
     "mqttPort": 1883,
-    "mqttPrefix": "/iot",
-    "mqttUser": "devices",
-    "mqttPass": "devices",
+    "mqttPrefix": "/iotTeam",
+    "mqttUser": "test",
+    "mqttPass": "test",
     "scen": "1",
     "pushingboxid": "v7C133E426B0C69E",
     "weblogin": "admin",

From 9add7c9e8e1047cbda8bab5199429fe46cb66145 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Fri, 26 Jun 2020 15:20:56 +0200
Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E?=
 =?UTF-8?q?=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20serial?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/conf/c021.txt | 7 +++++++
 data/conf/s021.txt | 6 ++++++
 src/Cmd.cpp        | 3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/data/conf/c021.txt b/data/conf/c021.txt
index e69de29b..615742f3 100644
--- a/data/conf/c021.txt
+++ b/data/conf/c021.txt
@@ -0,0 +1,7 @@
+serialBegin 9600 12 13
+button 1 na Управляется#из#arduino Serial 0 1
+button 2 na Отправить#в#arduino Serial 0 2
+text 1 Текст#из#arduino Serial 3
+
+//12 13 это пины uart к которым вы можете подключить arduino. Скетч для arduino выложен в группу.
+//команда serialWrite ard-on отправит в arduino текст ard-on
\ No newline at end of file
diff --git a/data/conf/s021.txt b/data/conf/s021.txt
index e69de29b..fb3f6455 100644
--- a/data/conf/s021.txt
+++ b/data/conf/s021.txt
@@ -0,0 +1,6 @@
+button2 = 1
+serialWrite ard-on
+end
+button2 = 0
+serialWrite ard-off
+end
\ No newline at end of file
diff --git a/src/Cmd.cpp b/src/Cmd.cpp
index 5d3789e9..e770ba01 100644
--- a/src/Cmd.cpp
+++ b/src/Cmd.cpp
@@ -71,6 +71,7 @@ void CMD_init() {
 #ifdef SERIAL_ENABLED
     sCmd.addCommand("serialBegin", serialBegin);
     sCmd.addCommand("serialWrite", serialWrite);
+    sCmd.addCommand("getData", getData);
 #endif
 
 #ifdef LOGGING_ENABLED
@@ -99,7 +100,7 @@ void CMD_init() {
     sCmd.addCommand("firmwareUpdate", firmwareUpdate);
     sCmd.addCommand("firmwareVersion", firmwareVersion);
 
-    sCmd.addCommand("getData", getData);
+   
 
     handle_time_init();
 }

From 5faa708c8382cdb1712155374d3f3d2c1a73bd1e Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Fri, 26 Jun 2020 16:41:39 +0200
Subject: [PATCH 3/3] Some changes

---
 data/conf/s021.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/conf/s021.txt b/data/conf/s021.txt
index fb3f6455..9ae72453 100644
--- a/data/conf/s021.txt
+++ b/data/conf/s021.txt
@@ -1,6 +1,6 @@
 button2 = 1
-serialWrite ard-on
+serialWrite ard-11-1
 end
 button2 = 0
-serialWrite ard-off
+serialWrite ard-11-0
 end
\ No newline at end of file