Merge branch 'ver3' of https://github.com/biveraxe/IoTManager into ver3

include/Clock.h

@@ -3,7 +3,7 @@
 #include "Clock.h"
 #include "Global.h"
 #include "Utils/TimeUtils.h"
-#include "Utils\SerialPrint.h"
+#include "Utils/SerialPrint.h"
 
 extern void clockInit();
 

include/YourSensor.h

@@ -1,4 +1,7 @@
 #pragma once
 
 #include <Arduino.h>
-float yourSensorReading(String type);
+float yourSensorReading(String type, String addr);
+
+void HDC1080_init(String &addr);
+void AHTX0_init();

platformio.ini

@@ -41,6 +41,8 @@ lib_deps =
 	adafruit/Adafruit CCS811 Library
 	milesburton/DallasTemperature
 	robtillaart/SHT2x@^0.1.1
+	ClosedCube HDC1080
+	Adafruit AHTX0
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -65,6 +67,8 @@ lib_deps =
 	adafruit/Adafruit CCS811 Library
 	milesburton/DallasTemperature
 	robtillaart/SHT2x@^0.1.1
+	ClosedCube HDC1080
+	Adafruit AHTX0
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -82,7 +86,6 @@ lib_deps =
 	ESPAsyncUDP
 	CTBot @2.1.6
 	MySensors @2.3.2
-	robtillaart/SHT2x@^0.1.1
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -108,6 +111,8 @@ lib_deps =
 	adafruit/Adafruit CCS811 Library
 	milesburton/DallasTemperature
 	robtillaart/SHT2x@^0.1.1
+	ClosedCube HDC1080
+	Adafruit AHTX0
 monitor_filters = esp32_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200

src/BufferExecute.cpp

@@ -19,7 +19,7 @@
 #include "items/vSensorDht.h"
 #include "items/vSensorNode.h"
 #include "items/vSensorPzem.h"
-#include "items/vSensorSht20.h"
+#include "items/vSensorSHT20.h"
 #include "items/vSensorUltrasonic.h"
 #include "items/vSensorUptime.h"
 

src/Init.cpp

@@ -19,7 +19,7 @@
 #include "items/vSensorDht.h"
 #include "items/vSensorNode.h"
 #include "items/vSensorPzem.h"
-#include "items/vSensorSht20.h"
+#include "items/vSensorSHT20.h"
 #include "items/vSensorUltrasonic.h"
 #include "items/vSensorUptime.h"
 

src/Utils/FileUtils.cpp

@@ -2,7 +2,7 @@
 
 #include "FileSystem.h"
 #include "Utils/StringUtils.h"
-#include "Utils\SerialPrint.h"
+#include "Utils/SerialPrint.h"
 
 const String filepath(const String& filename) {
     return filename.startsWith("/") ? filename : "/" + filename;

src/Utils/SerialPrint.cpp

@@ -1,4 +1,4 @@
-#include "Utils\SerialPrint.h"
+#include "Utils/SerialPrint.h"
 #include "Global.h"
 void SerialPrint(String errorLevel, String module, String msg) {
     //if (module == "MySensor") {

src/Utils/statUtils.cpp

@@ -1,4 +1,4 @@
-#include "Utils/StatUtils.h"
+#include "Utils/statUtils.h"
 
 #include <Arduino.h>
 #include <EEPROM.h>

src/YourSensor.cpp

@@ -1,23 +1,63 @@
 #include "YourSensor.h"
 
-float yourSensorReading(String type) {
+#include "Utils/StringUtils.h"
+
+//подключаем необходимые файлы библиотеки
+#include <Adafruit_AHTX0.h>
+
+#include "ClosedCube_HDC1080.h"
+
+//создаем объект HDC1080
+ClosedCube_HDC1080 hdc1080;
+
+//создаем объект AHTX0
+Adafruit_AHTX0 aht;
+Adafruit_Sensor *aht_humidity, *aht_temp;
+sensors_event_t tmpEvent_t;
+
+float yourSensorReading(String type, String addr) {
     float value;
-    if (type == "type1") {  // type1 - замените на название вашего датчика, потом это же название указывайте в type[], в вебе
-        //сюда вставляем процедуру чтения одного датчика
-        static int a;
-        a++;
-        value = a;
-    } else if (type == "type2") {
-        //сюда вставляем процедуру чтения другого датчика
-        static int b;
-        b--;
-        value = b;
-    } else if (type == "type3") {
-        //сюда третьего и так далее, создавайте сколько угодно else if....
-        //если у одного датчика несколько параметров то под каждый из них делайте свой else if и свое имя type
-        static int c;
-        c++;
-        value = c * 10;
+    //========================================================HDC1080================================================================
+    if (type == "HDC1080_temp") {
+        HDC1080_init(addr);
+        value = hdc1080.readTemperature();
+    } else if (type == "HDC1080_hum") {
+        HDC1080_init(addr);
+        value = hdc1080.readHumidity();
+    }
+    //==========================================================AHTX0=================================================================
+    if (type == "AHTX0_temp") {
+        AHTX0_init();
+        aht_temp->getEvent(&tmpEvent_t);
+        value = tmpEvent_t.temperature;
+    } else if (type == "typeAHTX0_hum") {
+        AHTX0_init();
+        aht_humidity->getEvent(&tmpEvent_t);
+        value = tmpEvent_t.relative_humidity;
     }
     return value;
 }
+
+void HDC1080_init(String &addr) {
+    static bool HDC1080_flag = true;
+    if (HDC1080_flag) {
+        hdc1080.begin(hexStringToUint8(addr));
+        HDC1080_flag = false;
+    }
+}
+
+void AHTX0_init() {
+    static bool AHTX0_flag = true;
+    if (AHTX0_flag) {
+        if (!aht.begin()) {
+            Serial.println("Failed to find AHT10/AHT20 chip");
+            // return -127;
+        }
+        aht_temp = aht.getTemperatureSensor();
+        aht_temp->printSensorDetails();
+
+        aht_humidity = aht.getHumiditySensor();
+        aht_humidity->printSensorDetails();
+        AHTX0_flag = false;
+    }
+}

src/items/vSensorAny.cpp

@@ -29,7 +29,7 @@ void SensorAny::loop() {
 }
 
 void SensorAny::read() {
-    float value = yourSensorReading(_type);
+    float value = yourSensorReading(_type, _addr);
 
     value = value * _c;
 

src/items/vSensorSHT20.cpp

@@ -1,6 +1,6 @@
 #include "Consts.h"
 #ifdef EnableSensorSht20
-#include "items/vSensorSht20.h"
+#include "items/vSensorSHT20.h"
 
 #include <Arduino.h>
 

src/main.cpp

@@ -16,7 +16,7 @@
 #include "SoftUART.h"
 #include "Telegram.h"
 #include "Tests.h"
-#include "Utils/StatUtils.h"
+#include "Utils/statUtils.h"
 #include "Utils/Timings.h"
 #include "Utils/WebUtils.h"
 #include "items/ButtonInClass.h"
@@ -32,7 +32,7 @@
 #include "items/vSensorDht.h"
 #include "items/vSensorNode.h"
 #include "items/vSensorPzem.h"
-#include "items/vSensorSht20.h"
+#include "items/vSensorSHT20.h"
 #include "items/vSensorUltrasonic.h"
 #include "items/vSensorUptime.h"
 //#include "WebServer.h"