diff --git a/compilerProfile.json b/compilerProfile.json index 97fd71cd..b6246f40 100644 --- a/compilerProfile.json +++ b/compilerProfile.json @@ -59,7 +59,7 @@ "bootloader_qio_80m": "0x1000", "firmware": "0x10000", "partitions": "0x8000", - "littlefs": "0x290000" + "littlefs": "0x310000" }, { "name": "esp32_16mb", @@ -146,7 +146,7 @@ }, { "path": "src/modules/virtual/Math", - "active": false + "active": true }, { "path": "src/modules/virtual/owmWeather", @@ -290,12 +290,20 @@ "path": "src/modules/sensors/Mhz19", "active": false }, + { + "path": "src/modules/sensors/MQgas", + "active": true + }, { "path": "src/modules/sensors/Ntc", "active": false }, { "path": "src/modules/sensors/Pzem004t", + "active": false + }, + { + "path": "src/modules/sensors/Pzem004t_v2", "active": true }, { @@ -340,6 +348,10 @@ } ], "executive_devices": [ + { + "path": "src/modules/exec/AnalogBtn", + "active": true + }, { "path": "src/modules/exec/ButtonIn", "active": true @@ -436,12 +448,16 @@ "screens": [ { "path": "src/modules/display/DwinI", - "active": false + "active": true }, { "path": "src/modules/display/Lcd2004", "active": true }, + { + "path": "src/modules/display/Nextion", + "active": false + }, { "path": "src/modules/display/NextionUpload", "active": false @@ -460,7 +476,7 @@ }, { "path": "src/modules/display/TM16XX", - "active": true + "active": false }, { "path": "src/modules/display/Ws2812b", diff --git a/data_svelte/flashProfile.json b/data_svelte/flashProfile.json index dea9e970..b17a4af6 100644 --- a/data_svelte/flashProfile.json +++ b/data_svelte/flashProfile.json @@ -24,7 +24,7 @@ }, { "path": "src/modules/virtual/Math", - "active": false + "active": true }, { "path": "src/modules/virtual/owmWeather", @@ -168,12 +168,20 @@ "path": "src/modules/sensors/Mhz19", "active": false }, + { + "path": "src/modules/sensors/MQgas", + "active": true + }, { "path": "src/modules/sensors/Ntc", "active": false }, { "path": "src/modules/sensors/Pzem004t", + "active": false + }, + { + "path": "src/modules/sensors/Pzem004t_v2", "active": true }, { @@ -218,6 +226,10 @@ } ], "executive_devices": [ + { + "path": "src/modules/exec/AnalogBtn", + "active": true + }, { "path": "src/modules/exec/ButtonIn", "active": true @@ -314,12 +326,16 @@ "screens": [ { "path": "src/modules/display/DwinI", - "active": false + "active": true }, { "path": "src/modules/display/Lcd2004", "active": true }, + { + "path": "src/modules/display/Nextion", + "active": false + }, { "path": "src/modules/display/NextionUpload", "active": false @@ -338,7 +354,7 @@ }, { "path": "src/modules/display/TM16XX", - "active": true + "active": false }, { "path": "src/modules/display/Ws2812b", diff --git a/data_svelte/items.json b/data_svelte/items.json index 8ee594e1..e432f9b8 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -68,7 +68,18 @@ }, { "global": 0, - "name": "5. Погода OWM", + "name": "5. Math library", + "type": "Reading", + "subtype": "IoTMath", + "id": "math", + "widget": "anydataValue", + "page": "Математика", + "descr": "", + "num": 5 + }, + { + "global": 0, + "name": "6. Погода OWM", "type": "Reading", "subtype": "owmWeather", "id": "owm", @@ -86,11 +97,11 @@ "round": 1, "val": "...", "debug": 0, - "num": 5 + "num": 6 }, { "global": 0, - "name": "6. Таймер", + "name": "7. Таймер", "type": "Writing", "subtype": "Timer", "id": "timer", @@ -102,11 +113,11 @@ "ticker": 1, "repeat": 1, "needSave": 0, - "num": 6 + "num": 7 }, { "global": 0, - "name": "7. Окно ввода числа (переменная)", + "name": "8. Окно ввода числа (переменная)", "type": "Reading", "subtype": "Variable", "id": "value", @@ -120,11 +131,11 @@ "plus": 0, "multiply": 1, "round": 0, - "num": 7 + "num": 8 }, { "global": 0, - "name": "8. Окно ввода времени", + "name": "9. Окно ввода времени", "type": "Reading", "subtype": "Variable", "id": "time", @@ -134,11 +145,11 @@ "descr": "Введите время", "int": "0", "val": "02:00", - "num": 8 + "num": 9 }, { "global": 0, - "name": "9. Окно ввода даты", + "name": "10. Окно ввода даты", "type": "Reading", "subtype": "Variable", "id": "time", @@ -148,11 +159,11 @@ "descr": "Введите дату", "int": "0", "val": "24.05.2022", - "num": 9 + "num": 10 }, { "global": 0, - "name": "10. Окно ввода текста", + "name": "11. Окно ввода текста", "type": "Reading", "subtype": "Variable", "id": "txt", @@ -162,11 +173,11 @@ "descr": "Введите текст", "int": "0", "val": "текст", - "num": 10 + "num": 11 }, { "global": 0, - "name": "11. Вывод значения", + "name": "12. Вывод значения", "type": "Reading", "subtype": "Variable", "id": "vout", @@ -180,11 +191,11 @@ "plus": 0, "multiply": 1, "round": 0, - "num": 11 + "num": 12 }, { "global": 0, - "name": "12. Виртуальная кнопка", + "name": "13. Виртуальная кнопка", "type": "Reading", "subtype": "VButton", "id": "vbtn", @@ -194,13 +205,13 @@ "descr": "Кнопка", "int": "0", "val": "0", - "num": 12 + "num": 13 }, { "header": "sensors" }, { - "name": "13. A02 Дальность", + "name": "14. A02 Дальность", "type": "Reading", "subtype": "A02Distance", "id": "dist", @@ -209,10 +220,14 @@ "descr": "Дальность", "int": 5, "round": 1, - "num": 13 + "tx": 17, + "rx": 16, + "line": 2, + "speed": 9600, + "num": 14 }, { - "name": "14. Acs712 Ток", + "name": "15. Acs712 Ток", "type": "Reading", "subtype": "Acs712", "id": "amp", @@ -227,11 +242,11 @@ "sens": 100, "adczero": 512, "btn-setZero": "nil", - "num": 14 + "num": 15 }, { "global": 0, - "name": "15. AHTXX Температура", + "name": "16. AHTXX Температура", "type": "Reading", "subtype": "AhtXXt", "id": "Temp20", @@ -242,11 +257,11 @@ "addr": "0x38", "shtType": 1, "round": 1, - "num": 15 + "num": 16 }, { "global": 0, - "name": "16. AHTXX Влажность", + "name": "17. AHTXX Влажность", "type": "Reading", "subtype": "AhtXXh", "id": "Hum20", @@ -257,11 +272,11 @@ "addr": "0x38", "shtType": 1, "round": 1, - "num": 16 + "num": 17 }, { "global": 0, - "name": "17. Аналоговый сенсор", + "name": "18. Аналоговый сенсор", "type": "Reading", "subtype": "AnalogAdc", "id": "t", @@ -275,11 +290,11 @@ "pin": 0, "int": 15, "avgSteps": 1, - "num": 17 + "num": 18 }, { "global": 0, - "name": "18. BME280 Температура", + "name": "19. BME280 Температура", "type": "Reading", "subtype": "Bme280t", "id": "Tmp3", @@ -289,11 +304,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 18 + "num": 19 }, { "global": 0, - "name": "19. BME280 Давление", + "name": "20. BME280 Давление", "type": "Reading", "subtype": "Bme280p", "id": "Press3", @@ -303,11 +318,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 19 + "num": 20 }, { "global": 0, - "name": "20. BME280 Влажность", + "name": "21. BME280 Влажность", "type": "Reading", "subtype": "Bme280h", "id": "Hum3", @@ -317,11 +332,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 20 + "num": 21 }, { "global": 0, - "name": "21. BME280 Tочка росы", + "name": "22. BME280 Tочка росы", "type": "Reading", "subtype": "Bme280dp", "id": "Dew3", @@ -331,11 +346,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 21 + "num": 22 }, { "global": 0, - "name": "22. BMP280 Температура", + "name": "23. BMP280 Температура", "type": "Reading", "subtype": "Bmp280t", "id": "tmp3", @@ -345,11 +360,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 22 + "num": 23 }, { "global": 0, - "name": "23. BMP280 Давление", + "name": "24. BMP280 Давление", "type": "Reading", "subtype": "Bmp280p", "id": "Press3", @@ -359,11 +374,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 23 + "num": 24 }, { "global": 0, - "name": "24. DHT11 Температура", + "name": "25. DHT11 Температура", "type": "Reading", "subtype": "Dht1122t", "id": "tmp3", @@ -373,11 +388,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 24 + "num": 25 }, { "global": 0, - "name": "25. DHT11 Влажность", + "name": "26. DHT11 Влажность", "type": "Reading", "subtype": "Dht1122h", "id": "Hum3", @@ -387,11 +402,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 25 + "num": 26 }, { "global": 0, - "name": "26. DS18B20 Температура", + "name": "27. DS18B20 Температура", "type": "Reading", "subtype": "Ds18b20", "id": "dstmp", @@ -403,11 +418,11 @@ "index": 0, "addr": "", "round": 1, - "num": 26 + "num": 27 }, { "global": 0, - "name": "27. Аналоговый счетчик импульсов", + "name": "28. Аналоговый счетчик импульсов", "type": "Writing", "subtype": "Impulse", "id": "impulse", @@ -420,11 +435,52 @@ "pinMode": "INPUT", "debounceDelay": 3, "multiply": 1, - "num": 27 + "num": 28 }, { "global": 0, - "name": "28. PZEM 004t Напряжение", + "name": "29. MQ газовые анализаторы", + "type": "Reading", + "subtype": "MQgas", + "id": "MQ", + "widget": "anydataPpm", + "page": "Сенсоры", + "descr": "MQ-135", + "Series": 135, + "Gas": "CO2", + "Rl on board": 10, + "Ro in clean air": 0, + "Rl/Ro in clean air": 0, + "PPM in clean air": 397.13, + "aLimit": -0.42, + "bLimit": 1.92, + "Warm up time": 60, + "Sample interval": 20, + "Sample times": 10, + "Calibtation intensity": 5, + "autoCalibration": 1, + "autoCalib.Period": 24, + "TempHum correction": 1, + "temperature": 20, + "idTempSensor": "", + "humidity": 50, + "idHumSensor": "", + "k1": 0.00672096284322792, + "k2": -0.0159038179354688, + "b1": -0.741244323718154, + "b2": 1.77535862501753, + "Debug": 1, + "plus": 0, + "multiply": 1, + "round": 1, + "pin-Esp32": 34, + "operating voltage": 3.3, + "int": 15, + "num": 29 + }, + { + "global": 0, + "name": "30. PZEM 004t Напряжение", "type": "Reading", "subtype": "Pzem004v", "id": "v", @@ -434,11 +490,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 28 + "num": 30 }, { "global": 0, - "name": "29. PZEM 004t Сила тока", + "name": "31. PZEM 004t Сила тока", "type": "Reading", "subtype": "Pzem004a", "id": "a", @@ -448,11 +504,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 29 + "num": 31 }, { "global": 0, - "name": "30. PZEM 004t Мощность", + "name": "32. PZEM 004t Мощность", "type": "Reading", "subtype": "Pzem004w", "id": "w", @@ -462,11 +518,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 30 + "num": 32 }, { "global": 0, - "name": "31. PZEM 004t Энергия", + "name": "33. PZEM 004t Энергия", "type": "Reading", "subtype": "Pzem004wh", "id": "wh", @@ -476,11 +532,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 31 + "num": 33 }, { "global": 0, - "name": "32. PZEM 004t Частота", + "name": "34. PZEM 004t Частота", "type": "Reading", "subtype": "Pzem004hz", "id": "hz", @@ -490,11 +546,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 32 + "num": 34 }, { "global": 0, - "name": "33. PZEM 004t Косинус", + "name": "35. PZEM 004t Косинус", "type": "Reading", "subtype": "Pzem004pf", "id": "pf", @@ -504,11 +560,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 33 + "num": 35 }, { "global": 0, - "name": "34. PZEM настройка", + "name": "36. PZEM настройка", "type": "Reading", "subtype": "Pzem004cmd", "id": "set", @@ -517,14 +573,28 @@ "descr": "", "int": 15, "addr": "0xF8", - "changeaddr": 0, - "setaddr": "0x01", - "reset": 0, - "num": 34 + "btn-changeaddr": "0x01", + "btn-reset": "", + "num": 36 }, { "global": 0, - "name": "35. Часы реального времени", + "name": "37. PZEM uart", + "type": "Reading", + "subtype": "Pzem004uart", + "id": "upzem", + "widget": "nil", + "page": "", + "descr": "", + "tx": 17, + "rx": 16, + "line": 2, + "speed": 9600, + "num": 37 + }, + { + "global": 0, + "name": "38. Часы реального времени", "type": "Reading", "subtype": "RTC", "id": "rtc", @@ -540,11 +610,12 @@ "int": 5, "btn-setUTime": "0", "btn-setSysTime": "nil", - "num": 35 + "num": 38 }, { - "name": "36. (S8) Cенсор качества воздуха", - "num": 36, + "global": 0, + "name": "39. (S8) Cенсор качества воздуха", + "num": 39, "type": "Reading", "subtype": "S8co", "id": "s8co", @@ -558,7 +629,7 @@ }, { "global": 0, - "name": "37. Sht20 Температура", + "name": "40. Sht20 Температура", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -567,11 +638,11 @@ "descr": "Температура", "int": 15, "round": 1, - "num": 37 + "num": 40 }, { "global": 0, - "name": "38. Sht20 Влажность", + "name": "41. Sht20 Влажность", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -580,11 +651,11 @@ "descr": "Влажность", "int": 15, "round": 1, - "num": 38 + "num": 41 }, { "global": 0, - "name": "39. Sht30 Температура", + "name": "42. Sht30 Температура", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -593,11 +664,11 @@ "descr": "SHT30 Температура", "int": 15, "round": 1, - "num": 39 + "num": 42 }, { "global": 0, - "name": "40. Sht30 Влажность", + "name": "43. Sht30 Влажность", "type": "Reading", "subtype": "Sht30h", "id": "Hum30", @@ -606,12 +677,12 @@ "descr": "SHT30 Влажность", "int": 15, "round": 1, - "num": 40 + "num": 43 }, { "global": 0, - "name": "41. HC-SR04 Ультразвуковой дальномер", - "num": 41, + "name": "44. HC-SR04 Ультразвуковой дальномер", + "num": 44, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -623,7 +694,7 @@ "int": 5 }, { - "name": "42. UART", + "name": "45. UART", "type": "Reading", "subtype": "UART", "page": "", @@ -635,14 +706,28 @@ "line": 2, "speed": 9600, "eventFormat": 0, - "num": 42 + "num": 45 }, { "header": "executive_devices" }, { "global": 0, - "name": "43. Кнопка подключенная к пину", + "name": "46. Аналоговая кнопка", + "type": "Reading", + "subtype": "AnalogBtn", + "id": "abtn", + "widget": "toggle", + "page": "Кнопки", + "descr": "Освещение", + "pin": 34, + "aValue": -1, + "delta": 50, + "num": 46 + }, + { + "global": 0, + "name": "47. Кнопка подключенная к пину", "type": "Writing", "subtype": "ButtonIn", "id": "btn", @@ -657,11 +742,11 @@ "debounceDelay": 50, "fixState": 0, "inv": 0, - "num": 43 + "num": 47 }, { "global": 0, - "name": "44. Управление пином", + "name": "48. Управление пином", "type": "Writing", "subtype": "ButtonOut", "needSave": 0, @@ -672,11 +757,11 @@ "int": 0, "inv": 0, "pin": 2, - "num": 44 + "num": 48 }, { "global": 0, - "name": "45. Пассивный звуковой извещатель", + "name": "49. Пассивный звуковой извещатель", "type": "Writing", "subtype": "Buzzer", "id": "buzzer", @@ -695,11 +780,11 @@ "cycle": 0, "indication": 1, "val": 0, - "num": 45 + "num": 49 }, { "global": 0, - "name": "46. Энкодер", + "name": "50. Энкодер", "type": "Writing", "subtype": "Encoder", "id": "enc", @@ -712,11 +797,11 @@ "step": 1, "stepOnPress": 5, "pins": "4,5,2", - "num": 46 + "num": 50 }, { "global": 0, - "name": "47. Сервопривод", + "name": "51. Сервопривод", "type": "Writing", "subtype": "IoTServo", "id": "servo", @@ -726,13 +811,14 @@ "pin": 12, "minPulseWidth": 544, "maxPulseWidth": 2400, - "neutralPulseWidth": 1500, + "minAngle": 0, + "maxAngle": 180, "trackingID": "", - "num": 47 + "num": 51 }, { "global": 0, - "name": "48. Расширитель портов Mcp23017", + "name": "52. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -742,11 +828,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 48 + "num": 52 }, { "global": 0, - "name": "49. MP3 плеер", + "name": "53. MP3 плеер", "type": "Reading", "subtype": "Mp3", "id": "mp3", @@ -756,11 +842,11 @@ "int": 1, "pins": "14,12", "volume": 20, - "num": 49 + "num": 53 }, { "global": 0, - "name": "50. Сенсорная кнопка", + "name": "54. Сенсорная кнопка", "type": "Writing", "subtype": "Multitouch", "id": "impulse", @@ -774,11 +860,11 @@ "pinMode": "INPUT", "debounceDelay": 50, "PWMDelay": 500, - "num": 50 + "num": 54 }, { "global": 0, - "name": "51. Расширитель портов Pcf8574", + "name": "55. Расширитель портов Pcf8574", "type": "Reading", "subtype": "Pcf8574", "id": "Pcf", @@ -788,11 +874,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 51 + "num": 55 }, { "global": 0, - "name": "52. PWM ESP8266", + "name": "56. PWM ESP8266", "type": "Writing", "subtype": "Pwm8266", "id": "pwm", @@ -804,11 +890,11 @@ "freq": 5000, "val": 0, "apin": -1, - "num": 52 + "num": 56 }, { "global": 0, - "name": "53. Телеграм-Лайт", + "name": "57. Телеграм-Лайт", "type": "Writing", "subtype": "TelegramLT", "id": "tg", @@ -817,14 +903,29 @@ "descr": "", "token": "", "chatID": "", - "num": 53 + "num": 57 }, { "header": "screens" }, + { + "name": "58. LCD Dwin экран", + "type": "Reading", + "subtype": "DwinI", + "id": "dwin", + "widget": "", + "page": "", + "descr": "", + "tx": 17, + "rx": 16, + "line": 2, + "speed": 9600, + "btn-uploadUI": "", + "num": 58 + }, { "global": 0, - "name": "54. LCD экран 2004", + "name": "59. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -837,10 +938,10 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 54 + "num": 59 }, { - "name": "55. LCD экран 1602", + "name": "60. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -853,11 +954,11 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 55 + "num": 60 }, { "global": 0, - "name": "56. OLED экран 64 8266", + "name": "61. OLED экран 64 8266", "type": "Reading", "subtype": "Oled64", "id": "Oled", @@ -870,26 +971,6 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 56 - }, - { - "global": 0, - "name": "57. 7 сегментный дисплей TM16XX", - "type": "Writing", - "subtype": "TM16XX", - "id": "tm", - "widget": "inputTxt", - "page": "screens", - "descr": "Экран", - "round": 0, - "chip": 1637, - "numDigits": 4, - "DIO": "13", - "CLK": "14", - "STB": "12", - "intensity": "5", - "on": "1", - "id2show": "", - "num": 57 + "num": 61 } ] \ No newline at end of file diff --git a/include/Const.h b/include/Const.h index e7abc35d..e170a3d2 100644 --- a/include/Const.h +++ b/include/Const.h @@ -2,7 +2,7 @@ #include "BuildTime.h" // Версия прошивки -#define FIRMWARE_VERSION 455 +#define FIRMWARE_VERSION 456 #ifdef esp8266_1mb_ota #define FIRMWARE_NAME "esp8266_1mb_ota" diff --git a/myProfile.json b/myProfile.json index 2ab4bf7a..b6246f40 100644 --- a/myProfile.json +++ b/myProfile.json @@ -146,7 +146,7 @@ }, { "path": "src/modules/virtual/Math", - "active": false + "active": true }, { "path": "src/modules/virtual/owmWeather", @@ -290,12 +290,20 @@ "path": "src/modules/sensors/Mhz19", "active": false }, + { + "path": "src/modules/sensors/MQgas", + "active": true + }, { "path": "src/modules/sensors/Ntc", "active": false }, { "path": "src/modules/sensors/Pzem004t", + "active": false + }, + { + "path": "src/modules/sensors/Pzem004t_v2", "active": true }, { @@ -340,6 +348,10 @@ } ], "executive_devices": [ + { + "path": "src/modules/exec/AnalogBtn", + "active": true + }, { "path": "src/modules/exec/ButtonIn", "active": true @@ -436,12 +448,16 @@ "screens": [ { "path": "src/modules/display/DwinI", - "active": false + "active": true }, { "path": "src/modules/display/Lcd2004", "active": true }, + { + "path": "src/modules/display/Nextion", + "active": false + }, { "path": "src/modules/display/NextionUpload", "active": false @@ -460,7 +476,7 @@ }, { "path": "src/modules/display/TM16XX", - "active": true + "active": false }, { "path": "src/modules/display/Ws2812b", diff --git a/platformio.ini b/platformio.ini index beb5f904..4d1dd51a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -544,17 +544,16 @@ lib_deps = adafruit/Adafruit BusIO @ ^1.13.2 dfrobot/DFRobotDFPlayerMini @ ^1.0.5 adafruit/Adafruit BusIO @ ^1.13.2 + plerup/EspSoftwareSerial https://github.com/robotclass/RobotClass_LiquidCrystal_I2C marcoschwartz/LiquidCrystal_I2C@^1.1.4 https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED https://github.com/adafruit/Adafruit-GFX-Library - https://github.com/maxint-rd/TM16xx - adafruit/Adafruit GFX Library @ ^1.11.5 - adafruit/Adafruit BusIO @ ^1.13.2 build_src_filter = + + + + + + + + @@ -568,13 +567,15 @@ build_src_filter = + + + - + + + + + + + + + + + + + + + + @@ -586,9 +587,9 @@ build_src_filter = + + + + + + + - + [env:esp32_4mb_fromitems] lib_deps = diff --git a/src/modules/API.cpp b/src/modules/API.cpp index af5a8dd8..a029331c 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -3,6 +3,7 @@ void* getAPI_Cron(String subtype, String params); void* getAPI_Loging(String subtype, String params); void* getAPI_LogingDaily(String subtype, String params); +void* getAPI_IoTMath(String subtype, String params); void* getAPI_owmWeather(String subtype, String params); void* getAPI_Timer(String subtype, String params); void* getAPI_Variable(String subtype, String params); @@ -16,13 +17,15 @@ void* getAPI_Bmp280(String subtype, String params); void* getAPI_Dht1122(String subtype, String params); void* getAPI_Ds18b20(String subtype, String params); void* getAPI_Impulse(String subtype, String params); -void* getAPI_Pzem004(String subtype, String params); +void* getAPI_MQgas(String subtype, String params); +void* getAPI_Pzem004_v2(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_AnalogBtn(String subtype, String params); void* getAPI_ButtonIn(String subtype, String params); void* getAPI_ButtonOut(String subtype, String params); void* getAPI_Buzzer(String subtype, String params); @@ -34,15 +37,16 @@ void* getAPI_Multitouch(String subtype, String params); void* getAPI_Pcf8574(String subtype, String params); void* getAPI_Pwm8266(String subtype, String params); void* getAPI_TelegramLT(String subtype, String params); +void* getAPI_DwinI(String subtype, String params); void* getAPI_Lcd2004(String subtype, String params); void* getAPI_Oled64(String subtype, String params); -void* getAPI_TM16XX(String subtype, String params); void* getAPI(String subtype, String params) { void* tmpAPI; if ((tmpAPI = getAPI_Cron(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Loging(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_LogingDaily(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_IoTMath(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_owmWeather(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI; @@ -56,13 +60,15 @@ 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_Impulse(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_Pzem004(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_MQgas(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Pzem004_v2(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_AnalogBtn(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_Buzzer(subtype, params)) != nullptr) return tmpAPI; @@ -74,8 +80,8 @@ if ((tmpAPI = getAPI_Multitouch(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Pcf8574(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_TelegramLT(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_DwinI(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Oled64(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_TM16XX(subtype, params)) != nullptr) return tmpAPI; return nullptr; } \ No newline at end of file