Rename fetch_fs_size in env, simplify mbed upload, remove PIO 3.6 legacy code

This commit is contained in:
unknown 2022-06-17 01:10:42 +02:00
parent ab1e380b64
commit 52bb6e5d7f

View File

@ -210,7 +210,7 @@ env.Append(
) )
# store function to get infno about filesystems for builder scripts. # store function to get infno about filesystems for builder scripts.
env["fetch_fs_size"] = fetch_fs_size env["__fetch_fs_size"] = fetch_fs_size
# #
# Target: Build executable and linkable firmware # Target: Build executable and linkable firmware
@ -249,9 +249,6 @@ if env.get("PIOMAINPROG"):
env.VerboseAction( env.VerboseAction(
lambda source, target, env: _update_max_upload_size(env), lambda source, target, env: _update_max_upload_size(env),
"Retrieving maximum program size $SOURCE")) "Retrieving maximum program size $SOURCE"))
# remove after PIO Core 3.6 release
elif set(["checkprogsize", "upload"]) & set(COMMAND_LINE_TARGETS):
_update_max_upload_size(env)
# #
# Target: Print binary size # Target: Print binary size
@ -295,12 +292,11 @@ def UploadUF2ToDisk(target, source, env):
"Firmware has been successfully uploaded.\n" "Firmware has been successfully uploaded.\n"
"(Some boards may require manual hard reset)" "(Some boards may require manual hard reset)"
) )
env.UploadUF2ToDisk = UploadUF2ToDisk
if upload_protocol == "mbed": if upload_protocol == "mbed":
upload_actions = [ upload_actions = [
env.VerboseAction(env.AutodetectUploadPort, "Looking for upload disk..."), env.VerboseAction(env.AutodetectUploadPort, "Looking for upload disk..."),
env.VerboseAction(env.UploadUF2ToDisk, "Uploading $SOURCE") env.VerboseAction(UploadUF2ToDisk, "Uploading $SOURCE")
] ]
elif upload_protocol == "picotool": elif upload_protocol == "picotool":
env.Replace( env.Replace(