From dd775eb4548734550d08c86ce8ac14bbdac254f6 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com>
Date: Sat, 15 Jan 2022 17:10:14 +0100
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=81=D1=8F=20=D0=BE=D1=82=20h=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=B5=D0=BD=D1=81=D0=BE=D1=80=D0=B0=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=83=D0=B4=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B0?=
 =?UTF-8?q?=20=D0=B8=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D1=81=D0=B5=D0=BD=D1=81?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B2=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/Configuration.h     | 2 +-
 include/modules/AnalogAdc.h | 5 -----
 src/Configuration.cpp       | 3 ++-
 src/classes/IoTSensor.cpp   | 2 +-
 src/modules/AnalogAdc.cpp   | 6 ++++--
 5 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 include/modules/AnalogAdc.h

diff --git a/include/Configuration.h b/include/Configuration.h
index 90aec619..928e202d 100644
--- a/include/Configuration.h
+++ b/include/Configuration.h
@@ -4,4 +4,4 @@
 
 extern std::vector<IoTSensor*> iotSensors;  // вектор ссылок базового класса IoTSensor - список всех запущенных сенсоров
 
-extern void configure(String path);
\ No newline at end of file
+extern void configure(String path);
diff --git a/include/modules/AnalogAdc.h b/include/modules/AnalogAdc.h
deleted file mode 100644
index 9733290d..00000000
--- a/include/modules/AnalogAdc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-#include "Global.h"
-#include "Classes/IoTSensor.h"
-
-extern void* getAPI_AnalogAdc(String params);
\ No newline at end of file
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index 0c3d4033..0cd2a3da 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -1,5 +1,6 @@
 #include "Configuration.h"
-#include "modules/AnalogAdc.h"
+
+extern void* getAPI_AnalogAdc(String params);
 
 std::vector<IoTSensor*> iotSensors;
 
diff --git a/src/classes/IoTSensor.cpp b/src/classes/IoTSensor.cpp
index a44198da..eb461b86 100644
--- a/src/classes/IoTSensor.cpp
+++ b/src/classes/IoTSensor.cpp
@@ -33,7 +33,7 @@ void IoTSensor::regEvent(String value, String consoleInfo = "") {
     eventGen2(_id, String(value));
     jsonWriteStr(paramsFlashJson, _id, String(value));
     publishStatus(_id, String(value));
-    SerialPrint("I", "Sensor", "'" + _id + "' data: " + String(value) + "' " + consoleInfo);
+    SerialPrint("I", "Sensor " + consoleInfo, "'" + _id + "' data: " + String(value) + "'");
 }
 
 void IoTSensor::doByInterval() {}
diff --git a/src/modules/AnalogAdc.cpp b/src/modules/AnalogAdc.cpp
index 9992938a..2f75c479 100644
--- a/src/modules/AnalogAdc.cpp
+++ b/src/modules/AnalogAdc.cpp
@@ -1,4 +1,6 @@
-#include "modules/AnalogAdc.h"
+#include "Global.h"
+#include "Classes/IoTSensor.h"
+
 
 class AnalogAdc : public IoTSensor {
    public:
@@ -13,7 +15,7 @@ class AnalogAdc : public IoTSensor {
     void doByInterval() {
         float value = analogRead(_pin);
 
-        regEvent((String)value, "analog");
+        regEvent((String)value, "AnalogAdc");
     }
 
     ~AnalogAdc();