diff --git a/builder/main.py b/builder/main.py
index 21a63a7..b3828ab 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -1,251 +1,258 @@
-# Copyright 2019-present PlatformIO <contact@platformio.org>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-from os.path import join
-
-from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
-                          Builder, Default, DefaultEnvironment)
-
-from platformio.public import list_serial_ports
-
-
-def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
-    upload_options = {}
-    if "BOARD" in env:
-        upload_options = env.BoardConfig().get("upload", {})
-
-    if env.subst("$UPLOAD_SPEED"):
-        env.Append(UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"])
-
-    # extra upload flags
-    if "extra_flags" in upload_options:
-        env.Append(UPLOADERFLAGS=upload_options.get("extra_flags"))
-
-    if upload_options and not upload_options.get("require_upload_port", False):
-        # upload methods via USB
-        env.Append(UPLOADERFLAGS=["-P", "usb"])
-        return
-
-    env.AutodetectUploadPort()
-    env.Append(UPLOADERFLAGS=["-P", '"$UPLOAD_PORT"'])
-
-    before_ports = list_serial_ports()
-
-    if upload_options.get("use_1200bps_touch", False):
-        env.TouchSerialPort("$UPLOAD_PORT", 1200)
-
-    if upload_options.get("wait_for_upload_port", False):
-        env.Replace(UPLOAD_PORT=env.WaitForNewSerialPort(before_ports))
-
-
-env = DefaultEnvironment()
-
-env.Replace(
-    AR="avr-gcc-ar",
-    AS="avr-as",
-    CC="avr-gcc",
-    GDB="avr-gdb",
-    CXX="avr-g++",
-    OBJCOPY="avr-objcopy",
-    RANLIB="avr-gcc-ranlib",
-    SIZETOOL="avr-size",
-
-    ARFLAGS=["rc"],
-
-    SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.bootloader)\s+([0-9]+).*",
-    SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+([0-9]+).* ",
-    SIZEEEPROMREGEXP=r"^(?:\.eeprom)\s+([0-9]+).*",
-    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
-    SIZEPRINTCMD='$SIZETOOL --mcu=$BOARD_MCU -C -d $SOURCES',
-
-    UPLOADER="avrdude",
-    UPLOADERFLAGS=[
-        "-p", "$BOARD_MCU", "-C",
-        join(
-            env.PioPlatform().get_package_dir(
-                "tool-avrdude"
-                if env.BoardConfig().get("build.core", "") in ("MegaCoreX", "megatinycore")
-                else "tool-avrdude-megaavr"
-            )
-            or "",
-            "avrdude.conf",
-        ),
-        "-c", "$UPLOAD_PROTOCOL"
-    ],
-    UPLOADCMD="$UPLOADER $UPLOADERFLAGS -U flash:w:$SOURCES:i",
-
-    PROGSUFFIX=".elf"
-)
-
-env.Append(
-    BUILDERS=dict(
-        ElfToBin=Builder(
-            action=env.VerboseAction(" ".join([
-                "$OBJCOPY",
-                "-O",
-                "binary",
-                "-R",
-                ".eeprom",
-                "$SOURCES",
-                "$TARGET"
-            ]), "Building $TARGET"),
-            suffix=".bin"
-        ),
-
-        ElfToEep=Builder(
-            action=env.VerboseAction(" ".join([
-                "$OBJCOPY",
-                "-O",
-                "ihex",
-                "-j",
-                ".eeprom",
-                '--set-section-flags=.eeprom="alloc,load"',
-                "--no-change-warnings",
-                "--change-section-lma",
-                ".eeprom=0",
-                "$SOURCES",
-                "$TARGET"
-            ]), "Building $TARGET"),
-            suffix=".eep"
-        ),
-
-        ElfToHex=Builder(
-            action=env.VerboseAction(" ".join([
-                "$OBJCOPY",
-                "-O",
-                "ihex",
-                "-R",
-                ".eeprom",
-                "$SOURCES",
-                "$TARGET"
-            ]), "Building $TARGET"),
-            suffix=".hex"
-        )
-    )
-)
-
-# Allow user to override via pre:script
-if env.get("PROGNAME", "program") == "program":
-    env.Replace(PROGNAME="firmware")
-
-if not env.get("PIOFRAMEWORK"):
-    env.SConscript("frameworks/_bare.py", exports="env")
-
-#
-# Target: Build executable and linkable firmware
-#
-
-target_elf = None
-if "nobuild" in COMMAND_LINE_TARGETS:
-    target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
-    target_firm = join("$BUILD_DIR", "${PROGNAME}.hex")
-else:
-    target_elf = env.BuildProgram()
-    target_firm = env.ElfToHex(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
-    env.Depends(target_firm, "checkprogsize")
-
-AlwaysBuild(env.Alias("nobuild", target_firm))
-target_buildprog = env.Alias("buildprog", target_firm, target_firm)
-
-#
-# Target: Print binary size
-#
-
-target_size = env.AddPlatformTarget(
-    "size",
-    target_elf,
-    env.VerboseAction("$SIZEPRINTCMD", "Calculating size $SOURCE"),
-    "Program Size",
-    "Calculate program size",
-)
-
-#
-# Target: Setup fuses
-#
-
-fuses_actions = None
-if "fuses" in COMMAND_LINE_TARGETS:
-    fuses_actions = [
-        env.VerboseAction(BeforeUpload, "Looking for port..."),
-        env.SConscript("fuses.py", exports="env")
-    ]
-env.AddPlatformTarget("fuses", None, fuses_actions, "Set Fuses")
-
-#
-# Target: Upload bootloader
-#
-
-bootloader_actions = None
-if "bootloader" in COMMAND_LINE_TARGETS:
-    bootloader_actions = env.SConscript("bootloader.py", exports="env")
-env.AddPlatformTarget("bootloader", None, bootloader_actions, "Burn Bootloader")
-
-#
-# Target: Upload by default .hex file
-#
-
-upload_protocol = env.subst("$UPLOAD_PROTOCOL")
-
-if upload_protocol == "custom":
-    upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
-else:
-    upload_actions = [
-        env.VerboseAction(BeforeUpload, "Looking for upload port..."),
-        env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")
-    ]
-
-    upload_options = env.BoardConfig().get("upload", {})
-    if upload_protocol in ("jtag2updi", "serialupdi"):
-        upload_options["require_upload_port"] = True
-    elif upload_protocol == "arduino":
-        upload_options["require_upload_port"] = True
-        upload_options["use_1200bps_touch"] = False
-        upload_options["wait_for_upload_port"] = False
-        env.Append(UPLOADERFLAGS=["-D"])
-
-    board = env.subst("$BOARD")
-    if "upload" in COMMAND_LINE_TARGETS and "arduino" in env.subst("$PIOFRAMEWORK"):
-        if board == "uno_wifi_rev2":
-            # uno_wifi_rev2 requires bootloader to be uploaded in any case
-            env.SConscript("bootloader.py", exports="env")
-            env.Append(UPLOADERFLAGS=env["FUSESFLAGS"])
-            env.Append(UPLOADERFLAGS=env["BOOTFLAGS"])
-
-        elif board == "nano_every":
-            env.SConscript("fuses.py", exports="env")
-            env.Append(UPLOADERFLAGS=env["FUSESFLAGS"])
-
-if int(ARGUMENTS.get("PIOVERBOSE", 0)):
-    env.Prepend(UPLOADERFLAGS=["-v"])
-
-env.AddPlatformTarget("upload", target_firm, upload_actions, "Upload")
-
-#
-# Deprecated target: Upload firmware using external programmer
-#
-
-if "program" in COMMAND_LINE_TARGETS:
-    sys.stderr.write(
-        "Error: `program` target is deprecated. To use a programmer for uploading "
-        "specify custom `upload_command`.\n"
-        "More details: https://docs.platformio.org/en/latest/platforms/"
-        "atmelavr.html#upload-using-programmer\n")
-    env.Exit(1)
-
-#
-# Setup default targets
-#
-
-Default([target_buildprog, target_size])
+# Copyright 2019-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+from os.path import join
+
+from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
+                          Builder, Default, DefaultEnvironment)
+
+from platformio.public import list_serial_ports
+
+
+def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
+    upload_options = {}
+    if "BOARD" in env:
+        upload_options = env.BoardConfig().get("upload", {})
+
+    if env.subst("$UPLOAD_SPEED"):
+        env.Append(UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"])
+
+    # extra upload flags
+    if "extra_flags" in upload_options:
+        env.Append(UPLOADERFLAGS=upload_options.get("extra_flags"))
+
+    if upload_options and not upload_options.get("require_upload_port", False):
+        # upload methods via USB
+        env.Append(UPLOADERFLAGS=["-P", "usb"])
+        return
+
+    env.AutodetectUploadPort()
+    env.Append(UPLOADERFLAGS=["-P", '"$UPLOAD_PORT"'])
+
+    before_ports = list_serial_ports()
+
+    if upload_options.get("use_1200bps_touch", False):
+        env.TouchSerialPort("$UPLOAD_PORT", 1200)
+
+    if upload_options.get("wait_for_upload_port", False):
+        env.Replace(UPLOAD_PORT=env.WaitForNewSerialPort(before_ports))
+
+
+env = DefaultEnvironment()
+def _have_avrdude(env):
+    for i in env.PioPlatform().get_installed_packages():
+        if i.metadata.name == 'tool-avrdude': return True
+    return False
+
+if _have_avrdude(env):
+    env.Replace(
+        UPLOADER="avrdude",
+        UPLOADERFLAGS=[
+            "-p", "$BOARD_MCU", "-C",
+            join(
+                env.PioPlatform().get_package_dir(
+                    "tool-avrdude"
+                    if env.BoardConfig().get("build.core", "") in ("MegaCoreX", "megatinycore")
+                    else "tool-avrdude-megaavr"
+                )
+                or "",
+                "avrdude.conf",
+            ),
+            "-c", "$UPLOAD_PROTOCOL"
+        ],
+        UPLOADCMD="$UPLOADER $UPLOADERFLAGS -U flash:w:$SOURCES:i",
+    )
+
+env.Replace(
+    AR="avr-gcc-ar",
+    AS="avr-as",
+    CC="avr-gcc",
+    GDB="avr-gdb",
+    CXX="avr-g++",
+    OBJCOPY="avr-objcopy",
+    RANLIB="avr-gcc-ranlib",
+    SIZETOOL="avr-size",
+
+    ARFLAGS=["rc"],
+
+    SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.bootloader)\s+([0-9]+).*",
+    SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+([0-9]+).* ",
+    SIZEEEPROMREGEXP=r"^(?:\.eeprom)\s+([0-9]+).*",
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
+    SIZEPRINTCMD='$SIZETOOL --mcu=$BOARD_MCU -C -d $SOURCES',
+
+    PROGSUFFIX=".elf"
+)
+
+env.Append(
+    BUILDERS=dict(
+        ElfToBin=Builder(
+            action=env.VerboseAction(" ".join([
+                "$OBJCOPY",
+                "-O",
+                "binary",
+                "-R",
+                ".eeprom",
+                "$SOURCES",
+                "$TARGET"
+            ]), "Building $TARGET"),
+            suffix=".bin"
+        ),
+
+        ElfToEep=Builder(
+            action=env.VerboseAction(" ".join([
+                "$OBJCOPY",
+                "-O",
+                "ihex",
+                "-j",
+                ".eeprom",
+                '--set-section-flags=.eeprom="alloc,load"',
+                "--no-change-warnings",
+                "--change-section-lma",
+                ".eeprom=0",
+                "$SOURCES",
+                "$TARGET"
+            ]), "Building $TARGET"),
+            suffix=".eep"
+        ),
+
+        ElfToHex=Builder(
+            action=env.VerboseAction(" ".join([
+                "$OBJCOPY",
+                "-O",
+                "ihex",
+                "-R",
+                ".eeprom",
+                "$SOURCES",
+                "$TARGET"
+            ]), "Building $TARGET"),
+            suffix=".hex"
+        )
+    )
+)
+
+# Allow user to override via pre:script
+if env.get("PROGNAME", "program") == "program":
+    env.Replace(PROGNAME="firmware")
+
+if not env.get("PIOFRAMEWORK"):
+    env.SConscript("frameworks/_bare.py", exports="env")
+
+#
+# Target: Build executable and linkable firmware
+#
+
+target_elf = None
+if "nobuild" in COMMAND_LINE_TARGETS:
+    target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
+    target_firm = join("$BUILD_DIR", "${PROGNAME}.hex")
+else:
+    target_elf = env.BuildProgram()
+    target_firm = env.ElfToHex(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
+    env.Depends(target_firm, "checkprogsize")
+
+AlwaysBuild(env.Alias("nobuild", target_firm))
+target_buildprog = env.Alias("buildprog", target_firm, target_firm)
+
+#
+# Target: Print binary size
+#
+
+target_size = env.AddPlatformTarget(
+    "size",
+    target_elf,
+    env.VerboseAction("$SIZEPRINTCMD", "Calculating size $SOURCE"),
+    "Program Size",
+    "Calculate program size",
+)
+
+#
+# Target: Setup fuses
+#
+
+fuses_actions = None
+if "fuses" in COMMAND_LINE_TARGETS:
+    fuses_actions = [
+        env.VerboseAction(BeforeUpload, "Looking for port..."),
+        env.SConscript("fuses.py", exports="env")
+    ]
+env.AddPlatformTarget("fuses", None, fuses_actions, "Set Fuses")
+
+#
+# Target: Upload bootloader
+#
+
+bootloader_actions = None
+if "bootloader" in COMMAND_LINE_TARGETS:
+    bootloader_actions = env.SConscript("bootloader.py", exports="env")
+env.AddPlatformTarget("bootloader", None, bootloader_actions, "Burn Bootloader")
+
+#
+# Target: Upload by default .hex file
+#
+
+upload_protocol = env.subst("$UPLOAD_PROTOCOL")
+
+if upload_protocol == "custom":
+    upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
+else:
+    upload_actions = [
+        env.VerboseAction(BeforeUpload, "Looking for upload port..."),
+        env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")
+    ]
+
+    upload_options = env.BoardConfig().get("upload", {})
+    if upload_protocol in ("jtag2updi", "serialupdi"):
+        upload_options["require_upload_port"] = True
+    elif upload_protocol == "arduino":
+        upload_options["require_upload_port"] = True
+        upload_options["use_1200bps_touch"] = False
+        upload_options["wait_for_upload_port"] = False
+        env.Append(UPLOADERFLAGS=["-D"])
+
+    board = env.subst("$BOARD")
+    if "upload" in COMMAND_LINE_TARGETS and "arduino" in env.subst("$PIOFRAMEWORK"):
+        if board == "uno_wifi_rev2":
+            # uno_wifi_rev2 requires bootloader to be uploaded in any case
+            env.SConscript("bootloader.py", exports="env")
+            env.Append(UPLOADERFLAGS=env["FUSESFLAGS"])
+            env.Append(UPLOADERFLAGS=env["BOOTFLAGS"])
+
+        elif board == "nano_every":
+            env.SConscript("fuses.py", exports="env")
+            env.Append(UPLOADERFLAGS=env["FUSESFLAGS"])
+
+if int(ARGUMENTS.get("PIOVERBOSE", 0)):
+    env.Prepend(UPLOADERFLAGS=["-v"])
+
+env.AddPlatformTarget("upload", target_firm, upload_actions, "Upload")
+
+#
+# Deprecated target: Upload firmware using external programmer
+#
+
+if "program" in COMMAND_LINE_TARGETS:
+    sys.stderr.write(
+        "Error: `program` target is deprecated. To use a programmer for uploading "
+        "specify custom `upload_command`.\n"
+        "More details: https://docs.platformio.org/en/latest/platforms/"
+        "atmelavr.html#upload-using-programmer\n")
+    env.Exit(1)
+
+#
+# Setup default targets
+#
+
+Default([target_buildprog, target_size])