mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-31 04:19:15 +03:00
Интегрируем датчик SHT20 в основные фалы проекта кроме set.device.json
This commit is contained in:
@@ -31,4 +31,6 @@
|
|||||||
0;output-value;txtid;anydata;Вывод;Температура;order*
|
0;output-value;txtid;anydata;Вывод;Температура;order*
|
||||||
0;logging;crtid;chart;Графики;История;order;val[any];int[60];cnt[100]*
|
0;logging;crtid;chart;Графики;История;order;val[any];int[60];cnt[100]*
|
||||||
0;logging;crtid;chart3;Графики;История;order;val[any];int[23:30];cnt[100];st[0]*
|
0;logging;crtid;chart3;Графики;История;order;val[any];int[23:30];cnt[100];st[0]*
|
||||||
0;uptime;uptid;anydataTime;Системные;%name%#uptime;order;int[60]*
|
0;uptime;uptid;anydataTime;Системные;%name%#uptime;order;int[60]*
|
||||||
|
0;sht20;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
|
||||||
|
0;sht20;humid;anydataHum;Сенсоры;Влажность;2;c[1];int[50]*
|
||||||
@@ -70,6 +70,7 @@
|
|||||||
#define EnablePwmOut
|
#define EnablePwmOut
|
||||||
#define EnableSensorAnalog
|
#define EnableSensorAnalog
|
||||||
#define EnableSensorBme280
|
#define EnableSensorBme280
|
||||||
|
#define EnableSensorSht20
|
||||||
#define EnableSensorBmp280
|
#define EnableSensorBmp280
|
||||||
#define EnableSensorCcs811
|
#define EnableSensorCcs811
|
||||||
#define EnableSensorDallas
|
#define EnableSensorDallas
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
#include "items/vPwmOut.h"
|
#include "items/vPwmOut.h"
|
||||||
#include "items/vSensorAnalog.h"
|
#include "items/vSensorAnalog.h"
|
||||||
#include "items/vSensorBme280.h"
|
#include "items/vSensorBme280.h"
|
||||||
|
#include "items/vSensorSht20.h"
|
||||||
#include "items/vSensorBmp280.h"
|
#include "items/vSensorBmp280.h"
|
||||||
#include "items/vSensorCcs811.h"
|
#include "items/vSensorCcs811.h"
|
||||||
#include "items/vSensorDallas.h"
|
#include "items/vSensorDallas.h"
|
||||||
@@ -110,6 +111,10 @@ void csvCmdExecute(String& cmdStr) {
|
|||||||
} else if (order == F("bme280")) {
|
} else if (order == F("bme280")) {
|
||||||
#ifdef EnableSensorBme280
|
#ifdef EnableSensorBme280
|
||||||
sCmd.addCommand(order.c_str(), bme280Sensor);
|
sCmd.addCommand(order.c_str(), bme280Sensor);
|
||||||
|
#endif
|
||||||
|
} else if (order == F("sht20")) {
|
||||||
|
#ifdef EnableSensorSht20
|
||||||
|
sCmd.addCommand(order.c_str(), sht20Sensor);
|
||||||
#endif
|
#endif
|
||||||
} else if (order == F("bmp280")) {
|
} else if (order == F("bmp280")) {
|
||||||
#ifdef EnableSensorBmp280
|
#ifdef EnableSensorBmp280
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
#include "items/vPwmOut.h"
|
#include "items/vPwmOut.h"
|
||||||
#include "items/vSensorAnalog.h"
|
#include "items/vSensorAnalog.h"
|
||||||
#include "items/vSensorBme280.h"
|
#include "items/vSensorBme280.h"
|
||||||
|
#include "items/vSensorSht20.h"
|
||||||
#include "items/vSensorBmp280.h"
|
#include "items/vSensorBmp280.h"
|
||||||
#include "items/vSensorCcs811.h"
|
#include "items/vSensorCcs811.h"
|
||||||
#include "items/vSensorDallas.h"
|
#include "items/vSensorDallas.h"
|
||||||
@@ -187,6 +188,11 @@ void clearVectors() {
|
|||||||
mySensorBme280->clear();
|
mySensorBme280->clear();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef EnableSensorSht20
|
||||||
|
if (mySensorSht20 != nullptr) {
|
||||||
|
mySensorSht20->clear();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#ifdef EnableSensorBmp280
|
#ifdef EnableSensorBmp280
|
||||||
if (mySensorBmp280 != nullptr) {
|
if (mySensorBmp280 != nullptr) {
|
||||||
mySensorBmp280->clear();
|
mySensorBmp280->clear();
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
#include "items/vLogging.h"
|
#include "items/vLogging.h"
|
||||||
#include "items/vSensorAnalog.h"
|
#include "items/vSensorAnalog.h"
|
||||||
#include "items/vSensorBme280.h"
|
#include "items/vSensorBme280.h"
|
||||||
|
#include "items/vSensorSht20.h"
|
||||||
#include "items/vSensorBmp280.h"
|
#include "items/vSensorBmp280.h"
|
||||||
#include "items/vSensorCcs811.h"
|
#include "items/vSensorCcs811.h"
|
||||||
#include "items/vSensorDallas.h"
|
#include "items/vSensorDallas.h"
|
||||||
@@ -173,6 +174,13 @@ void loop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef EnableSensorSht20
|
||||||
|
if (mySensorSht20 != nullptr) {
|
||||||
|
for (unsigned int i = 0; i < mySensorSht20->size(); i++) {
|
||||||
|
mySensorSht20->at(i).loop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#ifdef EnableSensorBmp280
|
#ifdef EnableSensorBmp280
|
||||||
if (mySensorBmp280 != nullptr) {
|
if (mySensorBmp280 != nullptr) {
|
||||||
for (unsigned int i = 0; i < mySensorBmp280->size(); i++) {
|
for (unsigned int i = 0; i < mySensorBmp280->size(); i++) {
|
||||||
|
|||||||
Reference in New Issue
Block a user