Merge 5544f43162 into 0f496fee42

platformio.ini

@@ -60,16 +60,10 @@ monitor_filters =
 	esp8266_exception_decoder
 board_build.flash_mode = dio
 board_build.filesystem = littlefs
-check_tool = ; pvs-studio
-check_flags =
-;  pvs-studio:
-;    --analysis-mode=4
-;    --exclude-path=./.pio/libdeps
 
 ; Defaults
 [esp8266_defaults]
 platform = espressif8266@^4.2.1
-platform_packages = ${env.platform_packages}
 lib_deps = 
 	${env.lib_deps}
 	nrwiersma/ESP8266Scheduler@^1.2
@@ -83,8 +77,6 @@ build_flags =
 	;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
 	-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 board_build.ldscript = eagle.flash.4m1m.ld
-check_tool = ${env.check_tool}
-check_flags = ${env.check_flags}
 
 [esp32_defaults]
 ;platform = espressif32@^6.7
@@ -92,8 +84,8 @@ check_flags = ${env.check_flags}
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20/platform-espressif32.zip
-platform_packages = ${env.platform_packages}
+platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
@@ -108,14 +100,11 @@ build_flags =
 	${env.build_flags}
 	-D CORE_DEBUG_LEVEL=0
 	-Wl,--wrap=esp_panic_handler
-check_tool = ${env.check_tool}
-check_flags = ${env.check_flags}
 
 
 ; Boards
 [env:d1_mini]
 platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
 board = d1_mini
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -130,12 +119,9 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
 	-D DEFAULT_STATUS_LED_GPIO=13
 	-D DEFAULT_OT_RX_LED_GPIO=15
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
 
 [env:d1_mini_lite]
 platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
 board = d1_mini_lite
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -150,12 +136,9 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
 	-D DEFAULT_STATUS_LED_GPIO=13
 	-D DEFAULT_OT_RX_LED_GPIO=15
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
 
 [env:d1_mini_pro]
 platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
 board = d1_mini_pro
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -170,12 +153,9 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
 	-D DEFAULT_STATUS_LED_GPIO=13
 	-D DEFAULT_OT_RX_LED_GPIO=15
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
 
 [env:nodemcu_8266]
 platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
 board = nodemcuv2
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -190,8 +170,6 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=4
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=16
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
 
 [env:s2_mini]
 platform = ${esp32_defaults.platform}
@@ -214,8 +192,6 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=7
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=12
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
 
 [env:s3_mini] 
 platform = ${esp32_defaults.platform}
@@ -242,8 +218,6 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=12
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=10
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
 
 [env:c3_mini] 
 platform = ${esp32_defaults.platform}
@@ -268,8 +242,6 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=1
 	-D DEFAULT_STATUS_LED_GPIO=4
 	-D DEFAULT_OT_RX_LED_GPIO=5
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
 
 [env:nodemcu_32]
 platform = ${esp32_defaults.platform}
@@ -291,8 +263,6 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=26
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=19
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
 
 [env:d1_mini32]
 platform = ${esp32_defaults.platform}
@@ -314,8 +284,6 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=18
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=19
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
 
 [env:esp32_c6]
 platform = ${esp32_defaults.platform}
@@ -344,8 +312,6 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=0
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=10
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
 
 [env:otthing] 
 platform = ${esp32_defaults.platform}
@@ -371,5 +337,3 @@ build_flags =
 	-D DEFAULT_STATUS_LED_GPIO=8
 	-D DEFAULT_OT_RX_LED_GPIO=2
 	-D OT_BYPASS_RELAY_GPIO=20
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}

src_data/pages/dashboard.html

@@ -21,7 +21,6 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
-              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/index.html

@@ -21,7 +21,6 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
-              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/network.html

@@ -21,7 +21,6 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
-              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/sensors.html

@@ -21,7 +21,6 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
-              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/settings.html

@@ -21,7 +21,6 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
-              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/upgrade.html

@@ -21,7 +21,6 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
-              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

tools/esp32.py

@@ -28,17 +28,6 @@ from os.path import join
 sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
 import esptool
 
-def esptool_call(cmd):
-    try:
-        esptool.main(cmd)
-    except SystemExit as e:
-        # Fetch sys.exit() without leaving the script
-        if e.code == 0:
-            return True
-        else:
-            print(f"❌ esptool failed with exit code: {e.code}")
-            return False
-
 def esp32_create_combined_bin(source, target, env):
     print("Generating combined binary for serial flashing")
 
@@ -50,21 +39,26 @@ def esp32_create_combined_bin(source, target, env):
     sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
     firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
     chip = env.get("BOARD_MCU")
-    flash_size = env.BoardConfig().get("upload.flash_size", "4MB")
+    flash_size = env.BoardConfig().get("upload.flash_size")
-    flash_mode = env["__get_board_flash_mode"](env)
+    flash_freq = env.BoardConfig().get("build.f_flash", '40m')
-    flash_freq = env["__get_board_f_flash"](env)
+    flash_freq = flash_freq.replace('000000L', 'm')
-
+    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
+    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
+    if flash_mode == "qio" or flash_mode == "qout":
+        flash_mode = "dio"
+    if memory_type == "opi_opi" or memory_type == "opi_qspi":
+        flash_mode = "dout"
     cmd = [
         "--chip",
         chip,
-        "merge-bin",
+        "merge_bin",
         "-o",
         new_file_name,
-        "--flash-mode",
+        "--flash_mode",
         flash_mode,
-        "--flash-freq",
+        "--flash_freq",
         flash_freq,
-        "--flash-size",
+        "--flash_size",
         flash_size,
     ]
 
@@ -79,7 +73,7 @@ def esp32_create_combined_bin(source, target, env):
 
     print('Using esptool.py arguments: %s' % ' '.join(cmd))
 
-    esptool_call(cmd)
+    esptool.main(cmd)
 
 
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)