From ac77b8fb4acc8cad16c033e645aeb91f93d34847 Mon Sep 17 00:00:00 2001 From: Mit4el Date: Mon, 3 Apr 2023 20:40:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB?= =?UTF-8?q?=D0=B5=D1=80=20esp8266=5F2mb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrepareProject.py | 4 +- include/Const.h | 8 + platformio.ini | 190 ++++++++---------- src/UpgradeFirm.cpp | 2 +- src/modules/display/Lcd2004/modinfo.json | 8 + src/modules/exec/ButtonIn/modinfo.json | 4 +- src/modules/exec/ButtonOut/modinfo.json | 4 +- src/modules/exec/HttpGet/modinfo.json | 4 +- src/modules/exec/Mcp23008/modinfo.json | 8 + src/modules/exec/Mcp23017/modinfo.json | 8 + src/modules/exec/Multitouch/modinfo.json | 4 +- src/modules/exec/Pcf8574/modinfo.json | 6 + src/modules/exec/Pwm8266/modinfo.json | 4 +- src/modules/exec/TelegramLT/modinfo.json | 4 +- src/modules/exec/Thermostat/modinfo.json | 4 +- src/modules/sensors/AnalogAdc/modinfo.json | 4 +- src/modules/sensors/Bme280/modinfo.json | 18 ++ src/modules/sensors/Bmp280/modinfo.json | 9 + src/modules/sensors/DS2401/modinfo.json | 20 +- src/modules/sensors/Ds18b20/modinfo.json | 6 + src/modules/sensors/ExternalMQTT/modinfo.json | 4 +- src/modules/sensors/Pzem004t/modinfo.json | 8 +- src/modules/sensors/RCswitch/modinfo.json | 6 + src/modules/sensors/RTC/modinfo.json | 4 +- src/modules/sensors/Sgp30/modinfo.json | 6 + src/modules/sensors/Sht20/modinfo.json | 6 + src/modules/sensors/Sht30/modinfo.json | 6 + src/modules/sensors/Sonar/modinfo.json | 4 +- src/modules/sensors/UART/modinfo.json | 17 +- src/modules/virtual/Cron/modinfo.json | 4 +- src/modules/virtual/Loging/modinfo.json | 8 +- src/modules/virtual/LogingDaily/modinfo.json | 8 +- src/modules/virtual/Timer/modinfo.json | 4 +- src/modules/virtual/VButton/modinfo.json | 4 +- src/modules/virtual/Variable/modinfo.json | 4 +- .../virtual/VariableColor/modinfo.json | 4 +- src/modules/virtual/Weather/modinfo.json | 4 +- 37 files changed, 282 insertions(+), 138 deletions(-) diff --git a/PrepareProject.py b/PrepareProject.py index b40b24cb..50e37ebd 100644 --- a/PrepareProject.py +++ b/PrepareProject.py @@ -20,6 +20,8 @@ # esp8266_1mb_ota # esp8285_1mb # esp8285_1mb_ota +# esp8266_2mb +# esp8266_2mb_ota import configparser import os, json, sys, getopt @@ -119,7 +121,7 @@ deviceName = profJson['projectProp']['platformio']['default_envs'] # назначаем папку с файлами прошивки в зависимости от устройства и запоминаем в профиле dataDir = 'data_svelte' -if deviceName == 'esp8266_1mb_ota' or deviceName == 'esp8285_1mb_ota': +if deviceName == 'esp8266_1mb_ota' or deviceName == 'esp8285_1mb_ota' or deviceName == 'esp8266_2mb_ota': dataDir = 'data_svelte_lite' profJson['projectProp'] = { 'platformio': { diff --git a/include/Const.h b/include/Const.h index e80ae50e..75efb4bb 100644 --- a/include/Const.h +++ b/include/Const.h @@ -11,6 +11,14 @@ #define FIRMWARE_NAME "esp8266_1mb" #endif +#ifdef esp8266_2mb +#define FIRMWARE_NAME "esp8266_2mb" +#endif + +#ifdef esp8266_2mb_ota +#define FIRMWARE_NAME "esp8266_2mb_ota" +#endif + #ifdef esp8266_4mb #define FIRMWARE_NAME "esp8266_4mb" #endif diff --git a/platformio.ini b/platformio.ini index 16c84fe2..bf13dc11 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ [platformio] -default_envs = esp8266_4mb -data_dir = data_svelte +default_envs = esp8266_2mb_ota +data_dir = data_svelte_lite [common_env_data] lib_deps_external = @@ -70,6 +70,48 @@ build_src_filter = + ${env:esp8285_1mb_ota_fromitems.build_src_filter} +[env:esp8266_2mb] +lib_deps = + ${common_env_data.lib_deps_external} + ${env:esp8266_2mb_fromitems.lib_deps} + ESPAsyncUDP +build_flags = -Desp8266_2mb="esp8266_2mb" +framework = arduino +board = d1_wroom_02 +board_build.ldscript = eagle.flash.2m1m.ld +platform = espressif8266 +monitor_filters = esp8266_exception_decoder +upload_speed = 921600 +monitor_speed = 115200 +board_build.filesystem = littlefs +build_src_filter = + +<*.cpp> + + + + + + + ${env:esp8266_2mb_fromitems.build_src_filter} + +[env:esp8266_2mb_ota] +lib_deps = + ${common_env_data.lib_deps_external} + ${env:esp8266_2mb_fromitems.lib_deps} + ESPAsyncUDP +build_flags = -Desp8266_2mb_ota="esp8266_2mb_ota" +framework = arduino +board = d1_wroom_02 +board_build.ldscript = eagle.flash.2m256.ld +platform = espressif8266 +monitor_filters = esp8266_exception_decoder +upload_speed = 921600 +monitor_speed = 115200 +board_build.filesystem = littlefs +build_src_filter = + +<*.cpp> + + + + + + + ${env:esp8266_2mb_fromitems.build_src_filter} + [env:esp8285_1mb] lib_deps = ${common_env_data.lib_deps_external} @@ -134,69 +176,74 @@ build_src_filter = [env:esp8266_1mb_ota_fromitems] lib_deps = + adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library - https://github.com/milesburton/Arduino-Temperature-Control-Library - https://github.com/tremaru/iarduino_RTC - robtillaart/SHT2x@^0.1.1 - WEMOS SHT3x@1.0.0 - adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 - adafruit/Adafruit BusIO @ ^1.13.2 - adafruit/Adafruit BusIO @ ^1.13.2 - https://github.com/robotclass/RobotClass_LiquidCrystal_I2C - marcoschwartz/LiquidCrystal_I2C@^1.1.4 + plerup/espsoftwareserial build_src_filter = + + + + + + + + + - + + + + + - + - + - + - + - + - + - + - + - + - + - + + + + + + - + [env:esp8266_1mb_fromitems] lib_deps = adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library - milesburton/DallasTemperature@^3.9.1 - robtillaart/SHT2x@^0.1.1 - WEMOS SHT3x@1.0.0 - adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 - adafruit/Adafruit BusIO @ ^1.13.2 - adafruit/Adafruit BusIO @ ^1.13.2 - marcoschwartz/LiquidCrystal_I2C@^1.1.4 + plerup/espsoftwareserial build_src_filter = + + + + + + + + + + - + + + - + - + - + - + + + + + + + - + - + - + - + + - + + +[env:esp8266_2mb_fromitems] +lib_deps = + plerup/EspSoftwareSerial +build_src_filter = + + + + + + + + + + + + + + + + + + + + + +[env:esp8266_2mb_ota_fromitems] +lib_deps = + plerup/EspSoftwareSerial +build_src_filter = + + + + + + + + + + + + + + + + + + + + [env:esp8285_1mb_ota_fromitems] lib_deps = @@ -255,21 +302,7 @@ build_src_filter = [env:esp8266_4mb_fromitems] lib_deps = - https://github.com/enjoyneering/AHTxx.git - adafruit/Adafruit BME280 Library - adafruit/Adafruit BMP280 Library - beegee-tokyo/DHT sensor library for ESPx - https://github.com/milesburton/Arduino-Temperature-Control-Library - https://github.com/tremaru/iarduino_RTC - robtillaart/SHT2x@^0.1.1 - WEMOS SHT3x@1.0.0 plerup/EspSoftwareSerial - adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 - adafruit/Adafruit BusIO @ ^1.13.2 - dfrobot/DFRobotDFPlayerMini @ ^1.0.5 - adafruit/Adafruit BusIO @ ^1.13.2 - https://github.com/robotclass/RobotClass_LiquidCrystal_I2C - marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = + + @@ -278,48 +311,16 @@ build_src_filter = + + + - + - + - + - + - + - + - + + - + - + - + - + + - + - + - + - + - + - + - + - + + - + [env:esp32_4mb_fromitems] lib_deps = - https://github.com/enjoyneering/AHTxx.git adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library - beegee-tokyo/DHT sensor library for ESPx - https://github.com/milesburton/Arduino-Temperature-Control-Library https://github.com/tremaru/iarduino_RTC - robtillaart/SHT2x@^0.1.1 - WEMOS SHT3x@1.0.0 plerup/EspSoftwareSerial - https://github.com/RoboticsBrno/ServoESP32 - adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 - adafruit/Adafruit BusIO @ ^1.13.2 - dfrobot/DFRobotDFPlayerMini @ ^1.0.5 - adafruit/Adafruit BusIO @ ^1.13.2 - https://github.com/robotclass/RobotClass_LiquidCrystal_I2C - marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = + + @@ -328,27 +329,12 @@ build_src_filter = + + + - + - + - + + + - + - + + + - + - + - + + + + - + - + - + - + - + - + + - + diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp index 53c6e15b..20385771 100644 --- a/src/UpgradeFirm.cpp +++ b/src/UpgradeFirm.cpp @@ -72,7 +72,7 @@ bool upgradeBuild() { handleUpdateStatus(true, PATH_ERROR); return ret; } -#if defined (esp8266_4mb) || defined (esp8266_1mb) || defined (esp8266_1mb_ota) +#if defined (esp8266_4mb) || defined (esp8266_1mb) || defined (esp8266_1mb_ota) || defined (esp8266_2mb) || defined (esp8266_2mb_ota) ESPhttpUpdate.rebootOnUpdate(false); t_httpUpdate_return retBuild = ESPhttpUpdate.update(wifiClient, getBinPath("firmware.bin")); #endif diff --git a/src/modules/display/Lcd2004/modinfo.json b/src/modules/display/Lcd2004/modinfo.json index 24faf854..024750b8 100644 --- a/src/modules/display/Lcd2004/modinfo.json +++ b/src/modules/display/Lcd2004/modinfo.json @@ -127,6 +127,14 @@ "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" ] } } \ No newline at end of file diff --git a/src/modules/exec/ButtonIn/modinfo.json b/src/modules/exec/ButtonIn/modinfo.json index 951df888..690ace99 100644 --- a/src/modules/exec/ButtonIn/modinfo.json +++ b/src/modules/exec/ButtonIn/modinfo.json @@ -50,6 +50,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "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 f4c2af3c..35e4d5c7 100644 --- a/src/modules/exec/ButtonOut/modinfo.json +++ b/src/modules/exec/ButtonOut/modinfo.json @@ -49,6 +49,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/HttpGet/modinfo.json b/src/modules/exec/HttpGet/modinfo.json index b954636a..56c4d57b 100644 --- a/src/modules/exec/HttpGet/modinfo.json +++ b/src/modules/exec/HttpGet/modinfo.json @@ -53,6 +53,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/Mcp23008/modinfo.json b/src/modules/exec/Mcp23008/modinfo.json index 6181b062..d04c12f7 100644 --- a/src/modules/exec/Mcp23008/modinfo.json +++ b/src/modules/exec/Mcp23008/modinfo.json @@ -62,6 +62,14 @@ "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" ] } } \ No newline at end of file diff --git a/src/modules/exec/Mcp23017/modinfo.json b/src/modules/exec/Mcp23017/modinfo.json index 35b10926..ad20b6ca 100644 --- a/src/modules/exec/Mcp23017/modinfo.json +++ b/src/modules/exec/Mcp23017/modinfo.json @@ -62,6 +62,14 @@ "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" ] } } \ No newline at end of file diff --git a/src/modules/exec/Multitouch/modinfo.json b/src/modules/exec/Multitouch/modinfo.json index 3f49e91a..b83a1f9e 100644 --- a/src/modules/exec/Multitouch/modinfo.json +++ b/src/modules/exec/Multitouch/modinfo.json @@ -48,6 +48,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } diff --git a/src/modules/exec/Pcf8574/modinfo.json b/src/modules/exec/Pcf8574/modinfo.json index e763280b..c3bfd7f4 100644 --- a/src/modules/exec/Pcf8574/modinfo.json +++ b/src/modules/exec/Pcf8574/modinfo.json @@ -50,6 +50,12 @@ ], "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" ] } } \ No newline at end of file diff --git a/src/modules/exec/Pwm8266/modinfo.json b/src/modules/exec/Pwm8266/modinfo.json index 362ca327..dfd53149 100644 --- a/src/modules/exec/Pwm8266/modinfo.json +++ b/src/modules/exec/Pwm8266/modinfo.json @@ -46,6 +46,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/exec/TelegramLT/modinfo.json b/src/modules/exec/TelegramLT/modinfo.json index 384e23f5..e718fd62 100644 --- a/src/modules/exec/TelegramLT/modinfo.json +++ b/src/modules/exec/TelegramLT/modinfo.json @@ -60,6 +60,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } diff --git a/src/modules/exec/Thermostat/modinfo.json b/src/modules/exec/Thermostat/modinfo.json index 61594db4..9c356ea3 100644 --- a/src/modules/exec/Thermostat/modinfo.json +++ b/src/modules/exec/Thermostat/modinfo.json @@ -134,6 +134,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } diff --git a/src/modules/sensors/AnalogAdc/modinfo.json b/src/modules/sensors/AnalogAdc/modinfo.json index dd0df107..a9a55c17 100644 --- a/src/modules/sensors/AnalogAdc/modinfo.json +++ b/src/modules/sensors/AnalogAdc/modinfo.json @@ -46,6 +46,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/sensors/Bme280/modinfo.json b/src/modules/sensors/Bme280/modinfo.json index 965551f7..5bb6f9b2 100644 --- a/src/modules/sensors/Bme280/modinfo.json +++ b/src/modules/sensors/Bme280/modinfo.json @@ -85,6 +85,24 @@ ], "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" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json index de46f163..4ce96b66 100644 --- a/src/modules/sensors/Bmp280/modinfo.json +++ b/src/modules/sensors/Bmp280/modinfo.json @@ -64,11 +64,20 @@ "esp8266_1mb_ota": [ "adafruit/Adafruit BMP280 Library" ], + "esp8266_2mb": [ + "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" ] } } \ No newline at end of file diff --git a/src/modules/sensors/DS2401/modinfo.json b/src/modules/sensors/DS2401/modinfo.json index 1e241d4e..8364b4f0 100644 --- a/src/modules/sensors/DS2401/modinfo.json +++ b/src/modules/sensors/DS2401/modinfo.json @@ -35,17 +35,13 @@ }, "defActive": false, "usedLibs": { - "esp32_4mb": [ - ], - "esp8266_4mb": [ - ], - "esp8266_1mb": [ - ], - "esp8266_1mb_ota": [ - ], - "esp8285_1mb": [ - ], - "esp8285_1mb_ota": [ - ] + "esp32_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/Ds18b20/modinfo.json b/src/modules/sensors/Ds18b20/modinfo.json index c140839c..9a4519a4 100644 --- a/src/modules/sensors/Ds18b20/modinfo.json +++ b/src/modules/sensors/Ds18b20/modinfo.json @@ -56,6 +56,12 @@ ], "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" ] } } \ No newline at end of file diff --git a/src/modules/sensors/ExternalMQTT/modinfo.json b/src/modules/sensors/ExternalMQTT/modinfo.json index 090344e1..02c41fb3 100644 --- a/src/modules/sensors/ExternalMQTT/modinfo.json +++ b/src/modules/sensors/ExternalMQTT/modinfo.json @@ -53,6 +53,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } diff --git a/src/modules/sensors/Pzem004t/modinfo.json b/src/modules/sensors/Pzem004t/modinfo.json index f76cf366..56a1fd58 100644 --- a/src/modules/sensors/Pzem004t/modinfo.json +++ b/src/modules/sensors/Pzem004t/modinfo.json @@ -128,6 +128,12 @@ "defActive": true, "usedLibs": { "esp32_4mb": [], - "esp8266_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 a5c6fa3c..dae2a245 100644 --- a/src/modules/sensors/RCswitch/modinfo.json +++ b/src/modules/sensors/RCswitch/modinfo.json @@ -78,6 +78,12 @@ ], "esp8285_1mb_ota": [ "rc-switch @ ^2.6.4" + ], + "esp8266_2mb": [ + "rc-switch @ ^2.6.4" + ], + "esp8266_2mb_ota": [ + "rc-switch @ ^2.6.4" ] } } \ No newline at end of file diff --git a/src/modules/sensors/RTC/modinfo.json b/src/modules/sensors/RTC/modinfo.json index 464dcb9c..3ecef7f7 100644 --- a/src/modules/sensors/RTC/modinfo.json +++ b/src/modules/sensors/RTC/modinfo.json @@ -62,6 +62,8 @@ "esp8266_1mb": ["https://github.com/tremaru/iarduino_RTC"], "esp8266_1mb_ota": ["https://github.com/tremaru/iarduino_RTC"], "esp8285_1mb": ["https://github.com/tremaru/iarduino_RTC"], - "esp8285_1mb_ota": ["https://github.com/tremaru/iarduino_RTC"] + "esp8285_1mb_ota": ["https://github.com/tremaru/iarduino_RTC"], + "esp8266_2mb": ["https://github.com/tremaru/iarduino_RTC"], + "esp8266_2mb_ota": ["https://github.com/tremaru/iarduino_RTC"] } } \ No newline at end of file diff --git a/src/modules/sensors/Sgp30/modinfo.json b/src/modules/sensors/Sgp30/modinfo.json index 4f5c521a..94c59309 100644 --- a/src/modules/sensors/Sgp30/modinfo.json +++ b/src/modules/sensors/Sgp30/modinfo.json @@ -65,6 +65,12 @@ ], "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" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Sht20/modinfo.json b/src/modules/sensors/Sht20/modinfo.json index aae500a3..39b07e6d 100644 --- a/src/modules/sensors/Sht20/modinfo.json +++ b/src/modules/sensors/Sht20/modinfo.json @@ -66,6 +66,12 @@ ], "esp8285_1mb_ota": [ "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_2mb": [ + "robtillaart/SHT2x@^0.1.1" + ], + "esp8266_2mb_ota": [ + "robtillaart/SHT2x@^0.1.1" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Sht30/modinfo.json b/src/modules/sensors/Sht30/modinfo.json index 9f9647c9..47e42933 100644 --- a/src/modules/sensors/Sht30/modinfo.json +++ b/src/modules/sensors/Sht30/modinfo.json @@ -66,6 +66,12 @@ ], "esp8285_1mb_ota": [ "WEMOS SHT3x@1.0.0" + ], + "esp8266_2mb": [ + "WEMOS SHT3x@1.0.0" + ], + "esp8266_2mb_ota": [ + "WEMOS SHT3x@1.0.0" ] } } \ No newline at end of file diff --git a/src/modules/sensors/Sonar/modinfo.json b/src/modules/sensors/Sonar/modinfo.json index 2aa30e72..8c79734a 100644 --- a/src/modules/sensors/Sonar/modinfo.json +++ b/src/modules/sensors/Sonar/modinfo.json @@ -42,6 +42,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "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 041f2ca1..8ba5ea0a 100644 --- a/src/modules/sensors/UART/modinfo.json +++ b/src/modules/sensors/UART/modinfo.json @@ -9,8 +9,8 @@ "descr": "", "widget": "nil", "id": "u", - "tx": 12, - "rx": 13, + "tx": 4, + "rx": 5, "line": 2, "speed": 9600, "eventFormat": 0 @@ -70,6 +70,19 @@ ], "esp8266_4mb": [ "plerup/EspSoftwareSerial" + ], + "esp8266_1mb": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_1mb_ota": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_2mb": [ + "plerup/EspSoftwareSerial" + ], + "esp8266_2mb_ota": [ + "plerup/EspSoftwareSerial" ] + } } \ No newline at end of file diff --git a/src/modules/virtual/Cron/modinfo.json b/src/modules/virtual/Cron/modinfo.json index ab5eca11..54783e3f 100644 --- a/src/modules/virtual/Cron/modinfo.json +++ b/src/modules/virtual/Cron/modinfo.json @@ -54,6 +54,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/Loging/modinfo.json b/src/modules/virtual/Loging/modinfo.json index 53a962f7..8fbdcbe3 100644 --- a/src/modules/virtual/Loging/modinfo.json +++ b/src/modules/virtual/Loging/modinfo.json @@ -51,6 +51,12 @@ "defActive": true, "usedLibs": { "esp32_4mb": [], - "esp8266_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/virtual/LogingDaily/modinfo.json b/src/modules/virtual/LogingDaily/modinfo.json index 1f4edd66..8118c82a 100644 --- a/src/modules/virtual/LogingDaily/modinfo.json +++ b/src/modules/virtual/LogingDaily/modinfo.json @@ -44,6 +44,12 @@ "defActive": true, "usedLibs": { "esp32_4mb": [], - "esp8266_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/virtual/Timer/modinfo.json b/src/modules/virtual/Timer/modinfo.json index 7f097b29..def3437c 100644 --- a/src/modules/virtual/Timer/modinfo.json +++ b/src/modules/virtual/Timer/modinfo.json @@ -74,6 +74,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "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 2f233598..36e5fabf 100644 --- a/src/modules/virtual/VButton/modinfo.json +++ b/src/modules/virtual/VButton/modinfo.json @@ -40,6 +40,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "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 4c2bfbfa..2a50d1c2 100644 --- a/src/modules/virtual/Variable/modinfo.json +++ b/src/modules/virtual/Variable/modinfo.json @@ -100,6 +100,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } } \ No newline at end of file diff --git a/src/modules/virtual/VariableColor/modinfo.json b/src/modules/virtual/VariableColor/modinfo.json index 7a2a6d72..e03c1ff9 100644 --- a/src/modules/virtual/VariableColor/modinfo.json +++ b/src/modules/virtual/VariableColor/modinfo.json @@ -41,6 +41,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "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 0530ebdf..cbdad91f 100644 --- a/src/modules/virtual/Weather/modinfo.json +++ b/src/modules/virtual/Weather/modinfo.json @@ -48,6 +48,8 @@ "esp8266_1mb": [], "esp8266_1mb_ota": [], "esp8285_1mb": [], - "esp8285_1mb_ota": [] + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] } }