From aaf7702f55271ddce508eba33901af5616bfa753 Mon Sep 17 00:00:00 2001 From: biver Date: Mon, 6 Jun 2022 14:41:22 +0300 Subject: [PATCH] =?UTF-8?q?=D1=87=D0=B8=D1=81=D1=82=D0=B8=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_svelte/items.json | 63 +++++++++++++++++------------------------- platformio.ini | 4 +-- src/modules/API.cpp | 2 -- 3 files changed, 27 insertions(+), 42 deletions(-) diff --git a/data_svelte/items.json b/data_svelte/items.json index 093af846..63671869 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -383,22 +383,9 @@ "round": 1 }, { - "name": "28. Считыватель Wiegand", + "name": "28. Cенсор температуры MAX6675", "num": 28, "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", "id": "maxtmp", "widget": "anydataTmp", @@ -410,8 +397,8 @@ "CLK": 14 }, { - "name": "30. Датчик CO2 MHZ-19 UART", - "num": 30, + "name": "29. Датчик CO2 MHZ-19 UART", + "num": 29, "type": "Reading", "subtype": "Mhz19uart", "id": "co2uart", @@ -429,8 +416,8 @@ "ABC": 1 }, { - "name": "31. Датчик CO2 MHZ-19 PWM", - "num": 31, + "name": "30. Датчик CO2 MHZ-19 PWM", + "num": 30, "type": "Reading", "subtype": "Mhz19pwm", "id": "co2pwm", @@ -444,8 +431,8 @@ "int": 300 }, { - "name": "32. Cенсор температуры от MHZ-19 UART", - "num": 32, + "name": "31. Cенсор температуры от MHZ-19 UART", + "num": 31, "type": "Reading", "subtype": "Mhz19temp", "id": "Mhz19temp", @@ -461,8 +448,8 @@ "int": 30 }, { - "name": "33. Рабочий диапазон от MHZ-19 UART", - "num": 33, + "name": "32. Рабочий диапазон от MHZ-19 UART", + "num": 32, "type": "Reading", "subtype": "Mhz19range", "id": "Mhz19range", @@ -479,8 +466,8 @@ "int": 30 }, { - "name": "34. Автокалибровка от MHZ-19 UART", - "num": 34, + "name": "33. Автокалибровка от MHZ-19 UART", + "num": 33, "type": "Reading", "subtype": "Mhz19ABC", "id": "Mhz19ABC", @@ -494,8 +481,8 @@ "int": 30 }, { - "name": "35. Датчик пыли SDS011 PM25", - "num": 35, + "name": "34. Датчик пыли SDS011 PM25", + "num": 34, "type": "Reading", "subtype": "Sds011_25", "id": "pmuart25", @@ -512,8 +499,8 @@ "period": 300 }, { - "name": "36. Датчик пыли SDS011 PM10", - "num": 36, + "name": "35. Датчик пыли SDS011 PM10", + "num": 35, "type": "Reading", "subtype": "Sds011_10", "id": "pmuart10", @@ -530,8 +517,8 @@ "period": 300 }, { - "name": "37. Cенсор температуры Sht20", - "num": 37, + "name": "36. Cенсор температуры Sht20", + "num": 36, "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -542,8 +529,8 @@ "round": 1 }, { - "name": "38. Cенсор влажности Sht20", - "num": 38, + "name": "37. Cенсор влажности Sht20", + "num": 37, "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -554,8 +541,8 @@ "round": 1 }, { - "name": "39. Сонар HC-SR04", - "num": 39, + "name": "38. Сонар HC-SR04", + "num": 38, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -570,8 +557,8 @@ "header": "Экраны" }, { - "name": "40. LCD экран 2004", - "num": 40, + "name": "39. LCD экран 2004", + "num": 39, "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -585,8 +572,8 @@ "id2show": "id датчика" }, { - "name": "41. LCD экран 1602", - "num": 41, + "name": "40. LCD экран 1602", + "num": 40, "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", diff --git a/platformio.ini b/platformio.ini index 712726b3..3fd4e4c8 100644 --- a/platformio.ini +++ b/platformio.ini @@ -56,7 +56,6 @@ lib_deps = openenergymonitor/EmonLib@1.1.0 https://github.com/JonasGMorsch/GY-21.git ClosedCube HDC1080 - https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino adafruit/MAX6675 library Nova Fitness Sds dust sensors library@1.5.1 robtillaart/SHT2x@^0.1.1 @@ -65,6 +64,7 @@ build_src_filter = - - - + - [env:esp32_4mb_fromitems] lib_deps = @@ -80,7 +80,6 @@ lib_deps = openenergymonitor/EmonLib@1.1.0 https://github.com/JonasGMorsch/GY-21.git ClosedCube HDC1080 - https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino adafruit/MAX6675 library Nova Fitness Sds dust sensors library@1.5.1 robtillaart/SHT2x@^0.1.1 @@ -89,4 +88,5 @@ build_src_filter = - - - + - diff --git a/src/modules/API.cpp b/src/modules/API.cpp index 3bd61345..5fcf2a5d 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -19,7 +19,6 @@ void* getAPI_Ds18b20(String subtype, String params); void* getAPI_Emon(String subtype, String params); void* getAPI_GY21(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_Mhz19(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_GY21(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_Mhz19(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sds011(subtype, params)) != nullptr) return tmpAPI;