diff --git a/src/modules/sensors/Ads1115/modinfo.json b/src/modules/sensors/Ads1115/modinfo.json index b3d26a78..fc75f9b2 100644 --- a/src/modules/sensors/Ads1115/modinfo.json +++ b/src/modules/sensors/Ads1115/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "ADS1115 датчик напряжения ", + "name": "ADS1115 Напряжение", "type": "Reading", "subtype": "Ads1115", "id": "Ads3", diff --git a/src/modules/sensors/Aht20/modinfo.json b/src/modules/sensors/Aht20/modinfo.json index c4628d41..8d2bc3a7 100644 --- a/src/modules/sensors/Aht20/modinfo.json +++ b/src/modules/sensors/Aht20/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "AHT20 Cенсор температуры", + "name": "AHT20 Температура", "type": "Reading", "subtype": "Aht20t", "id": "Temp20", @@ -14,7 +14,7 @@ "round": 1 }, { - "name": "AHT20 Cенсор влажности", + "name": "AHT20 Влажность", "type": "Reading", "subtype": "Aht20h", "id": "Hum20", diff --git a/src/modules/sensors/Bme280/modinfo.json b/src/modules/sensors/Bme280/modinfo.json index eece5bc1..982f177f 100644 --- a/src/modules/sensors/Bme280/modinfo.json +++ b/src/modules/sensors/Bme280/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "Bme280 Cенсор температуры", + "name": "BME280 Температура", "type": "Reading", "subtype": "Bme280t", "id": "tmp3", @@ -14,7 +14,7 @@ "round": 1 }, { - "name": "Bme280 Cенсор давления", + "name": "BME280 Давление", "type": "Reading", "subtype": "Bme280p", "id": "Press3", @@ -26,7 +26,7 @@ "round": 1 }, { - "name": "Bme280 Cенсор влажности", + "name": "BME280 Влажность", "type": "Reading", "subtype": "Bme280h", "id": "Hum3", diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json index 41219e10..27d61584 100644 --- a/src/modules/sensors/Bmp280/modinfo.json +++ b/src/modules/sensors/Bmp280/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "Bmp280 Cенсор температуры", + "name": "BMP280 Температура", "type": "Reading", "subtype": "Bmp280t", "id": "tmp3", @@ -14,7 +14,7 @@ "round": 1 }, { - "name": "Bmp280 Cенсор давления", + "name": "BMP280 Давление", "type": "Reading", "subtype": "Bmp280p", "id": "Press3", diff --git a/src/modules/sensors/Dht1122/modinfo.json b/src/modules/sensors/Dht1122/modinfo.json index a6bad740..18767b49 100644 --- a/src/modules/sensors/Dht1122/modinfo.json +++ b/src/modules/sensors/Dht1122/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "dht11 Cенсор температуры", + "name": "DHT11 Температура", "type": "Reading", "subtype": "Dht1122t", "id": "tmp3", @@ -14,7 +14,7 @@ "senstype": "dht11" }, { - "name": "dht11 Cенсор влажности", + "name": "DHT11 Влажность", "type": "Reading", "subtype": "Dht1122h", "id": "Hum3", diff --git a/src/modules/sensors/Ds18b20/modinfo.json b/src/modules/sensors/Ds18b20/modinfo.json index cf34d95c..c3359c34 100644 --- a/src/modules/sensors/Ds18b20/modinfo.json +++ b/src/modules/sensors/Ds18b20/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "ds18b20 Cенсор температуры", + "name": "DS18B20 Температура", "type": "Reading", "subtype": "Ds18b20", "id": "dstmp", diff --git a/src/modules/sensors/Emon/modinfo.json b/src/modules/sensors/Emon/modinfo.json index 84103460..18c19168 100644 --- a/src/modules/sensors/Emon/modinfo.json +++ b/src/modules/sensors/Emon/modinfo.json @@ -1,35 +1,35 @@ -{ +{ "menuSection": "Сенсоры", - - "configItem": [{ - "name": "Датчик тока", - "type": "Reading", - "subtype": "I", - "id": "current", - "widget": "anydataAmp", - "page": "Сенсоры", - "descr": "Датчик тока", - "int": 10, - "pin_I": 34, - "calib_I": 111.1, - "plus": 0, - "multiply": 1 - }, - { - "name": "Датчик напряжения", - "type": "Reading", - "subtype": "U", - "id": "voltage", - "widget": "anydataVlt", - "page": "Сенсоры", - "descr": "Датчик напряжения", - "int": 10, - "pin_U": 35, - "calib_U": 223.1, - "plus": 0, - "multiply": 1 - }], - + "configItem": [ + { + "name": "EMON Ток", + "type": "Reading", + "subtype": "I", + "id": "current", + "widget": "anydataAmp", + "page": "Сенсоры", + "descr": "Датчик тока", + "int": 10, + "pin_I": 34, + "calib_I": 111.1, + "plus": 0, + "multiply": 1 + }, + { + "name": "EMON Напряжение", + "type": "Reading", + "subtype": "U", + "id": "voltage", + "widget": "anydataVlt", + "page": "Сенсоры", + "descr": "Датчик напряжения", + "int": 10, + "pin_U": 35, + "calib_U": 223.1, + "plus": 0, + "multiply": 1 + } + ], "about": { "authorName": "Serghei Crasnicov", "authorContact": "https://t.me/Serghei63", @@ -38,7 +38,10 @@ "moduleName": "Emon", "moduleVersion": "1.0", "usedRam": 15, - "subTypes":["I", "U"], + "subTypes": [ + "I", + "U" + ], "title": "Датчик тока и напряжения", "moduleDesc": "Получение информации о токе и напряжении с использованием трансформатора", "propInfo": { @@ -49,9 +52,7 @@ "int": "Количество секунд между опросами датчика." } }, - "defActive": false, - "devices": { "esp32_4mb": [ "openenergymonitor/EmonLib@1.1.0" diff --git a/src/modules/sensors/GY21/modinfo.json b/src/modules/sensors/GY21/modinfo.json index a4a0dacc..7524731f 100644 --- a/src/modules/sensors/GY21/modinfo.json +++ b/src/modules/sensors/GY21/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "GY21 Cенсор температуры", + "name": "GY21 Температура", "type": "Reading", "subtype": "GY21t", "id": "tmp4", @@ -13,7 +13,7 @@ "int": 15 }, { - "name": "GY21 Cенсор влажности", + "name": "GY21 Влажность", "type": "Reading", "subtype": "GY21h", "id": "Hum4", diff --git a/src/modules/sensors/Hdc1080/modinfo.json b/src/modules/sensors/Hdc1080/modinfo.json index e45569ca..89c27f96 100644 --- a/src/modules/sensors/Hdc1080/modinfo.json +++ b/src/modules/sensors/Hdc1080/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "HDC1080 Cенсор температуры", + "name": "HDC1080 Температура", "type": "Reading", "subtype": "Hdc1080t", "id": "Temp1080", @@ -14,7 +14,7 @@ "round": 1 }, { - "name": "HDC1080 Cенсор влажности", + "name": "HDC1080 Влажность", "type": "Reading", "subtype": "Hdc1080h", "id": "Hum1080", diff --git a/src/modules/sensors/IoTWiegand/modinfo.json b/src/modules/sensors/IoTWiegand/modinfo.json index 4cff7c54..ba7e8639 100644 --- a/src/modules/sensors/IoTWiegand/modinfo.json +++ b/src/modules/sensors/IoTWiegand/modinfo.json @@ -1,19 +1,19 @@ -{ +{ "menuSection": "Сенсоры", - - "configItem": [{ - "name": "Считыватель Wiegand", - "type": "Reading", - "subtype": "IoTWiegand", - "id": "wg", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Считыватель", - "int": 0, - "pinD0": 13, - "pinD1": 12 - }], - + "configItem": [ + { + "name": "Wiegand Считыватель", + "type": "Reading", + "subtype": "IoTWiegand", + "id": "wg", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Считыватель", + "int": 0, + "pinD0": 13, + "pinD1": 12 + } + ], "about": { "authorName": "Ilya Belyakov", "authorContact": "https://t.me/Biveraxe", @@ -30,9 +30,7 @@ "int": "Количество секунд между опросами датчика." } }, - "defActive": false, - "devices": { "esp32_4mb": [ "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" diff --git a/src/modules/sensors/Mhz19/modinfo.json b/src/modules/sensors/Mhz19/modinfo.json index 25cdafe5..fcf848f9 100644 --- a/src/modules/sensors/Mhz19/modinfo.json +++ b/src/modules/sensors/Mhz19/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "MHZ-19 Датчик CO2 UART", + "name": "MHZ-19 CO2 (UART)", "type": "Reading", "subtype": "Mhz19uart", "id": "co2uart", @@ -20,7 +20,7 @@ "ABC": 1 }, { - "name": "MHZ-19 Датчик CO2 PWM", + "name": "MHZ-19 CO2 (PWM)", "type": "Reading", "subtype": "Mhz19pwm", "id": "co2pwm", diff --git a/src/modules/sensors/Pzem004t/modinfo.json b/src/modules/sensors/Pzem004t/modinfo.json index 54744d30..35d05a8c 100644 --- a/src/modules/sensors/Pzem004t/modinfo.json +++ b/src/modules/sensors/Pzem004t/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "Cенсор температуры Bme280", + "name": "PZEM 004t Напряжение", "type": "Reading", "subtype": "Bme280t", "id": "tmp3", @@ -12,30 +12,6 @@ "int": 15, "addr": "0x77", "round": 1 - }, - { - "name": "Cенсор давления Bme280", - "type": "Reading", - "subtype": "Bme280p", - "id": "Press3", - "widget": "anydataMm", - "page": "Сенсоры", - "descr": "Давление", - "int": 15, - "addr": "0x77", - "round": 1 - }, - { - "name": "Cенсор влажности Bme280", - "type": "Reading", - "subtype": "Bme280h", - "id": "Hum3", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "int": 15, - "addr": "0x77", - "round": 1 } ], "about": { diff --git a/src/modules/sensors/Sht20/modinfo.json b/src/modules/sensors/Sht20/modinfo.json index e4cb385d..d3bb9173 100644 --- a/src/modules/sensors/Sht20/modinfo.json +++ b/src/modules/sensors/Sht20/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "Sht20 Cенсор температуры", + "name": "Sht20 Температура", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -13,7 +13,7 @@ "round": 1 }, { - "name": "Sht20 Cенсор влажности", + "name": "Sht20 Влажность", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", diff --git a/src/modules/sensors/Sht30/modinfo.json b/src/modules/sensors/Sht30/modinfo.json index 1441553f..203e97ea 100644 --- a/src/modules/sensors/Sht30/modinfo.json +++ b/src/modules/sensors/Sht30/modinfo.json @@ -2,7 +2,7 @@ "menuSection": "Сенсоры", "configItem": [ { - "name": "Sht30 Cенсор температуры", + "name": "Sht30 Температура", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -13,7 +13,7 @@ "round": 1 }, { - "name": "Sht30 Cенсор влажности", + "name": "Sht30 Влажность", "type": "Reading", "subtype": "Sht30h", "id": "Hum30",