Add esp32_16m & esp8266_16m

include/Const.h

@@ -24,10 +24,18 @@
 #define FIRMWARE_NAME "esp8266_4mb"
 #endif
 
+#ifdef esp8266_16mb
+#define FIRMWARE_NAME "esp8266_16mb"
+#endif
+
 #ifdef esp32_4mb
 #define FIRMWARE_NAME "esp32_4mb"
 #endif
 
+#ifdef esp32_16mb
+#define FIRMWARE_NAME "esp32_16mb"
+#endif
+
 #ifdef esp32s2_4mb
 #define FIRMWARE_NAME "esp32s2_4mb"
 #endif

platformio.ini

@@ -1,5 +1,5 @@
 [platformio]
-default_envs = esp8266_4mb
+default_envs = esp8266_16mb
 data_dir = data_svelte
 
 [common_env_data]
@@ -157,6 +157,28 @@ build_src_filter =
 	+<modules/*.cpp>
 	${env:esp8266_4mb_fromitems.build_src_filter}
 
+[env:esp8266_16mb]
+extra_scripts = pre:tools/patch8266_16m.py
+lib_deps = 
+	${common_env_data.lib_deps_external}
+	${env:esp8266_16mb_fromitems.lib_deps}
+	ESPAsyncUDP
+build_flags = -Desp8266_16mb="esp8266_16mb"
+framework = arduino
+board = nodemcuv2
+platform = espressif8266 @4.0.1
+board_build.ldscript = eagle.flash.16m14m.ld
+monitor_filters = esp8266_exception_decoder
+upload_speed = 921600
+monitor_speed = 115200
+board_build.filesystem = littlefs
+build_src_filter = 
+	+<*.cpp>
+	+<classes/*.cpp>
+	+<utils/*.cpp>
+	+<modules/*.cpp>
+	${env:esp8266_16mb_fromitems.build_src_filter}
+
 [env:esp32_4mb]
 lib_deps = 
 	${common_env_data.lib_deps_external}
@@ -200,6 +222,29 @@ build_src_filter =
 	+<modules/*.cpp>
 	${env:esp32s2_4mb_fromitems.build_src_filter}
 
+[env:esp32_16mb]
+lib_deps = 
+	${common_env_data.lib_deps_external}
+	${env:esp32_16mb_fromitems.lib_deps}
+build_flags = -Desp32_16mb="esp32_16mb"
+framework = arduino
+board = esp32dev
+platform = espressif32 @5.1.1
+monitor_filters = esp32_exception_decoder
+upload_port = COM11
+upload_speed = 921600
+monitor_speed = 115200
+debug_tool = esp-prog
+board_build.partitions = tools/large_spiffs_16MB.csv
+board_upload.flash_size = 16MB
+board_build.filesystem = littlefs
+build_src_filter = 
+	+<*.cpp>
+	+<classes/*.cpp>
+	+<utils/*.cpp>
+	+<modules/*.cpp>
+	${env:esp32_16mb_fromitems.build_src_filter}
+
 [env:esp8266_1mb_ota_fromitems]
 lib_deps = 
 	adafruit/Adafruit BME280 Library
@@ -505,7 +550,6 @@ build_src_filter =
 	+<modules/display/Lcd2004>
 	+<modules/display/Smi2_m>
 
-
 [env:esp32s2_4mb_fromitems]
 lib_deps = 
 build_src_filter = 
@@ -521,3 +565,31 @@ build_src_filter =
 	+<modules/exec/Ftp>
 	+<modules/exec/TelegramLT>
 
+[env:esp8266_16mb_fromitems]
+lib_deps = 
+	gyverlibs/EncButton @ ^2.0
+build_src_filter = 
+	+<modules/virtual/Cron>
+	+<modules/virtual/Loging>
+	+<modules/virtual/LogingDaily>
+	+<modules/virtual/Timer>
+	+<modules/virtual/Variable>
+	+<modules/virtual/VariableColor>
+	+<modules/virtual/VButton>
+	+<modules/exec/ButtonIn>
+	+<modules/exec/ButtonOut>
+	+<modules/exec/Enconder>
+	+<modules/exec/TelegramLT>
+
+[env:esp32_16mb_fromitems]
+lib_deps = 
+build_src_filter = 
+	+<modules/virtual/Cron>
+	+<modules/virtual/Loging>
+	+<modules/virtual/LogingDaily>
+	+<modules/virtual/Timer>
+	+<modules/virtual/Variable>
+	+<modules/virtual/VButton>
+	+<modules/exec/ButtonOut>
+	+<modules/exec/TelegramLT>
+

src/PeriodicTasks.cpp

@@ -101,7 +101,7 @@ String ESP32GetResetReason(uint32_t cpu_no) {
     }
 }
 #endif
-#ifdef esp32_4mb
+#if defined(esp32_4mb) || defined(esp32_16mb) 
 String ESP_getResetReason(void) {
     return ESP32GetResetReason(0);  // CPU 0
 }

src/UpgradeFirm.cpp

@@ -74,7 +74,7 @@ bool upgradeBuild() {
         handleUpdateStatus(true, PATH_ERROR);
         return ret;
     }
-#if defined(esp8266_4mb) || defined(esp8266_1mb) || defined(esp8266_1mb_ota) || defined(esp8266_2mb) || defined(esp8266_2mb_ota)
+#if defined(esp8266_4mb) || defined(esp8266_16mb) || 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

src/modules/exec/ButtonIn/modinfo.json

@@ -46,7 +46,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/exec/ButtonOut/modinfo.json

@@ -45,7 +45,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/exec/Enconder/modinfo.json

@@ -50,6 +50,9 @@
         "esp8266_4mb": [
             "gyverlibs/EncButton @ ^2.0"
         ],
+        "esp8266_16mb": [
+            "gyverlibs/EncButton @ ^2.0"
+        ],
         "esp8266_1mb": [
             "gyverlibs/EncButton @ ^2.0"
         ],

src/modules/exec/Ftp/modinfo.json

@@ -39,8 +39,10 @@
   "defActive": false,
   "usedLibs": {
     "esp32_4mb": [],
+    "esp32_16mb": [],
     "esp32s2_4mb": [],
-    "esp8266_4mb": []
+    "esp8266_4mb": [],
+    "esp8266_16mb": []
   }
 }
 

src/modules/exec/Telegram/modinfo.json

@@ -57,6 +57,9 @@
         "esp32_4mb": [
             "CTBot @2.1.9"
         ],
+        "esp32_16mb": [
+            "CTBot @2.1.9"
+        ],
         "esp8266_4mb": [
             "CTBot @2.1.9"
         ]

src/modules/exec/TelegramLT/modinfo.json

@@ -56,8 +56,10 @@
 
   "usedLibs": {
     "esp32_4mb": [],
+    "esp32_16mb": [],
     "esp32s2_4mb": [],
     "esp8266_4mb": [],
+    "esp8266_16mb": [],
     "esp8266_1mb": [],
     "esp8266_1mb_ota": [],
     "esp8285_1mb": [],

src/modules/virtual/Cron/modinfo.json

@@ -50,8 +50,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
         "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/virtual/Loging/modinfo.json

@@ -51,8 +51,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
         "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/virtual/LogingDaily/modinfo.json

@@ -44,8 +44,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
         "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/virtual/Timer/modinfo.json

@@ -70,8 +70,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
         "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/virtual/VButton/modinfo.json

@@ -36,8 +36,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
         "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/virtual/Variable/modinfo.json

@@ -96,8 +96,10 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
         "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/virtual/VariableColor/modinfo.json

@@ -37,8 +37,10 @@
     
       "usedLibs": {
         "esp32_4mb": [],
+        "esp32_16mb": [],
         "esp32s2_4mb": [],
         "esp8266_4mb": [],
+        "esp8266_16mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],

src/modules/virtual/Weather/modinfo.json

@@ -44,8 +44,10 @@
 
   "usedLibs": {
     "esp32_4mb": [],
+    "esp32_16mb": [],
     "esp32s2_4mb": [],
     "esp8266_4mb": [],
+    "esp8266_16mb": [],
     "esp8266_1mb": [],
     "esp8266_1mb_ota": [],
     "esp8285_1mb": [],

tools/large_spiffs_16MB.csv

@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x480000,
+app1,     app,  ota_1,   0x490000,0x480000,
+spiffs,   data, spiffs,  0x910000,0x6E0000,
+coredump, data, coredump,0xFF0000,0x10000,

tools/patch8266_16m.py

@@ -0,0 +1,16 @@
+# правим  %USERPROFILE%\.platformio\platforms\espressif8266\builder\main.py 103-115
+# для добавления возможности прошивки 16мб модуля esp8266
+
+import os
+import shutil
+
+
+mainPyPath = os.environ['USERPROFILE'] + '\\.platformio\\platforms\\espressif8266@4.0.1\\builder\\main.py'
+
+with open(mainPyPath) as fr:
+    oldData = fr.read()
+    if not 'if _value == -0x6000:' in oldData:
+        shutil.copyfile(mainPyPath, mainPyPath+'.bak')
+        newData = oldData.replace('_value += 0xE00000  # correction', '_value += 0xE00000  # correction\n\n        if _value == -0x6000:\n            _value = env[k]-0x40200000')
+        with open(mainPyPath, 'w') as fw:
+            fw.write(newData)