From a4a8c752068a94c1bd8ad5f75fd2704161620aff Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com>
Date: Sat, 15 Jan 2022 16:41:25 +0100
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=B4=20=D1=81=D0=B5=D0=BD=D1=81=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_svelte/config.json     |  4 ++--
 include/modules/AnalogAdc.h | 11 -----------
 src/modules/AnalogAdc.cpp   | 28 +++++++++++++++++-----------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/data_svelte/config.json b/data_svelte/config.json
index 61377c72..81a4d579 100644
--- a/data_svelte/config.json
+++ b/data_svelte/config.json
@@ -2,7 +2,7 @@
     {
         "type": "Reading",
         "subtype": "AnalogAdc",
-        "id": "t",
+        "id": "t1",
         "widget": "anydata",
         "page": "Сенсоры",
         "descr": "Температура",
@@ -12,7 +12,7 @@
     {
         "type": "Reading",
         "subtype": "AnalogAdc",
-        "id": "t",
+        "id": "t2",
         "widget": "anydata",
         "page": "Сенсоры",
         "descr": "Температура",
diff --git a/include/modules/AnalogAdc.h b/include/modules/AnalogAdc.h
index e71cde7f..9733290d 100644
--- a/include/modules/AnalogAdc.h
+++ b/include/modules/AnalogAdc.h
@@ -2,15 +2,4 @@
 #include "Global.h"
 #include "Classes/IoTSensor.h"
 
-class AnalogAdc : public IoTSensor {
-   public:
-    AnalogAdc(String parameters);
-    ~AnalogAdc();
-
-    void doByInterval();
-
-   private:
-    unsigned int _pin;
-};
-
 extern void* getAPI_AnalogAdc(String params);
\ No newline at end of file
diff --git a/src/modules/AnalogAdc.cpp b/src/modules/AnalogAdc.cpp
index baf351b6..9992938a 100644
--- a/src/modules/AnalogAdc.cpp
+++ b/src/modules/AnalogAdc.cpp
@@ -1,20 +1,26 @@
 #include "modules/AnalogAdc.h"
 
-// setup()
-AnalogAdc::AnalogAdc(String parameters) {
-    init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int"));
+class AnalogAdc : public IoTSensor {
+   public:
+    // setup()
+    AnalogAdc(String parameters) {
+        init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int"));
 
-    _pin = jsonReadInt(parameters, "pin");
-}
+        _pin = jsonReadInt(parameters, "pin");
+    }
 
-AnalogAdc::~AnalogAdc() {}
+    // loop()
+    void doByInterval() {
+        float value = analogRead(_pin);
 
-// loop()
-void AnalogAdc::doByInterval() {
-    float value = analogRead(_pin);
+        regEvent((String)value, "analog");
+    }
 
-    regEvent((String)value, "analog");
-}
+    ~AnalogAdc();
+
+   private:
+    unsigned int _pin;
+};
 
 void* getAPI_AnalogAdc(String parameters) {
     String subtype;