diff --git a/.gitignore b/.gitignore index 65469d13..65bd8853 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ .vscode/c_cpp_properties.json .vscode/launch.json .vscode/ipch -lib/libraies-master - +data_svelte/settings.json diff --git a/data_svelte/items.json b/data_svelte/items.json index fcf14db1..bd2a1dfe 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -125,11 +125,431 @@ "needSave": 0, "num": 8 }, + { + "header": "Сенсоры" + }, + { + "name": "9. Датчик напряжения ADS1115", + "type": "Reading", + "subtype": "Ads1115", + "id": "Ads3", + "widget": "anydataVlt", + "page": "Сенсоры", + "descr": "ADS_3", + "pin": "0", + "mode": "volt", + "gain": "3/4x", + "plus": 0, + "multiply": 1, + "round": 2, + "int": 10, + "num": 9 + }, + { + "name": "10. Cенсор температуры AHT20", + "type": "Reading", + "subtype": "Aht20t", + "id": "Temp20", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "AHT20 Температура", + "int": 15, + "addr": "0x38", + "round": 1, + "num": 10 + }, + { + "name": "11. Cенсор влажности AHT20", + "type": "Reading", + "subtype": "Aht20h", + "id": "Hum20", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "AHT20 Влажность", + "int": 15, + "addr": "0x38", + "round": 1, + "num": 11 + }, + { + "name": "12. Аналоговый сенсор", + "type": "Reading", + "subtype": "AnalogAdc", + "id": "t", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "map": "1,1024,1,100", + "plus": 0, + "multiply": 1, + "round": 1, + "pin": 0, + "int": 15, + "avgSteps": 1, + "num": 12 + }, + { + "name": "13. Cенсор температуры Bme280", + "type": "Reading", + "subtype": "Bme280t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 13 + }, + { + "name": "14. Cенсор давления Bme280", + "type": "Reading", + "subtype": "Bme280p", + "id": "Press3", + "widget": "anydataMm", + "page": "Сенсоры", + "descr": "Давление", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 14 + }, + { + "name": "15. Cенсор влажности Bme280", + "type": "Reading", + "subtype": "Bme280h", + "id": "Hum3", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 15 + }, + { + "name": "16. Cенсор температуры Bmp280", + "type": "Reading", + "subtype": "Bmp280t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "280 Температура", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 16 + }, + { + "name": "17. Cенсор давления Bmp280", + "type": "Reading", + "subtype": "Bmp280p", + "id": "Press3", + "widget": "anydataMm", + "page": "Сенсоры", + "descr": "280 Давление", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 17 + }, + { + "name": "18. Cенсор температуры dht11", + "type": "Reading", + "subtype": "Dht1122t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "pin": 0, + "senstype": "dht11", + "num": 18 + }, + { + "name": "19. Cенсор влажности dht11", + "type": "Reading", + "subtype": "Dht1122h", + "id": "Hum3", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "pin": 0, + "senstype": "dht11", + "num": 19 + }, + { + "name": "20. Cенсор температуры ds18b20", + "type": "Reading", + "subtype": "Ds18b20", + "id": "dstmp", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "DS Температура", + "int": 15, + "pin": 2, + "index": 0, + "addr": "", + "round": 1, + "num": 20 + }, + { + "name": "21. Датчик тока", + "type": "Reading", + "subtype": "I", + "id": "current", + "widget": "anydataAmp", + "page": "Сенсоры", + "descr": "Датчик тока", + "int": 10, + "pin_I": 34, + "calib_I": 111.1, + "plus": 0, + "multiply": 1, + "num": 21 + }, + { + "name": "22. Датчик напряжения", + "type": "Reading", + "subtype": "U", + "id": "voltage", + "widget": "anydataVlt", + "page": "Сенсоры", + "descr": "Датчик напряжения", + "int": 10, + "pin_U": 35, + "calib_U": 223.1, + "plus": 0, + "multiply": 1, + "num": 22 + }, + { + "name": "23. Cенсор температуры GY21", + "type": "Reading", + "subtype": "GY21t", + "id": "tmp4", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "round": 1, + "int": 15, + "num": 23 + }, + { + "name": "24. Cенсор влажности GY21", + "type": "Reading", + "subtype": "GY21h", + "id": "Hum4", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "round": 1, + "int": 15, + "num": 24 + }, + { + "name": "25. Cенсор температуры HDC1080", + "type": "Reading", + "subtype": "Hdc1080t", + "id": "Temp1080", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "1080 Температура", + "int": 15, + "addr": "0x40", + "round": 1, + "num": 25 + }, + { + "name": "26. Cенсор влажности HDC1080", + "type": "Reading", + "subtype": "Hdc1080h", + "id": "Hum1080", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "1080 Влажность", + "int": 15, + "addr": "0x40", + "round": 1, + "num": 26 + }, + { + "name": "27. Cенсор температуры MAX6675", + "type": "Reading", + "subtype": "Max6675t", + "id": "maxtmp", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "MAX Температура", + "int": 15, + "DO": 12, + "CS": 13, + "CLK": 14, + "num": 27 + }, + { + "name": "28. Датчик CO2 MHZ-19 UART", + "type": "Reading", + "subtype": "Mhz19uart", + "id": "co2uart", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "CO2uart", + "plus": 0, + "multiply": 1, + "round": 1, + "pin": 0, + "rxPin": 14, + "txPin": 16, + "int": 15, + "range": 5000, + "ABC": 1, + "num": 28 + }, + { + "name": "29. Датчик CO2 MHZ-19 PWM", + "type": "Reading", + "subtype": "Mhz19pwm", + "id": "co2pwm", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "CO2pwm", + "plus": 0, + "multiply": 1, + "round": 1, + "pin": 16, + "int": 300, + "num": 29 + }, + { + "name": "30. Cенсор температуры от MHZ-19 UART", + "type": "Reading", + "subtype": "Mhz19temp", + "id": "Mhz19temp", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "plus": 0, + "multiply": 1, + "round": 1, + "rxPin": 14, + "txPin": 16, + "ABC": 1, + "int": 30, + "num": 30 + }, + { + "name": "31. Рабочий диапазон от MHZ-19 UART", + "type": "Reading", + "subtype": "Mhz19range", + "id": "Mhz19range", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "Диапазон", + "plus": 0, + "multiply": 1, + "round": 1, + "rxPin": 14, + "txPin": 16, + "range": 5000, + "ABC": 1, + "int": 30, + "num": 31 + }, + { + "name": "32. Автокалибровка от MHZ-19 UART", + "type": "Reading", + "subtype": "Mhz19ABC", + "id": "Mhz19ABC", + "widget": "anydataDef", + "page": "Сенсоры", + "descr": "ABC", + "rxPin": 14, + "txPin": 16, + "range": 5000, + "ABC": 1, + "int": 30, + "num": 32 + }, + { + "name": "33. Датчик пыли SDS011 PM25", + "type": "Reading", + "subtype": "Sds011_25", + "id": "pmuart25", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "PM-2.5", + "plus": 0, + "multiply": 1, + "round": 10, + "rxPin": 13, + "txPin": 12, + "int": 15, + "warmUp": 30, + "period": 300, + "num": 33 + }, + { + "name": "34. Датчик пыли SDS011 PM10", + "type": "Reading", + "subtype": "Sds011_10", + "id": "pmuart10", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "PM-10", + "plus": 0, + "multiply": 1, + "round": 10, + "rxPin": 13, + "txPin": 12, + "int": 15, + "warmUp": 30, + "period": 300, + "num": 34 + }, + { + "name": "35. Cенсор температуры Sht20", + "type": "Reading", + "subtype": "Sht20t", + "id": "tmp2", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "round": 1, + "num": 35 + }, + { + "name": "36. Cенсор влажности Sht20", + "type": "Reading", + "subtype": "Sht20h", + "id": "Hum2", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "round": 1, + "num": 36 + }, + { + "name": "37. Сонар HC-SR04", + "num": 37, + "type": "Reading", + "subtype": "Sonar", + "id": "sonar", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Расстояние (см)", + "pinTrig": 5, + "pinEcho": 4, + "int": 5 + }, { "header": "Расширения" }, { - "name": "9. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", + "name": "38. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", "type": "Reading", "subtype": "IarduinoRTC", "id": "RTC", @@ -143,10 +563,10 @@ "dat": 4, "defFormat": "d-m-Y", "ticker": 0, - "num": 9 + "num": 38 }, { - "name": "10. Расширитель портов Mcp23017", + "name": "39. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -156,10 +576,10 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 10 + "num": 39 }, { - "name": "11. Доп. функции системы", + "name": "40. Доп. функции системы", "type": "Reading", "subtype": "SysExt", "id": "SysExt", @@ -167,10 +587,10 @@ "page": "", "descr": "", "int": 15, - "num": 11 + "num": 40 }, { - "name": "12. Переменная", + "name": "41. Переменная", "type": "Reading", "subtype": "Variable", "id": "var", @@ -179,6 +599,6 @@ "descr": "", "int": "0", "val": "0", - "num": 12 + "num": 41 } ] \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 6eb84ef9..5d7d5e67 100644 --- a/platformio.ini +++ b/platformio.ini @@ -53,6 +53,18 @@ lib_deps = marcoschwartz/LiquidCrystal_I2C@^1.1.4 dfrobot/DFRobotDFPlayerMini @ ^1.0.5 CTBot @2.1.9 + adafruit/Adafruit ADS1X15 @ ^2.3.0 + Adafruit AHTX0 + adafruit/Adafruit BME280 Library + adafruit/Adafruit BMP280 Library + beegee-tokyo/DHT sensor library for ESPx + milesburton/DallasTemperature@^3.9.1 + openenergymonitor/EmonLib@1.1.0 + https://github.com/JonasGMorsch/GY-21.git + ClosedCube HDC1080 + adafruit/MAX6675 library + Nova Fitness Sds dust sensors library@1.5.1 + robtillaart/SHT2x@^0.1.1 adafruit/Adafruit MCP23017 Arduino Library@^2.0.2 adafruit/Adafruit BusIO @ ^1.13.0 build_src_filter = @@ -63,6 +75,21 @@ build_src_filter = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/API.cpp b/src/modules/API.cpp index 50863c25..9310b89e 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -7,6 +7,21 @@ void* getAPI_IoTServo(String subtype, String params); void* getAPI_Mp3(String subtype, String params); void* getAPI_Telegram(String subtype, String params); void* getAPI_Timer(String subtype, String params); +void* getAPI_Ads1115(String subtype, String params); +void* getAPI_Aht20(String subtype, String params); +void* getAPI_AnalogAdc(String subtype, String params); +void* getAPI_Bme280(String subtype, String params); +void* getAPI_Bmp280(String subtype, String params); +void* getAPI_Dht1122(String subtype, String params); +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_Max6675(String subtype, String params); +void* getAPI_Mhz19(String subtype, String params); +void* getAPI_Sds011(String subtype, String params); +void* getAPI_Sht20(String subtype, String params); +void* getAPI_Sonar(String subtype, String params); void* getAPI_IarduinoRTC(String subtype, String params); void* getAPI_Mcp23017(String subtype, String params); void* getAPI_SysExt(String subtype, String params); @@ -21,6 +36,21 @@ if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Telegram(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Ads1115(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Aht20(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Bme280(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Bmp280(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Dht1122(subtype, params)) != nullptr) return tmpAPI; +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_Max6675(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_Sht20(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Sonar(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_IarduinoRTC(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_SysExt(subtype, params)) != nullptr) return tmpAPI; diff --git a/src/modules/sensors/Ads1115/items.json b/src/modules/sensors/Ads1115/items.json deleted file mode 100644 index af458b77..00000000 --- a/src/modules/sensors/Ads1115/items.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "name": "Датчик напряжения ADS1115", - "num": 28, - "type": "Reading", - "subtype": "Ads1115", - "id": "Ads3", - "widget": "anydataVlt", - "page": "Сенсоры", - "descr": "ADS_3", - - "pin": "0", - "mode": "volt", - "gain": "3/4x", - - "plus": 0, - "multiply": 1, - "round": 2, - "int": 10 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Ads1115/modinfo.json b/src/modules/sensors/Ads1115/modinfo.json new file mode 100644 index 00000000..9364f881 --- /dev/null +++ b/src/modules/sensors/Ads1115/modinfo.json @@ -0,0 +1,49 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Датчик напряжения ADS1115", + "type": "Reading", + "subtype": "Ads1115", + "id": "Ads3", + "widget": "anydataVlt", + "page": "Сенсоры", + "descr": "ADS_3", + + "pin": "0", + "mode": "volt", + "gain": "3/4x", + + "plus": 0, + "multiply": 1, + "round": 2, + "int": 10 + }], + + "about": { + "authorName": "Serghei Crasnicov", + "authorContact": "https://t.me/Serghei63", + "authorGit": "https://github.com/Serghei63", + "specialThanks": "", + "moduleName": "Ads1115", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить относительную величину напряжения на понижающем трансформаторе.", + "propInfo": { + "pin": "GPIO номер, к которому подключен датчик.", + "mode": "", + "gain": "", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "adafruit/Adafruit ADS1X15 @ ^2.3.0" + ], + "esp8266_4mb": [ + "adafruit/Adafruit ADS1X15 @ ^2.3.0" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Ads1115/platformio.ini b/src/modules/sensors/Ads1115/platformio.ini deleted file mode 100644 index 89446999..00000000 --- a/src/modules/sensors/Ads1115/platformio.ini +++ /dev/null @@ -1,7 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - adafruit/Adafruit ADS1X15 @ ^2.3.0 - -[env:esp32_4mb] -lib_deps = - adafruit/Adafruit ADS1X15 @ ^2.3.0 \ No newline at end of file diff --git a/src/modules/sensors/Aht20/items.json b/src/modules/sensors/Aht20/items.json deleted file mode 100644 index 91fcef48..00000000 --- a/src/modules/sensors/Aht20/items.json +++ /dev/null @@ -1,27 +0,0 @@ -[{ - "name": "Cенсор температуры AHT20", - "num": 12, - "type": "Reading", - "subtype": "Aht20t", - "id": "Temp20", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "AHT20 Температура", - "int": 15, - "addr": "0x38", - "round": 1 -}, -{ - "name": "Cенсор влажности AHT20", - "num": 13, - "type": "Reading", - "subtype": "Aht20h", - "id": "Hum20", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "AHT20 Влажность", - "int": 15, - "addr": "0x38", - "round": 1 -} -] \ No newline at end of file diff --git a/src/modules/sensors/Aht20/modinfo.json b/src/modules/sensors/Aht20/modinfo.json new file mode 100644 index 00000000..5ce12da0 --- /dev/null +++ b/src/modules/sensors/Aht20/modinfo.json @@ -0,0 +1,54 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры AHT20", + "type": "Reading", + "subtype": "Aht20t", + "id": "Temp20", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "AHT20 Температура", + "int": 15, + "addr": "0x38", + "round": 1 + }, + { + "name": "Cенсор влажности AHT20", + "type": "Reading", + "subtype": "Aht20h", + "id": "Hum20", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "AHT20 Влажность", + "int": 15, + "addr": "0x38", + "round": 1 + }], + + "about": { + "authorName": "Serghei Crasnicov", + "authorContact": "https://t.me/Serghei63", + "authorGit": "https://github.com/Serghei63", + "specialThanks": "", + "moduleName": "Aht20", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить температуру и влажность с Aht20.", + "propInfo": { + "pin": "GPIO номер, к которому подключен датчик.", + "addr": "Адрес датчика на шине, обычно 0x38.", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "Adafruit AHTX0" + ], + "esp8266_4mb": [ + "Adafruit AHTX0" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Aht20/platformio.ini b/src/modules/sensors/Aht20/platformio.ini deleted file mode 100644 index 5e37d73b..00000000 --- a/src/modules/sensors/Aht20/platformio.ini +++ /dev/null @@ -1,7 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - Adafruit AHTX0 - -[env:esp32_4mb] -lib_deps = - Adafruit AHTX0 diff --git a/src/modules/sensors/AnalogAdc/items.json b/src/modules/sensors/AnalogAdc/items.json deleted file mode 100644 index 53c22ab0..00000000 --- a/src/modules/sensors/AnalogAdc/items.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "name": "Аналоговый сенсор", - "num": 1, - "type": "Reading", - "subtype": "AnalogAdc", - "id": "t", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "map": "1,1024,1,100", - "plus": 0, - "multiply": 1, - "round": 1, - "pin": 0, - "int": 15, - "avgSteps": 1 - } -] \ No newline at end of file diff --git a/src/modules/sensors/AnalogAdc/modinfo.json b/src/modules/sensors/AnalogAdc/modinfo.json new file mode 100644 index 00000000..f7f5019c --- /dev/null +++ b/src/modules/sensors/AnalogAdc/modinfo.json @@ -0,0 +1,42 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Аналоговый сенсор", + "type": "Reading", + "subtype": "AnalogAdc", + "id": "t", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "map": "1,1024,1,100", + "plus": 0, + "multiply": 1, + "round": 1, + "pin": 0, + "int": 15, + "avgSteps": 1 + }], + + "about": { + "authorName": "Ilya Belyakov", + "authorContact": "https://t.me/Biveraxe", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "", + "moduleName": "AnalogAdc", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить текущее значение на аналоговом GPIO или усредненное для avgSteps измерений каждого вызова loop.", + "propInfo": { + "pin": "Аналоговый GPIO номер, к которому подключен датчик.", + "avgSteps": "Количество считываний для усреднения. При <=1, считывается одно значение за каждый период опроса.", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [], + "esp8266_4mb": [] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Bme280/items.json b/src/modules/sensors/Bme280/modinfo.json similarity index 50% rename from src/modules/sensors/Bme280/items.json rename to src/modules/sensors/Bme280/modinfo.json index c04bc9c4..8c63a82a 100644 --- a/src/modules/sensors/Bme280/items.json +++ b/src/modules/sensors/Bme280/modinfo.json @@ -1,7 +1,8 @@ -[ - { +{ + "menuSection": "Сенсоры", + + "configItem": [{ "name": "Cенсор температуры Bme280", - "num": 9, "type": "Reading", "subtype": "Bme280t", "id": "tmp3", @@ -14,7 +15,6 @@ }, { "name": "Cенсор давления Bme280", - "num": 10, "type": "Reading", "subtype": "Bme280p", "id": "Press3", @@ -27,7 +27,6 @@ }, { "name": "Cенсор влажности Bme280", - "num": 11, "type": "Reading", "subtype": "Bme280h", "id": "Hum3", @@ -37,5 +36,30 @@ "int": 15, "addr": "0x77", "round": 1 + }], + + "about": { + "authorName": "Ilya Belyakov", + "authorContact": "https://t.me/Biveraxe", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "Serghei Crasnicov @Serghei63", + "moduleName": "Bme280", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры, давления и влажности с Bme280.", + "propInfo": { + "addr": "Адрес датчика на шине, обычно 0x77.", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "adafruit/Adafruit BME280 Library" + ], + "esp8266_4mb": [ + "adafruit/Adafruit BME280 Library" + ] } -] \ No newline at end of file +} \ No newline at end of file diff --git a/src/modules/sensors/Bme280/platformio.ini b/src/modules/sensors/Bme280/platformio.ini deleted file mode 100644 index b4c83133..00000000 --- a/src/modules/sensors/Bme280/platformio.ini +++ /dev/null @@ -1,8 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - adafruit/Adafruit BME280 Library - -[env:esp32_4mb] -lib_deps = - adafruit/Adafruit BME280 Library - \ No newline at end of file diff --git a/src/modules/sensors/Bmp280/items.json b/src/modules/sensors/Bmp280/items.json deleted file mode 100644 index 1d5b7636..00000000 --- a/src/modules/sensors/Bmp280/items.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "name": "Cенсор температуры Bmp280", - "num": 7, - "type": "Reading", - "subtype": "Bmp280t", - "id": "tmp3", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "280 Температура", - "int": 15, - "addr": "0x77", - "round": 1 - }, - { - "name": "Cенсор давления Bmp280", - "num": 8, - "type": "Reading", - "subtype": "Bmp280p", - "id": "Press3", - "widget": "anydataMm", - "page": "Сенсоры", - "descr": "280 Давление", - "int": 15, - "addr": "0x77", - "round": 1 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json new file mode 100644 index 00000000..4428497a --- /dev/null +++ b/src/modules/sensors/Bmp280/modinfo.json @@ -0,0 +1,53 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры Bmp280", + "type": "Reading", + "subtype": "Bmp280t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "280 Температура", + "int": 15, + "addr": "0x77", + "round": 1 + }, + { + "name": "Cенсор давления Bmp280", + "type": "Reading", + "subtype": "Bmp280p", + "id": "Press3", + "widget": "anydataMm", + "page": "Сенсоры", + "descr": "280 Давление", + "int": 15, + "addr": "0x77", + "round": 1 + }], + + "about": { + "authorName": "Ilya Belyakov", + "authorContact": "https://t.me/Biveraxe", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "Serghei Crasnicov @Serghei63", + "moduleName": "Bmp280", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры и давления с Bmp280.", + "propInfo": { + "addr": "Адрес датчика на шине, обычно 0x77.", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8266_4mb": [ + "adafruit/Adafruit BMP280 Library" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Bmp280/platformio.ini b/src/modules/sensors/Bmp280/platformio.ini deleted file mode 100644 index 037efd48..00000000 --- a/src/modules/sensors/Bmp280/platformio.ini +++ /dev/null @@ -1,8 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - adafruit/Adafruit BMP280 Library - -[env:esp32_4mb] -lib_deps = - adafruit/Adafruit BMP280 Library - \ No newline at end of file diff --git a/src/modules/sensors/Dht1122/items.json b/src/modules/sensors/Dht1122/items.json deleted file mode 100644 index e3a90111..00000000 --- a/src/modules/sensors/Dht1122/items.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "name": "Cенсор температуры dht11", - "num": 5, - "type": "Reading", - "subtype": "Dht1122t", - "id": "tmp3", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "int": 15, - "pin": 0, - "senstype": "dht11" - }, - { - "name": "Cенсор влажности dht11", - "num": 6, - "type": "Reading", - "subtype": "Dht1122h", - "id": "Hum3", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "int": 15, - "pin": 0, - "senstype": "dht11" - } -] \ No newline at end of file diff --git a/src/modules/sensors/Dht1122/modinfo.json b/src/modules/sensors/Dht1122/modinfo.json new file mode 100644 index 00000000..b0a417b6 --- /dev/null +++ b/src/modules/sensors/Dht1122/modinfo.json @@ -0,0 +1,53 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры dht11", + "type": "Reading", + "subtype": "Dht1122t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "pin": 0, + "senstype": "dht11" + }, + { + "name": "Cенсор влажности dht11", + "type": "Reading", + "subtype": "Dht1122h", + "id": "Hum3", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "pin": 0, + "senstype": "dht11" + }], + + "about": { + "authorName": "Ilya Belyakov", + "authorContact": "https://t.me/Biveraxe", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "Serghei Crasnicov @Serghei63", + "moduleName": "Dht1122", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры и влажности с dht11 или dht22.", + "propInfo": { + "senstype": "Тип сенсора dht11 или dht22.", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "beegee-tokyo/DHT sensor library for ESPx" + ], + "esp8266_4mb": [ + "beegee-tokyo/DHT sensor library for ESPx" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Dht1122/platformio.ini b/src/modules/sensors/Dht1122/platformio.ini deleted file mode 100644 index 34170b0f..00000000 --- a/src/modules/sensors/Dht1122/platformio.ini +++ /dev/null @@ -1,7 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - beegee-tokyo/DHT sensor library for ESPx - -[env:esp32_4mb] -lib_deps = - beegee-tokyo/DHT sensor library for ESPx diff --git a/src/modules/sensors/Ds18b20/items.json b/src/modules/sensors/Ds18b20/items.json deleted file mode 100644 index f7214366..00000000 --- a/src/modules/sensors/Ds18b20/items.json +++ /dev/null @@ -1,17 +0,0 @@ -[ - { - "name": "Cенсор температуры ds18b20", - "num": 2, - "type": "Reading", - "subtype": "Ds18b20", - "id": "dstmp", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "DS Температура", - "int": 15, - "pin": 2, - "index": 0, - "addr": "", - "round": 1 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Ds18b20/modinfo.json b/src/modules/sensors/Ds18b20/modinfo.json new file mode 100644 index 00000000..1da2a4ea --- /dev/null +++ b/src/modules/sensors/Ds18b20/modinfo.json @@ -0,0 +1,45 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры ds18b20", + "type": "Reading", + "subtype": "Ds18b20", + "id": "dstmp", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "DS Температура", + "int": 15, + "pin": 2, + "index": 0, + "addr": "", + "round": 1 + }], + + "about": { + "authorName": "Ilya Belyakov", + "authorContact": "https://t.me/Biveraxe", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "", + "moduleName": "Ds18b20", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры с Ds18b20.", + "propInfo": { + "pin": "GPIO номер, к которому подключена шина данных датчиков.", + "index": "Порядковый номер датчика на шине.", + "addr": "Адрес датчика на шине для точной идентификации. Можно скопировать из консоли.", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "milesburton/DallasTemperature@^3.9.1" + ], + "esp8266_4mb": [ + "milesburton/DallasTemperature@^3.9.1" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Ds18b20/platformio.ini b/src/modules/sensors/Ds18b20/platformio.ini deleted file mode 100644 index 3cedd5d7..00000000 --- a/src/modules/sensors/Ds18b20/platformio.ini +++ /dev/null @@ -1,8 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - milesburton/DallasTemperature@^3.9.1 - -[env:esp32_4mb] -lib_deps = - milesburton/DallasTemperature@^3.9.1 - diff --git a/src/modules/sensors/Emon/items.json b/src/modules/sensors/Emon/items.json deleted file mode 100644 index 1facbc24..00000000 --- a/src/modules/sensors/Emon/items.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "name": "Датчик тока", - "num": 31, - "type": "Reading", - "subtype": "I", - "id": "current", - "widget": "anydataAmp", - "page": "Сенсоры", - "descr": "Датчик тока", - "int": 10, - "pin_I": 34, - "calib_I": 111.1, - "plus": 0, - "multiply": 1 - }, - { - "name": "Датчик напряжения", - "num": 32, - "type": "Reading", - "subtype": "U", - "id": "voltage", - "widget": "anydataVlt", - "page": "Сенсоры", - "descr": "Датчик напряжения", - "int": 10, - "pin_U": 35, - "calib_U": 223.1, - "plus": 0, - "multiply": 1 - } - - -] \ No newline at end of file diff --git a/src/modules/sensors/Emon/modinfo.json b/src/modules/sensors/Emon/modinfo.json new file mode 100644 index 00000000..27996acc --- /dev/null +++ b/src/modules/sensors/Emon/modinfo.json @@ -0,0 +1,60 @@ +{ + "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 + }], + + "about": { + "authorName": "Serghei Crasnicov", + "authorContact": "https://t.me/Serghei63", + "authorGit": "https://github.com/Serghei63", + "specialThanks": "", + "moduleName": "Emon", + "moduleVersion": "1.0", + "moduleDesc": ".", + "propInfo": { + "pin_U": "", + "calib_U": "", + "pin_I": "", + "calib_I": "", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "openenergymonitor/EmonLib@1.1.0" + ], + "esp8266_4mb": [ + "openenergymonitor/EmonLib@1.1.0" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Emon/platformio.ini b/src/modules/sensors/Emon/platformio.ini deleted file mode 100644 index 47b8b86f..00000000 --- a/src/modules/sensors/Emon/platformio.ini +++ /dev/null @@ -1,8 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - openenergymonitor/EmonLib@1.1.0 - -[env:esp32_4mb] -lib_deps = - openenergymonitor/EmonLib@1.1.0 - diff --git a/src/modules/sensors/GY21/items.json b/src/modules/sensors/GY21/items.json deleted file mode 100644 index 4acf44a0..00000000 --- a/src/modules/sensors/GY21/items.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "name": "Cенсор температуры GY21", - "num": 16, - "type": "Reading", - "subtype": "GY21t", - "id": "tmp4", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "round": 1, - "int": 15 - }, - { - "name": "Cенсор влажности GY21", - "num": 17, - "type": "Reading", - "subtype": "GY21h", - "id": "Hum4", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "round": 1, - "int": 15 - } -] \ No newline at end of file diff --git a/src/modules/sensors/GY21/modinfo.json b/src/modules/sensors/GY21/modinfo.json new file mode 100644 index 00000000..2955810c --- /dev/null +++ b/src/modules/sensors/GY21/modinfo.json @@ -0,0 +1,50 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры GY21", + "type": "Reading", + "subtype": "GY21t", + "id": "tmp4", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "round": 1, + "int": 15 + }, + { + "name": "Cенсор влажности GY21", + "type": "Reading", + "subtype": "GY21h", + "id": "Hum4", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "round": 1, + "int": 15 + }], + + "about": { + "authorName": "Alecs", + "authorContact": "https://t.me/Alecs", + "authorGit": "", + "specialThanks": "", + "moduleName": "GY21", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры и влажности с GY21.", + "propInfo": { + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "https://github.com/JonasGMorsch/GY-21.git" + ], + "esp8266_4mb": [ + "https://github.com/JonasGMorsch/GY-21.git" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/GY21/platformio.ini b/src/modules/sensors/GY21/platformio.ini deleted file mode 100644 index 06635eda..00000000 --- a/src/modules/sensors/GY21/platformio.ini +++ /dev/null @@ -1,8 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - https://github.com/JonasGMorsch/GY-21.git - -[env:esp32_4mb] -lib_deps = - https://github.com/JonasGMorsch/GY-21.git - \ No newline at end of file diff --git a/src/modules/sensors/Hdc1080/items.json b/src/modules/sensors/Hdc1080/items.json deleted file mode 100644 index 71a0ad41..00000000 --- a/src/modules/sensors/Hdc1080/items.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "name": "Cенсор температуры HDC1080", - "num": 14, - "type": "Reading", - "subtype": "Hdc1080t", - "id": "Temp1080", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "1080 Температура", - "int": 15, - "addr": "0x40", - "round": 1 - }, - { - "name": "Cенсор влажности HDC1080", - "num": 15, - "type": "Reading", - "subtype": "Hdc1080h", - "id": "Hum1080", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "1080 Влажность", - "int": 15, - "addr": "0x40", - "round": 1 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Hdc1080/modinfo.json b/src/modules/sensors/Hdc1080/modinfo.json new file mode 100644 index 00000000..7b1a1834 --- /dev/null +++ b/src/modules/sensors/Hdc1080/modinfo.json @@ -0,0 +1,53 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры HDC1080", + "type": "Reading", + "subtype": "Hdc1080t", + "id": "Temp1080", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "1080 Температура", + "int": 15, + "addr": "0x40", + "round": 1 + }, + { + "name": "Cенсор влажности HDC1080", + "type": "Reading", + "subtype": "Hdc1080h", + "id": "Hum1080", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "1080 Влажность", + "int": 15, + "addr": "0x40", + "round": 1 + }], + + "about": { + "authorName": "Serghei Crasnicov", + "authorContact": "https://t.me/Serghei63", + "authorGit": "https://github.com/Serghei63", + "specialThanks": "", + "moduleName": "Hdc1080", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры и влажности с Hdc1080.", + "propInfo": { + "addr": "Адрес датчика на шине данных, обычно 0x40", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "ClosedCube HDC1080" + ], + "esp8266_4mb": [ + "ClosedCube HDC1080" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Hdc1080/platformio.ini b/src/modules/sensors/Hdc1080/platformio.ini deleted file mode 100644 index 4bef7f3b..00000000 --- a/src/modules/sensors/Hdc1080/platformio.ini +++ /dev/null @@ -1,7 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - ClosedCube HDC1080 - -[env:esp32_4mb] -lib_deps = - ClosedCube HDC1080 diff --git a/src/modules/sensors/IoTWiegand/items.json b/src/modules/sensors/IoTWiegand/items.json deleted file mode 100644 index a4961357..00000000 --- a/src/modules/sensors/IoTWiegand/items.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "name": "Считыватель Wiegand", - "num": 31, - "type": "Reading", - "subtype": "IoTWiegand", - "id": "wg", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Считыватель", - "int": 0, - "pinD0": 13, - "pinD1": 12 - } -] \ No newline at end of file diff --git a/src/modules/sensors/IoTWiegand/modinfo.json b/src/modules/sensors/IoTWiegand/modinfo.json new file mode 100644 index 00000000..f0920806 --- /dev/null +++ b/src/modules/sensors/IoTWiegand/modinfo.json @@ -0,0 +1,42 @@ +{ + "menuSection": "Сенсоры", + + "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", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "", + "moduleName": "IoTWiegand", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить коды доступа по протоколу Wiegand с различных считывателей. На данный момент модуль в РАЗРАБОТКЕ", + "propInfo": { + "pinD0": "GPIO шины данных", + "pinD1": "GPIO шины данных", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": false, + + "devices": { + "esp32_4mb": [ + "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" + ], + "esp8266_4mb": [ + "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/IoTWiegand/platformio.ini b/src/modules/sensors/IoTWiegand/platformio.ini deleted file mode 100644 index bb1e349b..00000000 --- a/src/modules/sensors/IoTWiegand/platformio.ini +++ /dev/null @@ -1,10 +0,0 @@ -[env:esp8266_4mb] -iotm_include = false -lib_deps = - https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino - -[env:esp32_4mb] -iotm_include = false -lib_deps = - https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino - diff --git a/src/modules/sensors/Max6675/items.json b/src/modules/sensors/Max6675/items.json deleted file mode 100644 index 117b477c..00000000 --- a/src/modules/sensors/Max6675/items.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "name": "Cенсор температуры MAX6675", - "num": 31, - "type": "Reading", - "subtype": "Max6675t", - "id": "maxtmp", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "MAX Температура", - "int": 15, - "DO": 12, - "CS": 13, - "CLK": 14 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Max6675/modinfo.json b/src/modules/sensors/Max6675/modinfo.json new file mode 100644 index 00000000..b4dbc3b6 --- /dev/null +++ b/src/modules/sensors/Max6675/modinfo.json @@ -0,0 +1,44 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры MAX6675", + "type": "Reading", + "subtype": "Max6675t", + "id": "maxtmp", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "MAX Температура", + "int": 15, + "DO": 12, + "CS": 13, + "CLK": 14 + }], + + "about": { + "authorName": "Serghei Crasnicov", + "authorContact": "https://t.me/Serghei63", + "authorGit": "https://github.com/Serghei63", + "specialThanks": "", + "moduleName": "Max6675", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры с Max6675.", + "propInfo": { + "DO": "GPIO шины данных", + "CS": "GPIO шины данных", + "CLK": "GPIO шины данных", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "adafruit/MAX6675 library" + ], + "esp8266_4mb": [ + "adafruit/MAX6675 library" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Max6675/platformio.ini b/src/modules/sensors/Max6675/platformio.ini deleted file mode 100644 index 9e9dec29..00000000 --- a/src/modules/sensors/Max6675/platformio.ini +++ /dev/null @@ -1,8 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - adafruit/MAX6675 library - -[env:esp32_4mb] -lib_deps = - adafruit/MAX6675 library - diff --git a/src/modules/sensors/Mhz19/items.json b/src/modules/sensors/Mhz19/modinfo.json similarity index 72% rename from src/modules/sensors/Mhz19/items.json rename to src/modules/sensors/Mhz19/modinfo.json index 327bba53..9e75cd88 100644 --- a/src/modules/sensors/Mhz19/items.json +++ b/src/modules/sensors/Mhz19/modinfo.json @@ -1,7 +1,8 @@ -[ - { +{ + "menuSection": "Сенсоры", + + "configItem": [{ "name": "Датчик CO2 MHZ-19 UART", - "num": 20, "type": "Reading", "subtype": "Mhz19uart", "id": "co2uart", @@ -20,7 +21,6 @@ }, { "name": "Датчик CO2 MHZ-19 PWM", - "num": 21, "type": "Reading", "subtype": "Mhz19pwm", "id": "co2pwm", @@ -35,7 +35,6 @@ }, { "name": "Cенсор температуры от MHZ-19 UART", - "num": 22, "type": "Reading", "subtype": "Mhz19temp", "id": "Mhz19temp", @@ -52,7 +51,6 @@ }, { "name": "Рабочий диапазон от MHZ-19 UART", - "num": 23, "type": "Reading", "subtype": "Mhz19range", "id": "Mhz19range", @@ -70,7 +68,6 @@ }, { "name": "Автокалибровка от MHZ-19 UART", - "num": 24, "type": "Reading", "subtype": "Mhz19ABC", "id": "Mhz19ABC", @@ -82,5 +79,29 @@ "range": 5000, "ABC": 1, "int": 30 + }], + + "about": { + "authorName": "Alex K", + "authorContact": "https://t.me/cmche", + "authorGit": "", + "specialThanks": "", + "moduleName": "Mhz19", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры и CO2 с Mhz19.", + "propInfo": { + "int": "Количество секунд между опросами датчика.", + "rxPin": "", + "txPin": "", + "range": "", + "ABC": "" + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [], + "esp8266_4mb": [] } -] \ No newline at end of file +} \ No newline at end of file diff --git a/src/modules/sensors/Sds011/items.json b/src/modules/sensors/Sds011/items.json deleted file mode 100644 index b0dc8d30..00000000 --- a/src/modules/sensors/Sds011/items.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "name": "Датчик пыли SDS011 PM25", - "num": 18, - "type": "Reading", - "subtype": "Sds011_25", - "id": "pmuart25", - "widget": "anydataPpm", - "page": "Сенсоры", - "descr": "PM-2.5", - "plus": 0, - "multiply": 1, - "round": 10, - "rxPin": 13, - "txPin": 12, - "int": 15, - "warmUp": 30, - "period": 300 - }, - { - "name": "Датчик пыли SDS011 PM10", - "num": 19, - "type": "Reading", - "subtype": "Sds011_10", - "id": "pmuart10", - "widget": "anydataPpm", - "page": "Сенсоры", - "descr": "PM-10", - "plus": 0, - "multiply": 1, - "round": 10, - "rxPin": 13, - "txPin": 12, - "int": 15, - "warmUp": 30, - "period": 300 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Sds011/modinfo.json b/src/modules/sensors/Sds011/modinfo.json new file mode 100644 index 00000000..5b829344 --- /dev/null +++ b/src/modules/sensors/Sds011/modinfo.json @@ -0,0 +1,66 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Датчик пыли SDS011 PM25", + "type": "Reading", + "subtype": "Sds011_25", + "id": "pmuart25", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "PM-2.5", + "plus": 0, + "multiply": 1, + "round": 10, + "rxPin": 13, + "txPin": 12, + "int": 15, + "warmUp": 30, + "period": 300 + }, + { + "name": "Датчик пыли SDS011 PM10", + "type": "Reading", + "subtype": "Sds011_10", + "id": "pmuart10", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "PM-10", + "plus": 0, + "multiply": 1, + "round": 10, + "rxPin": 13, + "txPin": 12, + "int": 15, + "warmUp": 30, + "period": 300 + }], + + "about": { + "authorName": "Alex K", + "authorContact": "https://t.me/cmche", + "authorGit": "", + "specialThanks": "", + "moduleName": "Sds011", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения концентрации пыли в воздухе с Sds011.", + "propInfo": { + "int": "Количество секунд между опросами датчика.", + "rxPin": "", + "txPin": "", + "warmUp": "", + "period": "" + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "Nova Fitness Sds dust sensors library@1.5.1" + ], + "esp8266_4mb": [ + "Nova Fitness Sds dust sensors library@1.5.1" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Sds011/platformio.ini b/src/modules/sensors/Sds011/platformio.ini deleted file mode 100644 index 9cfb0c87..00000000 --- a/src/modules/sensors/Sds011/platformio.ini +++ /dev/null @@ -1,7 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - Nova Fitness Sds dust sensors library@1.5.1 - -[env:esp32_4mb] -lib_deps = - Nova Fitness Sds dust sensors library@1.5.1 diff --git a/src/modules/sensors/Sht20/items.json b/src/modules/sensors/Sht20/items.json deleted file mode 100644 index be83703c..00000000 --- a/src/modules/sensors/Sht20/items.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "name": "Cенсор температуры Sht20", - "num": 3, - "type": "Reading", - "subtype": "Sht20t", - "id": "tmp2", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "int": 15, - "round": 1 - }, - { - "name": "Cенсор влажности Sht20", - "num": 4, - "type": "Reading", - "subtype": "Sht20h", - "id": "Hum2", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "int": 15, - "round": 1 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Sht20/modinfo.json b/src/modules/sensors/Sht20/modinfo.json new file mode 100644 index 00000000..ba5b9705 --- /dev/null +++ b/src/modules/sensors/Sht20/modinfo.json @@ -0,0 +1,50 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Cенсор температуры Sht20", + "type": "Reading", + "subtype": "Sht20t", + "id": "tmp2", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "round": 1 + }, + { + "name": "Cенсор влажности Sht20", + "type": "Reading", + "subtype": "Sht20h", + "id": "Hum2", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "round": 1 + }], + + "about": { + "authorName": "Ilya Belyakov", + "authorContact": "https://t.me/Biveraxe", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "", + "moduleName": "Sht20", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значения температуры и влажности с Sht20.", + "propInfo": { + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_4mb": [ + "robtillaart/SHT2x@^0.1.1" + ] + } +} \ No newline at end of file diff --git a/src/modules/sensors/Sht20/platformio.ini b/src/modules/sensors/Sht20/platformio.ini deleted file mode 100644 index aeb22d50..00000000 --- a/src/modules/sensors/Sht20/platformio.ini +++ /dev/null @@ -1,7 +0,0 @@ -[env:esp8266_4mb] -lib_deps = - robtillaart/SHT2x@^0.1.1 - -[env:esp32_4mb] -lib_deps = - robtillaart/SHT2x@^0.1.1 diff --git a/src/modules/sensors/Sonar/items.json b/src/modules/sensors/Sonar/items.json deleted file mode 100644 index ee00644c..00000000 --- a/src/modules/sensors/Sonar/items.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "name": "Сонар HC-SR04", - "num": 1, - "type": "Reading", - "subtype": "Sonar", - "id": "sonar", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Расстояние", - - "pinTrig": 5, - "pinEcho": 4, - "int": 5 - } -] \ No newline at end of file diff --git a/src/modules/sensors/Sonar/modinfo.json b/src/modules/sensors/Sonar/modinfo.json new file mode 100644 index 00000000..ac877d83 --- /dev/null +++ b/src/modules/sensors/Sonar/modinfo.json @@ -0,0 +1,40 @@ +{ + "menuSection": "Сенсоры", + + "configItem": [{ + "name": "Сонар HC-SR04", + "num": 1, + "type": "Reading", + "subtype": "Sonar", + "id": "sonar", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Расстояние (см)", + + "pinTrig": 5, + "pinEcho": 4, + "int": 5 + }], + + "about": { + "authorName": "Ilya Belyakov", + "authorContact": "https://t.me/Biveraxe", + "authorGit": "https://github.com/biveraxe", + "specialThanks": "", + "moduleName": "Sonar", + "moduleVersion": "1.0", + "moduleDesc": "Позволяет получить значение расстояния до препятствия с использованием ультразвукового датчика (в сантиметрах).", + "propInfo": { + "pinTrig": "GPIO контакта Trig", + "pinEcho": "GPIO контакта Echo", + "int": "Количество секунд между опросами датчика." + } + }, + + "defActive": true, + + "devices": { + "esp32_4mb": [], + "esp8266_4mb": [] + } +} \ No newline at end of file