Merge branch 'release/v1.3.0'
This commit is contained in:
commit
ff7f704a42
@ -43,7 +43,7 @@ def generate_uf2(target, source, env):
|
|||||||
env.Execute(
|
env.Execute(
|
||||||
" ".join(
|
" ".join(
|
||||||
[
|
[
|
||||||
join(platform.get_package_dir("tool-rp2040tools") or "", "elf2uf2"),
|
"elf2uf2",
|
||||||
'"%s"' % elf_file,
|
'"%s"' % elf_file,
|
||||||
'"%s"' % elf_file.replace(".elf", ".uf2"),
|
'"%s"' % elf_file.replace(".elf", ".uf2"),
|
||||||
]
|
]
|
||||||
@ -156,7 +156,7 @@ elif upload_protocol == "picotool":
|
|||||||
env.Replace(
|
env.Replace(
|
||||||
UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
|
UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
|
||||||
UPLOADERFLAGS=["-v", "-D"],
|
UPLOADERFLAGS=["-v", "-D"],
|
||||||
UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
|
UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
|
||||||
)
|
)
|
||||||
|
|
||||||
upload_actions = [
|
upload_actions = [
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/platformio/platform-raspberrypi.git"
|
"url": "https://github.com/platformio/platform-raspberrypi.git"
|
||||||
},
|
},
|
||||||
"version": "1.2.0",
|
"version": "1.3.0",
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"arduino": {
|
"arduino": {
|
||||||
"package": "framework-arduino-mbed",
|
"package": "framework-arduino-mbed",
|
||||||
@ -35,7 +35,7 @@
|
|||||||
"type": "framework",
|
"type": "framework",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"owner": "platformio",
|
"owner": "platformio",
|
||||||
"version": "~2.3.0"
|
"version": "~2.4.0"
|
||||||
},
|
},
|
||||||
"tool-rp2040tools": {
|
"tool-rp2040tools": {
|
||||||
"type": "uploader",
|
"type": "uploader",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user