чистим

This commit is contained in:
2022-06-06 14:41:22 +03:00
parent 5020816b89
commit aaf7702f55
3 changed files with 27 additions and 42 deletions

View File

@@ -383,22 +383,9 @@
"round": 1 "round": 1
}, },
{ {
"name": "28. Считыватель Wiegand", "name": "28. Cенсор температуры MAX6675",
"num": 28, "num": 28,
"type": "Reading", "type": "Reading",
"subtype": "IoTWiegand",
"id": "wg",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "Считыватель",
"int": 0,
"pinD0": 13,
"pinD1": 12
},
{
"name": "29. Cенсор температуры MAX6675",
"num": 29,
"type": "Reading",
"subtype": "Max6675t", "subtype": "Max6675t",
"id": "maxtmp", "id": "maxtmp",
"widget": "anydataTmp", "widget": "anydataTmp",
@@ -410,8 +397,8 @@
"CLK": 14 "CLK": 14
}, },
{ {
"name": "30. Датчик CO2 MHZ-19 UART", "name": "29. Датчик CO2 MHZ-19 UART",
"num": 30, "num": 29,
"type": "Reading", "type": "Reading",
"subtype": "Mhz19uart", "subtype": "Mhz19uart",
"id": "co2uart", "id": "co2uart",
@@ -429,8 +416,8 @@
"ABC": 1 "ABC": 1
}, },
{ {
"name": "31. Датчик CO2 MHZ-19 PWM", "name": "30. Датчик CO2 MHZ-19 PWM",
"num": 31, "num": 30,
"type": "Reading", "type": "Reading",
"subtype": "Mhz19pwm", "subtype": "Mhz19pwm",
"id": "co2pwm", "id": "co2pwm",
@@ -444,8 +431,8 @@
"int": 300 "int": 300
}, },
{ {
"name": "32. Cенсор температуры от MHZ-19 UART", "name": "31. Cенсор температуры от MHZ-19 UART",
"num": 32, "num": 31,
"type": "Reading", "type": "Reading",
"subtype": "Mhz19temp", "subtype": "Mhz19temp",
"id": "Mhz19temp", "id": "Mhz19temp",
@@ -461,8 +448,8 @@
"int": 30 "int": 30
}, },
{ {
"name": "33. Рабочий диапазон от MHZ-19 UART", "name": "32. Рабочий диапазон от MHZ-19 UART",
"num": 33, "num": 32,
"type": "Reading", "type": "Reading",
"subtype": "Mhz19range", "subtype": "Mhz19range",
"id": "Mhz19range", "id": "Mhz19range",
@@ -479,8 +466,8 @@
"int": 30 "int": 30
}, },
{ {
"name": "34. Автокалибровка от MHZ-19 UART", "name": "33. Автокалибровка от MHZ-19 UART",
"num": 34, "num": 33,
"type": "Reading", "type": "Reading",
"subtype": "Mhz19ABC", "subtype": "Mhz19ABC",
"id": "Mhz19ABC", "id": "Mhz19ABC",
@@ -494,8 +481,8 @@
"int": 30 "int": 30
}, },
{ {
"name": "35. Датчик пыли SDS011 PM25", "name": "34. Датчик пыли SDS011 PM25",
"num": 35, "num": 34,
"type": "Reading", "type": "Reading",
"subtype": "Sds011_25", "subtype": "Sds011_25",
"id": "pmuart25", "id": "pmuart25",
@@ -512,8 +499,8 @@
"period": 300 "period": 300
}, },
{ {
"name": "36. Датчик пыли SDS011 PM10", "name": "35. Датчик пыли SDS011 PM10",
"num": 36, "num": 35,
"type": "Reading", "type": "Reading",
"subtype": "Sds011_10", "subtype": "Sds011_10",
"id": "pmuart10", "id": "pmuart10",
@@ -530,8 +517,8 @@
"period": 300 "period": 300
}, },
{ {
"name": "37. Cенсор температуры Sht20", "name": "36. Cенсор температуры Sht20",
"num": 37, "num": 36,
"type": "Reading", "type": "Reading",
"subtype": "Sht20t", "subtype": "Sht20t",
"id": "tmp2", "id": "tmp2",
@@ -542,8 +529,8 @@
"round": 1 "round": 1
}, },
{ {
"name": "38. Cенсор влажности Sht20", "name": "37. Cенсор влажности Sht20",
"num": 38, "num": 37,
"type": "Reading", "type": "Reading",
"subtype": "Sht20h", "subtype": "Sht20h",
"id": "Hum2", "id": "Hum2",
@@ -554,8 +541,8 @@
"round": 1 "round": 1
}, },
{ {
"name": "39. Сонар HC-SR04", "name": "38. Сонар HC-SR04",
"num": 39, "num": 38,
"type": "Reading", "type": "Reading",
"subtype": "Sonar", "subtype": "Sonar",
"id": "sonar", "id": "sonar",
@@ -570,8 +557,8 @@
"header": "Экраны" "header": "Экраны"
}, },
{ {
"name": "40. LCD экран 2004", "name": "39. LCD экран 2004",
"num": 40, "num": 39,
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",
@@ -585,8 +572,8 @@
"id2show": "id датчика" "id2show": "id датчика"
}, },
{ {
"name": "41. LCD экран 1602", "name": "40. LCD экран 1602",
"num": 41, "num": 40,
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",

View File

@@ -56,7 +56,6 @@ lib_deps =
openenergymonitor/EmonLib@1.1.0 openenergymonitor/EmonLib@1.1.0
https://github.com/JonasGMorsch/GY-21.git https://github.com/JonasGMorsch/GY-21.git
ClosedCube HDC1080 ClosedCube HDC1080
https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino
adafruit/MAX6675 library adafruit/MAX6675 library
Nova Fitness Sds dust sensors library@1.5.1 Nova Fitness Sds dust sensors library@1.5.1
robtillaart/SHT2x@^0.1.1 robtillaart/SHT2x@^0.1.1
@@ -65,6 +64,7 @@ build_src_filter =
-<modules/exec/EspCam> -<modules/exec/EspCam>
-<modules/exec/SDcard> -<modules/exec/SDcard>
-<modules/exec/Telegram> -<modules/exec/Telegram>
-<modules/sensors/IoTWiegand>
[env:esp32_4mb_fromitems] [env:esp32_4mb_fromitems]
lib_deps = lib_deps =
@@ -80,7 +80,6 @@ lib_deps =
openenergymonitor/EmonLib@1.1.0 openenergymonitor/EmonLib@1.1.0
https://github.com/JonasGMorsch/GY-21.git https://github.com/JonasGMorsch/GY-21.git
ClosedCube HDC1080 ClosedCube HDC1080
https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino
adafruit/MAX6675 library adafruit/MAX6675 library
Nova Fitness Sds dust sensors library@1.5.1 Nova Fitness Sds dust sensors library@1.5.1
robtillaart/SHT2x@^0.1.1 robtillaart/SHT2x@^0.1.1
@@ -89,4 +88,5 @@ build_src_filter =
-<modules/exec/EspCam> -<modules/exec/EspCam>
-<modules/exec/SDcard> -<modules/exec/SDcard>
-<modules/exec/Telegram> -<modules/exec/Telegram>
-<modules/sensors/IoTWiegand>

View File

@@ -19,7 +19,6 @@ void* getAPI_Ds18b20(String subtype, String params);
void* getAPI_Emon(String subtype, String params); void* getAPI_Emon(String subtype, String params);
void* getAPI_GY21(String subtype, String params); void* getAPI_GY21(String subtype, String params);
void* getAPI_Hdc1080(String subtype, String params); void* getAPI_Hdc1080(String subtype, String params);
void* getAPI_IoTWiegand(String subtype, String params);
void* getAPI_Max6675(String subtype, String params); void* getAPI_Max6675(String subtype, String params);
void* getAPI_Mhz19(String subtype, String params); void* getAPI_Mhz19(String subtype, String params);
void* getAPI_Sds011(String subtype, String params); void* getAPI_Sds011(String subtype, String params);
@@ -48,7 +47,6 @@ if ((tmpAPI = getAPI_Ds18b20(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Emon(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Emon(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_GY21(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_GY21(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Hdc1080(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Hdc1080(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_IoTWiegand(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Max6675(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Max6675(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Mhz19(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Mhz19(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Sds011(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sds011(subtype, params)) != nullptr) return tmpAPI;