Merge branch 'release/v3.3.1'

builder/frameworks/espidf.py

@@ -109,6 +109,7 @@ def is_cmake_reconfigure_required(cmake_api_reply_dir):
         os.path.join(PROJECT_SRC_DIR, "CMakeLists.txt"),
     ]
     cmake_preconf_dir = os.path.join(BUILD_DIR, "config")
+    deafult_sdk_config = os.path.join(PROJECT_DIR, "sdkconfig.defaults")
 
     for d in (cmake_api_reply_dir, cmake_preconf_dir):
         if not os.path.isdir(d) or not os.listdir(d):
@@ -117,10 +118,14 @@ def is_cmake_reconfigure_required(cmake_api_reply_dir):
         return True
     if not os.path.isfile(os.path.join(BUILD_DIR, "build.ninja")):
         return True
-    if os.path.isfile(SDKCONFIG_PATH) and os.path.getmtime(
+    if not os.path.isfile(SDKCONFIG_PATH) or os.path.getmtime(
         SDKCONFIG_PATH
     ) > os.path.getmtime(cmake_cache_file):
         return True
+    if os.path.isfile(deafult_sdk_config) and os.path.getmtime(
+        deafult_sdk_config
+    ) > os.path.getmtime(cmake_cache_file):
+        return True
     if any(
         os.path.getmtime(f) > os.path.getmtime(cmake_cache_file)
         for f in cmake_txt_files + [cmake_preconf_dir, FRAMEWORK_DIR]

builder/main.py

@@ -31,15 +31,6 @@ def _get_board_f_flash(env):
     return str(int(int(frequency) / 1000000)) + "m"
 
 
-def _get_board_flash_mode(env):
-    mode = env.subst("$BOARD_FLASH_MODE")
-    if mode == "qio":
-        return "dio"
-    elif mode == "qout":
-        return "dout"
-    return mode
-
-
 def _parse_size(value):
     if isinstance(value, int):
         return value
@@ -139,7 +130,6 @@ def __fetch_spiffs_size(target, source, env):
 
 env.Replace(
     __get_board_f_flash=_get_board_f_flash,
-    __get_board_flash_mode=_get_board_flash_mode,
 
     AR="%s-elf-ar" % toolchain_arch,
     AS="%s-elf-as" % toolchain_arch,
@@ -312,7 +302,7 @@ def __fetch_spiffs_size(target, source, env):
             "--before", "default_reset",
             "--after", "hard_reset",
             "write_flash", "-z",
-            "--flash_mode", "${__get_board_flash_mode(__env__)}",
+            "--flash_mode", "$BOARD_FLASH_MODE",
             "--flash_freq", "${__get_board_f_flash(__env__)}",
             "--flash_size", "detect"
         ],

monitor/filter_exception_decoder.py

@@ -32,7 +32,7 @@ class Esp32ExceptionDecoder(DeviceMonitorFilter):
     def __call__(self):
         self.buffer = ""
         self.backtrace_re = re.compile(
-            r"^Backtrace: ?((0x[0-9a-f]+:0x[0-9a-f]+ ?)+)\s*"
+            r"^Backtrace: ?((0x[0-9a-fA-F]+:0x[0-9a-fA-F]+ ?)+)\s*"
         )
 
         self.firmware_path = None

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "3.3.0",
+  "version": "3.3.1",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoespressif32",