Skip to content

Commit

Permalink
Merge branch 'release/v2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Sep 7, 2020
2 parents a1e6055 + 43d34bc commit 86db0c0
Show file tree
Hide file tree
Showing 99 changed files with 1,786 additions and 1,072 deletions.
2 changes: 1 addition & 1 deletion boards/az-delivery-devkit-v4.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
"name": "AZ-Delivery ESP-32 Dev Kit C V4",
"upload": {
"flash_size": "16MB",
"flash_size": "4MB",
"maximum_ram_size": 532480,
"maximum_size": 16777216,
"require_upload_port": true,
Expand Down
4 changes: 3 additions & 1 deletion builder/frameworks/_embed_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ def embed_files(files, files_type):


def transform_to_asm(target, source, env):
return [join("$BUILD_DIR", s.name + ".S") for s in source], source
files = [join("$BUILD_DIR", s.name + ".S") for s in source]
env.AppendUnique(PIOBUILDFILES=files)
return files, source

env.Append(
BUILDERS=dict(
Expand Down
Loading

0 comments on commit 86db0c0

Please sign in to comment.