From 8b83e1649c4e8c23882a12ad942526b59abc144d Mon Sep 17 00:00:00 2001 From: biver Date: Sun, 6 Feb 2022 09:11:07 +0300 Subject: [PATCH] =?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=D0=BD=D0=B0=20=D0=B5=D0=B4=D0=B8=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=20IoTItem=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=D1=85=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/ESPConfiguration.h | 6 +++--- include/classes/IoTSensor.h | 6 +++--- src/ESPConfiguration.cpp | 8 ++++---- src/Main.cpp | 4 ++-- src/classes/IoTSensor.cpp | 20 ++++++++++---------- src/modules/AnalogAdc.cpp | 6 +++--- src/modules/Bme280.cpp | 14 +++++++------- src/modules/Bmp280.cpp | 10 +++++----- src/modules/Dht1122.cpp | 10 +++++----- src/modules/Sht20.cpp | 10 +++++----- src/modules/ds18b20.cpp | 6 +++--- 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/include/ESPConfiguration.h b/include/ESPConfiguration.h index 69d190cf..d2196696 100644 --- a/include/ESPConfiguration.h +++ b/include/ESPConfiguration.h @@ -1,8 +1,8 @@ #pragma once #include "Global.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" -extern std::vector iotSensors; // вектор ссылок базового класса IoTSensor - список всех запущенных сенсоров +extern std::vector IoTItems; // вектор ссылок базового класса IoTItem - список всех запущенных сенсоров extern void configure(String path); -extern IoTSensor* myIoTSensor; +extern IoTItem* myIoTItem; diff --git a/include/classes/IoTSensor.h b/include/classes/IoTSensor.h index f58dd40c..b1899614 100644 --- a/include/classes/IoTSensor.h +++ b/include/classes/IoTSensor.h @@ -2,10 +2,10 @@ #include -class IoTSensor { +class IoTItem { public: - IoTSensor(String parameters); - ~IoTSensor(); + IoTItem(String parameters); + ~IoTItem(); void loop(); virtual void doByInterval(); diff --git a/src/ESPConfiguration.cpp b/src/ESPConfiguration.cpp index ec3c0e3c..9e976008 100644 --- a/src/ESPConfiguration.cpp +++ b/src/ESPConfiguration.cpp @@ -1,6 +1,6 @@ #include "ESPConfiguration.h" -std::vector iotSensors; +std::vector IoTItems; void* getAPI(String subtype, String params); void configure(String path) { @@ -17,9 +17,9 @@ void configure(String path) { SerialPrint(F("E"), F("Config"), "json error " + subtype); continue; } else { - myIoTSensor = (IoTSensor*)getAPI(subtype, jsonArrayElement); - if (myIoTSensor) { - iotSensors.push_back(myIoTSensor); + myIoTItem = (IoTItem*)getAPI(subtype, jsonArrayElement); + if (myIoTItem) { + IoTItems.push_back(myIoTItem); } } } diff --git a/src/Main.cpp b/src/Main.cpp index 71385a04..17633a03 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -75,7 +75,7 @@ void loop() { //обновление mqtt mqttLoop(); - for (unsigned int i = 0; i < iotSensors.size(); i++) { - iotSensors[i]->loop(); + for (unsigned int i = 0; i < IoTItems.size(); i++) { + IoTItems[i]->loop(); } } diff --git a/src/classes/IoTSensor.cpp b/src/classes/IoTSensor.cpp index 6db2b6b2..bb30f3a4 100644 --- a/src/classes/IoTSensor.cpp +++ b/src/classes/IoTSensor.cpp @@ -1,10 +1,10 @@ #include "Utils/JsonUtils.h" #include "Utils/SerialPrint.h" #include "Classes/ScenarioClass3.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" #include "WsServer.h" -IoTSensor::IoTSensor(String parameters) { +IoTItem::IoTItem(String parameters) { jsonRead(parameters, "int", _interval); _interval = _interval * 1000; jsonRead(parameters, "subtype", _subtype); @@ -22,17 +22,17 @@ IoTSensor::IoTSensor(String parameters) { _map4 = selectFromMarkerToMarker(map, ",", 3).toInt(); } } -IoTSensor::~IoTSensor() {} +IoTItem::~IoTItem() {} -String IoTSensor::getSubtype() { +String IoTItem::getSubtype() { return _subtype; } -String IoTSensor::getID() { +String IoTItem::getID() { return _id; }; -void IoTSensor::loop() { +void IoTItem::loop() { currentMillis = millis(); difference = currentMillis - prevMillis; if (difference >= _interval) { @@ -41,7 +41,7 @@ void IoTSensor::loop() { } } -void IoTSensor::regEvent(String value, String consoleInfo = "") { +void IoTItem::regEvent(String value, String consoleInfo = "") { eventGen2(_id, value); jsonWriteStr(paramsFlashJson, _id, value); publishStatusMqtt(_id, value); @@ -49,7 +49,7 @@ void IoTSensor::regEvent(String value, String consoleInfo = "") { SerialPrint("I", "Sensor " + consoleInfo, "'" + _id + "' data: " + value + "'"); } -void IoTSensor::regEvent(float value, String consoleInfo = "") { +void IoTItem::regEvent(float value, String consoleInfo = "") { if (_multiply) value = value * _multiply; if (_plus) value = value + _multiply; if (_round != 0) { @@ -70,6 +70,6 @@ void IoTSensor::regEvent(float value, String consoleInfo = "") { regEvent((String)buf, consoleInfo); } -void IoTSensor::doByInterval() {} +void IoTItem::doByInterval() {} -IoTSensor* myIoTSensor; \ No newline at end of file +IoTItem* myIoTItem; \ No newline at end of file diff --git a/src/modules/AnalogAdc.cpp b/src/modules/AnalogAdc.cpp index 2f3ecac7..b7251e6a 100644 --- a/src/modules/AnalogAdc.cpp +++ b/src/modules/AnalogAdc.cpp @@ -1,11 +1,11 @@ #include "Global.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" //Это файл сенсора, в нем осуществляется чтение сенсора. //для добавления сенсора вам нужно скопировать этот файл и заменить в нем текст AnalogAdc на название вашего сенсора //Название должно быть уникальным, коротким и отражать суть сенсора. -class AnalogAdc : public IoTSensor { +class AnalogAdc : public IoTItem { private: //======================================================================================================= // Секция переменных. @@ -20,7 +20,7 @@ class AnalogAdc : public IoTSensor { //Такие как ...begin и подставлять в них параметры полученные из web интерфейса. //Все параметры хранятся в перемененной parameters, вы можете прочитать любой параметр используя jsonRead функции: // jsonReadStr, jsonReadBool, jsonReadInt - AnalogAdc(String parameters): IoTSensor(parameters) { + AnalogAdc(String parameters): IoTItem(parameters) { _pin = jsonReadInt(parameters, "pin"); } //======================================================================================================= diff --git a/src/modules/Bme280.cpp b/src/modules/Bme280.cpp index 09317cb0..0d14e38a 100644 --- a/src/modules/Bme280.cpp +++ b/src/modules/Bme280.cpp @@ -6,7 +6,7 @@ #include "Global.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" #include #include @@ -14,12 +14,12 @@ std::map bmes; -class Bme280t : public IoTSensor { +class Bme280t : public IoTItem { private: Adafruit_BME280* _bme; public: - Bme280t(Adafruit_BME280* bme, String parameters): IoTSensor(parameters) { + Bme280t(Adafruit_BME280* bme, String parameters): IoTItem(parameters) { _bme = bme; } @@ -33,12 +33,12 @@ class Bme280t : public IoTSensor { }; -class Bme280h : public IoTSensor { +class Bme280h : public IoTItem { private: Adafruit_BME280* _bme; public: - Bme280h(Adafruit_BME280* bme, String parameters): IoTSensor(parameters) { + Bme280h(Adafruit_BME280* bme, String parameters): IoTItem(parameters) { _bme = bme; } @@ -52,12 +52,12 @@ class Bme280h : public IoTSensor { }; -class Bme280p : public IoTSensor { +class Bme280p : public IoTItem { private: Adafruit_BME280* _bme; public: - Bme280p(Adafruit_BME280* bme, String parameters): IoTSensor(parameters) { + Bme280p(Adafruit_BME280* bme, String parameters): IoTItem(parameters) { _bme = bme; } diff --git a/src/modules/Bmp280.cpp b/src/modules/Bmp280.cpp index 4f264706..d474edc2 100644 --- a/src/modules/Bmp280.cpp +++ b/src/modules/Bmp280.cpp @@ -6,7 +6,7 @@ #include "Global.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" #include #include @@ -14,12 +14,12 @@ std::map bmps; -class Bmp280t : public IoTSensor { +class Bmp280t : public IoTItem { private: Adafruit_BMP280* _bmp; public: - Bmp280t(Adafruit_BMP280* bmp, String parameters): IoTSensor(parameters) { + Bmp280t(Adafruit_BMP280* bmp, String parameters): IoTItem(parameters) { _bmp = bmp; } @@ -33,12 +33,12 @@ class Bmp280t : public IoTSensor { }; -class Bmp280p : public IoTSensor { +class Bmp280p : public IoTItem { private: Adafruit_BMP280* _bmp; public: - Bmp280p(Adafruit_BMP280* bmp, String parameters): IoTSensor(parameters) { + Bmp280p(Adafruit_BMP280* bmp, String parameters): IoTItem(parameters) { _bmp = bmp; } diff --git a/src/modules/Dht1122.cpp b/src/modules/Dht1122.cpp index 1dfbe964..927861a5 100644 --- a/src/modules/Dht1122.cpp +++ b/src/modules/Dht1122.cpp @@ -6,7 +6,7 @@ #include "Global.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" #include "DHTesp.h" #include @@ -14,12 +14,12 @@ std::map dhts; -class Dht1122t : public IoTSensor { +class Dht1122t : public IoTItem { private: DHTesp* _dht; public: - Dht1122t(DHTesp* dht, String parameters): IoTSensor(parameters) { + Dht1122t(DHTesp* dht, String parameters): IoTItem(parameters) { _dht = dht; } @@ -33,12 +33,12 @@ class Dht1122t : public IoTSensor { }; -class Dht1122h : public IoTSensor { +class Dht1122h : public IoTItem { private: DHTesp* _dht; public: - Dht1122h(DHTesp* dht, String parameters): IoTSensor(parameters) { + Dht1122h(DHTesp* dht, String parameters): IoTItem(parameters) { _dht = dht; } diff --git a/src/modules/Sht20.cpp b/src/modules/Sht20.cpp index 6f30f78d..4381e9b4 100644 --- a/src/modules/Sht20.cpp +++ b/src/modules/Sht20.cpp @@ -1,5 +1,5 @@ #include "Global.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" #include "Wire.h" #include "SHT2x.h" @@ -7,9 +7,9 @@ SHT2x* sht = nullptr; -class Sht20t : public IoTSensor { +class Sht20t : public IoTItem { public: - Sht20t(String parameters): IoTSensor(parameters) { } + Sht20t(String parameters): IoTItem(parameters) { } void doByInterval() { sht->read(); @@ -21,9 +21,9 @@ class Sht20t : public IoTSensor { ~Sht20t(); }; -class Sht20h : public IoTSensor { +class Sht20h : public IoTItem { public: - Sht20h(String parameters): IoTSensor(parameters) { } + Sht20h(String parameters): IoTItem(parameters) { } void doByInterval() { sht->read(); diff --git a/src/modules/ds18b20.cpp b/src/modules/ds18b20.cpp index 9cbd6109..e51103f6 100644 --- a/src/modules/ds18b20.cpp +++ b/src/modules/ds18b20.cpp @@ -1,5 +1,5 @@ #include "Global.h" -#include "Classes/IoTSensor.h" +#include "Classes/IoTItem.h" #include "DallasTemperature.h" #include @@ -9,7 +9,7 @@ std::map oneWireTemperatureArray; std::map sensorsTemperatureArray; -class Ds18b20 : public IoTSensor { +class Ds18b20 : public IoTItem { private: //для работы библиотеки с несколькими линиями необходимо обеспечить каждый экземпляр класса ссылками на объекты настроенные на эти линии OneWire* oneWire; @@ -27,7 +27,7 @@ class Ds18b20 : public IoTSensor { //Такие как ...begin и подставлять в них параметры полученные из web интерфейса. //Все параметры хранятся в перемененной parameters, вы можете прочитать любой параметр используя jsonRead функции: // jsonReadStr, jsonReadBool, jsonReadInt - Ds18b20(String parameters): IoTSensor(parameters) { + Ds18b20(String parameters): IoTItem(parameters) { jsonRead(parameters, "pin", _pin); jsonRead(parameters, "index", _index); jsonRead(parameters, "addr", _addr);