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 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 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();