diff --git a/data_svelte/items.json b/data_svelte/items.json index 7e530a2f..f011b1ff 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -192,7 +192,19 @@ "header": "Сенсоры" }, { - "name": "13. Acs712 Ток", + "name": "13. A02 Дальность", + "type": "Reading", + "subtype": "A02Distance", + "id": "dist", + "widget": "anydataCm", + "page": "Сенсоры", + "descr": "Дальность", + "int": 5, + "round": 1, + "num": 13 + }, + { + "name": "14. Acs712 Ток", "type": "Reading", "subtype": "Acs712", "id": "amp", @@ -207,11 +219,11 @@ "sens": 100, "adczero": 512, "btn-setZero": "nil", - "num": 13 + "num": 14 }, { "global": 0, - "name": "14. AHTXX Температура", + "name": "15. AHTXX Температура", "type": "Reading", "subtype": "AhtXXt", "id": "Temp20", @@ -222,11 +234,11 @@ "addr": "0x38", "shtType": 1, "round": 1, - "num": 14 + "num": 15 }, { "global": 0, - "name": "15. AHTXX Влажность", + "name": "16. AHTXX Влажность", "type": "Reading", "subtype": "AhtXXh", "id": "Hum20", @@ -237,11 +249,11 @@ "addr": "0x38", "shtType": 1, "round": 1, - "num": 15 + "num": 16 }, { "global": 0, - "name": "16. Аналоговый сенсор", + "name": "17. Аналоговый сенсор", "type": "Reading", "subtype": "AnalogAdc", "id": "t", @@ -255,11 +267,11 @@ "pin": 0, "int": 15, "avgSteps": 1, - "num": 16 + "num": 17 }, { "global": 0, - "name": "17. BME280 Температура", + "name": "18. BME280 Температура", "type": "Reading", "subtype": "Bme280t", "id": "Tmp3", @@ -269,11 +281,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 17 + "num": 18 }, { "global": 0, - "name": "18. BME280 Давление", + "name": "19. BME280 Давление", "type": "Reading", "subtype": "Bme280p", "id": "Press3", @@ -283,11 +295,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 18 + "num": 19 }, { "global": 0, - "name": "19. BME280 Влажность", + "name": "20. BME280 Влажность", "type": "Reading", "subtype": "Bme280h", "id": "Hum3", @@ -297,11 +309,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 19 + "num": 20 }, { "global": 0, - "name": "20. BME280 Tочка росы", + "name": "21. BME280 Tочка росы", "type": "Reading", "subtype": "Bme280dp", "id": "Dew3", @@ -311,11 +323,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 20 + "num": 21 }, { "global": 0, - "name": "21. BMP280 Температура", + "name": "22. BMP280 Температура", "type": "Reading", "subtype": "Bmp280t", "id": "tmp3", @@ -325,11 +337,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 21 + "num": 22 }, { "global": 0, - "name": "22. BMP280 Давление", + "name": "23. BMP280 Давление", "type": "Reading", "subtype": "Bmp280p", "id": "Press3", @@ -339,11 +351,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 22 + "num": 23 }, { "global": 0, - "name": "23. DHT11 Температура", + "name": "24. DHT11 Температура", "type": "Reading", "subtype": "Dht1122t", "id": "tmp3", @@ -353,11 +365,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 23 + "num": 24 }, { "global": 0, - "name": "24. DHT11 Влажность", + "name": "25. DHT11 Влажность", "type": "Reading", "subtype": "Dht1122h", "id": "Hum3", @@ -367,11 +379,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 24 + "num": 25 }, { "global": 0, - "name": "25. DS18B20 Температура", + "name": "26. DS18B20 Температура", "type": "Reading", "subtype": "Ds18b20", "id": "dstmp", @@ -383,11 +395,11 @@ "index": 0, "addr": "", "round": 1, - "num": 25 + "num": 26 }, { "global": 0, - "name": "26. Аналоговый счетчик импульсов", + "name": "27. Аналоговый счетчик импульсов", "type": "Writing", "subtype": "Impulse", "id": "impulse", @@ -400,11 +412,11 @@ "pinMode": "INPUT", "debounceDelay": 3, "multiply": 1, - "num": 26 + "num": 27 }, { "global": 0, - "name": "27. PZEM 004t Напряжение", + "name": "28. PZEM 004t Напряжение", "type": "Reading", "subtype": "Pzem004v", "id": "v", @@ -414,11 +426,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 27 + "num": 28 }, { "global": 0, - "name": "28. PZEM 004t Сила тока", + "name": "29. PZEM 004t Сила тока", "type": "Reading", "subtype": "Pzem004a", "id": "a", @@ -428,11 +440,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 28 + "num": 29 }, { "global": 0, - "name": "29. PZEM 004t Мощность", + "name": "30. PZEM 004t Мощность", "type": "Reading", "subtype": "Pzem004w", "id": "w", @@ -442,11 +454,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 29 + "num": 30 }, { "global": 0, - "name": "30. PZEM 004t Энергия", + "name": "31. PZEM 004t Энергия", "type": "Reading", "subtype": "Pzem004wh", "id": "wh", @@ -456,11 +468,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 30 + "num": 31 }, { "global": 0, - "name": "31. PZEM 004t Частота", + "name": "32. PZEM 004t Частота", "type": "Reading", "subtype": "Pzem004hz", "id": "hz", @@ -470,11 +482,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 31 + "num": 32 }, { "global": 0, - "name": "32. PZEM 004t Косинус", + "name": "33. PZEM 004t Косинус", "type": "Reading", "subtype": "Pzem004pf", "id": "pf", @@ -484,11 +496,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 32 + "num": 33 }, { "global": 0, - "name": "33. PZEM настройка", + "name": "34. PZEM настройка", "type": "Reading", "subtype": "Pzem004cmd", "id": "set", @@ -500,11 +512,11 @@ "changeaddr": 0, "setaddr": "0x01", "reset": 0, - "num": 33 + "num": 34 }, { "global": 0, - "name": "34. Часы реального времени", + "name": "35. Часы реального времени", "type": "Reading", "subtype": "RTC", "id": "rtc", @@ -520,11 +532,25 @@ "int": 5, "btn-setUTime": "0", "btn-setSysTime": "nil", - "num": 34 + "num": 35 + }, + { + "name": "36. (S8) Cенсор качества воздуха", + "num": 36, + "type": "Reading", + "subtype": "S8co", + "id": "s8co", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "S8_CO2", + "int": 15, + "round": 1, + "rxPin": 13, + "txPin": 15 }, { "global": 0, - "name": "35. Sht20 Температура", + "name": "37. Sht20 Температура", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -533,11 +559,11 @@ "descr": "Температура", "int": 15, "round": 1, - "num": 35 + "num": 37 }, { "global": 0, - "name": "36. Sht20 Влажность", + "name": "38. Sht20 Влажность", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -546,11 +572,11 @@ "descr": "Влажность", "int": 15, "round": 1, - "num": 36 + "num": 38 }, { "global": 0, - "name": "37. Sht30 Температура", + "name": "39. Sht30 Температура", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -559,11 +585,11 @@ "descr": "SHT30 Температура", "int": 15, "round": 1, - "num": 37 + "num": 39 }, { "global": 0, - "name": "38. Sht30 Влажность", + "name": "40. Sht30 Влажность", "type": "Reading", "subtype": "Sht30h", "id": "Hum30", @@ -572,12 +598,12 @@ "descr": "SHT30 Влажность", "int": 15, "round": 1, - "num": 38 + "num": 40 }, { "global": 0, - "name": "39. HC-SR04 Ультразвуковой дальномер", - "num": 39, + "name": "41. HC-SR04 Ультразвуковой дальномер", + "num": 41, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -589,7 +615,7 @@ "int": 5 }, { - "name": "40. UART", + "name": "42. UART", "type": "Reading", "subtype": "UART", "page": "", @@ -601,14 +627,14 @@ "line": 2, "speed": 9600, "eventFormat": 0, - "num": 40 + "num": 42 }, { "header": "Исполнительные устройства" }, { "global": 0, - "name": "41. Кнопка подключенная к пину", + "name": "43. Кнопка подключенная к пину", "type": "Writing", "subtype": "ButtonIn", "id": "btn", @@ -623,11 +649,11 @@ "debounceDelay": 50, "fixState": 0, "inv": 0, - "num": 41 + "num": 43 }, { "global": 0, - "name": "42. Управление пином", + "name": "44. Управление пином", "type": "Writing", "subtype": "ButtonOut", "needSave": 0, @@ -638,11 +664,28 @@ "int": 0, "inv": 0, "pin": 2, - "num": 42 + "num": 44 }, { "global": 0, - "name": "43. Сервопривод", + "name": "45. Энкодер", + "type": "Writing", + "subtype": "Encoder", + "id": "enc", + "widget": "inputDgt", + "page": "Энкодер", + "descr": "Громкость", + "needSave": 0, + "val": "0", + "round": 0, + "step": 1, + "stepOnPress": 5, + "pins": "4,5,2", + "num": 45 + }, + { + "global": 0, + "name": "46. Сервопривод", "type": "Writing", "subtype": "IoTServo", "id": "servo", @@ -653,11 +696,11 @@ "pin": 12, "apin": -1, "amap": "0, 4096, 0, 180", - "num": 43 + "num": 46 }, { "global": 0, - "name": "44. Расширитель портов Mcp23017", + "name": "47. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -667,11 +710,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 44 + "num": 47 }, { "global": 0, - "name": "45. MP3 плеер", + "name": "48. MP3 плеер", "type": "Reading", "subtype": "Mp3", "id": "mp3", @@ -681,11 +724,11 @@ "int": 1, "pins": "14,12", "volume": 20, - "num": 45 + "num": 48 }, { "global": 0, - "name": "46. Сенсорная кнопка", + "name": "49. Сенсорная кнопка", "type": "Writing", "subtype": "Multitouch", "id": "impulse", @@ -699,11 +742,11 @@ "pinMode": "INPUT", "debounceDelay": 50, "PWMDelay": 500, - "num": 46 + "num": 49 }, { "global": 0, - "name": "47. Расширитель портов Pcf8574", + "name": "50. Расширитель портов Pcf8574", "type": "Reading", "subtype": "Pcf8574", "id": "Pcf", @@ -713,11 +756,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 47 + "num": 50 }, { "global": 0, - "name": "48. PWM ESP8266", + "name": "51. PWM ESP8266", "type": "Writing", "subtype": "Pwm8266", "id": "pwm", @@ -729,11 +772,11 @@ "freq": 5000, "val": 0, "apin": -1, - "num": 48 + "num": 51 }, { "global": 0, - "name": "49. Телеграм-Лайт", + "name": "52. Телеграм-Лайт", "type": "Writing", "subtype": "TelegramLT", "id": "tg", @@ -742,14 +785,14 @@ "descr": "", "token": "", "chatID": "", - "num": 49 + "num": 52 }, { "header": "Экраны" }, { "global": 0, - "name": "50. LCD экран 2004", + "name": "53. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -761,10 +804,10 @@ "size": "20,4", "coord": "0,0", "id2show": "id датчика", - "num": 50 + "num": 53 }, { - "name": "51. LCD экран 1602", + "name": "54. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -776,6 +819,6 @@ "size": "16,2", "coord": "0,0", "id2show": "id датчика", - "num": 51 + "num": 54 } ] \ No newline at end of file diff --git a/data_svelte_lite/items.json b/data_svelte_lite/items.json index c1501407..2d7b8c7a 100644 --- a/data_svelte_lite/items.json +++ b/data_svelte_lite/items.json @@ -23,7 +23,52 @@ }, { "global": 0, - "name": "2. Таймер", + "name": "2. График", + "type": "Writing", + "subtype": "Loging", + "id": "log", + "widget": "chart2", + "page": "Графики", + "descr": "Температура", + "num": 2, + "int": 5, + "logid": "t", + "points": 300 + }, + { + "global": 0, + "name": "3. График по событию", + "type": "Writing", + "subtype": "Loging", + "id": "log", + "widget": "chart2", + "page": "Графики", + "descr": "Температура", + "int": 0, + "num": 3, + "points": 300 + }, + { + "global": 0, + "name": "4. График дневного расхода", + "type": "Writing", + "subtype": "LogingDaily", + "id": "log", + "widget": "chart3", + "page": "Графики", + "descr": "Температура", + "num": 4, + "int": 1, + "logid": "t", + "points": 365, + "telegram": 0, + "test": 0, + "btn-defvalue": 0, + "btn-reset": "nil" + }, + { + "global": 0, + "name": "5. Таймер", "type": "Writing", "subtype": "Timer", "id": "timer", @@ -35,11 +80,11 @@ "ticker": 1, "repeat": 1, "needSave": 0, - "num": 2 + "num": 5 }, { "global": 0, - "name": "3. Окно ввода числа (переменная)", + "name": "6. Окно ввода числа (переменная)", "type": "Reading", "subtype": "Variable", "id": "value", @@ -53,11 +98,11 @@ "plus": 0, "multiply": 1, "round": 0, - "num": 3 + "num": 6 }, { "global": 0, - "name": "4. Окно ввода времени", + "name": "7. Окно ввода времени", "type": "Reading", "subtype": "Variable", "id": "time", @@ -67,11 +112,11 @@ "descr": "Введите время", "int": "0", "val": "02:00", - "num": 4 + "num": 7 }, { "global": 0, - "name": "5. Окно ввода даты", + "name": "8. Окно ввода даты", "type": "Reading", "subtype": "Variable", "id": "time", @@ -81,11 +126,11 @@ "descr": "Введите дату", "int": "0", "val": "24.05.2022", - "num": 5 + "num": 8 }, { "global": 0, - "name": "6. Окно ввода текста", + "name": "9. Окно ввода текста", "type": "Reading", "subtype": "Variable", "id": "txt", @@ -95,11 +140,11 @@ "descr": "Введите текст", "int": "0", "val": "текст", - "num": 6 + "num": 9 }, { "global": 0, - "name": "7. Вывод значения", + "name": "10. Вывод значения", "type": "Reading", "subtype": "Variable", "id": "vout", @@ -113,11 +158,11 @@ "plus": 0, "multiply": 1, "round": 0, - "num": 7 + "num": 10 }, { "global": 0, - "name": "8. Цветной текст", + "name": "11. Цветной текст", "type": "Reading", "subtype": "VariableColor", "id": "color", @@ -127,11 +172,11 @@ "descr": "Цветной текст", "val": "...", "round": 0, - "num": 8 + "num": 11 }, { "global": 0, - "name": "9. Виртуальная кнопка", + "name": "12. Виртуальная кнопка", "type": "Reading", "subtype": "VButton", "id": "vbtn", @@ -141,14 +186,44 @@ "descr": "Кнопка", "int": "0", "val": "0", - "num": 9 + "num": 12 }, { "header": "Сенсоры" }, + { + "name": "13. A02 Дальность", + "type": "Reading", + "subtype": "A02Distance", + "id": "dist", + "widget": "anydataCm", + "page": "Сенсоры", + "descr": "Дальность", + "int": 5, + "round": 1, + "num": 13 + }, + { + "name": "14. Acs712 Ток", + "type": "Reading", + "subtype": "Acs712", + "id": "amp", + "widget": "anydataAmp", + "page": "Сенсоры", + "descr": "Ток", + "round": 3, + "pin": 39, + "int": 5, + "rms": 1, + "vref": 5000, + "sens": 100, + "adczero": 512, + "btn-setZero": "nil", + "num": 14 + }, { "global": 0, - "name": "10. Аналоговый сенсор", + "name": "15. Аналоговый сенсор", "type": "Reading", "subtype": "AnalogAdc", "id": "t", @@ -162,11 +237,67 @@ "pin": 0, "int": 15, "avgSteps": 1, - "num": 10 + "num": 15 }, { "global": 0, - "name": "11. BMP280 Температура", + "name": "16. BME280 Температура", + "type": "Reading", + "subtype": "Bme280t", + "id": "Tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 16 + }, + { + "global": 0, + "name": "17. BME280 Давление", + "type": "Reading", + "subtype": "Bme280p", + "id": "Press3", + "widget": "anydataMm", + "page": "Сенсоры", + "descr": "Давление", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 17 + }, + { + "global": 0, + "name": "18. BME280 Влажность", + "type": "Reading", + "subtype": "Bme280h", + "id": "Hum3", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 18 + }, + { + "global": 0, + "name": "19. BME280 Tочка росы", + "type": "Reading", + "subtype": "Bme280dp", + "id": "Dew3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Точка росы", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 19 + }, + { + "global": 0, + "name": "20. BMP280 Температура", "type": "Reading", "subtype": "Bmp280t", "id": "tmp3", @@ -176,11 +307,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 11 + "num": 20 }, { "global": 0, - "name": "12. BMP280 Давление", + "name": "21. BMP280 Давление", "type": "Reading", "subtype": "Bmp280p", "id": "Press3", @@ -190,11 +321,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 12 + "num": 21 }, { "global": 0, - "name": "13. DS18B20 Температура", + "name": "22. DS18B20 Температура", "type": "Reading", "subtype": "Ds18b20", "id": "dstmp", @@ -206,11 +337,128 @@ "index": 0, "addr": "", "round": 1, - "num": 13 + "num": 22 }, { "global": 0, - "name": "14. Часы реального времени", + "name": "23. Аналоговый счетчик импульсов", + "type": "Writing", + "subtype": "Impulse", + "id": "impulse", + "widget": "anydataDef", + "page": "Счетчики", + "descr": "Импульсов", + "needSave": 0, + "int": 1, + "pin": 16, + "pinMode": "INPUT", + "debounceDelay": 3, + "multiply": 1, + "num": 23 + }, + { + "global": 0, + "name": "24. PZEM 004t Напряжение", + "type": "Reading", + "subtype": "Pzem004v", + "id": "v", + "widget": "anydataVlt", + "page": "PZEM", + "descr": "Напряжение", + "int": 15, + "addr": "0xF8", + "round": 1, + "num": 24 + }, + { + "global": 0, + "name": "25. PZEM 004t Сила тока", + "type": "Reading", + "subtype": "Pzem004a", + "id": "a", + "widget": "anydataAmp", + "page": "PZEM", + "descr": "Сила тока", + "int": 15, + "addr": "0xF8", + "round": 1, + "num": 25 + }, + { + "global": 0, + "name": "26. PZEM 004t Мощность", + "type": "Reading", + "subtype": "Pzem004w", + "id": "w", + "widget": "anydataWt", + "page": "PZEM", + "descr": "Мощность", + "int": 15, + "addr": "0xF8", + "round": 1, + "num": 26 + }, + { + "global": 0, + "name": "27. PZEM 004t Энергия", + "type": "Reading", + "subtype": "Pzem004wh", + "id": "wh", + "widget": "anydataWth", + "page": "PZEM", + "descr": "Энергия", + "int": 15, + "addr": "0xF8", + "round": 1, + "num": 27 + }, + { + "global": 0, + "name": "28. PZEM 004t Частота", + "type": "Reading", + "subtype": "Pzem004hz", + "id": "hz", + "widget": "anydataHtz", + "page": "PZEM", + "descr": "Частота", + "int": 15, + "addr": "0xF8", + "round": 1, + "num": 28 + }, + { + "global": 0, + "name": "29. PZEM 004t Косинус", + "type": "Reading", + "subtype": "Pzem004pf", + "id": "pf", + "widget": "anydata", + "page": "PZEM", + "descr": "Косинус F", + "int": 15, + "addr": "0xF8", + "round": 1, + "num": 29 + }, + { + "global": 0, + "name": "30. PZEM настройка", + "type": "Reading", + "subtype": "Pzem004cmd", + "id": "set", + "widget": "nil", + "page": "", + "descr": "", + "int": 15, + "addr": "0xF8", + "changeaddr": 0, + "setaddr": "0x01", + "reset": 0, + "num": 30 + }, + { + "global": 0, + "name": "31. Часы реального времени", "type": "Reading", "subtype": "RTC", "id": "rtc", @@ -226,11 +474,11 @@ "int": 5, "btn-setUTime": "0", "btn-setSysTime": "nil", - "num": 14 + "num": 31 }, { "global": 0, - "name": "15. Sht20 Температура", + "name": "32. Sht20 Температура", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -239,11 +487,11 @@ "descr": "Температура", "int": 15, "round": 1, - "num": 15 + "num": 32 }, { "global": 0, - "name": "16. Sht20 Влажность", + "name": "33. Sht20 Влажность", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -252,11 +500,11 @@ "descr": "Влажность", "int": 15, "round": 1, - "num": 16 + "num": 33 }, { "global": 0, - "name": "17. Sht30 Температура", + "name": "34. Sht30 Температура", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -265,11 +513,11 @@ "descr": "SHT30 Температура", "int": 15, "round": 1, - "num": 17 + "num": 34 }, { "global": 0, - "name": "18. Sht30 Влажность", + "name": "35. Sht30 Влажность", "type": "Reading", "subtype": "Sht30h", "id": "Hum30", @@ -278,12 +526,12 @@ "descr": "SHT30 Влажность", "int": 15, "round": 1, - "num": 18 + "num": 35 }, { "global": 0, - "name": "19. HC-SR04 Ультразвуковой дальномер", - "num": 19, + "name": "36. HC-SR04 Ультразвуковой дальномер", + "num": 36, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -294,12 +542,27 @@ "pinEcho": 4, "int": 5 }, + { + "name": "37. UART", + "type": "Reading", + "subtype": "UART", + "page": "", + "descr": "", + "widget": "nil", + "id": "u", + "tx": 4, + "rx": 5, + "line": 2, + "speed": 9600, + "eventFormat": 0, + "num": 37 + }, { "header": "Исполнительные устройства" }, { "global": 0, - "name": "20. Кнопка подключенная к пину", + "name": "38. Кнопка подключенная к пину", "type": "Writing", "subtype": "ButtonIn", "id": "btn", @@ -314,11 +577,11 @@ "debounceDelay": 50, "fixState": 0, "inv": 0, - "num": 20 + "num": 38 }, { "global": 0, - "name": "21. Управление пином", + "name": "39. Управление пином", "type": "Writing", "subtype": "ButtonOut", "needSave": 0, @@ -329,11 +592,11 @@ "int": 0, "inv": 0, "pin": 2, - "num": 21 + "num": 39 }, { "global": 0, - "name": "22. Расширитель портов Mcp23017", + "name": "40. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -343,11 +606,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 22 + "num": 40 }, { "global": 0, - "name": "23. Сенсорная кнопка", + "name": "41. Сенсорная кнопка", "type": "Writing", "subtype": "Multitouch", "id": "impulse", @@ -361,11 +624,11 @@ "pinMode": "INPUT", "debounceDelay": 50, "PWMDelay": 500, - "num": 23 + "num": 41 }, { "global": 0, - "name": "24. Расширитель портов Pcf8574", + "name": "42. Расширитель портов Pcf8574", "type": "Reading", "subtype": "Pcf8574", "id": "Pcf", @@ -375,11 +638,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 24 + "num": 42 }, { "global": 0, - "name": "25. PWM ESP8266", + "name": "43. PWM ESP8266", "type": "Writing", "subtype": "Pwm8266", "id": "pwm", @@ -391,11 +654,11 @@ "freq": 5000, "val": 0, "apin": -1, - "num": 25 + "num": 43 }, { "global": 0, - "name": "26. Телеграм-Лайт", + "name": "44. Телеграм-Лайт", "type": "Writing", "subtype": "TelegramLT", "id": "tg", @@ -404,14 +667,14 @@ "descr": "", "token": "", "chatID": "", - "num": 26 + "num": 44 }, { "header": "Экраны" }, { "global": 0, - "name": "27. LCD экран 2004", + "name": "45. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -423,10 +686,10 @@ "size": "20,4", "coord": "0,0", "id2show": "id датчика", - "num": 27 + "num": 45 }, { - "name": "28. LCD экран 1602", + "name": "46. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -438,6 +701,6 @@ "size": "16,2", "coord": "0,0", "id2show": "id датчика", - "num": 28 + "num": 46 } ] \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index f5e22a8e..f2239849 100644 --- a/platformio.ini +++ b/platformio.ini @@ -178,7 +178,16 @@ build_src_filter = lib_deps = adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library - plerup/espsoftwareserial + https://github.com/milesburton/Arduino-Temperature-Control-Library + https://github.com/tremaru/iarduino_RTC + robtillaart/SHT2x@^0.1.1 + WEMOS SHT3x@1.0.0 + plerup/EspSoftwareSerial + adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 + adafruit/Adafruit BusIO @ ^1.13.2 + adafruit/Adafruit BusIO @ ^1.13.2 + https://github.com/robotclass/RobotClass_LiquidCrystal_I2C + marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = + + @@ -187,18 +196,43 @@ build_src_filter = + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [env:esp8266_1mb_fromitems] lib_deps = adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library - plerup/espsoftwareserial + https://github.com/milesburton/Arduino-Temperature-Control-Library + IRremote @ ^4.1.2 + https://github.com/tremaru/iarduino_RTC + robtillaart/SHT2x@^0.1.1 + WEMOS SHT3x@1.0.0 + plerup/EspSoftwareSerial + adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 + adafruit/Adafruit BusIO @ ^1.13.2 + adafruit/Adafruit BusIO @ ^1.13.2 + https://github.com/robotclass/RobotClass_LiquidCrystal_I2C + marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = + + @@ -207,13 +241,28 @@ build_src_filter = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [env:esp8266_2mb_fromitems] lib_deps = @@ -274,27 +323,41 @@ build_src_filter = lib_deps = adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library - milesburton/DallasTemperature@^3.9.1 + https://github.com/milesburton/Arduino-Temperature-Control-Library + https://github.com/tremaru/iarduino_RTC robtillaart/SHT2x@^0.1.1 WEMOS SHT3x@1.0.0 + plerup/EspSoftwareSerial + gyverlibs/EncButton @ ^2.0 adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 adafruit/Adafruit BusIO @ ^1.13.2 adafruit/Adafruit BusIO @ ^1.13.2 + https://github.com/robotclass/RobotClass_LiquidCrystal_I2C marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -313,6 +376,61 @@ lib_deps = robtillaart/SHT2x@^0.1.1 WEMOS SHT3x@1.0.0 plerup/EspSoftwareSerial + gyverlibs/EncButton @ ^2.0 + adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 + adafruit/Adafruit BusIO @ ^1.13.2 + dfrobot/DFRobotDFPlayerMini @ ^1.0.5 + adafruit/Adafruit BusIO @ ^1.13.2 + https://github.com/robotclass/RobotClass_LiquidCrystal_I2C + marcoschwartz/LiquidCrystal_I2C@^1.1.4 +build_src_filter = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[env:esp32_4mb_fromitems] +lib_deps = + https://github.com/enjoyneering/AHTxx.git + adafruit/Adafruit BME280 Library + adafruit/Adafruit BMP280 Library + beegee-tokyo/DHT sensor library for ESPx + https://github.com/milesburton/Arduino-Temperature-Control-Library + https://github.com/tremaru/iarduino_RTC + robtillaart/SHT2x@^0.1.1 + WEMOS SHT3x@1.0.0 + plerup/EspSoftwareSerial + https://github.com/RoboticsBrno/ServoESP32 adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 adafruit/Adafruit BusIO @ ^1.13.2 dfrobot/DFRobotDFPlayerMini @ ^1.0.5 @@ -337,6 +455,7 @@ build_src_filter = + + + + + + + + @@ -348,30 +467,7 @@ build_src_filter = + + + - + + + + + -[env:esp32_4mb_fromitems] -lib_deps = - adafruit/Adafruit BME280 Library - adafruit/Adafruit BMP280 Library - https://github.com/tremaru/iarduino_RTC - plerup/EspSoftwareSerial -build_src_filter = - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - diff --git a/src/modules/API.cpp b/src/modules/API.cpp index 12480f10..7e9a1f3d 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -7,6 +7,7 @@ void* getAPI_Timer(String subtype, String params); void* getAPI_Variable(String subtype, String params); void* getAPI_VariableColor(String subtype, String params); void* getAPI_VButton(String subtype, String params); +void* getAPI_A02Distance(String subtype, String params); void* getAPI_Acs712(String subtype, String params); void* getAPI_AhtXX(String subtype, String params); void* getAPI_AnalogAdc(String subtype, String params); @@ -17,12 +18,14 @@ void* getAPI_Ds18b20(String subtype, String params); void* getAPI_Impulse(String subtype, String params); void* getAPI_Pzem004(String subtype, String params); void* getAPI_RTC(String subtype, String params); +void* getAPI_S8(String subtype, String params); void* getAPI_Sht20(String subtype, String params); void* getAPI_Sht30(String subtype, String params); void* getAPI_Sonar(String subtype, String params); void* getAPI_UART(String subtype, String params); void* getAPI_ButtonIn(String subtype, String params); void* getAPI_ButtonOut(String subtype, String params); +void* getAPI_Encoder(String subtype, String params); void* getAPI_IoTServo(String subtype, String params); void* getAPI_Mcp23017(String subtype, String params); void* getAPI_Mp3(String subtype, String params); @@ -41,6 +44,7 @@ if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_VariableColor(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_VButton(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_A02Distance(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Acs712(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_AhtXX(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI; @@ -51,12 +55,14 @@ if ((tmpAPI = getAPI_Ds18b20(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Impulse(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Pzem004(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_RTC(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_S8(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sht20(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sht30(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sonar(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_UART(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_ButtonIn(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_ButtonOut(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Encoder(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI;