From 4eae1055e7d1b7c4d2d2efe0143f2778f6fce3dd Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 1 Feb 2022 12:51:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D1=88=D0=B8=D0=BC=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B5=D0=B4=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=BC=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=BE=D0=BC=20=D0=B3?=
 =?UTF-8?q?=D0=BB=D1=83=D0=B1=D0=B6=D0=B5=20=D0=B2=20=D0=B1=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20IoT?=
 =?UTF-8?q?Sensor=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B9=D1=88=D0=B5=D0=B3=D0=BE=20=D1=80=D0=B0=D0=B7=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D0=B8=D1=8F=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0=20=D1=87?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=D1=8B=20=D0=B1=D0=B5=D0=B7=20=D0=B8=D0=B7=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=B4=D0=B0?=
 =?UTF-8?q?=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9.=20=D0=9F=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=81=20=D1=83=D0=BF=D1=80=D0=BE=D1=89=D0=B0=D0=B5=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/classes/IoTSensor.h |  7 +------
 src/classes/IoTSensor.cpp   | 11 +++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/include/classes/IoTSensor.h b/include/classes/IoTSensor.h
index 9fa541b0..40807f75 100644
--- a/include/classes/IoTSensor.h
+++ b/include/classes/IoTSensor.h
@@ -4,12 +4,11 @@
 
 class IoTSensor {
    public:
-    IoTSensor();
+    IoTSensor(String parameters);
     ~IoTSensor();
 
     void loop();
     virtual void doByInterval();
-    void init(String subtype, String id, unsigned long interval);
     void regEvent(String value, String consoleInfo);
 
     String getSubtype();
@@ -24,7 +23,3 @@ class IoTSensor {
     String _id;
     unsigned long _interval;
 };
-
-// extern IoTSensor* myIoTSensor;
-//модулям не нужно знать эту переменную
-//- ок понял
\ No newline at end of file
diff --git a/src/classes/IoTSensor.cpp b/src/classes/IoTSensor.cpp
index 0e2b10f9..fa253b5c 100644
--- a/src/classes/IoTSensor.cpp
+++ b/src/classes/IoTSensor.cpp
@@ -3,13 +3,12 @@
 #include "Classes/ScenarioClass3.h"
 #include "Classes/IoTSensor.h"
 
-void IoTSensor::init(String subtype, String id, unsigned long interval) {
-    _interval = interval * 1000;
-    _subtype = subtype;
-    _id = id;
-}
 
-IoTSensor::IoTSensor() {}
+IoTSensor::IoTSensor(String parameters) {
+    _interval = jsonReadInt(parameters, "int") * 1000;
+    _subtype = jsonReadStr(parameters, "subtype");
+    _id = jsonReadStr(parameters, "id");
+}
 IoTSensor::~IoTSensor() {}
 
 String IoTSensor::getSubtype() {