Merge branch 'platformio:develop' into develop

Author: Jason2866

.github/workflows/examples.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, windows-latest, macos-latest]
+        os: [ubuntu-18.04, windows-latest, macos-latest]
         python-version: [3.7]
         example:
           - "examples/arduino-blink"

boards/esp32-c3-devkitm-1.json

@@ -0,0 +1,32 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32c3_out.ld"
+    },
+    "core": "esp32",
+    "f_cpu": "160000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32c3",
+    "variant": "esp32c3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32c3.cfg"
+  },
+  "frameworks": [
+    "espidf"
+  ],
+  "name": "Espressif ESP32-C3-DevKitM-1",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html",
+  "vendor": "Espressif"
+}

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

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

boards/tinypico.json

@@ -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"
 }

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):
@@ -130,7 +125,7 @@ def transform_to_asm(target, source, env):
             ),
             suffix=".txt.o",
         ),
-        TxtToAsm=Builder(
+        FileToAsm=Builder(
             action=env.VerboseAction(
                 " ".join(
                     [
@@ -141,7 +136,7 @@ def transform_to_asm(target, source, env):
                         ),
                         "-DDATA_FILE=$SOURCE",
                         "-DSOURCE_FILE=$TARGET",
-                        "-DFILE_TYPE=TEXT",
+                        "-DFILE_TYPE=$FILE_TYPE",
                         "-P",
                         join(
                             env.PioPlatform().get_package_dir("framework-espidf") or "",
@@ -171,7 +166,13 @@ def transform_to_asm(target, source, env):
 
     files = extract_files(flags, files_type)
     if "espidf" in env.subst("$PIOFRAMEWORK"):
-        env.Requires(join("$BUILD_DIR", "${PROGNAME}.elf"), env.TxtToAsm(files))
+        env.Requires(
+            join("$BUILD_DIR", "${PROGNAME}.elf"),
+            env.FileToAsm(
+                files,
+                FILE_TYPE="TEXT" if files_type == "embed_txtfiles" else "BINARY",
+            ),
+        )
     else:
         embed_files(files, files_type)
         remove_config_define(flags, files_type)