Merge branch 'release/v3.3.2'

platformio · Aug 31, 2021 · e170b13 · e170b13
2 parents b8a1469 + 0d2edd0
commit e170b13
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/boards/m5stack-core2.json b/boards/m5stack-core2.json
@@ -25,7 +25,7 @@
   "name": "M5Stack Core2",
   "upload": {
     "flash_size": "16MB",
-    "maximum_ram_size": 6553600,
+    "maximum_ram_size": 4521984,
     "maximum_size": 16777216,
     "require_upload_port": true,
     "speed": 460800

diff --git a/boards/m5stack-fire.json b/boards/m5stack-fire.json
@@ -25,7 +25,7 @@
   "name": "M5Stack FIRE",
   "upload": {
     "flash_size": "16MB",
-    "maximum_ram_size": 6553600,
+    "maximum_ram_size": 4521984,
     "maximum_size": 16777216,
     "require_upload_port": true,
     "speed": 460800

diff --git a/boards/tinypico.json b/boards/tinypico.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DARDUINO_TINYPICO -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
-    "flash_mode": "qio",
+    "flash_mode": "dio",
     "mcu": "esp32",
     "variant": "pico32"
   },
@@ -21,7 +21,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "TinyPICO",
+  "name": "Unexpected Maker TinyPICO",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
@@ -30,5 +30,5 @@
     "speed": 460800
   },
   "url": "https://www.tinypico.com",
-  "vendor": "TinyPICO"
+  "vendor": "Unexpected Maker"
 }
diff --git a/builder/frameworks/_embed_files.py b/builder/frameworks/_embed_files.py
@@ -28,15 +28,10 @@
 
 
 def extract_files(cppdefines, files_type):
-    files = []
-    if "build." + files_type in board:
-        files.extend(
-            [
-                join("$PROJECT_DIR", f)
-                for f in board.get("build." + files_type, "").split()
-                if f
-            ]
-        )
+    result = []
+    files = env.GetProjectOption("board_build.%s" % files_type, "").splitlines()
+    if files:
+        result.extend([join("$PROJECT_DIR", f.strip()) for f in files if f])
     else:
         files_define = "COMPONENT_" + files_type.upper()
         for define in cppdefines:
@@ -58,13 +53,13 @@ def extract_files(cppdefines, files_type):
             for f in value.split(":"):
                 if not f:
                     continue
-                files.append(join("$PROJECT_DIR", f))
+                result.append(join("$PROJECT_DIR", f))
 
-    for f in files:
+    for f in result:
         if not isfile(env.subst(f)):
             print('Warning! Could not find file "%s"' % basename(f))
 
-    return files
+    return result
 
 
 def remove_config_define(cppdefines, files_type):

diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
@@ -838,9 +838,8 @@ def create_version_file():
     version_file = os.path.join(FRAMEWORK_DIR, "version.txt")
     if not os.path.isfile(version_file):
         with open(version_file, "w") as fp:
-            fp.write(
-                get_original_version(platform.get_package_version("framework-espidf"))
-            )
+            package_version = platform.get_package_version("framework-espidf")
+            fp.write(get_original_version(package_version) or package_version)
 
 
 def generate_empty_partition_image(binary_path, image_size):

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