From 348d305e42ba920d6d518aa269165b4d45dc4289 Mon Sep 17 00:00:00 2001 From: Mit4el Date: Sat, 25 Nov 2023 14:41:55 +0300 Subject: [PATCH 01/11] bugfix ld2410 --- src/modules/sensors/ld2410/ld2410.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/sensors/ld2410/ld2410.cpp b/src/modules/sensors/ld2410/ld2410.cpp index c17c5751..bd0e7c30 100644 --- a/src/modules/sensors/ld2410/ld2410.cpp +++ b/src/modules/sensors/ld2410/ld2410.cpp @@ -237,7 +237,7 @@ public: } ~ld2410m() { - delete ld2410; + delete radar; radar = nullptr; }; }; @@ -297,7 +297,7 @@ public: ~ld2410t() { - delete ld2410; + delete radar; radar = nullptr; }; }; @@ -356,7 +356,7 @@ public: } ~ld2410d() { - delete ld2410; + delete radar; radar = nullptr; }; }; @@ -418,7 +418,7 @@ public: } ~ld2410e() { - delete ld2410; + delete radar; radar = nullptr; }; }; From 620a29a41ae7b172061058bd578477287826d0e9 Mon Sep 17 00:00:00 2001 From: Mit4el Date: Sat, 25 Nov 2023 16:34:39 +0300 Subject: [PATCH 02/11] upd owmWeather --- src/modules/virtual/owmWeather/modinfo.json | 5 ++++- src/modules/virtual/owmWeather/owmWeather.cpp | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/virtual/owmWeather/modinfo.json b/src/modules/virtual/owmWeather/modinfo.json index 43d3708a..748ff5d8 100644 --- a/src/modules/virtual/owmWeather/modinfo.json +++ b/src/modules/virtual/owmWeather/modinfo.json @@ -38,6 +38,9 @@ }, "subTypes": [ "temp", + "temp_min", + "temp_max", + "feels_like", "humidity", "pressure", "speed", @@ -53,7 +56,7 @@ "title": "Погода", "moduleDesc": "Получение погоды из интернет OpenWeatherMap", "propInfo": { - "param": "Тип текущего Item: temp - температура, humidity - влажность, pressure - давление, speed - скорость ветра, deg - направление ветра, all - процент облачности, sunrise - рассвет, sunset - закат, description - Погодные условия, icon - код иконки, name - город. Если оставить пустым пудет искать и публиковать при изменении в Items с именами wea_temp и т.д. wea_...", + "param": "Тип текущего Item: temp - температура, feels_like - ощущается темп, temp_min - min температура, temp_max - max температура humidity - влажность, pressure - давление, speed - скорость ветра, deg - направление ветра, all - процент облачности, sunrise - рассвет, sunset - закат, description - Погодные условия, icon - код иконки, name - город. Если оставить пустым пудет искать и публиковать при изменении в Items с именами wea_temp и т.д. wea_...", "int": "Интервал запроса погоды в минутах", "API_key": "API ключ", "city": "Название города, через запятую можно уочнить код страны. Наример Moscow или Moscow,ru или Москва. Если город не задан будут использоваться координаты. OWM рекомендует координаты", diff --git a/src/modules/virtual/owmWeather/owmWeather.cpp b/src/modules/virtual/owmWeather/owmWeather.cpp index 6204db5c..1ba7b0e9 100644 --- a/src/modules/virtual/owmWeather/owmWeather.cpp +++ b/src/modules/virtual/owmWeather/owmWeather.cpp @@ -115,6 +115,9 @@ public: _sunsetTime = _sunsetTime + _tzone; publishNew("main", "temp"); + publishNew("main", "temp_min"); + publishNew("main", "temp_max"); + publishNew("main", "feels_like"); publishNew("main", "pressure"); publishNew("main", "humidity"); publishNew("wind", "speed"); @@ -127,9 +130,9 @@ public: publishNew("sys", "sunset"); publishNew("", "name"); - if (_param == "temp") + if (_param == "temp" || _param == "temp_min" || _param == "temp_max" || _param == "feels_like") { - value.valS = jsonReadStr(Weatherdoc1["main"], "temp", true); + value.valS = jsonReadStr(Weatherdoc1["main"], _param, true); regEvent(value.valS, "owmWeather"); } else if (_param == "pressure") From d98ded42da59d0c8b7fc676993f5997037bf06bd Mon Sep 17 00:00:00 2001 From: Mit4el Date: Sat, 25 Nov 2023 16:36:38 +0300 Subject: [PATCH 03/11] fix flash espCam --- myProfile.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/myProfile.json b/myProfile.json index 97fd71cd..2ab4bf7a 100644 --- a/myProfile.json +++ b/myProfile.json @@ -59,7 +59,7 @@ "bootloader_qio_80m": "0x1000", "firmware": "0x10000", "partitions": "0x8000", - "littlefs": "0x290000" + "littlefs": "0x310000" }, { "name": "esp32_16mb", From cae0a7a19caf44fe353c2551cf49cec53637e7e4 Mon Sep 17 00:00:00 2001 From: IoT Manager <67171972+IoTManagerProject@users.noreply.github.com> Date: Sun, 21 Jan 2024 21:31:01 +0100 Subject: [PATCH 04/11] Revert "Ver4dev" --- platformio.ini | 11 ++---- src/modules/display/Lcd2004/modinfo.json | 36 +++++++++++++++++-- .../display/NextionUpload/modinfo.json | 9 +++-- src/modules/display/Oled128/modinfo.json | 10 ++++-- src/modules/display/Oled64/modinfo.json | 12 +++++-- src/modules/display/Smi2_m/modinfo.json | 4 ++- src/modules/display/Ws2812b/modinfo.json | 10 ++++-- src/modules/exec/ButtonIn/modinfo.json | 15 ++++++-- src/modules/exec/ButtonOut/modinfo.json | 15 ++++++-- src/modules/exec/Buzzer/modinfo.json | 12 +++++-- src/modules/exec/Enconder/modinfo.json | 25 +++++++++++-- src/modules/exec/Ftp/modinfo.json | 9 +++-- src/modules/exec/HttpGet/modinfo.json | 13 +++++-- src/modules/exec/IoTServo/modinfo.json | 10 ++++-- src/modules/exec/Mcp23008/modinfo.json | 36 +++++++++++++++++-- src/modules/exec/Mcp23017/modinfo.json | 36 +++++++++++++++++-- src/modules/exec/Mp3/modinfo.json | 10 ++++-- src/modules/exec/Multitouch/modinfo.json | 12 +++++-- src/modules/exec/MySensors/modinfo.json | 4 ++- src/modules/exec/Pcf8574/modinfo.json | 28 +++++++++++++-- src/modules/exec/Pcf8591/modinfo.json | 28 +++++++++++++-- src/modules/exec/Pwm32/modinfo.json | 4 ++- src/modules/exec/Pwm8266/modinfo.json | 8 ++++- src/modules/exec/SDcard/modinfo.json | 8 ++++- src/modules/exec/SysExt/modinfo.json | 6 ++-- src/modules/exec/Telegram/modinfo.json | 11 +++++- src/modules/exec/TelegramLT/modinfo.json | 16 +++++++-- src/modules/exec/Telegram_v2/modinfo.json | 14 +++++++- src/modules/exec/Thermostat/modinfo.json | 12 +++++-- src/modules/sensors/A02Distance/modinfo.json | 11 ++++-- src/modules/sensors/Acs712/modinfo.json | 13 +++++-- src/modules/sensors/Ads1115/modinfo.json | 10 ++++-- src/modules/sensors/AhtXX/modinfo.json | 22 ++++++++++-- src/modules/sensors/AnalogAdc/modinfo.json | 12 +++++-- src/modules/sensors/BH_1750/modinfo.json | 10 ++++-- src/modules/sensors/Ble/modinfo.json | 18 ++++++++-- src/modules/sensors/Ble_part1/modinfo.json | 18 ++++++++-- src/modules/sensors/Ble_part2/modinfo.json | 18 ++++++++-- src/modules/sensors/Bme280/modinfo.json | 31 ++++++++++++++-- src/modules/sensors/Bmp280/modinfo.json | 28 +++++++++++++-- src/modules/sensors/DS2401/modinfo.json | 12 +++++-- src/modules/sensors/Dht1122/modinfo.json | 10 ++++-- src/modules/sensors/Ds18b20/modinfo.json | 28 +++++++++++++-- src/modules/sensors/Ds2423/modinfo.json | 12 +++++-- src/modules/sensors/Emon/modinfo.json | 10 ++++-- .../sensors/ExampleModule/modinfo.json | 13 +++++-- src/modules/sensors/ExternalMQTT/modinfo.json | 13 +++++-- src/modules/sensors/FreqMeter/modinfo.json | 10 ++++-- src/modules/sensors/GY21/modinfo.json | 10 ++++-- src/modules/sensors/Hdc1080/modinfo.json | 10 ++++-- src/modules/sensors/Hx710/modinfo.json | 10 ++++-- src/modules/sensors/Hx711/modinfo.json | 10 ++++-- src/modules/sensors/Impulse/modinfo.json | 10 ++++-- src/modules/sensors/Ina219/modinfo.json | 16 +++++++-- src/modules/sensors/Ina226/modinfo.json | 16 +++++++-- src/modules/sensors/IoTWiegand/modinfo.json | 8 ++++- src/modules/sensors/Max6675/modinfo.json | 7 ++-- src/modules/sensors/Mhz19/modinfo.json | 10 +++--- src/modules/sensors/Ntc/modinfo.json | 12 +++++-- src/modules/sensors/RCswitch/modinfo.json | 28 +++++++++++++-- src/modules/sensors/RTC/modinfo.json | 12 +++++-- src/modules/sensors/S8/modinfo.json | 5 +-- src/modules/sensors/Scd40/modinfo.json | 12 +++++-- src/modules/sensors/Sds011/modinfo.json | 10 ++++-- src/modules/sensors/Sgp30/modinfo.json | 28 +++++++++++++-- src/modules/sensors/Sht20/modinfo.json | 25 +++++++++++-- src/modules/sensors/Sht30/modinfo.json | 28 +++++++++++++-- src/modules/sensors/Sonar/modinfo.json | 12 +++++-- src/modules/sensors/UART/modinfo.json | 28 +++++++++++++-- src/modules/sensors/ld2410/modinfo.json | 5 ++- src/modules/virtual/Cron/modinfo.json | 17 +++++++-- src/modules/virtual/GoogleSheet/modinfo.json | 9 +++-- src/modules/virtual/Loging/modinfo.json | 17 +++++++-- src/modules/virtual/LogingDaily/modinfo.json | 17 +++++++-- src/modules/virtual/Math/modinfo.json | 13 +++++-- src/modules/virtual/Timer/modinfo.json | 17 +++++++-- src/modules/virtual/VButton/modinfo.json | 17 +++++++-- src/modules/virtual/Variable/modinfo.json | 17 +++++++-- src/modules/virtual/Weather/modinfo.json | 17 +++++++-- src/modules/virtual/owmWeather/modinfo.json | 16 +++++++-- 80 files changed, 1029 insertions(+), 163 deletions(-) diff --git a/platformio.ini b/platformio.ini index eaeb3c81..4d1dd51a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -607,24 +607,21 @@ 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 - https://github.com/adafruit/Adafruit-GFX-Library + adafruit/Adafruit GFX Library @ ^1.11.5 adafruit/Adafruit BusIO @ ^1.13.2 build_src_filter = + + + - + + + + + - + + + + @@ -633,15 +630,13 @@ build_src_filter = + + + - + - + + + + + + + + + - + + + + @@ -650,10 +645,10 @@ build_src_filter = + + + + + + + + - + + + + diff --git a/src/modules/display/Lcd2004/modinfo.json b/src/modules/display/Lcd2004/modinfo.json index 0700b92f..1176d45e 100644 --- a/src/modules/display/Lcd2004/modinfo.json +++ b/src/modules/display/Lcd2004/modinfo.json @@ -119,11 +119,43 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp32cam_4mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp8266_4mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp8266_1mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp8266_1mb_ota": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp8285_1mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp8285_1mb_ota": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp8266_2mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", + "marcoschwartz/LiquidCrystal_I2C@^1.1.4" + ], + "esp8266_2mb_ota": [ "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ] diff --git a/src/modules/display/NextionUpload/modinfo.json b/src/modules/display/NextionUpload/modinfo.json index db2ee677..54fdb1c7 100644 --- a/src/modules/display/NextionUpload/modinfo.json +++ b/src/modules/display/NextionUpload/modinfo.json @@ -38,7 +38,12 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/display/Oled128/modinfo.json b/src/modules/display/Oled128/modinfo.json index d88014e4..5a59dc57 100644 --- a/src/modules/display/Oled128/modinfo.json +++ b/src/modules/display/Oled128/modinfo.json @@ -73,10 +73,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "gyverlibs/GyverOLED @ 1.4" ], - "esp82*": [ + "esp32_4mb3f": [ + "gyverlibs/GyverOLED @ 1.4" + ], + "esp32_16mb": [ + "gyverlibs/GyverOLED @ 1.4" + ], + "esp8266_4mb": [ "gyverlibs/GyverOLED @ 1.4" ] } diff --git a/src/modules/display/Oled64/modinfo.json b/src/modules/display/Oled64/modinfo.json index b64b4eef..39f0395a 100644 --- a/src/modules/display/Oled64/modinfo.json +++ b/src/modules/display/Oled64/modinfo.json @@ -77,11 +77,19 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", "https://github.com/adafruit/Adafruit-GFX-Library" ], - "esp82*": [ + "esp8266_4mb": [ + "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", + "https://github.com/adafruit/Adafruit-GFX-Library" + ], + "esp8266_1mb": [ + "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", + "https://github.com/adafruit/Adafruit-GFX-Library" + ], + "esp8266_1mb_ota": [ "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", "https://github.com/adafruit/Adafruit-GFX-Library" ] diff --git a/src/modules/display/Smi2_m/modinfo.json b/src/modules/display/Smi2_m/modinfo.json index 443d5c46..8c1debc0 100644 --- a/src/modules/display/Smi2_m/modinfo.json +++ b/src/modules/display/Smi2_m/modinfo.json @@ -52,6 +52,8 @@ }, "defActive": true, "usedLibs": { - "esp32*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [] } } \ No newline at end of file diff --git a/src/modules/display/Ws2812b/modinfo.json b/src/modules/display/Ws2812b/modinfo.json index 685ad4ea..bcad5b1e 100644 --- a/src/modules/display/Ws2812b/modinfo.json +++ b/src/modules/display/Ws2812b/modinfo.json @@ -97,10 +97,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/Adafruit NeoPixel@^1.10.6" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/Adafruit NeoPixel@^1.10.6" + ], + "esp32cam_4mb": [ + "adafruit/Adafruit NeoPixel@^1.10.6" + ], + "esp8266_4mb": [ "adafruit/Adafruit NeoPixel@^1.10.6" ] } diff --git a/src/modules/exec/ButtonIn/modinfo.json b/src/modules/exec/ButtonIn/modinfo.json index 07fcc87c..09759edf 100644 --- a/src/modules/exec/ButtonIn/modinfo.json +++ b/src/modules/exec/ButtonIn/modinfo.json @@ -45,7 +45,18 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/ButtonOut/modinfo.json b/src/modules/exec/ButtonOut/modinfo.json index d655bed9..10a39ded 100644 --- a/src/modules/exec/ButtonOut/modinfo.json +++ b/src/modules/exec/ButtonOut/modinfo.json @@ -49,7 +49,18 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/Buzzer/modinfo.json b/src/modules/exec/Buzzer/modinfo.json index be7ee225..44b01e2b 100644 --- a/src/modules/exec/Buzzer/modinfo.json +++ b/src/modules/exec/Buzzer/modinfo.json @@ -103,7 +103,15 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/Enconder/modinfo.json b/src/modules/exec/Enconder/modinfo.json index d48e7344..5019d20e 100644 --- a/src/modules/exec/Enconder/modinfo.json +++ b/src/modules/exec/Enconder/modinfo.json @@ -43,10 +43,31 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "gyverlibs/EncButton @ ^2.0" ], - "esp82*": [ + "esp32_4mb3f": [ + "gyverlibs/EncButton @ ^2.0" + ], + "esp32cam_4mb": [ + "gyverlibs/EncButton @ ^2.0" + ], + "esp8266_4mb": [ + "gyverlibs/EncButton @ ^2.0" + ], + "esp8266_16mb": [ + "gyverlibs/EncButton @ ^2.0" + ], + "esp8266_1mb": [ + "gyverlibs/EncButton @ ^2.0" + ], + "esp8266_1mb_ota": [ + "gyverlibs/EncButton @ ^2.0" + ], + "esp8285_1mb": [ + "gyverlibs/EncButton @ ^2.0" + ], + "esp8285_1mb_ota": [ "gyverlibs/EncButton @ ^2.0" ] } diff --git a/src/modules/exec/Ftp/modinfo.json b/src/modules/exec/Ftp/modinfo.json index c922bf7c..a4049ee5 100644 --- a/src/modules/exec/Ftp/modinfo.json +++ b/src/modules/exec/Ftp/modinfo.json @@ -34,7 +34,12 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [] } } \ No newline at end of file diff --git a/src/modules/exec/HttpGet/modinfo.json b/src/modules/exec/HttpGet/modinfo.json index fbcda96c..d8bcda2c 100644 --- a/src/modules/exec/HttpGet/modinfo.json +++ b/src/modules/exec/HttpGet/modinfo.json @@ -49,7 +49,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32s2_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/IoTServo/modinfo.json b/src/modules/exec/IoTServo/modinfo.json index b5184c51..56ecc51b 100644 --- a/src/modules/exec/IoTServo/modinfo.json +++ b/src/modules/exec/IoTServo/modinfo.json @@ -52,9 +52,15 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/RoboticsBrno/ServoESP32#v1.0.3" ], - "esp82*": [] + "esp32_4mb3f": [ + "https://github.com/RoboticsBrno/ServoESP32#v1.0.3" + ], + "esp32cam_4mb": [ + "https://github.com/RoboticsBrno/ServoESP32#v1.0.3" + ], + "esp8266_4mb": [] } } \ No newline at end of file diff --git a/src/modules/exec/Mcp23008/modinfo.json b/src/modules/exec/Mcp23008/modinfo.json index 3f109b81..7554b884 100644 --- a/src/modules/exec/Mcp23008/modinfo.json +++ b/src/modules/exec/Mcp23008/modinfo.json @@ -36,11 +36,43 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp32cam_4mb": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_4mb": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_1mb": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_1mb_ota": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8285_1mb": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8285_1mb_ota": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_2mb": [ + "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_2mb_ota": [ "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ] diff --git a/src/modules/exec/Mcp23017/modinfo.json b/src/modules/exec/Mcp23017/modinfo.json index 5d2fba62..53534b90 100644 --- a/src/modules/exec/Mcp23017/modinfo.json +++ b/src/modules/exec/Mcp23017/modinfo.json @@ -36,11 +36,43 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp32cam_4mb": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_4mb": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_1mb": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_1mb_ota": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8285_1mb": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8285_1mb_ota": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_2mb": [ + "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_2mb_ota": [ "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ] diff --git a/src/modules/exec/Mp3/modinfo.json b/src/modules/exec/Mp3/modinfo.json index 631ba050..6896d77b 100644 --- a/src/modules/exec/Mp3/modinfo.json +++ b/src/modules/exec/Mp3/modinfo.json @@ -89,10 +89,16 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" ], - "esp82*": [ + "esp32_4mb4f": [ + "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" + ], + "esp32cam_4mb": [ + "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" + ], + "esp8266_4mb": [ "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" ] } diff --git a/src/modules/exec/Multitouch/modinfo.json b/src/modules/exec/Multitouch/modinfo.json index 5cd87db0..c08f35e7 100644 --- a/src/modules/exec/Multitouch/modinfo.json +++ b/src/modules/exec/Multitouch/modinfo.json @@ -43,7 +43,15 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/MySensors/modinfo.json b/src/modules/exec/MySensors/modinfo.json index 0eb297c8..75afbfe8 100644 --- a/src/modules/exec/MySensors/modinfo.json +++ b/src/modules/exec/MySensors/modinfo.json @@ -49,6 +49,8 @@ }, "defActive": false, "usedLibs": { - "esp32*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [] } } \ No newline at end of file diff --git a/src/modules/exec/Pcf8574/modinfo.json b/src/modules/exec/Pcf8574/modinfo.json index f3ece10d..45f008ce 100644 --- a/src/modules/exec/Pcf8574/modinfo.json +++ b/src/modules/exec/Pcf8574/modinfo.json @@ -32,10 +32,34 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/Adafruit BusIO @ ^1.13.2" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp32cam_4mb": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_4mb": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_1mb": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_1mb_ota": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8285_1mb": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8285_1mb_ota": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_2mb": [ + "adafruit/Adafruit BusIO @ ^1.13.2" + ], + "esp8266_2mb_ota": [ "adafruit/Adafruit BusIO @ ^1.13.2" ] } diff --git a/src/modules/exec/Pcf8591/modinfo.json b/src/modules/exec/Pcf8591/modinfo.json index 183b354b..c3bef508 100644 --- a/src/modules/exec/Pcf8591/modinfo.json +++ b/src/modules/exec/Pcf8591/modinfo.json @@ -41,10 +41,34 @@ "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/adafruit/Adafruit_PCF8591" ], - "esp82*": [ + "esp32_16mb": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8266_4mb": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8266_16mb": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8266_1mb": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8266_1mb_ota": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8285_1mb": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8285_1mb_ota": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8266_2mb": [ + "https://github.com/adafruit/Adafruit_PCF8591" + ], + "esp8266_2mb_ota": [ "https://github.com/adafruit/Adafruit_PCF8591" ] } diff --git a/src/modules/exec/Pwm32/modinfo.json b/src/modules/exec/Pwm32/modinfo.json index 74fcccb4..ce789a19 100644 --- a/src/modules/exec/Pwm32/modinfo.json +++ b/src/modules/exec/Pwm32/modinfo.json @@ -44,6 +44,8 @@ }, "defActive": true, "usedLibs": { - "esp32*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [] } } \ No newline at end of file diff --git a/src/modules/exec/Pwm8266/modinfo.json b/src/modules/exec/Pwm8266/modinfo.json index 98163426..f446db57 100644 --- a/src/modules/exec/Pwm8266/modinfo.json +++ b/src/modules/exec/Pwm8266/modinfo.json @@ -40,6 +40,12 @@ }, "defActive": true, "usedLibs": { - "esp82*": [] + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/SDcard/modinfo.json b/src/modules/exec/SDcard/modinfo.json index 2d1872b3..5f10bce6 100644 --- a/src/modules/exec/SDcard/modinfo.json +++ b/src/modules/exec/SDcard/modinfo.json @@ -32,7 +32,13 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ + "espressif/esp32-camera @ ^2.0.0" + ], + "esp32_4mb3f": [ + "espressif/esp32-camera @ ^2.0.0" + ], + "esp32cam_4mb": [ "espressif/esp32-camera @ ^2.0.0" ] } diff --git a/src/modules/exec/SysExt/modinfo.json b/src/modules/exec/SysExt/modinfo.json index ce23b05a..1cd552ac 100644 --- a/src/modules/exec/SysExt/modinfo.json +++ b/src/modules/exec/SysExt/modinfo.json @@ -32,7 +32,9 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [] } } \ No newline at end of file diff --git a/src/modules/exec/Telegram/modinfo.json b/src/modules/exec/Telegram/modinfo.json index 80ba7662..2910ace1 100644 --- a/src/modules/exec/Telegram/modinfo.json +++ b/src/modules/exec/Telegram/modinfo.json @@ -55,7 +55,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ + "CTBot @2.1.9" + ], + "esp32_4mb3f": [ + "CTBot @2.1.9" + ], + "esp32cam_4mb": [ + "CTBot @2.1.9" + ], + "esp32_16mb": [ "CTBot @2.1.9" ], "esp8266_4mb": [ diff --git a/src/modules/exec/TelegramLT/modinfo.json b/src/modules/exec/TelegramLT/modinfo.json index b8cf7ba5..706338c3 100644 --- a/src/modules/exec/TelegramLT/modinfo.json +++ b/src/modules/exec/TelegramLT/modinfo.json @@ -51,7 +51,19 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32c3m_4mb":[], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/Telegram_v2/modinfo.json b/src/modules/exec/Telegram_v2/modinfo.json index 6c7e25f1..c5633329 100644 --- a/src/modules/exec/Telegram_v2/modinfo.json +++ b/src/modules/exec/Telegram_v2/modinfo.json @@ -124,7 +124,19 @@ "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ + "gyverlibs/FastBot" + ], + "esp32_4mb3f": [ + "gyverlibs/FastBot" + ], + "esp32cam_4mb": [ + "gyverlibs/FastBot" + ], + "esp32s2_4mb": [ + "gyverlibs/FastBot" + ], + "esp32_16mb": [ "gyverlibs/FastBot" ], "esp8266_4mb": [ diff --git a/src/modules/exec/Thermostat/modinfo.json b/src/modules/exec/Thermostat/modinfo.json index fa0a274c..2e7bd938 100644 --- a/src/modules/exec/Thermostat/modinfo.json +++ b/src/modules/exec/Thermostat/modinfo.json @@ -134,7 +134,15 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/A02Distance/modinfo.json b/src/modules/sensors/A02Distance/modinfo.json index ba970862..326b7c52 100644 --- a/src/modules/sensors/A02Distance/modinfo.json +++ b/src/modules/sensors/A02Distance/modinfo.json @@ -37,7 +37,14 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Acs712/modinfo.json b/src/modules/sensors/Acs712/modinfo.json index b741d377..2f68ee40 100644 --- a/src/modules/sensors/Acs712/modinfo.json +++ b/src/modules/sensors/Acs712/modinfo.json @@ -41,7 +41,16 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32s2_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Ads1115/modinfo.json b/src/modules/sensors/Ads1115/modinfo.json index af1690e5..dccbbc28 100644 --- a/src/modules/sensors/Ads1115/modinfo.json +++ b/src/modules/sensors/Ads1115/modinfo.json @@ -41,10 +41,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/Adafruit ADS1X15 @ ^2.3.0" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/Adafruit ADS1X15 @ ^2.3.0" + ], + "esp32cam_4mb": [ + "adafruit/Adafruit ADS1X15 @ ^2.3.0" + ], + "esp8266_4mb": [ "adafruit/Adafruit ADS1X15 @ ^2.3.0" ] } diff --git a/src/modules/sensors/AhtXX/modinfo.json b/src/modules/sensors/AhtXX/modinfo.json index 76a41e2c..b621e931 100644 --- a/src/modules/sensors/AhtXX/modinfo.json +++ b/src/modules/sensors/AhtXX/modinfo.json @@ -56,10 +56,28 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/enjoyneering/AHTxx.git" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/enjoyneering/AHTxx.git" + ], + "esp32cam_4mb": [ + "https://github.com/enjoyneering/AHTxx.git" + ], + "esp8266_4mb": [ + "https://github.com/enjoyneering/AHTxx.git" + ], + "esp8266_1mb": [ + "https://github.com/enjoyneering/AHTxx.git" + ], + "esp8266_1mb_ota": [ + "https://github.com/enjoyneering/AHTxx.git" + ], + "esp8285_1mb": [ + "https://github.com/enjoyneering/AHTxx.git" + ], + "esp8285_1mb_ota": [ "https://github.com/enjoyneering/AHTxx.git" ] } diff --git a/src/modules/sensors/AnalogAdc/modinfo.json b/src/modules/sensors/AnalogAdc/modinfo.json index ee41ed63..873701ff 100644 --- a/src/modules/sensors/AnalogAdc/modinfo.json +++ b/src/modules/sensors/AnalogAdc/modinfo.json @@ -41,7 +41,15 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/BH_1750/modinfo.json b/src/modules/sensors/BH_1750/modinfo.json index e3428545..9177a22f 100644 --- a/src/modules/sensors/BH_1750/modinfo.json +++ b/src/modules/sensors/BH_1750/modinfo.json @@ -34,10 +34,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "BH1750" ], - "esp82*": [ + "esp32_4mb3f": [ + "BH1750" + ], + "esp32cam_4mb": [ + "BH1750" + ], + "esp8266_4mb": [ "BH1750" ] } diff --git a/src/modules/sensors/Ble/modinfo.json b/src/modules/sensors/Ble/modinfo.json index c4cb3106..ac7cd8fc 100644 --- a/src/modules/sensors/Ble/modinfo.json +++ b/src/modules/sensors/Ble/modinfo.json @@ -64,11 +64,23 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/Mit4el/NimBLE-Arduino.git" ], - "esp32s2_4mb": [ - "exclude" + "esp32_16mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32_4mb3f": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32cam_4mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32s3_16mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32c3m_4mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Ble_part1/modinfo.json b/src/modules/sensors/Ble_part1/modinfo.json index 199c92b8..9e990fbd 100644 --- a/src/modules/sensors/Ble_part1/modinfo.json +++ b/src/modules/sensors/Ble_part1/modinfo.json @@ -64,11 +64,23 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/Mit4el/NimBLE-Arduino.git" ], - "esp32s2_4mb": [ - "exclude" + "esp32_16mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32_4mb3f": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32cam_4mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32s3_16mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32c3m_4mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Ble_part2/modinfo.json b/src/modules/sensors/Ble_part2/modinfo.json index b32ccd52..6c7d1634 100644 --- a/src/modules/sensors/Ble_part2/modinfo.json +++ b/src/modules/sensors/Ble_part2/modinfo.json @@ -64,11 +64,23 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/Mit4el/NimBLE-Arduino.git" ], - "esp32s2_4mb": [ - "exclude" + "esp32_16mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32_4mb3f": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32cam_4mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32s3_16mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" + ], + "esp32c3m_4mb": [ + "https://github.com/Mit4el/NimBLE-Arduino.git" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Bme280/modinfo.json b/src/modules/sensors/Bme280/modinfo.json index be8e93cb..53df6b2c 100644 --- a/src/modules/sensors/Bme280/modinfo.json +++ b/src/modules/sensors/Bme280/modinfo.json @@ -80,10 +80,37 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/Adafruit BME280 Library" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/Adafruit BME280 Library" + ], + "esp32cam_4mb": [ + "adafruit/Adafruit BME280 Library" + ], + "esp32c3m_4mb":[ + "adafruit/Adafruit BME280 Library" + ], + "esp8266_4mb": [ + "adafruit/Adafruit BME280 Library" + ], + "esp8266_1mb": [ + "adafruit/Adafruit BME280 Library" + ], + "esp8266_1mb_ota": [ + "adafruit/Adafruit BME280 Library" + ], + "esp8285_1mb": [ + "adafruit/Adafruit BME280 Library" + ], + "esp8285_1mb_ota": [ + "adafruit/Adafruit BME280 Library" + ], + "esp8266_2mb": [ + "adafruit/Adafruit BME280 Library" + ], + "esp8266_2mb_ota": [ "adafruit/Adafruit BME280 Library" ] } diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json index 65bb4dbf..ad796c25 100644 --- a/src/modules/sensors/Bmp280/modinfo.json +++ b/src/modules/sensors/Bmp280/modinfo.json @@ -52,10 +52,34 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/Adafruit BMP280 Library" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp32cam_4mb": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8266_4mb": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8266_1mb": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8266_1mb_ota": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8285_1mb": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8285_1mb_ota": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8266_2mb": [ + "adafruit/Adafruit BMP280 Library" + ], + "esp8266_2mb_ota": [ "adafruit/Adafruit BMP280 Library" ] } diff --git a/src/modules/sensors/DS2401/modinfo.json b/src/modules/sensors/DS2401/modinfo.json index a6bfef7b..c718c39d 100644 --- a/src/modules/sensors/DS2401/modinfo.json +++ b/src/modules/sensors/DS2401/modinfo.json @@ -35,7 +35,15 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Dht1122/modinfo.json b/src/modules/sensors/Dht1122/modinfo.json index 8f86208d..802cd8fd 100644 --- a/src/modules/sensors/Dht1122/modinfo.json +++ b/src/modules/sensors/Dht1122/modinfo.json @@ -52,10 +52,16 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "beegee-tokyo/DHT sensor library for ESPx" ], - "esp82*": [ + "esp32_4mb3f": [ + "beegee-tokyo/DHT sensor library for ESPx" + ], + "esp32cam_4mb": [ + "beegee-tokyo/DHT sensor library for ESPx" + ], + "esp8266_4mb": [ "beegee-tokyo/DHT sensor library for ESPx" ] } diff --git a/src/modules/sensors/Ds18b20/modinfo.json b/src/modules/sensors/Ds18b20/modinfo.json index 85bd3c96..7bb5e566 100644 --- a/src/modules/sensors/Ds18b20/modinfo.json +++ b/src/modules/sensors/Ds18b20/modinfo.json @@ -39,10 +39,34 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/milesburton/Arduino-Temperature-Control-Library" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp32cam_4mb": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp8266_4mb": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp8266_1mb": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp8266_1mb_ota": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp8285_1mb": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp8285_1mb_ota": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp8266_2mb": [ + "https://github.com/milesburton/Arduino-Temperature-Control-Library" + ], + "esp8266_2mb_ota": [ "https://github.com/milesburton/Arduino-Temperature-Control-Library" ] } diff --git a/src/modules/sensors/Ds2423/modinfo.json b/src/modules/sensors/Ds2423/modinfo.json index 19907ded..958541a4 100644 --- a/src/modules/sensors/Ds2423/modinfo.json +++ b/src/modules/sensors/Ds2423/modinfo.json @@ -60,11 +60,19 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/jbechter/arduino-onewire-DS2423", "paulstoffregen/OneWire @ ^2.3.7" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/jbechter/arduino-onewire-DS2423", + "paulstoffregen/OneWire @ ^2.3.7" + ], + "esp32cam_4mb": [ + "https://github.com/jbechter/arduino-onewire-DS2423", + "paulstoffregen/OneWire @ ^2.3.7" + ], + "esp8266_4mb": [ "https://github.com/jbechter/arduino-onewire-DS2423", "paulstoffregen/OneWire @ ^2.3.7" ] diff --git a/src/modules/sensors/Emon/modinfo.json b/src/modules/sensors/Emon/modinfo.json index c4af8764..f984a65c 100644 --- a/src/modules/sensors/Emon/modinfo.json +++ b/src/modules/sensors/Emon/modinfo.json @@ -59,10 +59,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "openenergymonitor/EmonLib@1.1.0" ], - "esp82*": [ + "esp32_4mb3f": [ + "openenergymonitor/EmonLib@1.1.0" + ], + "esp32cam_4mb": [ + "openenergymonitor/EmonLib@1.1.0" + ], + "esp8266_4mb": [ "openenergymonitor/EmonLib@1.1.0" ] } diff --git a/src/modules/sensors/ExampleModule/modinfo.json b/src/modules/sensors/ExampleModule/modinfo.json index fc25b3e6..5e2a5dd2 100644 --- a/src/modules/sensors/ExampleModule/modinfo.json +++ b/src/modules/sensors/ExampleModule/modinfo.json @@ -75,7 +75,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32s2_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/ExternalMQTT/modinfo.json b/src/modules/sensors/ExternalMQTT/modinfo.json index 3bfc7f1c..b1ed1b11 100644 --- a/src/modules/sensors/ExternalMQTT/modinfo.json +++ b/src/modules/sensors/ExternalMQTT/modinfo.json @@ -50,7 +50,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32s2_4mb": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/FreqMeter/modinfo.json b/src/modules/sensors/FreqMeter/modinfo.json index 4358c349..73fb8007 100644 --- a/src/modules/sensors/FreqMeter/modinfo.json +++ b/src/modules/sensors/FreqMeter/modinfo.json @@ -84,10 +84,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "kosme/arduinoFFT@^1.5.6" ], - "esp82*": [ + "esp32_4mb3f": [ + "kosme/arduinoFFT@^1.5.6" + ], + "esp32cam_4mb": [ + "kosme/arduinoFFT@^1.5.6" + ], + "esp8266_4mb": [ "kosme/arduinoFFT@^1.5.6" ] } diff --git a/src/modules/sensors/GY21/modinfo.json b/src/modules/sensors/GY21/modinfo.json index 4b985d48..aa80c3d4 100644 --- a/src/modules/sensors/GY21/modinfo.json +++ b/src/modules/sensors/GY21/modinfo.json @@ -49,10 +49,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/JonasGMorsch/GY-21.git" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/JonasGMorsch/GY-21.git" + ], + "esp32cam_4mb": [ + "https://github.com/JonasGMorsch/GY-21.git" + ], + "esp8266_4mb": [ "https://github.com/JonasGMorsch/GY-21.git" ] } diff --git a/src/modules/sensors/Hdc1080/modinfo.json b/src/modules/sensors/Hdc1080/modinfo.json index becff38a..574a8331 100644 --- a/src/modules/sensors/Hdc1080/modinfo.json +++ b/src/modules/sensors/Hdc1080/modinfo.json @@ -52,10 +52,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "ClosedCube HDC1080" ], - "esp82*": [ + "esp32_4mb3f": [ + "ClosedCube HDC1080" + ], + "esp32cam_4mb": [ + "ClosedCube HDC1080" + ], + "esp8266_4mb": [ "ClosedCube HDC1080" ] } diff --git a/src/modules/sensors/Hx710/modinfo.json b/src/modules/sensors/Hx710/modinfo.json index 47df1d0d..4a2bf5c7 100644 --- a/src/modules/sensors/Hx710/modinfo.json +++ b/src/modules/sensors/Hx710/modinfo.json @@ -46,10 +46,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/kurimawxx00/hx710B_pressure_sensor" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/kurimawxx00/hx710B_pressure_sensor" + ], + "esp32cam_4mb": [ + "https://github.com/kurimawxx00/hx710B_pressure_sensor" + ], + "esp8266_4mb": [ "https://github.com/kurimawxx00/hx710B_pressure_sensor" ] } diff --git a/src/modules/sensors/Hx711/modinfo.json b/src/modules/sensors/Hx711/modinfo.json index 44e2f2ca..d3713615 100644 --- a/src/modules/sensors/Hx711/modinfo.json +++ b/src/modules/sensors/Hx711/modinfo.json @@ -61,10 +61,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "GyverHX711@1.2" ], - "esp82*": [ + "esp32_4mb3f": [ + "GyverHX711@1.2" + ], + "esp32cam_4mb": [ + "GyverHX711@1.2" + ], + "esp8266_4mb": [ "GyverHX711@1.2" ] } diff --git a/src/modules/sensors/Impulse/modinfo.json b/src/modules/sensors/Impulse/modinfo.json index 81095235..4fa98b2a 100644 --- a/src/modules/sensors/Impulse/modinfo.json +++ b/src/modules/sensors/Impulse/modinfo.json @@ -40,7 +40,13 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Ina219/modinfo.json b/src/modules/sensors/Ina219/modinfo.json index 0205747a..f9694297 100644 --- a/src/modules/sensors/Ina219/modinfo.json +++ b/src/modules/sensors/Ina219/modinfo.json @@ -119,10 +119,22 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/GyverLibs/GyverINA" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp32cam_4mb": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp32s2_4mb": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp8266_4mb": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp8266_16mb": [ "https://github.com/GyverLibs/GyverINA" ] } diff --git a/src/modules/sensors/Ina226/modinfo.json b/src/modules/sensors/Ina226/modinfo.json index 66c06b71..5a8f7f15 100644 --- a/src/modules/sensors/Ina226/modinfo.json +++ b/src/modules/sensors/Ina226/modinfo.json @@ -119,10 +119,22 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "https://github.com/GyverLibs/GyverINA" ], - "esp82*": [ + "esp32_4mb3f": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp32cam_4mb": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp32s2_4mb": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp8266_4mb": [ + "https://github.com/GyverLibs/GyverINA" + ], + "esp8266_16mb": [ "https://github.com/GyverLibs/GyverINA" ] } diff --git a/src/modules/sensors/IoTWiegand/modinfo.json b/src/modules/sensors/IoTWiegand/modinfo.json index 06fc20a7..f91afe00 100644 --- a/src/modules/sensors/IoTWiegand/modinfo.json +++ b/src/modules/sensors/IoTWiegand/modinfo.json @@ -36,7 +36,13 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ + "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" + ], + "esp32_4mb3f": [ + "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" + ], + "esp32cam_4mb": [ "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" ], "esp8266_4mb": [ diff --git a/src/modules/sensors/Max6675/modinfo.json b/src/modules/sensors/Max6675/modinfo.json index 7b97905a..469bbef1 100644 --- a/src/modules/sensors/Max6675/modinfo.json +++ b/src/modules/sensors/Max6675/modinfo.json @@ -38,10 +38,13 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "adafruit/MAX6675 library" ], - "esp82*": [ + "esp32_4mb3f": [ + "adafruit/MAX6675 library" + ], + "esp8266_4mb": [ "adafruit/MAX6675 library" ] } diff --git a/src/modules/sensors/Mhz19/modinfo.json b/src/modules/sensors/Mhz19/modinfo.json index b141ccf6..ee93fcb6 100644 --- a/src/modules/sensors/Mhz19/modinfo.json +++ b/src/modules/sensors/Mhz19/modinfo.json @@ -78,10 +78,10 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp32s2_4mb": [ - "plerup/EspSoftwareSerial" - ], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32s2_4mb": [], + "esp32cam_4mb": [], + "esp8266_4mb": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Ntc/modinfo.json b/src/modules/sensors/Ntc/modinfo.json index 6e0dc849..6f0b1ce4 100644 --- a/src/modules/sensors/Ntc/modinfo.json +++ b/src/modules/sensors/Ntc/modinfo.json @@ -50,7 +50,15 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/RCswitch/modinfo.json b/src/modules/sensors/RCswitch/modinfo.json index d70452dd..5c44ba44 100644 --- a/src/modules/sensors/RCswitch/modinfo.json +++ b/src/modules/sensors/RCswitch/modinfo.json @@ -61,10 +61,34 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "rc-switch @ ^2.6.4" ], - "esp82*": [ + "esp32_4mb3f": [ + "rc-switch @ ^2.6.4" + ], + "esp32cam_4mb": [ + "rc-switch @ ^2.6.4" + ], + "esp8266_4mb": [ + "rc-switch @ ^2.6.4" + ], + "esp8266_1mb": [ + "rc-switch @ ^2.6.4" + ], + "esp8266_1mb_ota": [ + "rc-switch @ ^2.6.4" + ], + "esp8285_1mb": [ + "rc-switch @ ^2.6.4" + ], + "esp8285_1mb_ota": [ + "rc-switch @ ^2.6.4" + ], + "esp8266_2mb": [ + "rc-switch @ ^2.6.4" + ], + "esp8266_2mb_ota": [ "rc-switch @ ^2.6.4" ] } diff --git a/src/modules/sensors/RTC/modinfo.json b/src/modules/sensors/RTC/modinfo.json index 369d70c3..f22250a1 100644 --- a/src/modules/sensors/RTC/modinfo.json +++ b/src/modules/sensors/RTC/modinfo.json @@ -80,7 +80,15 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/S8/modinfo.json b/src/modules/sensors/S8/modinfo.json index 5aeadc3f..5874fca9 100644 --- a/src/modules/sensors/S8/modinfo.json +++ b/src/modules/sensors/S8/modinfo.json @@ -36,7 +36,8 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp8266_4mb": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Scd40/modinfo.json b/src/modules/sensors/Scd40/modinfo.json index 302c606d..9e29e654 100644 --- a/src/modules/sensors/Scd40/modinfo.json +++ b/src/modules/sensors/Scd40/modinfo.json @@ -70,11 +70,19 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "Sensirion I2C SCD4x @0.4.0", "Sensirion Core @0.6.0" ], - "esp82*": [ + "esp32_4mb3f": [ + "Sensirion I2C SCD4x @0.4.0", + "Sensirion Core @0.6.0" + ], + "esp32cam_4mb": [ + "Sensirion I2C SCD4x @0.4.0", + "Sensirion Core @0.6.0" + ], + "esp8266_4mb": [ "Sensirion I2C SCD4x @0.4.0", "Sensirion Core @0.6.0" ] diff --git a/src/modules/sensors/Sds011/modinfo.json b/src/modules/sensors/Sds011/modinfo.json index e34db8fe..3026e56e 100644 --- a/src/modules/sensors/Sds011/modinfo.json +++ b/src/modules/sensors/Sds011/modinfo.json @@ -66,10 +66,16 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "Nova Fitness Sds dust sensors library@1.5.1" ], - "esp82*": [ + "esp32_4mb3f": [ + "Nova Fitness Sds dust sensors library@1.5.1" + ], + "esp32cam_4mb": [ + "Nova Fitness Sds dust sensors library@1.5.1" + ], + "esp8266_4mb": [ "Nova Fitness Sds dust sensors library@1.5.1" ] } diff --git a/src/modules/sensors/Sgp30/modinfo.json b/src/modules/sensors/Sgp30/modinfo.json index f157077c..b3da3628 100644 --- a/src/modules/sensors/Sgp30/modinfo.json +++ b/src/modules/sensors/Sgp30/modinfo.json @@ -48,10 +48,34 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" ], - "esp82*": [ + "esp32_4mb3f": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp32cam_4mb": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp8266_4mb": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp8266_1mb": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp8266_1mb_ota": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp8285_1mb": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp8285_1mb_ota": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp8266_2mb": [ + "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" + ], + "esp8266_2mb_ota": [ "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" ] } diff --git a/src/modules/sensors/Sht20/modinfo.json b/src/modules/sensors/Sht20/modinfo.json index fdded673..443b91b7 100644 --- a/src/modules/sensors/Sht20/modinfo.json +++ b/src/modules/sensors/Sht20/modinfo.json @@ -49,10 +49,31 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "robtillaart/SHT2x@^0.1.1" ], - "esp82*": [ + "esp32_4mb3f": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_4mb": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_1mb": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_1mb_ota": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8285_1mb": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8285_1mb_ota": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_2mb": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_2mb_ota": [ "robtillaart/SHT2x@^0.1.1" ] } diff --git a/src/modules/sensors/Sht30/modinfo.json b/src/modules/sensors/Sht30/modinfo.json index 6a22d155..5cbedff1 100644 --- a/src/modules/sensors/Sht30/modinfo.json +++ b/src/modules/sensors/Sht30/modinfo.json @@ -49,10 +49,34 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "WEMOS SHT3x@1.0.0" ], - "esp82*": [ + "esp32_4mb3f": [ + "WEMOS SHT3x@1.0.0" + ], + "esp32cam_4mb": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8266_4mb": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8266_1mb": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8266_1mb_ota": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8285_1mb": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8285_1mb_ota": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8266_2mb": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8266_2mb_ota": [ "WEMOS SHT3x@1.0.0" ] } diff --git a/src/modules/sensors/Sonar/modinfo.json b/src/modules/sensors/Sonar/modinfo.json index 737ecd3f..eaaeed5c 100644 --- a/src/modules/sensors/Sonar/modinfo.json +++ b/src/modules/sensors/Sonar/modinfo.json @@ -37,7 +37,15 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/UART/modinfo.json b/src/modules/sensors/UART/modinfo.json index 9ab1ce8d..e17a3f66 100644 --- a/src/modules/sensors/UART/modinfo.json +++ b/src/modules/sensors/UART/modinfo.json @@ -74,10 +74,34 @@ }, "defActive": true, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ "plerup/EspSoftwareSerial" ], - "esp82*": [ + "esp32_4mb3f": [ + "plerup/EspSoftwareSerial" + ], + "esp32cam_4mb": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_4mb": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_1mb": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_1mb_ota": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_2mb": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_2mb_ota": [ + "plerup/EspSoftwareSerial" + ], + "esp8285_1mb": [ + "plerup/EspSoftwareSerial" + ], + "esp8285_1mb_ota": [ "plerup/EspSoftwareSerial" ] } diff --git a/src/modules/sensors/ld2410/modinfo.json b/src/modules/sensors/ld2410/modinfo.json index afd3cef8..298079f1 100644 --- a/src/modules/sensors/ld2410/modinfo.json +++ b/src/modules/sensors/ld2410/modinfo.json @@ -85,7 +85,10 @@ }, "defActive": false, "usedLibs": { - "esp32*": [ + "esp32_4mb": [ + "ncmreynolds/ld2410@^0.1.3" + ], + "esp32_4mb3f": [ "ncmreynolds/ld2410@^0.1.3" ] } diff --git a/src/modules/virtual/Cron/modinfo.json b/src/modules/virtual/Cron/modinfo.json index 26f9fbab..4356adb6 100644 --- a/src/modules/virtual/Cron/modinfo.json +++ b/src/modules/virtual/Cron/modinfo.json @@ -49,7 +49,20 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/GoogleSheet/modinfo.json b/src/modules/virtual/GoogleSheet/modinfo.json index 96bab326..8fa0c5fb 100644 --- a/src/modules/virtual/GoogleSheet/modinfo.json +++ b/src/modules/virtual/GoogleSheet/modinfo.json @@ -58,7 +58,12 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Loging/modinfo.json b/src/modules/virtual/Loging/modinfo.json index 61b2ad2d..c5bbf6b4 100644 --- a/src/modules/virtual/Loging/modinfo.json +++ b/src/modules/virtual/Loging/modinfo.json @@ -50,7 +50,20 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/LogingDaily/modinfo.json b/src/modules/virtual/LogingDaily/modinfo.json index 1bfbc10d..4f0a5f09 100644 --- a/src/modules/virtual/LogingDaily/modinfo.json +++ b/src/modules/virtual/LogingDaily/modinfo.json @@ -43,7 +43,20 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Math/modinfo.json b/src/modules/virtual/Math/modinfo.json index 6ae5c83a..27080b3c 100644 --- a/src/modules/virtual/Math/modinfo.json +++ b/src/modules/virtual/Math/modinfo.json @@ -55,7 +55,16 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32s2_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } diff --git a/src/modules/virtual/Timer/modinfo.json b/src/modules/virtual/Timer/modinfo.json index 7e3ee204..c0b02ea3 100644 --- a/src/modules/virtual/Timer/modinfo.json +++ b/src/modules/virtual/Timer/modinfo.json @@ -73,7 +73,20 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/VButton/modinfo.json b/src/modules/virtual/VButton/modinfo.json index 8a61b2d1..366e6b51 100644 --- a/src/modules/virtual/VButton/modinfo.json +++ b/src/modules/virtual/VButton/modinfo.json @@ -35,7 +35,20 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Variable/modinfo.json b/src/modules/virtual/Variable/modinfo.json index bf91bb7a..49bff50c 100644 --- a/src/modules/virtual/Variable/modinfo.json +++ b/src/modules/virtual/Variable/modinfo.json @@ -95,7 +95,20 @@ }, "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Weather/modinfo.json b/src/modules/virtual/Weather/modinfo.json index 0cd65884..928bc442 100644 --- a/src/modules/virtual/Weather/modinfo.json +++ b/src/modules/virtual/Weather/modinfo.json @@ -39,7 +39,20 @@ }, "defActive": false, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32_16mb": [], + "esp32s2_4mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/owmWeather/modinfo.json b/src/modules/virtual/owmWeather/modinfo.json index 5940d5db..748ff5d8 100644 --- a/src/modules/virtual/owmWeather/modinfo.json +++ b/src/modules/virtual/owmWeather/modinfo.json @@ -87,7 +87,19 @@ "defActive": true, "usedLibs": { - "esp32*": [], - "esp82*": [] + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32s2_4mb": [], + "esp32_16mb": [], + "esp32s3_16mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_16mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } From 27788b611a24403184e471553ff61ce28aff786b Mon Sep 17 00:00:00 2001 From: IoT Manager <158345374+mira-service@users.noreply.github.com> Date: Tue, 14 May 2024 21:14:02 +0200 Subject: [PATCH 05/11] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=2045?= =?UTF-8?q?7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/Const.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Const.h b/include/Const.h index e170a3d2..599de170 100644 --- a/include/Const.h +++ b/include/Const.h @@ -2,7 +2,7 @@ #include "BuildTime.h" // Версия прошивки -#define FIRMWARE_VERSION 456 +#define FIRMWARE_VERSION 457 #ifdef esp8266_1mb_ota #define FIRMWARE_NAME "esp8266_1mb_ota" From a8ff7a4350186b6ae2d1e44e56f91db8fff2e47e Mon Sep 17 00:00:00 2001 From: IoT Manager <158345374+mira-service@users.noreply.github.com> Date: Tue, 14 May 2024 21:54:50 +0200 Subject: [PATCH 06/11] fix bug --- data_svelte/flashProfile.json | 24 +++ data_svelte/items.json | 281 +++++++++++++++++++++------------- platformio.ini | 3 + src/modules/API.cpp | 4 + 4 files changed, 202 insertions(+), 110 deletions(-) diff --git a/data_svelte/flashProfile.json b/data_svelte/flashProfile.json index b17a4af6..0ca40475 100644 --- a/data_svelte/flashProfile.json +++ b/data_svelte/flashProfile.json @@ -6,6 +6,10 @@ }, "modules": { "virtual_elments": [ + { + "path": "src/modules/virtual/Benchmark", + "active": false + }, { "path": "src/modules/virtual/Cron", "active": true @@ -30,6 +34,10 @@ "path": "src/modules/virtual/owmWeather", "active": true }, + { + "path": "src/modules/virtual/Ping", + "active": true + }, { "path": "src/modules/virtual/Timer", "active": true @@ -112,6 +120,10 @@ "path": "src/modules/sensors/Emon", "active": false }, + { + "path": "src/modules/sensors/EnergyMon485", + "active": true + }, { "path": "src/modules/sensors/ExampleModule", "active": false @@ -230,6 +242,10 @@ "path": "src/modules/exec/AnalogBtn", "active": true }, + { + "path": "src/modules/exec/BrokerMQTT", + "active": false + }, { "path": "src/modules/exec/ButtonIn", "active": true @@ -298,6 +314,14 @@ "path": "src/modules/exec/SDcard", "active": false }, + { + "path": "src/modules/exec/SIM800", + "active": false + }, + { + "path": "src/modules/exec/SmartBoiler", + "active": false + }, { "path": "src/modules/exec/SysExt", "active": false diff --git a/data_svelte/items.json b/data_svelte/items.json index e432f9b8..fd3bc24a 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -101,7 +101,25 @@ }, { "global": 0, - "name": "7. Таймер", + "name": "7. Ping", + "type": "Reading", + "subtype": "Ping", + "id": "ping", + "needSave": 0, + "widget": "nil", + "page": "", + "descr": "", + "ip": "8.8.8.8", + "timeout": 5, + "interval": 1, + "data_size": 0, + "count": 0, + "tos": 0, + "num": 7 + }, + { + "global": 0, + "name": "8. Таймер", "type": "Writing", "subtype": "Timer", "id": "timer", @@ -113,11 +131,11 @@ "ticker": 1, "repeat": 1, "needSave": 0, - "num": 7 + "num": 8 }, { "global": 0, - "name": "8. Окно ввода числа (переменная)", + "name": "9. Окно ввода числа (переменная)", "type": "Reading", "subtype": "Variable", "id": "value", @@ -131,11 +149,11 @@ "plus": 0, "multiply": 1, "round": 0, - "num": 8 + "num": 9 }, { "global": 0, - "name": "9. Окно ввода времени", + "name": "10. Окно ввода времени", "type": "Reading", "subtype": "Variable", "id": "time", @@ -145,11 +163,11 @@ "descr": "Введите время", "int": "0", "val": "02:00", - "num": 9 + "num": 10 }, { "global": 0, - "name": "10. Окно ввода даты", + "name": "11. Окно ввода даты", "type": "Reading", "subtype": "Variable", "id": "time", @@ -159,11 +177,11 @@ "descr": "Введите дату", "int": "0", "val": "24.05.2022", - "num": 10 + "num": 11 }, { "global": 0, - "name": "11. Окно ввода текста", + "name": "12. Окно ввода текста", "type": "Reading", "subtype": "Variable", "id": "txt", @@ -173,11 +191,11 @@ "descr": "Введите текст", "int": "0", "val": "текст", - "num": 11 + "num": 12 }, { "global": 0, - "name": "12. Вывод значения", + "name": "13. Вывод значения", "type": "Reading", "subtype": "Variable", "id": "vout", @@ -191,11 +209,11 @@ "plus": 0, "multiply": 1, "round": 0, - "num": 12 + "num": 13 }, { "global": 0, - "name": "13. Виртуальная кнопка", + "name": "14. Виртуальная кнопка", "type": "Reading", "subtype": "VButton", "id": "vbtn", @@ -205,13 +223,13 @@ "descr": "Кнопка", "int": "0", "val": "0", - "num": 13 + "num": 14 }, { "header": "sensors" }, { - "name": "14. A02 Дальность", + "name": "15. A02 Дальность", "type": "Reading", "subtype": "A02Distance", "id": "dist", @@ -224,10 +242,10 @@ "rx": 16, "line": 2, "speed": 9600, - "num": 14 + "num": 15 }, { - "name": "15. Acs712 Ток", + "name": "16. Acs712 Ток", "type": "Reading", "subtype": "Acs712", "id": "amp", @@ -242,11 +260,11 @@ "sens": 100, "adczero": 512, "btn-setZero": "nil", - "num": 15 + "num": 16 }, { "global": 0, - "name": "16. AHTXX Температура", + "name": "17. AHTXX Температура", "type": "Reading", "subtype": "AhtXXt", "id": "Temp20", @@ -257,11 +275,11 @@ "addr": "0x38", "shtType": 1, "round": 1, - "num": 16 + "num": 17 }, { "global": 0, - "name": "17. AHTXX Влажность", + "name": "18. AHTXX Влажность", "type": "Reading", "subtype": "AhtXXh", "id": "Hum20", @@ -272,11 +290,11 @@ "addr": "0x38", "shtType": 1, "round": 1, - "num": 17 + "num": 18 }, { "global": 0, - "name": "18. Аналоговый сенсор", + "name": "19. Аналоговый сенсор", "type": "Reading", "subtype": "AnalogAdc", "id": "t", @@ -290,11 +308,11 @@ "pin": 0, "int": 15, "avgSteps": 1, - "num": 18 + "num": 19 }, { "global": 0, - "name": "19. BME280 Температура", + "name": "20. BME280 Температура", "type": "Reading", "subtype": "Bme280t", "id": "Tmp3", @@ -304,11 +322,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 19 + "num": 20 }, { "global": 0, - "name": "20. BME280 Давление", + "name": "21. BME280 Давление", "type": "Reading", "subtype": "Bme280p", "id": "Press3", @@ -318,11 +336,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 20 + "num": 21 }, { "global": 0, - "name": "21. BME280 Влажность", + "name": "22. BME280 Влажность", "type": "Reading", "subtype": "Bme280h", "id": "Hum3", @@ -332,11 +350,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 21 + "num": 22 }, { "global": 0, - "name": "22. BME280 Tочка росы", + "name": "23. BME280 Tочка росы", "type": "Reading", "subtype": "Bme280dp", "id": "Dew3", @@ -346,11 +364,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 22 + "num": 23 }, { "global": 0, - "name": "23. BMP280 Температура", + "name": "24. BMP280 Температура", "type": "Reading", "subtype": "Bmp280t", "id": "tmp3", @@ -360,11 +378,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 23 + "num": 24 }, { "global": 0, - "name": "24. BMP280 Давление", + "name": "25. BMP280 Давление", "type": "Reading", "subtype": "Bmp280p", "id": "Press3", @@ -374,11 +392,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 24 + "num": 25 }, { "global": 0, - "name": "25. DHT11 Температура", + "name": "26. DHT11 Температура", "type": "Reading", "subtype": "Dht1122t", "id": "tmp3", @@ -388,11 +406,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 25 + "num": 26 }, { "global": 0, - "name": "26. DHT11 Влажность", + "name": "27. DHT11 Влажность", "type": "Reading", "subtype": "Dht1122h", "id": "Hum3", @@ -402,11 +420,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 26 + "num": 27 }, { "global": 0, - "name": "27. DS18B20 Температура", + "name": "28. DS18B20 Температура", "type": "Reading", "subtype": "Ds18b20", "id": "dstmp", @@ -418,11 +436,54 @@ "index": 0, "addr": "", "round": 1, - "num": 27 + "num": 28 }, { "global": 0, - "name": "28. Аналоговый счетчик импульсов", + "name": "29. Gran данные", + "type": "Reading", + "subtype": "gran485", + "id": "gran", + "widget": "anydataVlt", + "page": "Гран-Электро", + "descr": "Потребление", + "sensor": "k", + "int": 15, + "round": 1, + "num": 29 + }, + { + "global": 0, + "name": "30. SDM120 данные", + "type": "Reading", + "subtype": "sdm120", + "id": "sdm120", + "widget": "anydataVlt", + "page": "Счётчик SDM120", + "descr": "Потребление", + "sensor": "k", + "int": 15, + "round": 1, + "num": 30 + }, + { + "global": 0, + "name": "31. Energy UART", + "type": "Reading", + "subtype": "energy_uart", + "id": "enrg_uart", + "widget": "nil", + "page": "", + "descr": "", + "tx": 17, + "rx": 16, + "line": 2, + "speed": 9600, + "num": 31 + }, + { + "global": 0, + "name": "32. Аналоговый счетчик импульсов", "type": "Writing", "subtype": "Impulse", "id": "impulse", @@ -435,11 +496,11 @@ "pinMode": "INPUT", "debounceDelay": 3, "multiply": 1, - "num": 28 + "num": 32 }, { "global": 0, - "name": "29. MQ газовые анализаторы", + "name": "33. MQ газовые анализаторы", "type": "Reading", "subtype": "MQgas", "id": "MQ", @@ -476,11 +537,11 @@ "pin-Esp32": 34, "operating voltage": 3.3, "int": 15, - "num": 29 + "num": 33 }, { "global": 0, - "name": "30. PZEM 004t Напряжение", + "name": "34. PZEM 004t Напряжение", "type": "Reading", "subtype": "Pzem004v", "id": "v", @@ -490,11 +551,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 30 + "num": 34 }, { "global": 0, - "name": "31. PZEM 004t Сила тока", + "name": "35. PZEM 004t Сила тока", "type": "Reading", "subtype": "Pzem004a", "id": "a", @@ -504,11 +565,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 31 + "num": 35 }, { "global": 0, - "name": "32. PZEM 004t Мощность", + "name": "36. PZEM 004t Мощность", "type": "Reading", "subtype": "Pzem004w", "id": "w", @@ -518,11 +579,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 32 + "num": 36 }, { "global": 0, - "name": "33. PZEM 004t Энергия", + "name": "37. PZEM 004t Энергия", "type": "Reading", "subtype": "Pzem004wh", "id": "wh", @@ -532,11 +593,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 33 + "num": 37 }, { "global": 0, - "name": "34. PZEM 004t Частота", + "name": "38. PZEM 004t Частота", "type": "Reading", "subtype": "Pzem004hz", "id": "hz", @@ -546,11 +607,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 34 + "num": 38 }, { "global": 0, - "name": "35. PZEM 004t Косинус", + "name": "39. PZEM 004t Косинус", "type": "Reading", "subtype": "Pzem004pf", "id": "pf", @@ -560,11 +621,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 35 + "num": 39 }, { "global": 0, - "name": "36. PZEM настройка", + "name": "40. PZEM настройка", "type": "Reading", "subtype": "Pzem004cmd", "id": "set", @@ -575,11 +636,11 @@ "addr": "0xF8", "btn-changeaddr": "0x01", "btn-reset": "", - "num": 36 + "num": 40 }, { "global": 0, - "name": "37. PZEM uart", + "name": "41. PZEM uart", "type": "Reading", "subtype": "Pzem004uart", "id": "upzem", @@ -590,11 +651,11 @@ "rx": 16, "line": 2, "speed": 9600, - "num": 37 + "num": 41 }, { "global": 0, - "name": "38. Часы реального времени", + "name": "42. Часы реального времени", "type": "Reading", "subtype": "RTC", "id": "rtc", @@ -610,12 +671,12 @@ "int": 5, "btn-setUTime": "0", "btn-setSysTime": "nil", - "num": 38 + "num": 42 }, { "global": 0, - "name": "39. (S8) Cенсор качества воздуха", - "num": 39, + "name": "43. (S8) Cенсор качества воздуха", + "num": 43, "type": "Reading", "subtype": "S8co", "id": "s8co", @@ -629,7 +690,7 @@ }, { "global": 0, - "name": "40. Sht20 Температура", + "name": "44. Sht20 Температура", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -638,11 +699,11 @@ "descr": "Температура", "int": 15, "round": 1, - "num": 40 + "num": 44 }, { "global": 0, - "name": "41. Sht20 Влажность", + "name": "45. Sht20 Влажность", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -651,11 +712,11 @@ "descr": "Влажность", "int": 15, "round": 1, - "num": 41 + "num": 45 }, { "global": 0, - "name": "42. Sht30 Температура", + "name": "46. Sht30 Температура", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -664,11 +725,11 @@ "descr": "SHT30 Температура", "int": 15, "round": 1, - "num": 42 + "num": 46 }, { "global": 0, - "name": "43. Sht30 Влажность", + "name": "47. Sht30 Влажность", "type": "Reading", "subtype": "Sht30h", "id": "Hum30", @@ -677,12 +738,12 @@ "descr": "SHT30 Влажность", "int": 15, "round": 1, - "num": 43 + "num": 47 }, { "global": 0, - "name": "44. HC-SR04 Ультразвуковой дальномер", - "num": 44, + "name": "48. HC-SR04 Ультразвуковой дальномер", + "num": 48, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -694,7 +755,7 @@ "int": 5 }, { - "name": "45. UART", + "name": "49. UART", "type": "Reading", "subtype": "UART", "page": "", @@ -706,14 +767,14 @@ "line": 2, "speed": 9600, "eventFormat": 0, - "num": 45 + "num": 49 }, { "header": "executive_devices" }, { "global": 0, - "name": "46. Аналоговая кнопка", + "name": "50. Аналоговая кнопка", "type": "Reading", "subtype": "AnalogBtn", "id": "abtn", @@ -723,11 +784,11 @@ "pin": 34, "aValue": -1, "delta": 50, - "num": 46 + "num": 50 }, { "global": 0, - "name": "47. Кнопка подключенная к пину", + "name": "51. Кнопка подключенная к пину", "type": "Writing", "subtype": "ButtonIn", "id": "btn", @@ -742,11 +803,11 @@ "debounceDelay": 50, "fixState": 0, "inv": 0, - "num": 47 + "num": 51 }, { "global": 0, - "name": "48. Управление пином", + "name": "52. Управление пином", "type": "Writing", "subtype": "ButtonOut", "needSave": 0, @@ -757,11 +818,11 @@ "int": 0, "inv": 0, "pin": 2, - "num": 48 + "num": 52 }, { "global": 0, - "name": "49. Пассивный звуковой извещатель", + "name": "53. Пассивный звуковой извещатель", "type": "Writing", "subtype": "Buzzer", "id": "buzzer", @@ -780,11 +841,11 @@ "cycle": 0, "indication": 1, "val": 0, - "num": 49 + "num": 53 }, { "global": 0, - "name": "50. Энкодер", + "name": "54. Энкодер", "type": "Writing", "subtype": "Encoder", "id": "enc", @@ -797,11 +858,11 @@ "step": 1, "stepOnPress": 5, "pins": "4,5,2", - "num": 50 + "num": 54 }, { "global": 0, - "name": "51. Сервопривод", + "name": "55. Сервопривод", "type": "Writing", "subtype": "IoTServo", "id": "servo", @@ -814,11 +875,11 @@ "minAngle": 0, "maxAngle": 180, "trackingID": "", - "num": 51 + "num": 55 }, { "global": 0, - "name": "52. Расширитель портов Mcp23017", + "name": "56. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -828,11 +889,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 52 + "num": 56 }, { "global": 0, - "name": "53. MP3 плеер", + "name": "57. MP3 плеер", "type": "Reading", "subtype": "Mp3", "id": "mp3", @@ -842,11 +903,11 @@ "int": 1, "pins": "14,12", "volume": 20, - "num": 53 + "num": 57 }, { "global": 0, - "name": "54. Сенсорная кнопка", + "name": "58. Сенсорная кнопка", "type": "Writing", "subtype": "Multitouch", "id": "impulse", @@ -860,11 +921,11 @@ "pinMode": "INPUT", "debounceDelay": 50, "PWMDelay": 500, - "num": 54 + "num": 58 }, { "global": 0, - "name": "55. Расширитель портов Pcf8574", + "name": "59. Расширитель портов Pcf8574", "type": "Reading", "subtype": "Pcf8574", "id": "Pcf", @@ -874,11 +935,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 55 + "num": 59 }, { "global": 0, - "name": "56. PWM ESP8266", + "name": "60. PWM ESP8266", "type": "Writing", "subtype": "Pwm8266", "id": "pwm", @@ -890,11 +951,11 @@ "freq": 5000, "val": 0, "apin": -1, - "num": 56 + "num": 60 }, { "global": 0, - "name": "57. Телеграм-Лайт", + "name": "61. Телеграм-Лайт", "type": "Writing", "subtype": "TelegramLT", "id": "tg", @@ -903,13 +964,13 @@ "descr": "", "token": "", "chatID": "", - "num": 57 + "num": 61 }, { "header": "screens" }, { - "name": "58. LCD Dwin экран", + "name": "62. LCD Dwin экран", "type": "Reading", "subtype": "DwinI", "id": "dwin", @@ -921,11 +982,11 @@ "line": 2, "speed": 9600, "btn-uploadUI": "", - "num": 58 + "num": 62 }, { "global": 0, - "name": "59. LCD экран 2004", + "name": "63. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -938,10 +999,10 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 59 + "num": 63 }, { - "name": "60. LCD экран 1602", + "name": "64. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -954,11 +1015,11 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 60 + "num": 64 }, { "global": 0, - "name": "61. OLED экран 64 8266", + "name": "65. OLED экран 64 8266", "type": "Reading", "subtype": "Oled64", "id": "Oled", @@ -971,6 +1032,6 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 61 + "num": 65 } ] \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index fc3328f3..2fd8ad81 100644 --- a/platformio.ini +++ b/platformio.ini @@ -538,6 +538,7 @@ build_src_filter = [env:esp8266_4mb_fromitems] lib_deps = + https://github.com/dancol90/ESP8266Ping https://github.com/enjoyneering/AHTxx.git adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library @@ -562,6 +563,7 @@ build_src_filter = + + + + + + + + @@ -573,6 +575,7 @@ build_src_filter = + + + + + + + + diff --git a/src/modules/API.cpp b/src/modules/API.cpp index a029331c..3dcef050 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -5,6 +5,7 @@ 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_Ping(String subtype, String params); void* getAPI_Timer(String subtype, String params); void* getAPI_Variable(String subtype, String params); void* getAPI_VButton(String subtype, String params); @@ -16,6 +17,7 @@ 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_EnergyMon485(String subtype, String params); void* getAPI_Impulse(String subtype, String params); void* getAPI_MQgas(String subtype, String params); void* getAPI_Pzem004_v2(String subtype, String params); @@ -48,6 +50,7 @@ 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_Ping(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_VButton(subtype, params)) != nullptr) return tmpAPI; @@ -59,6 +62,7 @@ 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_EnergyMon485(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Impulse(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_MQgas(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Pzem004_v2(subtype, params)) != nullptr) return tmpAPI; From eff916a7b5953f46595a27e75a63eaf746aaeb15 Mon Sep 17 00:00:00 2001 From: IoT Manager <158345374+mira-service@users.noreply.github.com> Date: Tue, 14 May 2024 22:01:07 +0200 Subject: [PATCH 07/11] update compiler with new modules --- compilerProfile.json | 28 +++ data_svelte/flashProfile.json | 6 +- data_svelte/items.json | 315 ++++++++++++++++++++-------------- myProfile.json | 6 +- platformio.ini | 2 +- src/modules/API.cpp | 4 +- 6 files changed, 227 insertions(+), 134 deletions(-) diff --git a/compilerProfile.json b/compilerProfile.json index b6246f40..bac5d993 100644 --- a/compilerProfile.json +++ b/compilerProfile.json @@ -128,6 +128,10 @@ }, "modules": { "virtual_elments": [ + { + "path": "src/modules/virtual/Benchmark", + "active": false + }, { "path": "src/modules/virtual/Cron", "active": true @@ -152,6 +156,10 @@ "path": "src/modules/virtual/owmWeather", "active": true }, + { + "path": "src/modules/virtual/Ping", + "active": true + }, { "path": "src/modules/virtual/Timer", "active": true @@ -198,6 +206,10 @@ "path": "src/modules/sensors/BH_1750", "active": false }, + { + "path": "src/modules/sensors/BL0937", + "active": true + }, { "path": "src/modules/sensors/Ble", "active": false @@ -234,6 +246,10 @@ "path": "src/modules/sensors/Emon", "active": false }, + { + "path": "src/modules/sensors/EnergyMon485", + "active": false + }, { "path": "src/modules/sensors/ExampleModule", "active": false @@ -352,6 +368,10 @@ "path": "src/modules/exec/AnalogBtn", "active": true }, + { + "path": "src/modules/exec/BrokerMQTT", + "active": false + }, { "path": "src/modules/exec/ButtonIn", "active": true @@ -420,6 +440,14 @@ "path": "src/modules/exec/SDcard", "active": false }, + { + "path": "src/modules/exec/SIM800", + "active": false + }, + { + "path": "src/modules/exec/SmartBoiler", + "active": false + }, { "path": "src/modules/exec/SysExt", "active": false diff --git a/data_svelte/flashProfile.json b/data_svelte/flashProfile.json index 0ca40475..337a4283 100644 --- a/data_svelte/flashProfile.json +++ b/data_svelte/flashProfile.json @@ -84,6 +84,10 @@ "path": "src/modules/sensors/BH_1750", "active": false }, + { + "path": "src/modules/sensors/BL0937", + "active": true + }, { "path": "src/modules/sensors/Ble", "active": false @@ -122,7 +126,7 @@ }, { "path": "src/modules/sensors/EnergyMon485", - "active": true + "active": false }, { "path": "src/modules/sensors/ExampleModule", diff --git a/data_svelte/items.json b/data_svelte/items.json index fd3bc24a..8c476da9 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -312,7 +312,107 @@ }, { "global": 0, - "name": "20. BME280 Температура", + "name": "20. BL0937 Напряжение", + "type": "Reading", + "subtype": "BL0937v", + "id": "bl_v", + "widget": "anydataVlt", + "page": "BL0937", + "descr": "Напряжение", + "int": 15, + "round": 1, + "num": 20 + }, + { + "global": 0, + "name": "21. BL0937 Сила тока", + "type": "Reading", + "subtype": "BL0937a", + "id": "bl_a", + "widget": "anydataAmp", + "page": "BL0937", + "descr": "Сила тока", + "int": 15, + "round": 1, + "num": 21 + }, + { + "global": 0, + "name": "22. BL0937 Мощность", + "type": "Reading", + "subtype": "BL0937w", + "id": "bl_w", + "widget": "anydataWt", + "page": "BL0937", + "descr": "Мощность", + "int": 15, + "round": 1, + "num": 22 + }, + { + "global": 0, + "name": "23. BL0937 Реакт.Мощность", + "type": "Reading", + "subtype": "BL0937reactw", + "id": "bl_reactw", + "widget": "anydataWt", + "page": "BL0937", + "descr": "Реакт.Мощность", + "int": 15, + "round": 1, + "num": 23 + }, + { + "global": 0, + "name": "24. BL0937 Активн.Мощность", + "type": "Reading", + "subtype": "BL0937actw", + "id": "bl_actw", + "widget": "anydataWt", + "page": "BL0937", + "descr": "Актив.Мощность", + "int": 15, + "round": 1, + "num": 24 + }, + { + "global": 0, + "name": "25. BL0937 Энергия", + "type": "Reading", + "subtype": "BL0937wh", + "id": "bl_wh", + "widget": "anydataWth", + "page": "BL0937", + "descr": "Энергия", + "int": 15, + "round": 1, + "num": 25 + }, + { + "global": 0, + "name": "26. BL0937 настройка", + "type": "Reading", + "subtype": "BL0937cmd", + "id": "bl_set", + "widget": "nil", + "page": "", + "descr": "", + "btn-reset": "", + "int": "5", + "R_current": 0.001, + "R_upstream": 1000000, + "R_downstream": 1000, + "CF_GPIO": 4, + "CF1_GPIO": 5, + "SEL_GPIO": 12, + "kfV": 0, + "kfA": 0, + "kfW": 0, + "num": 26 + }, + { + "global": 0, + "name": "27. BME280 Температура", "type": "Reading", "subtype": "Bme280t", "id": "Tmp3", @@ -322,11 +422,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 20 + "num": 27 }, { "global": 0, - "name": "21. BME280 Давление", + "name": "28. BME280 Давление", "type": "Reading", "subtype": "Bme280p", "id": "Press3", @@ -336,11 +436,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 21 + "num": 28 }, { "global": 0, - "name": "22. BME280 Влажность", + "name": "29. BME280 Влажность", "type": "Reading", "subtype": "Bme280h", "id": "Hum3", @@ -350,11 +450,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 22 + "num": 29 }, { "global": 0, - "name": "23. BME280 Tочка росы", + "name": "30. BME280 Tочка росы", "type": "Reading", "subtype": "Bme280dp", "id": "Dew3", @@ -364,11 +464,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 23 + "num": 30 }, { "global": 0, - "name": "24. BMP280 Температура", + "name": "31. BMP280 Температура", "type": "Reading", "subtype": "Bmp280t", "id": "tmp3", @@ -378,11 +478,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 24 + "num": 31 }, { "global": 0, - "name": "25. BMP280 Давление", + "name": "32. BMP280 Давление", "type": "Reading", "subtype": "Bmp280p", "id": "Press3", @@ -392,11 +492,11 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 25 + "num": 32 }, { "global": 0, - "name": "26. DHT11 Температура", + "name": "33. DHT11 Температура", "type": "Reading", "subtype": "Dht1122t", "id": "tmp3", @@ -406,11 +506,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 26 + "num": 33 }, { "global": 0, - "name": "27. DHT11 Влажность", + "name": "34. DHT11 Влажность", "type": "Reading", "subtype": "Dht1122h", "id": "Hum3", @@ -420,11 +520,11 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 27 + "num": 34 }, { "global": 0, - "name": "28. DS18B20 Температура", + "name": "35. DS18B20 Температура", "type": "Reading", "subtype": "Ds18b20", "id": "dstmp", @@ -436,54 +536,11 @@ "index": 0, "addr": "", "round": 1, - "num": 28 + "num": 35 }, { "global": 0, - "name": "29. Gran данные", - "type": "Reading", - "subtype": "gran485", - "id": "gran", - "widget": "anydataVlt", - "page": "Гран-Электро", - "descr": "Потребление", - "sensor": "k", - "int": 15, - "round": 1, - "num": 29 - }, - { - "global": 0, - "name": "30. SDM120 данные", - "type": "Reading", - "subtype": "sdm120", - "id": "sdm120", - "widget": "anydataVlt", - "page": "Счётчик SDM120", - "descr": "Потребление", - "sensor": "k", - "int": 15, - "round": 1, - "num": 30 - }, - { - "global": 0, - "name": "31. Energy UART", - "type": "Reading", - "subtype": "energy_uart", - "id": "enrg_uart", - "widget": "nil", - "page": "", - "descr": "", - "tx": 17, - "rx": 16, - "line": 2, - "speed": 9600, - "num": 31 - }, - { - "global": 0, - "name": "32. Аналоговый счетчик импульсов", + "name": "36. Аналоговый счетчик импульсов", "type": "Writing", "subtype": "Impulse", "id": "impulse", @@ -496,11 +553,11 @@ "pinMode": "INPUT", "debounceDelay": 3, "multiply": 1, - "num": 32 + "num": 36 }, { "global": 0, - "name": "33. MQ газовые анализаторы", + "name": "37. MQ газовые анализаторы", "type": "Reading", "subtype": "MQgas", "id": "MQ", @@ -537,11 +594,11 @@ "pin-Esp32": 34, "operating voltage": 3.3, "int": 15, - "num": 33 + "num": 37 }, { "global": 0, - "name": "34. PZEM 004t Напряжение", + "name": "38. PZEM 004t Напряжение", "type": "Reading", "subtype": "Pzem004v", "id": "v", @@ -551,11 +608,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 34 + "num": 38 }, { "global": 0, - "name": "35. PZEM 004t Сила тока", + "name": "39. PZEM 004t Сила тока", "type": "Reading", "subtype": "Pzem004a", "id": "a", @@ -565,11 +622,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 35 + "num": 39 }, { "global": 0, - "name": "36. PZEM 004t Мощность", + "name": "40. PZEM 004t Мощность", "type": "Reading", "subtype": "Pzem004w", "id": "w", @@ -579,11 +636,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 36 + "num": 40 }, { "global": 0, - "name": "37. PZEM 004t Энергия", + "name": "41. PZEM 004t Энергия", "type": "Reading", "subtype": "Pzem004wh", "id": "wh", @@ -593,11 +650,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 37 + "num": 41 }, { "global": 0, - "name": "38. PZEM 004t Частота", + "name": "42. PZEM 004t Частота", "type": "Reading", "subtype": "Pzem004hz", "id": "hz", @@ -607,11 +664,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 38 + "num": 42 }, { "global": 0, - "name": "39. PZEM 004t Косинус", + "name": "43. PZEM 004t Косинус", "type": "Reading", "subtype": "Pzem004pf", "id": "pf", @@ -621,11 +678,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 39 + "num": 43 }, { "global": 0, - "name": "40. PZEM настройка", + "name": "44. PZEM настройка", "type": "Reading", "subtype": "Pzem004cmd", "id": "set", @@ -636,11 +693,11 @@ "addr": "0xF8", "btn-changeaddr": "0x01", "btn-reset": "", - "num": 40 + "num": 44 }, { "global": 0, - "name": "41. PZEM uart", + "name": "45. PZEM uart", "type": "Reading", "subtype": "Pzem004uart", "id": "upzem", @@ -651,11 +708,11 @@ "rx": 16, "line": 2, "speed": 9600, - "num": 41 + "num": 45 }, { "global": 0, - "name": "42. Часы реального времени", + "name": "46. Часы реального времени", "type": "Reading", "subtype": "RTC", "id": "rtc", @@ -671,12 +728,12 @@ "int": 5, "btn-setUTime": "0", "btn-setSysTime": "nil", - "num": 42 + "num": 46 }, { "global": 0, - "name": "43. (S8) Cенсор качества воздуха", - "num": 43, + "name": "47. (S8) Cенсор качества воздуха", + "num": 47, "type": "Reading", "subtype": "S8co", "id": "s8co", @@ -690,7 +747,7 @@ }, { "global": 0, - "name": "44. Sht20 Температура", + "name": "48. Sht20 Температура", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -699,11 +756,11 @@ "descr": "Температура", "int": 15, "round": 1, - "num": 44 + "num": 48 }, { "global": 0, - "name": "45. Sht20 Влажность", + "name": "49. Sht20 Влажность", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -712,11 +769,11 @@ "descr": "Влажность", "int": 15, "round": 1, - "num": 45 + "num": 49 }, { "global": 0, - "name": "46. Sht30 Температура", + "name": "50. Sht30 Температура", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -725,11 +782,11 @@ "descr": "SHT30 Температура", "int": 15, "round": 1, - "num": 46 + "num": 50 }, { "global": 0, - "name": "47. Sht30 Влажность", + "name": "51. Sht30 Влажность", "type": "Reading", "subtype": "Sht30h", "id": "Hum30", @@ -738,12 +795,12 @@ "descr": "SHT30 Влажность", "int": 15, "round": 1, - "num": 47 + "num": 51 }, { "global": 0, - "name": "48. HC-SR04 Ультразвуковой дальномер", - "num": 48, + "name": "52. HC-SR04 Ультразвуковой дальномер", + "num": 52, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -755,7 +812,7 @@ "int": 5 }, { - "name": "49. UART", + "name": "53. UART", "type": "Reading", "subtype": "UART", "page": "", @@ -767,14 +824,14 @@ "line": 2, "speed": 9600, "eventFormat": 0, - "num": 49 + "num": 53 }, { "header": "executive_devices" }, { "global": 0, - "name": "50. Аналоговая кнопка", + "name": "54. Аналоговая кнопка", "type": "Reading", "subtype": "AnalogBtn", "id": "abtn", @@ -784,11 +841,11 @@ "pin": 34, "aValue": -1, "delta": 50, - "num": 50 + "num": 54 }, { "global": 0, - "name": "51. Кнопка подключенная к пину", + "name": "55. Кнопка подключенная к пину", "type": "Writing", "subtype": "ButtonIn", "id": "btn", @@ -803,11 +860,11 @@ "debounceDelay": 50, "fixState": 0, "inv": 0, - "num": 51 + "num": 55 }, { "global": 0, - "name": "52. Управление пином", + "name": "56. Управление пином", "type": "Writing", "subtype": "ButtonOut", "needSave": 0, @@ -818,11 +875,11 @@ "int": 0, "inv": 0, "pin": 2, - "num": 52 + "num": 56 }, { "global": 0, - "name": "53. Пассивный звуковой извещатель", + "name": "57. Пассивный звуковой извещатель", "type": "Writing", "subtype": "Buzzer", "id": "buzzer", @@ -841,11 +898,11 @@ "cycle": 0, "indication": 1, "val": 0, - "num": 53 + "num": 57 }, { "global": 0, - "name": "54. Энкодер", + "name": "58. Энкодер", "type": "Writing", "subtype": "Encoder", "id": "enc", @@ -858,11 +915,11 @@ "step": 1, "stepOnPress": 5, "pins": "4,5,2", - "num": 54 + "num": 58 }, { "global": 0, - "name": "55. Сервопривод", + "name": "59. Сервопривод", "type": "Writing", "subtype": "IoTServo", "id": "servo", @@ -875,11 +932,11 @@ "minAngle": 0, "maxAngle": 180, "trackingID": "", - "num": 55 + "num": 59 }, { "global": 0, - "name": "56. Расширитель портов Mcp23017", + "name": "60. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -889,11 +946,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 56 + "num": 60 }, { "global": 0, - "name": "57. MP3 плеер", + "name": "61. MP3 плеер", "type": "Reading", "subtype": "Mp3", "id": "mp3", @@ -903,11 +960,11 @@ "int": 1, "pins": "14,12", "volume": 20, - "num": 57 + "num": 61 }, { "global": 0, - "name": "58. Сенсорная кнопка", + "name": "62. Сенсорная кнопка", "type": "Writing", "subtype": "Multitouch", "id": "impulse", @@ -921,11 +978,11 @@ "pinMode": "INPUT", "debounceDelay": 50, "PWMDelay": 500, - "num": 58 + "num": 62 }, { "global": 0, - "name": "59. Расширитель портов Pcf8574", + "name": "63. Расширитель портов Pcf8574", "type": "Reading", "subtype": "Pcf8574", "id": "Pcf", @@ -935,11 +992,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 59 + "num": 63 }, { "global": 0, - "name": "60. PWM ESP8266", + "name": "64. PWM ESP8266", "type": "Writing", "subtype": "Pwm8266", "id": "pwm", @@ -951,11 +1008,11 @@ "freq": 5000, "val": 0, "apin": -1, - "num": 60 + "num": 64 }, { "global": 0, - "name": "61. Телеграм-Лайт", + "name": "65. Телеграм-Лайт", "type": "Writing", "subtype": "TelegramLT", "id": "tg", @@ -964,13 +1021,13 @@ "descr": "", "token": "", "chatID": "", - "num": 61 + "num": 65 }, { "header": "screens" }, { - "name": "62. LCD Dwin экран", + "name": "66. LCD Dwin экран", "type": "Reading", "subtype": "DwinI", "id": "dwin", @@ -982,11 +1039,11 @@ "line": 2, "speed": 9600, "btn-uploadUI": "", - "num": 62 + "num": 66 }, { "global": 0, - "name": "63. LCD экран 2004", + "name": "67. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -999,10 +1056,10 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 63 + "num": 67 }, { - "name": "64. LCD экран 1602", + "name": "68. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -1015,11 +1072,11 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 64 + "num": 68 }, { "global": 0, - "name": "65. OLED экран 64 8266", + "name": "69. OLED экран 64 8266", "type": "Reading", "subtype": "Oled64", "id": "Oled", @@ -1032,6 +1089,6 @@ "id2show": "", "prefix": "", "postfix": "", - "num": 65 + "num": 69 } ] \ No newline at end of file diff --git a/myProfile.json b/myProfile.json index 9044ff30..bac5d993 100644 --- a/myProfile.json +++ b/myProfile.json @@ -206,6 +206,10 @@ "path": "src/modules/sensors/BH_1750", "active": false }, + { + "path": "src/modules/sensors/BL0937", + "active": true + }, { "path": "src/modules/sensors/Ble", "active": false @@ -244,7 +248,7 @@ }, { "path": "src/modules/sensors/EnergyMon485", - "active": true + "active": false }, { "path": "src/modules/sensors/ExampleModule", diff --git a/platformio.ini b/platformio.ini index 2fd8ad81..82d089cd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -571,11 +571,11 @@ build_src_filter = + + + + + + + + + - + + + + diff --git a/src/modules/API.cpp b/src/modules/API.cpp index 3dcef050..5dd27955 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -13,11 +13,11 @@ 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); +void* getAPI_BL0937(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_EnergyMon485(String subtype, String params); void* getAPI_Impulse(String subtype, String params); void* getAPI_MQgas(String subtype, String params); void* getAPI_Pzem004_v2(String subtype, String params); @@ -58,11 +58,11 @@ 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; +if ((tmpAPI = getAPI_BL0937(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_EnergyMon485(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Impulse(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_MQgas(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Pzem004_v2(subtype, params)) != nullptr) return tmpAPI; From 26bd69a2244a28eff0a7d0be0a7a96c22947619d Mon Sep 17 00:00:00 2001 From: IoT Manager <158345374+mira-service@users.noreply.github.com> Date: Tue, 14 May 2024 22:35:13 +0200 Subject: [PATCH 08/11] ws patch path --- tools/patch32_ws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patch32_ws.py b/tools/patch32_ws.py index c30cfa43..4800c237 100644 --- a/tools/patch32_ws.py +++ b/tools/patch32_ws.py @@ -10,7 +10,7 @@ from sys import platform if platform == "linux" or platform == "linux2": # linux - mainPyPath = '~/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src/WiFiClient.cpp' + mainPyPath = '/home/rise/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src/WiFiClient.cpp' else: # windows mainPyPath = os.environ['USERPROFILE'] + '\\.platformio\\packages\\framework-arduinoespressif32\\libraries\\WiFi\\src\\WiFiClient.cpp' From ae455446ca479c8a42b65f2c94ee37f8f22b3e71 Mon Sep 17 00:00:00 2001 From: Mit4el Date: Tue, 14 May 2024 23:36:14 +0300 Subject: [PATCH 09/11] =?UTF-8?q?=D0=92=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?= =?UTF-8?q?=D1=8F=D1=85=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=BF=D0=BF=D1=8B=20=D0=BF=D0=BB=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/display/Lcd2004/modinfo.json | 36 ++----------------- .../display/NextionUpload/modinfo.json | 9 ++--- src/modules/display/Oled64/modinfo.json | 12 ++----- src/modules/display/Smi2_m/modinfo.json | 4 +-- src/modules/display/Ws2812b/modinfo.json | 10 ++---- src/modules/exec/ButtonIn/modinfo.json | 15 ++------ src/modules/exec/ButtonOut/modinfo.json | 15 ++------ src/modules/exec/Buzzer/modinfo.json | 12 ++----- src/modules/exec/Enconder/modinfo.json | 25 ++----------- src/modules/exec/Ftp/modinfo.json | 9 ++--- src/modules/exec/HttpGet/modinfo.json | 13 ++----- src/modules/exec/IoTServo/modinfo.json | 10 ++---- src/modules/exec/Mcp23008/modinfo.json | 36 ++----------------- src/modules/exec/Mcp23017/modinfo.json | 36 ++----------------- src/modules/exec/Mp3/modinfo.json | 10 ++---- src/modules/exec/Multitouch/modinfo.json | 12 ++----- src/modules/exec/MySensors/modinfo.json | 4 +-- src/modules/exec/Pcf8574/modinfo.json | 28 ++------------- src/modules/exec/Pcf8591/modinfo.json | 28 ++------------- src/modules/exec/Pwm32/modinfo.json | 4 +-- src/modules/exec/Pwm8266/modinfo.json | 8 +---- src/modules/exec/SDcard/modinfo.json | 8 +---- src/modules/exec/SysExt/modinfo.json | 6 ++-- src/modules/exec/Telegram/modinfo.json | 11 +----- src/modules/exec/TelegramLT/modinfo.json | 16 ++------- src/modules/exec/Telegram_v2/modinfo.json | 14 +------- src/modules/exec/Thermostat/modinfo.json | 12 ++----- src/modules/sensors/A02Distance/modinfo.json | 11 ++---- src/modules/sensors/Acs712/modinfo.json | 13 ++----- src/modules/sensors/Ads1115/modinfo.json | 10 ++---- src/modules/sensors/AhtXX/modinfo.json | 22 ++---------- src/modules/sensors/AnalogAdc/modinfo.json | 12 ++----- src/modules/sensors/BH_1750/modinfo.json | 10 ++---- src/modules/sensors/Ble/modinfo.json | 18 ++-------- src/modules/sensors/Ble_part1/modinfo.json | 18 ++-------- src/modules/sensors/Ble_part2/modinfo.json | 18 ++-------- src/modules/sensors/Bme280/modinfo.json | 31 ++-------------- src/modules/sensors/Bmp280/modinfo.json | 28 ++------------- src/modules/sensors/DS2401/modinfo.json | 12 ++----- src/modules/sensors/Dht1122/modinfo.json | 10 ++---- src/modules/sensors/Ds18b20/modinfo.json | 28 ++------------- src/modules/sensors/Ds2423/modinfo.json | 12 ++----- src/modules/sensors/Emon/modinfo.json | 10 ++---- .../sensors/ExampleModule/modinfo.json | 13 ++----- src/modules/sensors/ExternalMQTT/modinfo.json | 13 ++----- src/modules/sensors/FreqMeter/modinfo.json | 10 ++---- src/modules/sensors/GY21/modinfo.json | 10 ++---- src/modules/sensors/Hdc1080/modinfo.json | 10 ++---- src/modules/sensors/Hx710/modinfo.json | 14 +++----- src/modules/sensors/Hx711/modinfo.json | 10 ++---- src/modules/sensors/Impulse/modinfo.json | 10 ++---- src/modules/sensors/Ina219/modinfo.json | 16 ++------- src/modules/sensors/Ina226/modinfo.json | 16 ++------- src/modules/sensors/IoTWiegand/modinfo.json | 8 +---- src/modules/sensors/Max6675/modinfo.json | 7 ++-- src/modules/sensors/Mhz19/modinfo.json | 10 +++--- src/modules/sensors/Ntc/modinfo.json | 12 ++----- src/modules/sensors/RCswitch/modinfo.json | 28 ++------------- src/modules/sensors/RTC/modinfo.json | 12 ++----- src/modules/sensors/S8/modinfo.json | 5 ++- src/modules/sensors/Scd40/modinfo.json | 12 ++----- src/modules/sensors/Sds011/modinfo.json | 10 ++---- src/modules/sensors/Sgp30/modinfo.json | 28 ++------------- src/modules/sensors/Sht20/modinfo.json | 25 ++----------- src/modules/sensors/Sht30/modinfo.json | 28 ++------------- src/modules/sensors/Sonar/modinfo.json | 12 ++----- src/modules/sensors/UART/modinfo.json | 28 ++------------- src/modules/sensors/ld2410/modinfo.json | 5 +-- src/modules/virtual/Cron/modinfo.json | 17 ++------- src/modules/virtual/GoogleSheet/modinfo.json | 9 ++--- src/modules/virtual/Loging/modinfo.json | 17 ++------- src/modules/virtual/LogingDaily/modinfo.json | 17 ++------- src/modules/virtual/Math/modinfo.json | 13 ++----- src/modules/virtual/Timer/modinfo.json | 17 ++------- src/modules/virtual/VButton/modinfo.json | 17 ++------- src/modules/virtual/Variable/modinfo.json | 17 ++------- src/modules/virtual/Weather/modinfo.json | 17 ++------- src/modules/virtual/owmWeather/modinfo.json | 16 ++------- 78 files changed, 156 insertions(+), 1019 deletions(-) diff --git a/src/modules/display/Lcd2004/modinfo.json b/src/modules/display/Lcd2004/modinfo.json index 1176d45e..0700b92f 100644 --- a/src/modules/display/Lcd2004/modinfo.json +++ b/src/modules/display/Lcd2004/modinfo.json @@ -119,43 +119,11 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ], - "esp32_4mb3f": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp32cam_4mb": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp8266_4mb": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp8266_1mb": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp8266_1mb_ota": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp8285_1mb": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp8285_1mb_ota": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp8266_2mb": [ - "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", - "marcoschwartz/LiquidCrystal_I2C@^1.1.4" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ] diff --git a/src/modules/display/NextionUpload/modinfo.json b/src/modules/display/NextionUpload/modinfo.json index 54fdb1c7..db2ee677 100644 --- a/src/modules/display/NextionUpload/modinfo.json +++ b/src/modules/display/NextionUpload/modinfo.json @@ -38,12 +38,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/display/Oled64/modinfo.json b/src/modules/display/Oled64/modinfo.json index 39f0395a..b64b4eef 100644 --- a/src/modules/display/Oled64/modinfo.json +++ b/src/modules/display/Oled64/modinfo.json @@ -77,19 +77,11 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", "https://github.com/adafruit/Adafruit-GFX-Library" ], - "esp8266_4mb": [ - "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", - "https://github.com/adafruit/Adafruit-GFX-Library" - ], - "esp8266_1mb": [ - "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", - "https://github.com/adafruit/Adafruit-GFX-Library" - ], - "esp8266_1mb_ota": [ + "esp82*": [ "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED", "https://github.com/adafruit/Adafruit-GFX-Library" ] diff --git a/src/modules/display/Smi2_m/modinfo.json b/src/modules/display/Smi2_m/modinfo.json index 8c1debc0..443d5c46 100644 --- a/src/modules/display/Smi2_m/modinfo.json +++ b/src/modules/display/Smi2_m/modinfo.json @@ -52,8 +52,6 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [] + "esp32*": [] } } \ No newline at end of file diff --git a/src/modules/display/Ws2812b/modinfo.json b/src/modules/display/Ws2812b/modinfo.json index bcad5b1e..685ad4ea 100644 --- a/src/modules/display/Ws2812b/modinfo.json +++ b/src/modules/display/Ws2812b/modinfo.json @@ -97,16 +97,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/Adafruit NeoPixel@^1.10.6" ], - "esp32_4mb3f": [ - "adafruit/Adafruit NeoPixel@^1.10.6" - ], - "esp32cam_4mb": [ - "adafruit/Adafruit NeoPixel@^1.10.6" - ], - "esp8266_4mb": [ + "esp82*": [ "adafruit/Adafruit NeoPixel@^1.10.6" ] } diff --git a/src/modules/exec/ButtonIn/modinfo.json b/src/modules/exec/ButtonIn/modinfo.json index 09759edf..07fcc87c 100644 --- a/src/modules/exec/ButtonIn/modinfo.json +++ b/src/modules/exec/ButtonIn/modinfo.json @@ -45,18 +45,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/ButtonOut/modinfo.json b/src/modules/exec/ButtonOut/modinfo.json index 10a39ded..d655bed9 100644 --- a/src/modules/exec/ButtonOut/modinfo.json +++ b/src/modules/exec/ButtonOut/modinfo.json @@ -49,18 +49,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/Buzzer/modinfo.json b/src/modules/exec/Buzzer/modinfo.json index 44b01e2b..be7ee225 100644 --- a/src/modules/exec/Buzzer/modinfo.json +++ b/src/modules/exec/Buzzer/modinfo.json @@ -103,15 +103,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/Enconder/modinfo.json b/src/modules/exec/Enconder/modinfo.json index 5019d20e..d48e7344 100644 --- a/src/modules/exec/Enconder/modinfo.json +++ b/src/modules/exec/Enconder/modinfo.json @@ -43,31 +43,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "gyverlibs/EncButton @ ^2.0" ], - "esp32_4mb3f": [ - "gyverlibs/EncButton @ ^2.0" - ], - "esp32cam_4mb": [ - "gyverlibs/EncButton @ ^2.0" - ], - "esp8266_4mb": [ - "gyverlibs/EncButton @ ^2.0" - ], - "esp8266_16mb": [ - "gyverlibs/EncButton @ ^2.0" - ], - "esp8266_1mb": [ - "gyverlibs/EncButton @ ^2.0" - ], - "esp8266_1mb_ota": [ - "gyverlibs/EncButton @ ^2.0" - ], - "esp8285_1mb": [ - "gyverlibs/EncButton @ ^2.0" - ], - "esp8285_1mb_ota": [ + "esp82*": [ "gyverlibs/EncButton @ ^2.0" ] } diff --git a/src/modules/exec/Ftp/modinfo.json b/src/modules/exec/Ftp/modinfo.json index a4049ee5..c922bf7c 100644 --- a/src/modules/exec/Ftp/modinfo.json +++ b/src/modules/exec/Ftp/modinfo.json @@ -34,12 +34,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/HttpGet/modinfo.json b/src/modules/exec/HttpGet/modinfo.json index d8bcda2c..fbcda96c 100644 --- a/src/modules/exec/HttpGet/modinfo.json +++ b/src/modules/exec/HttpGet/modinfo.json @@ -49,16 +49,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32s2_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/IoTServo/modinfo.json b/src/modules/exec/IoTServo/modinfo.json index 56ecc51b..b5184c51 100644 --- a/src/modules/exec/IoTServo/modinfo.json +++ b/src/modules/exec/IoTServo/modinfo.json @@ -52,15 +52,9 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/RoboticsBrno/ServoESP32#v1.0.3" ], - "esp32_4mb3f": [ - "https://github.com/RoboticsBrno/ServoESP32#v1.0.3" - ], - "esp32cam_4mb": [ - "https://github.com/RoboticsBrno/ServoESP32#v1.0.3" - ], - "esp8266_4mb": [] + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/Mcp23008/modinfo.json b/src/modules/exec/Mcp23008/modinfo.json index 7554b884..3f109b81 100644 --- a/src/modules/exec/Mcp23008/modinfo.json +++ b/src/modules/exec/Mcp23008/modinfo.json @@ -36,43 +36,11 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ], - "esp32_4mb3f": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp32cam_4mb": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_4mb": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_1mb": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_1mb_ota": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8285_1mb": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8285_1mb_ota": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_2mb": [ - "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ] diff --git a/src/modules/exec/Mcp23017/modinfo.json b/src/modules/exec/Mcp23017/modinfo.json index 53534b90..5d2fba62 100644 --- a/src/modules/exec/Mcp23017/modinfo.json +++ b/src/modules/exec/Mcp23017/modinfo.json @@ -36,43 +36,11 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ], - "esp32_4mb3f": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp32cam_4mb": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_4mb": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_1mb": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_1mb_ota": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8285_1mb": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8285_1mb_ota": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_2mb": [ - "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", "adafruit/Adafruit BusIO @ ^1.13.2" ] diff --git a/src/modules/exec/Mp3/modinfo.json b/src/modules/exec/Mp3/modinfo.json index 6896d77b..631ba050 100644 --- a/src/modules/exec/Mp3/modinfo.json +++ b/src/modules/exec/Mp3/modinfo.json @@ -89,16 +89,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" ], - "esp32_4mb4f": [ - "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" - ], - "esp32cam_4mb": [ - "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" - ], - "esp8266_4mb": [ + "esp82*": [ "dfrobot/DFRobotDFPlayerMini @ ^1.0.5" ] } diff --git a/src/modules/exec/Multitouch/modinfo.json b/src/modules/exec/Multitouch/modinfo.json index c08f35e7..5cd87db0 100644 --- a/src/modules/exec/Multitouch/modinfo.json +++ b/src/modules/exec/Multitouch/modinfo.json @@ -43,15 +43,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/MySensors/modinfo.json b/src/modules/exec/MySensors/modinfo.json index 75afbfe8..0eb297c8 100644 --- a/src/modules/exec/MySensors/modinfo.json +++ b/src/modules/exec/MySensors/modinfo.json @@ -49,8 +49,6 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [] + "esp32*": [] } } \ No newline at end of file diff --git a/src/modules/exec/Pcf8574/modinfo.json b/src/modules/exec/Pcf8574/modinfo.json index 45f008ce..f3ece10d 100644 --- a/src/modules/exec/Pcf8574/modinfo.json +++ b/src/modules/exec/Pcf8574/modinfo.json @@ -32,34 +32,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/Adafruit BusIO @ ^1.13.2" ], - "esp32_4mb3f": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp32cam_4mb": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_4mb": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_1mb": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_1mb_ota": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8285_1mb": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8285_1mb_ota": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_2mb": [ - "adafruit/Adafruit BusIO @ ^1.13.2" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "adafruit/Adafruit BusIO @ ^1.13.2" ] } diff --git a/src/modules/exec/Pcf8591/modinfo.json b/src/modules/exec/Pcf8591/modinfo.json index c3bef508..183b354b 100644 --- a/src/modules/exec/Pcf8591/modinfo.json +++ b/src/modules/exec/Pcf8591/modinfo.json @@ -41,34 +41,10 @@ "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/adafruit/Adafruit_PCF8591" ], - "esp32_16mb": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8266_4mb": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8266_16mb": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8266_1mb": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8266_1mb_ota": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8285_1mb": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8285_1mb_ota": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8266_2mb": [ - "https://github.com/adafruit/Adafruit_PCF8591" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "https://github.com/adafruit/Adafruit_PCF8591" ] } diff --git a/src/modules/exec/Pwm32/modinfo.json b/src/modules/exec/Pwm32/modinfo.json index ce789a19..74fcccb4 100644 --- a/src/modules/exec/Pwm32/modinfo.json +++ b/src/modules/exec/Pwm32/modinfo.json @@ -44,8 +44,6 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [] + "esp32*": [] } } \ No newline at end of file diff --git a/src/modules/exec/Pwm8266/modinfo.json b/src/modules/exec/Pwm8266/modinfo.json index f446db57..98163426 100644 --- a/src/modules/exec/Pwm8266/modinfo.json +++ b/src/modules/exec/Pwm8266/modinfo.json @@ -40,12 +40,6 @@ }, "defActive": true, "usedLibs": { - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/SDcard/modinfo.json b/src/modules/exec/SDcard/modinfo.json index 5f10bce6..2d1872b3 100644 --- a/src/modules/exec/SDcard/modinfo.json +++ b/src/modules/exec/SDcard/modinfo.json @@ -32,13 +32,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ - "espressif/esp32-camera @ ^2.0.0" - ], - "esp32_4mb3f": [ - "espressif/esp32-camera @ ^2.0.0" - ], - "esp32cam_4mb": [ + "esp32*": [ "espressif/esp32-camera @ ^2.0.0" ] } diff --git a/src/modules/exec/SysExt/modinfo.json b/src/modules/exec/SysExt/modinfo.json index 1cd552ac..ce23b05a 100644 --- a/src/modules/exec/SysExt/modinfo.json +++ b/src/modules/exec/SysExt/modinfo.json @@ -32,9 +32,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/Telegram/modinfo.json b/src/modules/exec/Telegram/modinfo.json index 2910ace1..80ba7662 100644 --- a/src/modules/exec/Telegram/modinfo.json +++ b/src/modules/exec/Telegram/modinfo.json @@ -55,16 +55,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ - "CTBot @2.1.9" - ], - "esp32_4mb3f": [ - "CTBot @2.1.9" - ], - "esp32cam_4mb": [ - "CTBot @2.1.9" - ], - "esp32_16mb": [ + "esp32*": [ "CTBot @2.1.9" ], "esp8266_4mb": [ diff --git a/src/modules/exec/TelegramLT/modinfo.json b/src/modules/exec/TelegramLT/modinfo.json index 706338c3..b8cf7ba5 100644 --- a/src/modules/exec/TelegramLT/modinfo.json +++ b/src/modules/exec/TelegramLT/modinfo.json @@ -51,19 +51,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32c3m_4mb":[], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/exec/Telegram_v2/modinfo.json b/src/modules/exec/Telegram_v2/modinfo.json index daf930d4..a3693e42 100644 --- a/src/modules/exec/Telegram_v2/modinfo.json +++ b/src/modules/exec/Telegram_v2/modinfo.json @@ -127,19 +127,7 @@ "defActive": false, "usedLibs": { - "esp32_4mb": [ - "gyverlibs/FastBot" - ], - "esp32_4mb3f": [ - "gyverlibs/FastBot" - ], - "esp32cam_4mb": [ - "gyverlibs/FastBot" - ], - "esp32s2_4mb": [ - "gyverlibs/FastBot" - ], - "esp32_16mb": [ + "esp32*": [ "gyverlibs/FastBot" ], "esp8266_4mb": [ diff --git a/src/modules/exec/Thermostat/modinfo.json b/src/modules/exec/Thermostat/modinfo.json index 2e7bd938..fa0a274c 100644 --- a/src/modules/exec/Thermostat/modinfo.json +++ b/src/modules/exec/Thermostat/modinfo.json @@ -134,15 +134,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/A02Distance/modinfo.json b/src/modules/sensors/A02Distance/modinfo.json index 326b7c52..ba970862 100644 --- a/src/modules/sensors/A02Distance/modinfo.json +++ b/src/modules/sensors/A02Distance/modinfo.json @@ -37,14 +37,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Acs712/modinfo.json b/src/modules/sensors/Acs712/modinfo.json index 2f68ee40..b741d377 100644 --- a/src/modules/sensors/Acs712/modinfo.json +++ b/src/modules/sensors/Acs712/modinfo.json @@ -41,16 +41,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32s2_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Ads1115/modinfo.json b/src/modules/sensors/Ads1115/modinfo.json index dccbbc28..af1690e5 100644 --- a/src/modules/sensors/Ads1115/modinfo.json +++ b/src/modules/sensors/Ads1115/modinfo.json @@ -41,16 +41,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/Adafruit ADS1X15 @ ^2.3.0" ], - "esp32_4mb3f": [ - "adafruit/Adafruit ADS1X15 @ ^2.3.0" - ], - "esp32cam_4mb": [ - "adafruit/Adafruit ADS1X15 @ ^2.3.0" - ], - "esp8266_4mb": [ + "esp82*": [ "adafruit/Adafruit ADS1X15 @ ^2.3.0" ] } diff --git a/src/modules/sensors/AhtXX/modinfo.json b/src/modules/sensors/AhtXX/modinfo.json index b621e931..76a41e2c 100644 --- a/src/modules/sensors/AhtXX/modinfo.json +++ b/src/modules/sensors/AhtXX/modinfo.json @@ -56,28 +56,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/enjoyneering/AHTxx.git" ], - "esp32_4mb3f": [ - "https://github.com/enjoyneering/AHTxx.git" - ], - "esp32cam_4mb": [ - "https://github.com/enjoyneering/AHTxx.git" - ], - "esp8266_4mb": [ - "https://github.com/enjoyneering/AHTxx.git" - ], - "esp8266_1mb": [ - "https://github.com/enjoyneering/AHTxx.git" - ], - "esp8266_1mb_ota": [ - "https://github.com/enjoyneering/AHTxx.git" - ], - "esp8285_1mb": [ - "https://github.com/enjoyneering/AHTxx.git" - ], - "esp8285_1mb_ota": [ + "esp82*": [ "https://github.com/enjoyneering/AHTxx.git" ] } diff --git a/src/modules/sensors/AnalogAdc/modinfo.json b/src/modules/sensors/AnalogAdc/modinfo.json index 873701ff..ee41ed63 100644 --- a/src/modules/sensors/AnalogAdc/modinfo.json +++ b/src/modules/sensors/AnalogAdc/modinfo.json @@ -41,15 +41,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/BH_1750/modinfo.json b/src/modules/sensors/BH_1750/modinfo.json index 9177a22f..e3428545 100644 --- a/src/modules/sensors/BH_1750/modinfo.json +++ b/src/modules/sensors/BH_1750/modinfo.json @@ -34,16 +34,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "BH1750" ], - "esp32_4mb3f": [ - "BH1750" - ], - "esp32cam_4mb": [ - "BH1750" - ], - "esp8266_4mb": [ + "esp82*": [ "BH1750" ] } diff --git a/src/modules/sensors/Ble/modinfo.json b/src/modules/sensors/Ble/modinfo.json index ac7cd8fc..c4cb3106 100644 --- a/src/modules/sensors/Ble/modinfo.json +++ b/src/modules/sensors/Ble/modinfo.json @@ -64,23 +64,11 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/Mit4el/NimBLE-Arduino.git" ], - "esp32_16mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32_4mb3f": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32cam_4mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32s3_16mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32c3m_4mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" + "esp32s2_4mb": [ + "exclude" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Ble_part1/modinfo.json b/src/modules/sensors/Ble_part1/modinfo.json index 9e990fbd..199c92b8 100644 --- a/src/modules/sensors/Ble_part1/modinfo.json +++ b/src/modules/sensors/Ble_part1/modinfo.json @@ -64,23 +64,11 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/Mit4el/NimBLE-Arduino.git" ], - "esp32_16mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32_4mb3f": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32cam_4mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32s3_16mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32c3m_4mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" + "esp32s2_4mb": [ + "exclude" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Ble_part2/modinfo.json b/src/modules/sensors/Ble_part2/modinfo.json index 6c7d1634..b32ccd52 100644 --- a/src/modules/sensors/Ble_part2/modinfo.json +++ b/src/modules/sensors/Ble_part2/modinfo.json @@ -64,23 +64,11 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/Mit4el/NimBLE-Arduino.git" ], - "esp32_16mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32_4mb3f": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32cam_4mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32s3_16mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" - ], - "esp32c3m_4mb": [ - "https://github.com/Mit4el/NimBLE-Arduino.git" + "esp32s2_4mb": [ + "exclude" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Bme280/modinfo.json b/src/modules/sensors/Bme280/modinfo.json index 53df6b2c..be8e93cb 100644 --- a/src/modules/sensors/Bme280/modinfo.json +++ b/src/modules/sensors/Bme280/modinfo.json @@ -80,37 +80,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/Adafruit BME280 Library" ], - "esp32_4mb3f": [ - "adafruit/Adafruit BME280 Library" - ], - "esp32cam_4mb": [ - "adafruit/Adafruit BME280 Library" - ], - "esp32c3m_4mb":[ - "adafruit/Adafruit BME280 Library" - ], - "esp8266_4mb": [ - "adafruit/Adafruit BME280 Library" - ], - "esp8266_1mb": [ - "adafruit/Adafruit BME280 Library" - ], - "esp8266_1mb_ota": [ - "adafruit/Adafruit BME280 Library" - ], - "esp8285_1mb": [ - "adafruit/Adafruit BME280 Library" - ], - "esp8285_1mb_ota": [ - "adafruit/Adafruit BME280 Library" - ], - "esp8266_2mb": [ - "adafruit/Adafruit BME280 Library" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "adafruit/Adafruit BME280 Library" ] } diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json index ad796c25..65bb4dbf 100644 --- a/src/modules/sensors/Bmp280/modinfo.json +++ b/src/modules/sensors/Bmp280/modinfo.json @@ -52,34 +52,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/Adafruit BMP280 Library" ], - "esp32_4mb3f": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp32cam_4mb": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp8266_4mb": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp8266_1mb": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp8266_1mb_ota": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp8285_1mb": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp8285_1mb_ota": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp8266_2mb": [ - "adafruit/Adafruit BMP280 Library" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "adafruit/Adafruit BMP280 Library" ] } diff --git a/src/modules/sensors/DS2401/modinfo.json b/src/modules/sensors/DS2401/modinfo.json index c718c39d..a6bfef7b 100644 --- a/src/modules/sensors/DS2401/modinfo.json +++ b/src/modules/sensors/DS2401/modinfo.json @@ -35,15 +35,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Dht1122/modinfo.json b/src/modules/sensors/Dht1122/modinfo.json index 802cd8fd..8f86208d 100644 --- a/src/modules/sensors/Dht1122/modinfo.json +++ b/src/modules/sensors/Dht1122/modinfo.json @@ -52,16 +52,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "beegee-tokyo/DHT sensor library for ESPx" ], - "esp32_4mb3f": [ - "beegee-tokyo/DHT sensor library for ESPx" - ], - "esp32cam_4mb": [ - "beegee-tokyo/DHT sensor library for ESPx" - ], - "esp8266_4mb": [ + "esp82*": [ "beegee-tokyo/DHT sensor library for ESPx" ] } diff --git a/src/modules/sensors/Ds18b20/modinfo.json b/src/modules/sensors/Ds18b20/modinfo.json index 7bb5e566..85bd3c96 100644 --- a/src/modules/sensors/Ds18b20/modinfo.json +++ b/src/modules/sensors/Ds18b20/modinfo.json @@ -39,34 +39,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/milesburton/Arduino-Temperature-Control-Library" ], - "esp32_4mb3f": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp32cam_4mb": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp8266_4mb": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp8266_1mb": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp8266_1mb_ota": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp8285_1mb": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp8285_1mb_ota": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp8266_2mb": [ - "https://github.com/milesburton/Arduino-Temperature-Control-Library" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "https://github.com/milesburton/Arduino-Temperature-Control-Library" ] } diff --git a/src/modules/sensors/Ds2423/modinfo.json b/src/modules/sensors/Ds2423/modinfo.json index 958541a4..19907ded 100644 --- a/src/modules/sensors/Ds2423/modinfo.json +++ b/src/modules/sensors/Ds2423/modinfo.json @@ -60,19 +60,11 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/jbechter/arduino-onewire-DS2423", "paulstoffregen/OneWire @ ^2.3.7" ], - "esp32_4mb3f": [ - "https://github.com/jbechter/arduino-onewire-DS2423", - "paulstoffregen/OneWire @ ^2.3.7" - ], - "esp32cam_4mb": [ - "https://github.com/jbechter/arduino-onewire-DS2423", - "paulstoffregen/OneWire @ ^2.3.7" - ], - "esp8266_4mb": [ + "esp82*": [ "https://github.com/jbechter/arduino-onewire-DS2423", "paulstoffregen/OneWire @ ^2.3.7" ] diff --git a/src/modules/sensors/Emon/modinfo.json b/src/modules/sensors/Emon/modinfo.json index f984a65c..c4af8764 100644 --- a/src/modules/sensors/Emon/modinfo.json +++ b/src/modules/sensors/Emon/modinfo.json @@ -59,16 +59,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "openenergymonitor/EmonLib@1.1.0" ], - "esp32_4mb3f": [ - "openenergymonitor/EmonLib@1.1.0" - ], - "esp32cam_4mb": [ - "openenergymonitor/EmonLib@1.1.0" - ], - "esp8266_4mb": [ + "esp82*": [ "openenergymonitor/EmonLib@1.1.0" ] } diff --git a/src/modules/sensors/ExampleModule/modinfo.json b/src/modules/sensors/ExampleModule/modinfo.json index 5e2a5dd2..fc25b3e6 100644 --- a/src/modules/sensors/ExampleModule/modinfo.json +++ b/src/modules/sensors/ExampleModule/modinfo.json @@ -75,16 +75,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32s2_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/ExternalMQTT/modinfo.json b/src/modules/sensors/ExternalMQTT/modinfo.json index b1ed1b11..3bfc7f1c 100644 --- a/src/modules/sensors/ExternalMQTT/modinfo.json +++ b/src/modules/sensors/ExternalMQTT/modinfo.json @@ -50,16 +50,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32s2_4mb": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/FreqMeter/modinfo.json b/src/modules/sensors/FreqMeter/modinfo.json index 73fb8007..4358c349 100644 --- a/src/modules/sensors/FreqMeter/modinfo.json +++ b/src/modules/sensors/FreqMeter/modinfo.json @@ -84,16 +84,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "kosme/arduinoFFT@^1.5.6" ], - "esp32_4mb3f": [ - "kosme/arduinoFFT@^1.5.6" - ], - "esp32cam_4mb": [ - "kosme/arduinoFFT@^1.5.6" - ], - "esp8266_4mb": [ + "esp82*": [ "kosme/arduinoFFT@^1.5.6" ] } diff --git a/src/modules/sensors/GY21/modinfo.json b/src/modules/sensors/GY21/modinfo.json index aa80c3d4..4b985d48 100644 --- a/src/modules/sensors/GY21/modinfo.json +++ b/src/modules/sensors/GY21/modinfo.json @@ -49,16 +49,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/JonasGMorsch/GY-21.git" ], - "esp32_4mb3f": [ - "https://github.com/JonasGMorsch/GY-21.git" - ], - "esp32cam_4mb": [ - "https://github.com/JonasGMorsch/GY-21.git" - ], - "esp8266_4mb": [ + "esp82*": [ "https://github.com/JonasGMorsch/GY-21.git" ] } diff --git a/src/modules/sensors/Hdc1080/modinfo.json b/src/modules/sensors/Hdc1080/modinfo.json index 574a8331..becff38a 100644 --- a/src/modules/sensors/Hdc1080/modinfo.json +++ b/src/modules/sensors/Hdc1080/modinfo.json @@ -52,16 +52,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "ClosedCube HDC1080" ], - "esp32_4mb3f": [ - "ClosedCube HDC1080" - ], - "esp32cam_4mb": [ - "ClosedCube HDC1080" - ], - "esp8266_4mb": [ + "esp82*": [ "ClosedCube HDC1080" ] } diff --git a/src/modules/sensors/Hx710/modinfo.json b/src/modules/sensors/Hx710/modinfo.json index 4a2bf5c7..d22559bb 100644 --- a/src/modules/sensors/Hx710/modinfo.json +++ b/src/modules/sensors/Hx710/modinfo.json @@ -14,7 +14,8 @@ "multiply": 1, "round": 1, "data": 14, - "clock": 15 + "clock": 15, + "gain": 128 } ], "about": { @@ -33,6 +34,7 @@ "propInfo": { "clock": "GPIO шины данных", "data": "GPIO шины данных", + "gain": "Коэффициент усиления, 64 или 128 - выбран канал A, 32 - выбран канал B", "int": "Количество секунд между опросами датчика." }, "retInfo": "Содержит mmHg значение датчика, необходима калибровка", @@ -46,16 +48,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/kurimawxx00/hx710B_pressure_sensor" ], - "esp32_4mb3f": [ - "https://github.com/kurimawxx00/hx710B_pressure_sensor" - ], - "esp32cam_4mb": [ - "https://github.com/kurimawxx00/hx710B_pressure_sensor" - ], - "esp8266_4mb": [ + "esp82*": [ "https://github.com/kurimawxx00/hx710B_pressure_sensor" ] } diff --git a/src/modules/sensors/Hx711/modinfo.json b/src/modules/sensors/Hx711/modinfo.json index d3713615..44e2f2ca 100644 --- a/src/modules/sensors/Hx711/modinfo.json +++ b/src/modules/sensors/Hx711/modinfo.json @@ -61,16 +61,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "GyverHX711@1.2" ], - "esp32_4mb3f": [ - "GyverHX711@1.2" - ], - "esp32cam_4mb": [ - "GyverHX711@1.2" - ], - "esp8266_4mb": [ + "esp82*": [ "GyverHX711@1.2" ] } diff --git a/src/modules/sensors/Impulse/modinfo.json b/src/modules/sensors/Impulse/modinfo.json index 4fa98b2a..81095235 100644 --- a/src/modules/sensors/Impulse/modinfo.json +++ b/src/modules/sensors/Impulse/modinfo.json @@ -40,13 +40,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Ina219/modinfo.json b/src/modules/sensors/Ina219/modinfo.json index f9694297..0205747a 100644 --- a/src/modules/sensors/Ina219/modinfo.json +++ b/src/modules/sensors/Ina219/modinfo.json @@ -119,22 +119,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/GyverLibs/GyverINA" ], - "esp32_4mb3f": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp32cam_4mb": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp32s2_4mb": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp8266_4mb": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp8266_16mb": [ + "esp82*": [ "https://github.com/GyverLibs/GyverINA" ] } diff --git a/src/modules/sensors/Ina226/modinfo.json b/src/modules/sensors/Ina226/modinfo.json index 5a8f7f15..66c06b71 100644 --- a/src/modules/sensors/Ina226/modinfo.json +++ b/src/modules/sensors/Ina226/modinfo.json @@ -119,22 +119,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "https://github.com/GyverLibs/GyverINA" ], - "esp32_4mb3f": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp32cam_4mb": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp32s2_4mb": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp8266_4mb": [ - "https://github.com/GyverLibs/GyverINA" - ], - "esp8266_16mb": [ + "esp82*": [ "https://github.com/GyverLibs/GyverINA" ] } diff --git a/src/modules/sensors/IoTWiegand/modinfo.json b/src/modules/sensors/IoTWiegand/modinfo.json index f91afe00..06fc20a7 100644 --- a/src/modules/sensors/IoTWiegand/modinfo.json +++ b/src/modules/sensors/IoTWiegand/modinfo.json @@ -36,13 +36,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ - "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" - ], - "esp32_4mb3f": [ - "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" - ], - "esp32cam_4mb": [ + "esp32*": [ "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino" ], "esp8266_4mb": [ diff --git a/src/modules/sensors/Max6675/modinfo.json b/src/modules/sensors/Max6675/modinfo.json index 469bbef1..7b97905a 100644 --- a/src/modules/sensors/Max6675/modinfo.json +++ b/src/modules/sensors/Max6675/modinfo.json @@ -38,13 +38,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "adafruit/MAX6675 library" ], - "esp32_4mb3f": [ - "adafruit/MAX6675 library" - ], - "esp8266_4mb": [ + "esp82*": [ "adafruit/MAX6675 library" ] } diff --git a/src/modules/sensors/Mhz19/modinfo.json b/src/modules/sensors/Mhz19/modinfo.json index ee93fcb6..b141ccf6 100644 --- a/src/modules/sensors/Mhz19/modinfo.json +++ b/src/modules/sensors/Mhz19/modinfo.json @@ -78,10 +78,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32s2_4mb": [], - "esp32cam_4mb": [], - "esp8266_4mb": [] + "esp32*": [], + "esp32s2_4mb": [ + "plerup/EspSoftwareSerial" + ], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Ntc/modinfo.json b/src/modules/sensors/Ntc/modinfo.json index 6f0b1ce4..6e0dc849 100644 --- a/src/modules/sensors/Ntc/modinfo.json +++ b/src/modules/sensors/Ntc/modinfo.json @@ -50,15 +50,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/RCswitch/modinfo.json b/src/modules/sensors/RCswitch/modinfo.json index 5c44ba44..d70452dd 100644 --- a/src/modules/sensors/RCswitch/modinfo.json +++ b/src/modules/sensors/RCswitch/modinfo.json @@ -61,34 +61,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "rc-switch @ ^2.6.4" ], - "esp32_4mb3f": [ - "rc-switch @ ^2.6.4" - ], - "esp32cam_4mb": [ - "rc-switch @ ^2.6.4" - ], - "esp8266_4mb": [ - "rc-switch @ ^2.6.4" - ], - "esp8266_1mb": [ - "rc-switch @ ^2.6.4" - ], - "esp8266_1mb_ota": [ - "rc-switch @ ^2.6.4" - ], - "esp8285_1mb": [ - "rc-switch @ ^2.6.4" - ], - "esp8285_1mb_ota": [ - "rc-switch @ ^2.6.4" - ], - "esp8266_2mb": [ - "rc-switch @ ^2.6.4" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "rc-switch @ ^2.6.4" ] } diff --git a/src/modules/sensors/RTC/modinfo.json b/src/modules/sensors/RTC/modinfo.json index f22250a1..369d70c3 100644 --- a/src/modules/sensors/RTC/modinfo.json +++ b/src/modules/sensors/RTC/modinfo.json @@ -80,15 +80,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/S8/modinfo.json b/src/modules/sensors/S8/modinfo.json index 5874fca9..5aeadc3f 100644 --- a/src/modules/sensors/S8/modinfo.json +++ b/src/modules/sensors/S8/modinfo.json @@ -36,8 +36,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp8266_4mb": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Scd40/modinfo.json b/src/modules/sensors/Scd40/modinfo.json index 9e29e654..302c606d 100644 --- a/src/modules/sensors/Scd40/modinfo.json +++ b/src/modules/sensors/Scd40/modinfo.json @@ -70,19 +70,11 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "Sensirion I2C SCD4x @0.4.0", "Sensirion Core @0.6.0" ], - "esp32_4mb3f": [ - "Sensirion I2C SCD4x @0.4.0", - "Sensirion Core @0.6.0" - ], - "esp32cam_4mb": [ - "Sensirion I2C SCD4x @0.4.0", - "Sensirion Core @0.6.0" - ], - "esp8266_4mb": [ + "esp82*": [ "Sensirion I2C SCD4x @0.4.0", "Sensirion Core @0.6.0" ] diff --git a/src/modules/sensors/Sds011/modinfo.json b/src/modules/sensors/Sds011/modinfo.json index 3026e56e..e34db8fe 100644 --- a/src/modules/sensors/Sds011/modinfo.json +++ b/src/modules/sensors/Sds011/modinfo.json @@ -66,16 +66,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "Nova Fitness Sds dust sensors library@1.5.1" ], - "esp32_4mb3f": [ - "Nova Fitness Sds dust sensors library@1.5.1" - ], - "esp32cam_4mb": [ - "Nova Fitness Sds dust sensors library@1.5.1" - ], - "esp8266_4mb": [ + "esp82*": [ "Nova Fitness Sds dust sensors library@1.5.1" ] } diff --git a/src/modules/sensors/Sgp30/modinfo.json b/src/modules/sensors/Sgp30/modinfo.json index b3da3628..f157077c 100644 --- a/src/modules/sensors/Sgp30/modinfo.json +++ b/src/modules/sensors/Sgp30/modinfo.json @@ -48,34 +48,10 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" ], - "esp32_4mb3f": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp32cam_4mb": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp8266_4mb": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp8266_1mb": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp8266_1mb_ota": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp8285_1mb": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp8285_1mb_ota": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp8266_2mb": [ - "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5" ] } diff --git a/src/modules/sensors/Sht20/modinfo.json b/src/modules/sensors/Sht20/modinfo.json index 443b91b7..fdded673 100644 --- a/src/modules/sensors/Sht20/modinfo.json +++ b/src/modules/sensors/Sht20/modinfo.json @@ -49,31 +49,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "robtillaart/SHT2x@^0.1.1" ], - "esp32_4mb3f": [ - "robtillaart/SHT2x@^0.1.1" - ], - "esp8266_4mb": [ - "robtillaart/SHT2x@^0.1.1" - ], - "esp8266_1mb": [ - "robtillaart/SHT2x@^0.1.1" - ], - "esp8266_1mb_ota": [ - "robtillaart/SHT2x@^0.1.1" - ], - "esp8285_1mb": [ - "robtillaart/SHT2x@^0.1.1" - ], - "esp8285_1mb_ota": [ - "robtillaart/SHT2x@^0.1.1" - ], - "esp8266_2mb": [ - "robtillaart/SHT2x@^0.1.1" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "robtillaart/SHT2x@^0.1.1" ] } diff --git a/src/modules/sensors/Sht30/modinfo.json b/src/modules/sensors/Sht30/modinfo.json index 5cbedff1..6a22d155 100644 --- a/src/modules/sensors/Sht30/modinfo.json +++ b/src/modules/sensors/Sht30/modinfo.json @@ -49,34 +49,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "WEMOS SHT3x@1.0.0" ], - "esp32_4mb3f": [ - "WEMOS SHT3x@1.0.0" - ], - "esp32cam_4mb": [ - "WEMOS SHT3x@1.0.0" - ], - "esp8266_4mb": [ - "WEMOS SHT3x@1.0.0" - ], - "esp8266_1mb": [ - "WEMOS SHT3x@1.0.0" - ], - "esp8266_1mb_ota": [ - "WEMOS SHT3x@1.0.0" - ], - "esp8285_1mb": [ - "WEMOS SHT3x@1.0.0" - ], - "esp8285_1mb_ota": [ - "WEMOS SHT3x@1.0.0" - ], - "esp8266_2mb": [ - "WEMOS SHT3x@1.0.0" - ], - "esp8266_2mb_ota": [ + "esp82*": [ "WEMOS SHT3x@1.0.0" ] } diff --git a/src/modules/sensors/Sonar/modinfo.json b/src/modules/sensors/Sonar/modinfo.json index eaaeed5c..737ecd3f 100644 --- a/src/modules/sensors/Sonar/modinfo.json +++ b/src/modules/sensors/Sonar/modinfo.json @@ -37,15 +37,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/sensors/UART/modinfo.json b/src/modules/sensors/UART/modinfo.json index e17a3f66..9ab1ce8d 100644 --- a/src/modules/sensors/UART/modinfo.json +++ b/src/modules/sensors/UART/modinfo.json @@ -74,34 +74,10 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [ + "esp32*": [ "plerup/EspSoftwareSerial" ], - "esp32_4mb3f": [ - "plerup/EspSoftwareSerial" - ], - "esp32cam_4mb": [ - "plerup/EspSoftwareSerial" - ], - "esp8266_4mb": [ - "plerup/EspSoftwareSerial" - ], - "esp8266_1mb": [ - "plerup/EspSoftwareSerial" - ], - "esp8266_1mb_ota": [ - "plerup/EspSoftwareSerial" - ], - "esp8266_2mb": [ - "plerup/EspSoftwareSerial" - ], - "esp8266_2mb_ota": [ - "plerup/EspSoftwareSerial" - ], - "esp8285_1mb": [ - "plerup/EspSoftwareSerial" - ], - "esp8285_1mb_ota": [ + "esp82*": [ "plerup/EspSoftwareSerial" ] } diff --git a/src/modules/sensors/ld2410/modinfo.json b/src/modules/sensors/ld2410/modinfo.json index 298079f1..afd3cef8 100644 --- a/src/modules/sensors/ld2410/modinfo.json +++ b/src/modules/sensors/ld2410/modinfo.json @@ -85,10 +85,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ - "ncmreynolds/ld2410@^0.1.3" - ], - "esp32_4mb3f": [ + "esp32*": [ "ncmreynolds/ld2410@^0.1.3" ] } diff --git a/src/modules/virtual/Cron/modinfo.json b/src/modules/virtual/Cron/modinfo.json index 4356adb6..26f9fbab 100644 --- a/src/modules/virtual/Cron/modinfo.json +++ b/src/modules/virtual/Cron/modinfo.json @@ -49,20 +49,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/GoogleSheet/modinfo.json b/src/modules/virtual/GoogleSheet/modinfo.json index 8fa0c5fb..96bab326 100644 --- a/src/modules/virtual/GoogleSheet/modinfo.json +++ b/src/modules/virtual/GoogleSheet/modinfo.json @@ -58,12 +58,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Loging/modinfo.json b/src/modules/virtual/Loging/modinfo.json index c5bbf6b4..61b2ad2d 100644 --- a/src/modules/virtual/Loging/modinfo.json +++ b/src/modules/virtual/Loging/modinfo.json @@ -50,20 +50,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/LogingDaily/modinfo.json b/src/modules/virtual/LogingDaily/modinfo.json index 4f0a5f09..1bfbc10d 100644 --- a/src/modules/virtual/LogingDaily/modinfo.json +++ b/src/modules/virtual/LogingDaily/modinfo.json @@ -43,20 +43,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Math/modinfo.json b/src/modules/virtual/Math/modinfo.json index 27080b3c..6ae5c83a 100644 --- a/src/modules/virtual/Math/modinfo.json +++ b/src/modules/virtual/Math/modinfo.json @@ -55,16 +55,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32s2_4mb": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } diff --git a/src/modules/virtual/Timer/modinfo.json b/src/modules/virtual/Timer/modinfo.json index c0b02ea3..7e3ee204 100644 --- a/src/modules/virtual/Timer/modinfo.json +++ b/src/modules/virtual/Timer/modinfo.json @@ -73,20 +73,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/VButton/modinfo.json b/src/modules/virtual/VButton/modinfo.json index 366e6b51..8a61b2d1 100644 --- a/src/modules/virtual/VButton/modinfo.json +++ b/src/modules/virtual/VButton/modinfo.json @@ -35,20 +35,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Variable/modinfo.json b/src/modules/virtual/Variable/modinfo.json index 49bff50c..bf91bb7a 100644 --- a/src/modules/virtual/Variable/modinfo.json +++ b/src/modules/virtual/Variable/modinfo.json @@ -95,20 +95,7 @@ }, "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Weather/modinfo.json b/src/modules/virtual/Weather/modinfo.json index 928bc442..0cd65884 100644 --- a/src/modules/virtual/Weather/modinfo.json +++ b/src/modules/virtual/Weather/modinfo.json @@ -39,20 +39,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32cam_4mb": [], - "esp32_16mb": [], - "esp32s2_4mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/virtual/owmWeather/modinfo.json b/src/modules/virtual/owmWeather/modinfo.json index 748ff5d8..5940d5db 100644 --- a/src/modules/virtual/owmWeather/modinfo.json +++ b/src/modules/virtual/owmWeather/modinfo.json @@ -87,19 +87,7 @@ "defActive": true, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp32s2_4mb": [], - "esp32_16mb": [], - "esp32s3_16mb": [], - "esp32c3m_4mb": [], - "esp8266_4mb": [], - "esp8266_16mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [], - "esp8266_2mb": [], - "esp8266_2mb_ota": [] + "esp32*": [], + "esp82*": [] } } From 0a9a1b9387ea9324ab904cc1dee88fd34f01723d Mon Sep 17 00:00:00 2001 From: Mit4el Date: Wed, 15 May 2024 22:22:55 +0300 Subject: [PATCH 10/11] =?UTF-8?q?Impulse=20-=20=D0=B4=D0=B2=D0=B0=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/sensors/Impulse/Impulse.cpp | 33 ++++++++++++++++++------ src/modules/sensors/Impulse/modinfo.json | 10 ++++--- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/modules/sensors/Impulse/Impulse.cpp b/src/modules/sensors/Impulse/Impulse.cpp index e84a1123..b32a2693 100644 --- a/src/modules/sensors/Impulse/Impulse.cpp +++ b/src/modules/sensors/Impulse/Impulse.cpp @@ -12,7 +12,9 @@ private: bool _lastButtonState = LOW; unsigned long _lastDebounceTime = 0; int _debounceDelay = 50; + int _timeORcount = 0; int _count = 0; + int CNT = 0; unsigned long timing; public: @@ -22,6 +24,8 @@ public: jsonRead(parameters, F("pin"), _pin); jsonRead(parameters, F("pinMode"), _pinMode); jsonRead(parameters, F("debounceDelay"), _debounceDelay); + jsonRead(parameters, F("count"), _count); + jsonRead(parameters, F("timeORcount"), _timeORcount); jsonRead(parameters, "int", _int); _round = 0; @@ -53,18 +57,31 @@ public: if (_reading != _buttonState) { _buttonState = _reading; - _count++; + CNT++; } - if (_count == 1) + if (CNT == 1) { timing = millis(); } - if (millis() - timing > _int * 1000 && _count > 1) - { - timing = millis(); - value.valD = _count; - regEvent(value.valD, F("Impulse")); - _count = 0; + if (!_timeORcount) + { // работаем по времени + if (millis() - timing > _int * 1000 && CNT > 1) + { + timing = millis(); + value.valD = CNT; + regEvent(value.valD, F("Impulse")); + CNT = 0; + } + } + else + { // работаем по количеству импульсов + if (_count && CNT == _count) + { + value.valD = 1; + regEvent(value.valD, F("Impulse")); + CNT = 0; + } + } } diff --git a/src/modules/sensors/Impulse/modinfo.json b/src/modules/sensors/Impulse/modinfo.json index 81095235..bc4d8587 100644 --- a/src/modules/sensors/Impulse/modinfo.json +++ b/src/modules/sensors/Impulse/modinfo.json @@ -15,7 +15,9 @@ "pin": 16, "pinMode": "INPUT", "debounceDelay": 3, - "multiply": 1 + "multiply": 1, + "count": 0, + "timeORcount":0 } ], "about": { @@ -24,7 +26,7 @@ "authorGit": "https://github.com/avaksru", "specialThanks": "", "moduleName": "Impulse", - "moduleVersion": "2.0", + "moduleVersion": "3.0", "usedRam": { "esp32_4mb": 15, "esp8266_4mb": 15 @@ -35,7 +37,9 @@ "int": "Период сбора импульсов в секундах", "pin": "Укажите GPIO номер пина для чтения импульсов", "pinMode": "Может быть INPUT_PULLUP INPUT_PULLDOWN INPUT", - "debounceDelay": "Время обработки дребезга (миллисекунд)" + "debounceDelay": "Время обработки дребезга (миллисекунд)", + "count": "количество импульсов для выработки события c 1(единицей в данных). По событию можно прибавлять к другой переменной, так же домножить на multiply. Например 32имп = 0.1кВт => count=32, multiply=0.1", + "timeORcount": "0 - выдает количество импульсов за int секунд; 1 - выдает событие с 1 когда количество импульсов наберется равным count" } }, "defActive": true, From 94bfc4ec61687d635ec20c33490a6ccee9611d44 Mon Sep 17 00:00:00 2001 From: Mit4el Date: Wed, 15 May 2024 22:25:23 +0300 Subject: [PATCH 11/11] =?UTF-8?q?Fix=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B8=20=D0=BF=D0=BE=D0=B4=20esp8266?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ESPNexUpload/src/ESPNexUpload.cpp | 94 +++++++++---------- lib/ESPNexUpload/src/ESPNexUpload.h | 19 +++- src/modules/display/Nextion/Nextion.cpp | 5 +- src/modules/display/Nextion/modinfo.json | 9 +- .../display/NextionUpload/NextionUpload.cpp | 11 ++- src/modules/display/TM16XX/TM16XX.cpp | 2 +- src/modules/exec/Telegram_v2/Telegram_v2.cpp | 13 ++- 7 files changed, 86 insertions(+), 67 deletions(-) diff --git a/lib/ESPNexUpload/src/ESPNexUpload.cpp b/lib/ESPNexUpload/src/ESPNexUpload.cpp index 0856aa5f..1eaf5403 100644 --- a/lib/ESPNexUpload/src/ESPNexUpload.cpp +++ b/lib/ESPNexUpload/src/ESPNexUpload.cpp @@ -26,33 +26,6 @@ #define DEBUG_SERIAL_ENABLE #include "ESPNexUpload.h" -#if defined ESP8266 - -#include - -#ifndef NEXT_RX -#define NEXT_RX 14 // Nextion RX pin | Default 14 / D5 -#define NEXT_TX 12 // Nextion TX pin | Default 12 / D6 -#endif -#ifndef nexSerial -//SoftwareSerial softSerial(NEXT_RX, NEXT_TX); -#define nexSerial softSerial -#define nexSerialBegin(a, b, c) nexSerial.begin(a) -#endif - -#elif defined ESP32 - -#ifndef NEXT_RX -#define NEXT_RX 17 // Nextion RX pin | Default 16 -#define NEXT_TX 16 // Nextion TX pin | Default 17 -#endif -#ifndef nexSerial -#define nexSerial Serial2 -#define nexSerialBegin(a, rx, tx) nexSerial.begin(a, SERIAL_8N1, rx, tx) -#endif - -#endif - #ifdef DEBUG_SERIAL_ENABLE #define dbSerialPrint(a) Serial.print(a) #define dbSerialPrintHex(a) Serial.print(a, HEX) @@ -77,23 +50,40 @@ } while (0) #endif -ESPNexUpload::ESPNexUpload(uint32_t upload_baudrate, uint8_t rx, uint8_t tx) +ESPNexUpload::ESPNexUpload(uint32_t upload_baudrate, int line, int rx, int tx) { _upload_baudrate = upload_baudrate; - if (rx == 0 || tx == 0) - { - _rx = NEXT_RX; - _tx = NEXT_TX; - }else{ - _rx = rx; - _tx = tx; - } + _rx = rx; + _tx = tx; + _line = line; + #if defined ESP8266 - SoftwareSerial softSerial(_rx, _tx); + nexSerial = new SoftwareSerial(_rx, _tx); +#else + if (line >= 0) { + nexSerial = new HardwareSerial(line); + // ((HardwareSerial*)nexSerial)->begin(_upload_baudrate, SERIAL_8N1, _rx, _tx); + } else { + nexSerial = new SoftwareSerial(_rx, _tx); + // ((SoftwareSerial*)nexSerial)->begin(_upload_baudrate); + } #endif } +void ESPNexUpload::nexSerialBegin(uint32_t _speed, int _line, int _rx, int _tx) +{ +#if defined ESP8266 + nexSerial->begin(_speed); +#else + if (_line >= 0) { + ((HardwareSerial*)nexSerial)->begin(_speed, SERIAL_8N1, _rx, _tx); + } else { + ((SoftwareSerial*)nexSerial)->begin(_speed); + } +#endif +} + bool ESPNexUpload::connect() { #if defined ESP8266 @@ -172,7 +162,7 @@ bool ESPNexUpload::_searchBaudrate(uint32_t baudrate) dbSerialPrint(F("init nextion serial interface on baudrate: ")); dbSerialPrintln(baudrate); - nexSerialBegin(baudrate, _rx, _tx); + nexSerialBegin(baudrate, _line, _rx, _tx); _printInfoLine(F("ESP baudrate established, try to connect to display")); const char _nextion_FF_FF[3] = {0xFF, 0xFF, 0x00}; @@ -231,20 +221,20 @@ void ESPNexUpload::sendCommand(const char *cmd, bool tail, bool null_head) if (null_head) { - nexSerial.write(0x00); + ((HardwareSerial*)nexSerial)->write(0x00); } - while (nexSerial.available()) + while (nexSerial->available()) { - nexSerial.read(); + nexSerial->read(); } - nexSerial.print(cmd); + nexSerial->print(cmd); if (tail) { - nexSerial.write(0xFF); - nexSerial.write(0xFF); - nexSerial.write(0xFF); + nexSerial->write(0xFF); + nexSerial->write(0xFF); + nexSerial->write(0xFF); } _printSerialData(true, cmd); } @@ -270,10 +260,10 @@ uint16_t ESPNexUpload::recvRetString(String &response, uint32_t timeout, bool re while (millis() - start <= timeout) { - while (nexSerial.available()) + while (nexSerial->available()) { - c = nexSerial.read(); + c = nexSerial->read(); if (c == 0) { continue; @@ -344,9 +334,9 @@ bool ESPNexUpload::_setPrepareForFirmwareUpdate(uint32_t upload_baudrate) // because switching to another baudrate (nexSerialBegin command) has an higher prio. // The ESP will first jump to the new 'upload_baudrate' and than process the serial 'transmit buffer' // The flush command forced the ESP to wait until the 'transmit buffer' is empty - nexSerial.flush(); + nexSerial->flush(); - nexSerialBegin(upload_baudrate, _rx, _tx); + nexSerialBegin(upload_baudrate, _line, _rx, _tx); _printInfoLine(F("changing upload baudrate...")); _printInfoLine(String(upload_baudrate)); @@ -421,7 +411,7 @@ bool ESPNexUpload::upload(const uint8_t *file_buf, size_t buf_size) c = file_buf[i]; // write byte to nextion over serial - nexSerial.write(c); + nexSerial->write(c); // update sent packets counter _sent_packets++; @@ -438,7 +428,7 @@ bool ESPNexUpload::upload(Stream &myFile) #endif // create buffer for read - uint8_t buff[2048] = {0}; + uint8_t buff[4096] = {0}; // read all data from server while (_undownloadByte > 0 || _undownloadByte == -1) @@ -492,7 +482,7 @@ void ESPNexUpload::end() this->softReset(); // end Serial connection - nexSerial.end(); + ((HardwareSerial*)nexSerial)->end(); // reset sent packets counter _sent_packets = 0; diff --git a/lib/ESPNexUpload/src/ESPNexUpload.h b/lib/ESPNexUpload/src/ESPNexUpload.h index b9cfe746..3a22ac15 100644 --- a/lib/ESPNexUpload/src/ESPNexUpload.h +++ b/lib/ESPNexUpload/src/ESPNexUpload.h @@ -56,6 +56,13 @@ #include #include +#ifdef ESP8266 +#include +#else +#include +#include +#endif + /** * @addtogroup CoreAPI * @{ @@ -79,7 +86,7 @@ public: /* methods */ * * @param uint32_t upload_baudrate - set upload baudrate. */ - ESPNexUpload(uint32_t upload_baudrate, uint8_t rx=0, uint8_t tx=0); + ESPNexUpload(uint32_t upload_baudrate, int line, int rx, int tx); /** * destructor. @@ -256,6 +263,8 @@ private: /* methods */ */ uint32_t calculateTransmissionTimeMs(String message); + void nexSerialBegin(uint32_t upload_baudrate, int line, int rx, int tx); + private: /* data */ uint32_t _baudrate; /* nextion serail baudrate */ uint32_t _undownloadByte; /* undownload byte of tft file */ @@ -263,8 +272,14 @@ private: /* data */ uint16_t _sent_packets = 0; /* upload baudrate */ uint8_t _rx; uint8_t _tx; - + uint8_t _line; THandlerFunction _updateProgressCallback; + +#ifdef ESP8266 + SoftwareSerial* nexSerial; +#else + Stream* nexSerial; +#endif }; /** * @} diff --git a/src/modules/display/Nextion/Nextion.cpp b/src/modules/display/Nextion/Nextion.cpp index 4fe3af4f..a1a25c33 100644 --- a/src/modules/display/Nextion/Nextion.cpp +++ b/src/modules/display/Nextion/Nextion.cpp @@ -211,9 +211,10 @@ public: if (!updated) { SerialPrint("I", F("NextionUpdate"), "connecting to " + (String)_host); - HTTPClient http; + HTTPClient http; #if defined ESP8266 - if (!http.begin(_host, 80, _url)) + WiFiClient client; + if (!http.begin(client, _host, 80, _url)) SerialPrint("I", F("NextionUpdate"), "connection failed "); #elif defined ESP32 if (!http.begin(String("http://") + _host + _url)) diff --git a/src/modules/display/Nextion/modinfo.json b/src/modules/display/Nextion/modinfo.json index d74991c1..7168875d 100644 --- a/src/modules/display/Nextion/modinfo.json +++ b/src/modules/display/Nextion/modinfo.json @@ -87,12 +87,7 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [], - "esp32_4mb3f": [], - "esp8266_4mb": [], - "esp8266_1mb": [], - "esp8266_1mb_ota": [], - "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp32*": [], + "esp82*": [] } } \ No newline at end of file diff --git a/src/modules/display/NextionUpload/NextionUpload.cpp b/src/modules/display/NextionUpload/NextionUpload.cpp index f2db9474..b8745217 100644 --- a/src/modules/display/NextionUpload/NextionUpload.cpp +++ b/src/modules/display/NextionUpload/NextionUpload.cpp @@ -42,7 +42,8 @@ public: HTTPClient http; #if defined ESP8266 - if (!http.begin(_host, 80, _url)) + WiFiClient client; + if (!http.begin(client, _host, 80, _url)) { // Serial.println("connection failed"); SerialPrint("I", F("NextionUpdate"), "connection failed "); @@ -118,7 +119,13 @@ public: int contentLength = http.getSize(); SerialPrint("I", F("NextionUpdate"), "File received. Update Nextion... "); bool result; - ESPNexUpload nextion(115200, _NEXT_RX, _NEXT_TX); + #ifdef ESP8266 + ESPNexUpload nextion(115200, -1, _NEXT_RX, _NEXT_TX); + #elif defined(esp32c3m_4mb) || defined(esp32s2_4mb) + ESPNexUpload nextion(115200, 1, _NEXT_RX, _NEXT_TX); + #else + ESPNexUpload nextion(115200, 2, _NEXT_RX, _NEXT_TX); + #endif nextion.setUpdateProgressCallback([]() { SerialPrint("I", F("NextionUpdate"), "... "); }); diff --git a/src/modules/display/TM16XX/TM16XX.cpp b/src/modules/display/TM16XX/TM16XX.cpp index 10199d38..8bbafc2d 100644 --- a/src/modules/display/TM16XX/TM16XX.cpp +++ b/src/modules/display/TM16XX/TM16XX.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include TM16xxButtons* buttons = nullptr; // указатель на объект управления кнопками для TM1638 иначе nullptr diff --git a/src/modules/exec/Telegram_v2/Telegram_v2.cpp b/src/modules/exec/Telegram_v2/Telegram_v2.cpp index 30092bb6..b872730a 100644 --- a/src/modules/exec/Telegram_v2/Telegram_v2.cpp +++ b/src/modules/exec/Telegram_v2/Telegram_v2.cpp @@ -8,7 +8,9 @@ // #include // #include // #include "esp_camera.h" - +#ifdef ESP8266 +#define FB_DYNAMIC +#endif #include #include @@ -93,6 +95,7 @@ public: if (fl_rollback) { _myBot->tickManual(); // Чтобы отметить сообщение прочитанным +#ifdef ESP32 if (Update.rollBack()) { SerialPrint("I", F("Update"), F("Откат OTA успешно выполнен")); @@ -104,6 +107,7 @@ public: SerialPrint("E", F("Update"), F("Откат OTA не выполнен!")); _myBot->sendMessage("Откат OTA не выполнен!", _chatID); } +#endif } // была попытка OTA обновления. Обновляемся после ответа серверу! if (_OTAstate >= 0) @@ -369,10 +373,16 @@ public: // ------------------------------------------------------------------------- if (msg.text.indexOf("/rollback") != -1 && msg.chatID == _chatID) { +#ifdef ESP32 _myBot->inlineMenu("Вы уверены, что хотите откатить прошивку? " + jsonReadStr(settingsFlashJson, F("name")) + " \n OTA_roll", F("Rollback \t Cancel")); +#elif ESP8266 + SerialPrint("E", F("Update"), F("Откат OTA не поддерживается на esp8266!")); + _myBot->sendMessage("Откат OTA не поддерживается на esp8266!", _chatID); +#endif } else if (msg.text.indexOf("OTA_roll") != -1) { +#ifdef ESP32 // удаляем последнее сообщение от бота _myBot->deleteMessage(_myBot->lastBotMsg()); if (msg.data.indexOf("Rollback") != -1) @@ -387,6 +397,7 @@ public: _myBot->sendMessage("Откат OTA не возможен!", _chatID); } } +#endif } // -------------- Обработка файлов *.bin для прошивки по OTA -------------- // -------------------------------------------------------------------------