From 71dcd0626b6c20af551dbe8de47287f1a2781840 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 1 Feb 2022 12:30:13 +0300
Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=BC=20=D1=81=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20key=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20subtype=20=D0=B4=D0=BB=D1=8F=20IoTSensor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/include/classes/IoTSensor.h b/include/classes/IoTSensor.h
index caf08d9c..9fa541b0 100644
--- a/include/classes/IoTSensor.h
+++ b/include/classes/IoTSensor.h
@@ -9,10 +9,10 @@ class IoTSensor {
 
     void loop();
     virtual void doByInterval();
-    void init(String key, String id, unsigned long interval);
+    void init(String subtype, String id, unsigned long interval);
     void regEvent(String value, String consoleInfo);
 
-    String getKey();
+    String getSubtype();
     String getID();
 
     unsigned long currentMillis;
@@ -20,7 +20,7 @@ class IoTSensor {
     unsigned long difference;
 
    protected:
-    String _key;
+    String _subtype;
     String _id;
     unsigned long _interval;
 };
diff --git a/src/classes/IoTSensor.cpp b/src/classes/IoTSensor.cpp
index eb461b86..0e2b10f9 100644
--- a/src/classes/IoTSensor.cpp
+++ b/src/classes/IoTSensor.cpp
@@ -3,17 +3,17 @@
 #include "Classes/ScenarioClass3.h"
 #include "Classes/IoTSensor.h"
 
-void IoTSensor::init(String key, String id, unsigned long interval) {
+void IoTSensor::init(String subtype, String id, unsigned long interval) {
     _interval = interval * 1000;
-    _key = key;
+    _subtype = subtype;
     _id = id;
 }
 
 IoTSensor::IoTSensor() {}
 IoTSensor::~IoTSensor() {}
 
-String IoTSensor::getKey() {
-    return _key;
+String IoTSensor::getSubtype() {
+    return _subtype;
 }
 
 String IoTSensor::getID() {

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 2/4] =?UTF-8?q?=D0=9F=D1=83=D1=88=D0=B8=D0=BC=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B5=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=BC=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=BE=D0=BC=20?=
 =?UTF-8?q?=D0=B3=D0=BB=D1=83=D0=B1=D0=B6=D0=B5=20=D0=B2=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?=
 =?UTF-8?q?=20IoTSensor=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B9=D1=88=D0=B5=D0=B3=D0=BE=20=D1=80=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=82=D0=B8=D1=8F=20=D0=B8=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0=20?=
 =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D1=80=D1=8B=20=D0=B1=D0=B5=D0=B7=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9.=20=D0=9F?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=81=20=D1=83=D0=BF=D1=80=D0=BE=D1=89=D0=B0=D0=B5?=
 =?UTF-8?q?=D1=82=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() {

From 9ca620ada424ebfdde8db0fab56d9fc91a4f5f03 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 1 Feb 2022 12:52:19 +0300
Subject: [PATCH 3/4] =?UTF-8?q?=D0=90=D0=B4=D0=B0=D0=BF=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D1=83=D0=B5=D0=BC=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20Ana?=
 =?UTF-8?q?logAdc=20=D0=BA=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/AnalogAdc.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/modules/AnalogAdc.cpp b/src/modules/AnalogAdc.cpp
index 5d2b3e6e..ae298f1d 100644
--- a/src/modules/AnalogAdc.cpp
+++ b/src/modules/AnalogAdc.cpp
@@ -20,9 +20,7 @@ class AnalogAdc : public IoTSensor {
     //Такие как ...begin и подставлять в них параметры полученные из web интерфейса.
     //Все параметры хранятся в перемененной parameters, вы можете прочитать любой параметр используя jsonRead функции:
     // jsonReadStr, jsonReadBool, jsonReadInt
-    AnalogAdc(String parameters) {
-        init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int")); //обязательный вызов
-
+    AnalogAdc(String parameters): IoTSensor(parameters) {
         _pin = jsonReadInt(parameters, "pin");
     }
     //=======================================================================================================

From 0128a8966ae3f492218a23a198c0a7e758e9ff59 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 1 Feb 2022 13:03:19 +0300
Subject: [PATCH 4/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20ds18b20=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84?=
 =?UTF-8?q?=D0=B8=D0=B3=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B8=20?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=BF=D1=82=D0=B8=D1=80=D1=83=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=BA=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=B8=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/ds18b20.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/ds18b20.cpp b/src/modules/ds18b20.cpp
index cefd7696..c227dc2c 100644
--- a/src/modules/ds18b20.cpp
+++ b/src/modules/ds18b20.cpp
@@ -27,9 +27,8 @@ class ds18b20 : public IoTSensor {
     //Такие как ...begin и подставлять в них параметры полученные из web интерфейса.
     //Все параметры хранятся в перемененной parameters, вы можете прочитать любой параметр используя jsonRead функции:
     // jsonReadStr, jsonReadBool, jsonReadInt
-    ds18b20(String parameters) {
-        init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int")); //обязательный вызов
- 
+    ds18b20(String parameters): IoTSensor(parameters) {
+        
         _pin = jsonReadInt(parameters, "pin");
         _index = jsonReadInt(parameters, "index");
         _addr = jsonReadStr(parameters, "addr");             
@@ -62,6 +61,8 @@ class ds18b20 : public IoTSensor {
         sensors->requestTemperatures();
         
         //Определяем адрес. Если парамтер addr не установлен, то узнаем адрес по индексу
+        // TODO: понять как лучше. в текущей реализации адрес вычисляется каждый раз при опросе шины, это хорошо при отладке, 
+        // но при постоянном контакте и использовании правильнее генерировать адрес при инициализации модуля. Но тогда нужно перезагружать устройство при новом датчике
         DeviceAddress deviceAddress;
         if (_addr == "") {
             sensors->getAddress(deviceAddress, _index);