diff --git a/drivers/0x01_uart_cbm/Makefile b/drivers/0x01_uart_cbm/Makefile
index d64d0d4..1ec6ba0 100644
--- a/drivers/0x01_uart_cbm/Makefile
+++ b/drivers/0x01_uart_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -46,9 +55,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -61,14 +70,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x01_uart_cbm/Src/main.c b/drivers/0x01_uart_cbm/Src/main.c
index dff47bb..f9d916d 100644
--- a/drivers/0x01_uart_cbm/Src/main.c
+++ b/drivers/0x01_uart_cbm/Src/main.c
@@ -32,8 +32,10 @@ int main(void)
 {
   uart_puts("UART driver ready (115200 8N1)\r\n");
   uart_puts("Type characters to echo them back in UPPERCASE:\r\n");
-  while (1) {
-    if (uart_is_readable()) {
+  while (1) 
+  {
+    if (uart_is_readable()) 
+    {
       char c = uart_getchar();
       char upper = uart_to_upper(c);
       uart_putchar(upper);
diff --git a/drivers/0x01_uart_cbm/Src/rp2350_reset.c b/drivers/0x01_uart_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x01_uart_cbm/Src/rp2350_reset.c
+++ b/drivers/0x01_uart_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x01_uart_cbm/Src/rp2350_uart.c b/drivers/0x01_uart_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x01_uart_cbm/Src/rp2350_uart.c
+++ b/drivers/0x01_uart_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x01_uart_cbm/Src/rp2350_xosc.c b/drivers/0x01_uart_cbm/Src/rp2350_xosc.c
index 2051745..a55dcc0 100644
--- a/drivers/0x01_uart_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x01_uart_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x01_uart_cbm/uf2conv.py b/drivers/0x01_uart_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x01_uart_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x01_uart_cbm/uf2families.json b/drivers/0x01_uart_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x01_uart_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x02_blink_cbm/Makefile b/drivers/0x02_blink_cbm/Makefile
index 2b11db5..7d06b2b 100644
--- a/drivers/0x02_blink_cbm/Makefile
+++ b/drivers/0x02_blink_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -49,9 +58,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -64,14 +73,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x02_blink_cbm/Src/main.c b/drivers/0x02_blink_cbm/Src/main.c
index 5bc40b9..998f6b5 100644
--- a/drivers/0x02_blink_cbm/Src/main.c
+++ b/drivers/0x02_blink_cbm/Src/main.c
@@ -44,7 +44,8 @@ int main(void)
 {
   led_init(LED_PIN);
   uart_puts("LED driver initialized on GPIO 25\r\n");
-  while (1) {
+  while (1) 
+  {
     led_toggle(LED_PIN);
     _print_led_state(LED_PIN);
     delay_ms(BLINK_DELAY_MS);
diff --git a/drivers/0x02_blink_cbm/Src/rp2350_reset.c b/drivers/0x02_blink_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x02_blink_cbm/Src/rp2350_reset.c
+++ b/drivers/0x02_blink_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x02_blink_cbm/Src/rp2350_uart.c b/drivers/0x02_blink_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x02_blink_cbm/Src/rp2350_uart.c
+++ b/drivers/0x02_blink_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x02_blink_cbm/Src/rp2350_xosc.c b/drivers/0x02_blink_cbm/Src/rp2350_xosc.c
index 2051745..a55dcc0 100644
--- a/drivers/0x02_blink_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x02_blink_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x02_blink_cbm/uf2conv.py b/drivers/0x02_blink_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x02_blink_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x02_blink_cbm/uf2families.json b/drivers/0x02_blink_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x02_blink_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x03_button_cbm/Makefile b/drivers/0x03_button_cbm/Makefile
index 0196fea..2939900 100644
--- a/drivers/0x03_button_cbm/Makefile
+++ b/drivers/0x03_button_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -50,9 +59,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -65,14 +74,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x03_button_cbm/Src/main.c b/drivers/0x03_button_cbm/Src/main.c
index cbcc19e..d276804 100644
--- a/drivers/0x03_button_cbm/Src/main.c
+++ b/drivers/0x03_button_cbm/Src/main.c
@@ -55,7 +55,8 @@ static void _set_led_state(bool pressed)
   */
 static void _report_edge(bool pressed, bool *last_state)
 {
-  if (pressed != *last_state) {
+  if (pressed != *last_state) 
+  {
     if (pressed)
       uart_puts("Button: PRESSED\r\n");
     else
@@ -83,7 +84,8 @@ int main(void)
   led_init(LED_PIN);
   uart_puts("Button driver initialized: button=GPIO15  led=GPIO25\r\n");
   bool last_state = false;
-  while (1) {
+  while (1) 
+  {
     _poll_button(&last_state);
     delay_ms(POLL_DELAY_MS);
   }
diff --git a/drivers/0x03_button_cbm/Src/rp2350_reset.c b/drivers/0x03_button_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x03_button_cbm/Src/rp2350_reset.c
+++ b/drivers/0x03_button_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x03_button_cbm/Src/rp2350_uart.c b/drivers/0x03_button_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x03_button_cbm/Src/rp2350_uart.c
+++ b/drivers/0x03_button_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x03_button_cbm/Src/rp2350_xosc.c b/drivers/0x03_button_cbm/Src/rp2350_xosc.c
index 2051745..a55dcc0 100644
--- a/drivers/0x03_button_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x03_button_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x03_button_cbm/uf2conv.py b/drivers/0x03_button_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x03_button_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x03_button_cbm/uf2families.json b/drivers/0x03_button_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x03_button_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x04_pwm_cbm/Makefile b/drivers/0x04_pwm_cbm/Makefile
index a4e256d..2b5aad8 100644
--- a/drivers/0x04_pwm_cbm/Makefile
+++ b/drivers/0x04_pwm_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x04_pwm_cbm/Src/main.c b/drivers/0x04_pwm_cbm/Src/main.c
index 7ef24a7..3137b52 100644
--- a/drivers/0x04_pwm_cbm/Src/main.c
+++ b/drivers/0x04_pwm_cbm/Src/main.c
@@ -71,7 +71,8 @@ static void _print_duty(uint8_t duty)
   */
 static void _sweep_up(void)
 {
-  for (uint8_t duty = 0; duty <= 100; duty += SWEEP_STEP) {
+  for (uint8_t duty = 0; duty <= 100; duty += SWEEP_STEP) 
+  {
     pwm_set_duty(duty);
     _print_duty(duty);
     delay_ms(SWEEP_DELAY_MS);
@@ -84,7 +85,8 @@ static void _sweep_up(void)
   */
 static void _sweep_down(void)
 {
-  for (int8_t duty = 100; duty >= 0; duty -= SWEEP_STEP) {
+  for (int8_t duty = 100; duty >= 0; duty -= SWEEP_STEP) 
+  {
     pwm_set_duty((uint8_t)duty);
     _print_duty((uint8_t)duty);
     delay_ms(SWEEP_DELAY_MS);
@@ -94,7 +96,8 @@ static void _sweep_down(void)
 int main(void)
 {
   uart_puts("PWM initialized: GPIO25\r\n");
-  while (1) {
+  while (1) 
+  {
     _sweep_up();
     _sweep_down();
   }
diff --git a/drivers/0x04_pwm_cbm/Src/rp2350_pwm.c b/drivers/0x04_pwm_cbm/Src/rp2350_pwm.c
index 171f4ec..e729721 100644
--- a/drivers/0x04_pwm_cbm/Src/rp2350_pwm.c
+++ b/drivers/0x04_pwm_cbm/Src/rp2350_pwm.c
@@ -55,8 +55,7 @@ static void _pwm_clear_reset_bit(void)
   */
 static void _pwm_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_PWM_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_PWM_SHIFT)) == 0) {}
 }
 
 /**
diff --git a/drivers/0x04_pwm_cbm/Src/rp2350_reset.c b/drivers/0x04_pwm_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x04_pwm_cbm/Src/rp2350_reset.c
+++ b/drivers/0x04_pwm_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x04_pwm_cbm/Src/rp2350_uart.c b/drivers/0x04_pwm_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x04_pwm_cbm/Src/rp2350_uart.c
+++ b/drivers/0x04_pwm_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x04_pwm_cbm/Src/rp2350_xosc.c b/drivers/0x04_pwm_cbm/Src/rp2350_xosc.c
index 2051745..a55dcc0 100644
--- a/drivers/0x04_pwm_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x04_pwm_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x04_pwm_cbm/uf2conv.py b/drivers/0x04_pwm_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x04_pwm_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x04_pwm_cbm/uf2families.json b/drivers/0x04_pwm_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x04_pwm_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x05_servo_cbm/Makefile b/drivers/0x05_servo_cbm/Makefile
index 85ec89e..4d9d67c 100644
--- a/drivers/0x05_servo_cbm/Makefile
+++ b/drivers/0x05_servo_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x05_servo_cbm/Src/main.c b/drivers/0x05_servo_cbm/Src/main.c
index 036fa59..676270b 100644
--- a/drivers/0x05_servo_cbm/Src/main.c
+++ b/drivers/0x05_servo_cbm/Src/main.c
@@ -72,7 +72,8 @@ static void _print_angle(uint8_t angle)
   */
 static void _sweep_up(void)
 {
-  for (uint8_t angle = 0; angle <= 180; angle += STEP_DEGREES) {
+  for (uint8_t angle = 0; angle <= 180; angle += STEP_DEGREES) 
+  {
     servo_set_angle(angle);
     _print_angle(angle);
     delay_ms(STEP_DELAY_MS);
@@ -85,7 +86,8 @@ static void _sweep_up(void)
   */
 static void _sweep_down(void)
 {
-  for (int16_t angle = 180; angle >= 0; angle -= STEP_DEGREES) {
+  for (int16_t angle = 180; angle >= 0; angle -= STEP_DEGREES) 
+  {
     servo_set_angle((uint8_t)angle);
     _print_angle((uint8_t)angle);
     delay_ms(STEP_DELAY_MS);
@@ -96,7 +98,8 @@ int main(void)
 {
   uart_puts("Servo driver initialized on GPIO6\r\n");
   uart_puts("Sweeping 0 -> 180 -> 0 degrees\r\n");
-  while (1) {
+  while (1) 
+  {
     _sweep_up();
     _sweep_down();
   }
diff --git a/drivers/0x05_servo_cbm/Src/rp2350_reset.c b/drivers/0x05_servo_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x05_servo_cbm/Src/rp2350_reset.c
+++ b/drivers/0x05_servo_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x05_servo_cbm/Src/rp2350_servo.c b/drivers/0x05_servo_cbm/Src/rp2350_servo.c
index efaf0a9..beb07ac 100644
--- a/drivers/0x05_servo_cbm/Src/rp2350_servo.c
+++ b/drivers/0x05_servo_cbm/Src/rp2350_servo.c
@@ -75,8 +75,7 @@ static void _servo_clear_reset_bit(void)
   */
 static void _servo_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_PWM_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_PWM_SHIFT)) == 0) {}
 }
 
 /**
diff --git a/drivers/0x05_servo_cbm/Src/rp2350_uart.c b/drivers/0x05_servo_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x05_servo_cbm/Src/rp2350_uart.c
+++ b/drivers/0x05_servo_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x05_servo_cbm/Src/rp2350_xosc.c b/drivers/0x05_servo_cbm/Src/rp2350_xosc.c
index 2051745..a55dcc0 100644
--- a/drivers/0x05_servo_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x05_servo_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x05_servo_cbm/uf2conv.py b/drivers/0x05_servo_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x05_servo_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x05_servo_cbm/uf2families.json b/drivers/0x05_servo_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x05_servo_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x06_adc_cbm/Makefile b/drivers/0x06_adc_cbm/Makefile
index a7fd712..bd61056 100644
--- a/drivers/0x06_adc_cbm/Makefile
+++ b/drivers/0x06_adc_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x06_adc_cbm/Src/main.c b/drivers/0x06_adc_cbm/Src/main.c
index 6d8c85d..430c54c 100644
--- a/drivers/0x06_adc_cbm/Src/main.c
+++ b/drivers/0x06_adc_cbm/Src/main.c
@@ -44,7 +44,8 @@
   */
 static void _reverse(char *buf, uint8_t len)
 {
-  for (uint8_t i = 0; i < len / 2; i++) {
+  for (uint8_t i = 0; i < len / 2; i++) 
+  {
     char tmp = buf[i];
     buf[i] = buf[len - 1 - i];
     buf[len - 1 - i] = tmp;
@@ -100,7 +101,8 @@ int main(void)
   xosc_enable_adc_clk();
   adc_release_reset();
   adc_init();
-  while (1) {
+  while (1) 
+  {
     _print_readings();
     delay_ms(SAMPLE_DELAY_MS);
   }
diff --git a/drivers/0x06_adc_cbm/Src/rp2350_adc.c b/drivers/0x06_adc_cbm/Src/rp2350_adc.c
index 1e538dc..49014eb 100644
--- a/drivers/0x06_adc_cbm/Src/rp2350_adc.c
+++ b/drivers/0x06_adc_cbm/Src/rp2350_adc.c
@@ -82,10 +82,12 @@ static uint16_t _adc_read_raw(void)
 {
   uint32_t timeout = ADC_READY_TIMEOUT;
   ADC->CS |= (1U << ADC_CS_START_ONCE_SHIFT);
-  while (!(ADC->CS & (1U << ADC_CS_READY_SHIFT)) && timeout > 0U) {
+  while (!(ADC->CS & (1U << ADC_CS_READY_SHIFT)) && timeout > 0U) 
+  {
     timeout--;
   }
-  if (timeout == 0U) {
+  if (timeout == 0U) 
+  {
     return 0U;
   }
   return (uint16_t)(ADC->RESULT & 0xFFFU);
@@ -126,7 +128,8 @@ void adc_release_reset(void)
   RESETS->RESET |= (1U << RESETS_RESET_ADC_SHIFT);
   uint32_t timeout = ADC_READY_TIMEOUT;
   RESETS->RESET &= ~(1U << RESETS_RESET_ADC_SHIFT);
-  while (!(RESETS->RESET_DONE & (1U << RESETS_RESET_ADC_SHIFT)) && timeout > 0U) {
+  while (!(RESETS->RESET_DONE & (1U << RESETS_RESET_ADC_SHIFT)) && timeout > 0U) 
+  {
     timeout--;
   }
 }
diff --git a/drivers/0x06_adc_cbm/Src/rp2350_reset.c b/drivers/0x06_adc_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x06_adc_cbm/Src/rp2350_reset.c
+++ b/drivers/0x06_adc_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x06_adc_cbm/Src/rp2350_uart.c b/drivers/0x06_adc_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x06_adc_cbm/Src/rp2350_uart.c
+++ b/drivers/0x06_adc_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x06_adc_cbm/Src/rp2350_xosc.c b/drivers/0x06_adc_cbm/Src/rp2350_xosc.c
index 92eba2f..02afcc3 100644
--- a/drivers/0x06_adc_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x06_adc_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x06_adc_cbm/uf2conv.py b/drivers/0x06_adc_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x06_adc_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x06_adc_cbm/uf2families.json b/drivers/0x06_adc_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x06_adc_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x07_i2c_cbm/Makefile b/drivers/0x07_i2c_cbm/Makefile
index 97274d8..f37fda1 100644
--- a/drivers/0x07_i2c_cbm/Makefile
+++ b/drivers/0x07_i2c_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x07_i2c_cbm/Src/main.c b/drivers/0x07_i2c_cbm/Src/main.c
index 82ffc0d..09d71e2 100644
--- a/drivers/0x07_i2c_cbm/Src/main.c
+++ b/drivers/0x07_i2c_cbm/Src/main.c
@@ -43,7 +43,8 @@ int main(void)
   i2c_release_reset();
   i2c_init();
   uart_puts("I2C driver initialized: I2C1 @ 100 kHz  SDA=GPIO2  SCL=GPIO3\r\n");
-  while (1) {
+  while (1) 
+  {
     i2c_scan();
     delay_ms(SCAN_DELAY_MS);
   }
diff --git a/drivers/0x07_i2c_cbm/Src/rp2350_i2c.c b/drivers/0x07_i2c_cbm/Src/rp2350_i2c.c
index e6d2dc4..02ee07f 100644
--- a/drivers/0x07_i2c_cbm/Src/rp2350_i2c.c
+++ b/drivers/0x07_i2c_cbm/Src/rp2350_i2c.c
@@ -103,9 +103,11 @@ static void _print_hex8(uint8_t val)
   */
 static void _print_probe_result(uint8_t addr)
 {
-  if (addr < 0x08 || addr > 0x77) {
+  if (addr < 0x08 || addr > 0x77) 
+  {
     uart_puts("   ");
-  } else if (i2c_probe(addr)) {
+  } else if (i2c_probe(addr)) 
+  {
     _print_hex8(addr);
     uart_puts(" ");
   } else {
@@ -135,8 +137,7 @@ void i2c_release_reset(void)
 {
   RESETS->RESET |= (1U << RESETS_RESET_I2C1_SHIFT);
   RESETS->RESET &= ~(1U << RESETS_RESET_I2C1_SHIFT);
-  while (!(RESETS->RESET_DONE & (1U << RESETS_RESET_I2C1_SHIFT))) {
-  }
+  while (!(RESETS->RESET_DONE & (1U << RESETS_RESET_I2C1_SHIFT))) {}
 }
 
 void i2c_init(void)
@@ -180,7 +181,8 @@ static void _probe_send_read(void)
 static bool _probe_wait_response(void)
 {
   uint32_t timeout = I2C_TIMEOUT;
-  while (timeout > 0U) {
+  while (timeout > 0U) 
+  {
     if (I2C1->RAW_INTR_STAT & I2C_RAW_INTR_TX_ABRT)
       return true;
     if (I2C1->RXFLR)
@@ -217,7 +219,8 @@ void i2c_scan(void)
 {
   uart_puts("\r\nI2C bus scan:\r\n");
   uart_puts("     0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F\r\n");
-  for (uint8_t addr = 0; addr < 128; addr++) {
+  for (uint8_t addr = 0; addr < 128; addr++) 
+  {
     _print_scan_entry(addr);
   }
 }
diff --git a/drivers/0x07_i2c_cbm/Src/rp2350_reset.c b/drivers/0x07_i2c_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x07_i2c_cbm/Src/rp2350_reset.c
+++ b/drivers/0x07_i2c_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x07_i2c_cbm/Src/rp2350_uart.c b/drivers/0x07_i2c_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x07_i2c_cbm/Src/rp2350_uart.c
+++ b/drivers/0x07_i2c_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x07_i2c_cbm/Src/rp2350_xosc.c b/drivers/0x07_i2c_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x07_i2c_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x07_i2c_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x07_i2c_cbm/uf2conv.py b/drivers/0x07_i2c_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x07_i2c_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x07_i2c_cbm/uf2families.json b/drivers/0x07_i2c_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x07_i2c_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x08_lcd1602_cbm/Makefile b/drivers/0x08_lcd1602_cbm/Makefile
index 528c32b..b06b732 100644
--- a/drivers/0x08_lcd1602_cbm/Makefile
+++ b/drivers/0x08_lcd1602_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -49,9 +58,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -64,14 +73,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x08_lcd1602_cbm/Src/main.c b/drivers/0x08_lcd1602_cbm/Src/main.c
index 0f66392..dd3c97c 100644
--- a/drivers/0x08_lcd1602_cbm/Src/main.c
+++ b/drivers/0x08_lcd1602_cbm/Src/main.c
@@ -68,7 +68,8 @@ static void _uint_to_str(uint32_t val, char *buf)
   char tmp[11];
   int i = 0;
   if (val == 0) { buf[0] = '0'; buf[1] = '\0'; return; }
-  while (val > 0) {
+  while (val > 0) 
+  {
     tmp[i++] = (char)('0' + (val % 10));
     val /= 10;
   }
@@ -143,7 +144,8 @@ int main(void)
 {
   uint32_t count = 0;
   _lcd_setup();
-  while (1) {
+  while (1) 
+  {
     _display_count(count);
     count++;
     delay_ms(COUNT_DELAY_MS);
diff --git a/drivers/0x08_lcd1602_cbm/Src/rp2350_i2c.c b/drivers/0x08_lcd1602_cbm/Src/rp2350_i2c.c
index a663367..595b85e 100644
--- a/drivers/0x08_lcd1602_cbm/Src/rp2350_i2c.c
+++ b/drivers/0x08_lcd1602_cbm/Src/rp2350_i2c.c
@@ -89,7 +89,8 @@ static void _i2c_config_timing(void)
   */
 static bool _check_abort(void)
 {
-  if (I2C1->RAW_INTR_STAT & I2C_RAW_INTR_TX_ABRT) {
+  if (I2C1->RAW_INTR_STAT & I2C_RAW_INTR_TX_ABRT) 
+  {
     (void)I2C1->CLR_TX_ABRT;
     return true;
   }
@@ -102,7 +103,8 @@ static bool _check_abort(void)
   */
 static bool _check_stop(void)
 {
-  if (I2C1->RAW_INTR_STAT & I2C_RAW_INTR_STOP_DET) {
+  if (I2C1->RAW_INTR_STAT & I2C_RAW_INTR_STOP_DET) 
+  {
     (void)I2C1->CLR_STOP_DET;
     return true;
   }
@@ -116,7 +118,8 @@ static bool _check_stop(void)
 static void _i2c_wait_done(void)
 {
   uint32_t timeout = I2C_TIMEOUT;
-  while (timeout > 0U) {
+  while (timeout > 0U) 
+  {
     if (_check_abort() || _check_stop())
       break;
     timeout--;
@@ -127,8 +130,7 @@ void i2c_release_reset(void)
 {
   RESETS->RESET |= (1U << RESETS_RESET_I2C1_SHIFT);
   RESETS->RESET &= ~(1U << RESETS_RESET_I2C1_SHIFT);
-  while (!(RESETS->RESET_DONE & (1U << RESETS_RESET_I2C1_SHIFT))) {
-  }
+  while (!(RESETS->RESET_DONE & (1U << RESETS_RESET_I2C1_SHIFT))) {}
 }
 
 void i2c_init(void)
diff --git a/drivers/0x08_lcd1602_cbm/Src/rp2350_reset.c b/drivers/0x08_lcd1602_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x08_lcd1602_cbm/Src/rp2350_reset.c
+++ b/drivers/0x08_lcd1602_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x08_lcd1602_cbm/Src/rp2350_uart.c b/drivers/0x08_lcd1602_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x08_lcd1602_cbm/Src/rp2350_uart.c
+++ b/drivers/0x08_lcd1602_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x08_lcd1602_cbm/Src/rp2350_xosc.c b/drivers/0x08_lcd1602_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x08_lcd1602_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x08_lcd1602_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x08_lcd1602_cbm/uf2conv.py b/drivers/0x08_lcd1602_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x08_lcd1602_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x08_lcd1602_cbm/uf2families.json b/drivers/0x08_lcd1602_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x08_lcd1602_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x09_dht11_cbm/Makefile b/drivers/0x09_dht11_cbm/Makefile
index dd35b17..c6d336a 100644
--- a/drivers/0x09_dht11_cbm/Makefile
+++ b/drivers/0x09_dht11_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x09_dht11_cbm/Src/rp2350_dht11.c b/drivers/0x09_dht11_cbm/Src/rp2350_dht11.c
index 547e694..d7ebc2c 100644
--- a/drivers/0x09_dht11_cbm/Src/rp2350_dht11.c
+++ b/drivers/0x09_dht11_cbm/Src/rp2350_dht11.c
@@ -204,8 +204,7 @@ static void _timer_clear_reset(void)
   */
 static void _timer_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_TIMER0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_TIMER0_SHIFT)) == 0) {}
 }
 
 /**
diff --git a/drivers/0x09_dht11_cbm/Src/rp2350_reset.c b/drivers/0x09_dht11_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x09_dht11_cbm/Src/rp2350_reset.c
+++ b/drivers/0x09_dht11_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x09_dht11_cbm/Src/rp2350_uart.c b/drivers/0x09_dht11_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x09_dht11_cbm/Src/rp2350_uart.c
+++ b/drivers/0x09_dht11_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x09_dht11_cbm/Src/rp2350_xosc.c b/drivers/0x09_dht11_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x09_dht11_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x09_dht11_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x09_dht11_cbm/uf2conv.py b/drivers/0x09_dht11_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x09_dht11_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x09_dht11_cbm/uf2families.json b/drivers/0x09_dht11_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x09_dht11_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x0a_ir_cbm/Inc/rp2350.h b/drivers/0x0a_ir_cbm/Inc/rp2350.h
index c333a52..656ada4 100644
--- a/drivers/0x0a_ir_cbm/Inc/rp2350.h
+++ b/drivers/0x0a_ir_cbm/Inc/rp2350.h
@@ -32,35 +32,35 @@
 #define __IO volatile
 
 /*!< Stack addresses */
-#define STACK_TOP              0x20082000UL
-#define STACK_LIMIT            0x2007A000UL
+#define STACK_TOP                        0x20082000UL
+#define STACK_LIMIT                      0x2007A000UL
 
 /*!< Memory map */
-#define XIP_BASE               0x10000000UL
-#define SRAM_BASE              0x20000000UL
-#define SIO_BASE               0xD0000000UL
-#define PPB_BASE               0xE0000000UL
+#define XIP_BASE                         0x10000000UL
+#define SRAM_BASE                        0x20000000UL
+#define SIO_BASE                         0xD0000000UL
+#define PPB_BASE                         0xE0000000UL
 
 /*!< APB peripherals */
-#define CLOCKS_BASE            0x40010000UL
-#define RESETS_BASE            0x40020000UL
-#define IO_BANK0_BASE          0x40028000UL
-#define PADS_BANK0_BASE        0x40038000UL
-#define XOSC_BASE              0x40048000UL
-#define UART0_BASE             0x40070000UL
-#define TIMER0_BASE            0x400B0000UL
-#define TICKS_BASE             0x40108000UL
+#define CLOCKS_BASE                      0x40010000UL
+#define RESETS_BASE                      0x40020000UL
+#define IO_BANK0_BASE                    0x40028000UL
+#define PADS_BANK0_BASE                  0x40038000UL
+#define XOSC_BASE                        0x40048000UL
+#define UART0_BASE                       0x40070000UL
+#define TIMER0_BASE                      0x400B0000UL
+#define TICKS_BASE                       0x40108000UL
 
 /**
   * @brief XOSC (External Crystal Oscillator)
   */
 typedef struct
 {
-  __IO uint32_t CTRL;          // Control register                               Address offset: 0x00
-  __IO uint32_t STATUS;        // Status register                                Address offset: 0x04
-  __IO uint32_t DORMANT;       // Dormant mode                                   Address offset: 0x08
-  __IO uint32_t STARTUP;       // Startup delay                                  Address offset: 0x0C
-  __IO uint32_t COUNT;         // Frequency count                                Address offset: 0x10
+  __IO uint32_t CTRL;                    // Control register                       0x00
+  __IO uint32_t STATUS;                  // Status register                        0x04
+  __IO uint32_t DORMANT;                 // Dormant mode                           0x08
+  __IO uint32_t STARTUP;                 // Startup delay                          0x0C
+  __IO uint32_t COUNT;                   // Frequency count                        0x10
 } XOSC_TypeDef;
 
 /**
@@ -68,10 +68,10 @@ typedef struct
   */
 typedef struct
 {
-  __IO uint32_t RESERVED0[12]; // GPOUT0..GPOUT3 registers                       Address offset: 0x00-0x2C
-  __IO uint32_t CLK_REF_CTRL;  // Reference clock control                        Address offset: 0x30
-  __IO uint32_t RESERVED1[5];  // CLK_REF_DIV..CLK_SYS_SELECTED                  Address offset: 0x34-0x44
-  __IO uint32_t CLK_PERI_CTRL; // Peripheral clock control                       Address offset: 0x48
+  __IO uint32_t RESERVED0[12];           // GPOUT0..GPOUT3 registers               0x00-0x2C
+  __IO uint32_t CLK_REF_CTRL;            // Reference clock control                0x30
+  __IO uint32_t RESERVED1[5];            // CLK_REF_DIV..CLK_SYS_SELECTED          0x34-0x44
+  __IO uint32_t CLK_PERI_CTRL;           // Peripheral clock control               0x48
 } CLOCKS_TypeDef;
 
 /**
@@ -79,9 +79,9 @@ typedef struct
   */
 typedef struct
 {
-  __IO uint32_t RESET;         // Reset control                                  Address offset: 0x00
-  __IO uint32_t WDSEL;         // Watchdog select                                Address offset: 0x04
-  __IO uint32_t RESET_DONE;    // Reset done status                              Address offset: 0x08
+  __IO uint32_t RESET;                   // Reset control                          0x00
+  __IO uint32_t WDSEL;                   // Watchdog select                        0x04
+  __IO uint32_t RESET_DONE;              // Reset done status                      0x08
 } RESETS_TypeDef;
 
 /**
@@ -89,8 +89,8 @@ typedef struct
   */
 typedef struct
 {
-  __IO uint32_t STATUS;        // GPIO status                                    Address offset: 0x00
-  __IO uint32_t CTRL;          // GPIO control                                   Address offset: 0x04
+  __IO uint32_t STATUS;                  // GPIO status                            0x00
+  __IO uint32_t CTRL;                    // GPIO control                           0x04
 } IO_BANK0_GPIO_TypeDef;
 
 /**
@@ -98,7 +98,7 @@ typedef struct
   */
 typedef struct
 {
-  IO_BANK0_GPIO_TypeDef GPIO[30]; // GPIO 0-29 status/ctrl pairs                 Address offset: 0x000-0x0E8
+  IO_BANK0_GPIO_TypeDef GPIO[30];        // GPIO 0-29 status/ctrl pairs            0x000-0x0E8
 } IO_BANK0_TypeDef;
 
 /**
@@ -106,139 +106,139 @@ typedef struct
   */
 typedef struct
 {
-  __IO uint32_t VOLTAGE_SELECT; // Voltage select                                Address offset: 0x00
-  __IO uint32_t GPIO[30];      // GPIO 0-29 pad control                          Address offset: 0x04-0x78
+  __IO uint32_t VOLTAGE_SELECT;          // Voltage select                         0x00
+  __IO uint32_t GPIO[30];                // GPIO 0-29 pad control                  0x04-0x78
 } PADS_BANK0_TypeDef;
 
 /**
   * @brief Peripheral Definitions
   */
-#define XOSC                   ((XOSC_TypeDef *) XOSC_BASE)
-#define CLOCKS                 ((CLOCKS_TypeDef *) CLOCKS_BASE)
-#define RESETS                 ((RESETS_TypeDef *) RESETS_BASE)
-#define IO_BANK0               ((IO_BANK0_TypeDef *) IO_BANK0_BASE)
-#define PADS_BANK0             ((PADS_BANK0_TypeDef *) PADS_BANK0_BASE)
-#define SIO                    ((volatile uint32_t *) SIO_BASE)
-#define TIMER0                 ((volatile uint32_t *) TIMER0_BASE)
-#define TICKS                  ((volatile uint32_t *) TICKS_BASE)
-#define CPACR                  ((volatile uint32_t *) (PPB_BASE + 0x0ED88UL))
+#define XOSC                             ((XOSC_TypeDef *) XOSC_BASE)
+#define CLOCKS                           ((CLOCKS_TypeDef *) CLOCKS_BASE)
+#define RESETS                           ((RESETS_TypeDef *) RESETS_BASE)
+#define IO_BANK0                         ((IO_BANK0_TypeDef *) IO_BANK0_BASE)
+#define PADS_BANK0                       ((PADS_BANK0_TypeDef *) PADS_BANK0_BASE)
+#define SIO                              ((volatile uint32_t *) SIO_BASE)
+#define TIMER0                           ((volatile uint32_t *) TIMER0_BASE)
+#define TICKS                            ((volatile uint32_t *) TICKS_BASE)
+#define CPACR                            ((volatile uint32_t *) (PPB_BASE + 0x0ED88UL))
 
 /**
   * @brief XOSC bit definitions
   */
-#define XOSC_STATUS_STABLE_SHIFT     31U
+#define XOSC_STATUS_STABLE_SHIFT         31U
 
 /**
   * @brief CPACR bit definitions
   */
-#define CPACR_CP0_SHIFT              0U
-#define CPACR_CP1_SHIFT              1U
+#define CPACR_CP0_SHIFT                  0U
+#define CPACR_CP1_SHIFT                  1U
 
 /**
   * @brief CLK_REF bit definitions
   */
-#define CLK_REF_CTRL_SRC_XOSC       2U
+#define CLK_REF_CTRL_SRC_XOSC            2U
 
 /**
   * @brief CLOCKS bit definitions
   */
-#define CLK_PERI_CTRL_ENABLE_SHIFT   11U
-#define CLK_PERI_CTRL_AUXSRC_SHIFT   5U
-#define CLK_PERI_CTRL_AUXSRC_MASK   (0x07U << CLK_PERI_CTRL_AUXSRC_SHIFT)
-#define CLK_PERI_CTRL_AUXSRC_XOSC   4U
+#define CLK_PERI_CTRL_ENABLE_SHIFT       11U
+#define CLK_PERI_CTRL_AUXSRC_SHIFT       5U
+#define CLK_PERI_CTRL_AUXSRC_MASK        (0x07U << CLK_PERI_CTRL_AUXSRC_SHIFT)
+#define CLK_PERI_CTRL_AUXSRC_XOSC        4U
 
 /**
   * @brief RESETS bit definitions
   */
-#define RESETS_RESET_IO_BANK0_SHIFT  6U
-#define RESETS_RESET_TIMER0_SHIFT    23U
-#define RESETS_RESET_UART0_SHIFT     26U
+#define RESETS_RESET_IO_BANK0_SHIFT      6U
+#define RESETS_RESET_TIMER0_SHIFT        23U
+#define RESETS_RESET_UART0_SHIFT         26U
 
 /**
   * @brief IO_BANK0 bit definitions
   */
-#define IO_BANK0_CTRL_FUNCSEL_MASK   0x1FU
-#define IO_BANK0_CTRL_FUNCSEL_UART   0x02U
-#define IO_BANK0_CTRL_FUNCSEL_SIO    0x05U
-#define IO_BANK0_CTRL_FUNCSEL_NULL   0x1FU
+#define IO_BANK0_CTRL_FUNCSEL_MASK       0x1FU
+#define IO_BANK0_CTRL_FUNCSEL_UART       0x02U
+#define IO_BANK0_CTRL_FUNCSEL_SIO        0x05U
+#define IO_BANK0_CTRL_FUNCSEL_NULL       0x1FU
 
 /**
   * @brief PADS_BANK0 bit definitions
   */
-#define PADS_BANK0_OD_SHIFT          7U
-#define PADS_BANK0_IE_SHIFT          6U
-#define PADS_BANK0_ISO_SHIFT         8U
-#define PADS_BANK0_PUE_SHIFT         3U
-#define PADS_BANK0_PDE_SHIFT         2U
+#define PADS_BANK0_OD_SHIFT              7U
+#define PADS_BANK0_IE_SHIFT              6U
+#define PADS_BANK0_ISO_SHIFT             8U
+#define PADS_BANK0_PUE_SHIFT             3U
+#define PADS_BANK0_PDE_SHIFT             2U
 
 /**
   * @brief SIO GPIO register offsets (word indices from SIO_BASE)
   */
-#define SIO_GPIO_IN_OFFSET           (0x004U / 4U)
-#define SIO_GPIO_OUT_SET_OFFSET      (0x018U / 4U)
-#define SIO_GPIO_OUT_CLR_OFFSET      (0x020U / 4U)
-#define SIO_GPIO_OE_SET_OFFSET       (0x038U / 4U)
-#define SIO_GPIO_OE_CLR_OFFSET       (0x040U / 4U)
+#define SIO_GPIO_IN_OFFSET               (0x004U / 4U)
+#define SIO_GPIO_OUT_SET_OFFSET          (0x018U / 4U)
+#define SIO_GPIO_OUT_CLR_OFFSET          (0x020U / 4U)
+#define SIO_GPIO_OE_SET_OFFSET           (0x038U / 4U)
+#define SIO_GPIO_OE_CLR_OFFSET           (0x040U / 4U)
 
 /**
   * @brief TIMER0 register offsets (word indices from TIMER0_BASE)
   */
-#define TIMER_TIMERAWL_OFFSET        (0x028U / 4U)
+#define TIMER_TIMERAWL_OFFSET            (0x028U / 4U)
 
 /**
   * @brief Tick generator register offsets (word indices from TICKS_BASE)
   */
-#define TICKS_TIMER0_CTRL_OFFSET     (0x018U / 4U)
-#define TICKS_TIMER0_CYCLES_OFFSET   (0x01CU / 4U)
-#define TICKS_TIMER0_ENABLE          1U
-#define TICKS_TIMER0_CYCLES_12MHZ    12U
+#define TICKS_TIMER0_CTRL_OFFSET         (0x018U / 4U)
+#define TICKS_TIMER0_CYCLES_OFFSET       (0x01CU / 4U)
+#define TICKS_TIMER0_ENABLE              1U
+#define TICKS_TIMER0_CYCLES_12MHZ        12U
 
 /**
   * @brief UART register offsets (word indices from UART0_BASE)
   */
-#define UART_DR_OFFSET               (0x000U / 4U)
-#define UART_FR_OFFSET               (0x018U / 4U)
-#define UART_IBRD_OFFSET             (0x024U / 4U)
-#define UART_FBRD_OFFSET             (0x028U / 4U)
-#define UART_LCR_H_OFFSET           (0x02CU / 4U)
-#define UART_CR_OFFSET               (0x030U / 4U)
+#define UART_DR_OFFSET                   (0x000U / 4U)
+#define UART_FR_OFFSET                   (0x018U / 4U)
+#define UART_IBRD_OFFSET                 (0x024U / 4U)
+#define UART_FBRD_OFFSET                 (0x028U / 4U)
+#define UART_LCR_H_OFFSET                (0x02CU / 4U)
+#define UART_CR_OFFSET                   (0x030U / 4U)
 
 /**
   * @brief UART flag register bit definitions
   */
-#define UART_FR_TXFF_MASK            32U
-#define UART_FR_RXFE_MASK            16U
+#define UART_FR_TXFF_MASK                32U
+#define UART_FR_RXFE_MASK                16U
 
 /**
   * @brief UART line control and enable values
   */
-#define UART_LCR_H_8N1_FIFO         0x70U
-#define UART_CR_ENABLE               ((3U << 8) | 1U)
+#define UART_LCR_H_8N1_FIFO              0x70U
+#define UART_CR_ENABLE                   ((3U << 8) | 1U)
 
 /**
   * @brief NEC IR receiver GPIO pin definition
   */
-#define IR_PIN                       5U
+#define IR_PIN                           5U
 
 /**
   * @brief NEC protocol timing thresholds (microseconds)
   */
-#define NEC_LEADER_WAIT_US           150000U
-#define NEC_LEADER_MARK_MIN_US       8000U
-#define NEC_LEADER_MARK_MAX_US       10000U
-#define NEC_LEADER_MARK_TIMEOUT_US   12000U
-#define NEC_LEADER_SPACE_MIN_US      3500U
-#define NEC_LEADER_SPACE_MAX_US      5000U
-#define NEC_LEADER_SPACE_TIMEOUT_US  7000U
-#define NEC_BIT_MARK_TIMEOUT_US      1000U
-#define NEC_BIT_SPACE_TIMEOUT_US     2500U
-#define NEC_BIT_SPACE_MIN_US         200U
-#define NEC_BIT_ONE_THRESHOLD_US     1200U
+#define NEC_LEADER_WAIT_US               150000U
+#define NEC_LEADER_MARK_MIN_US           8000U
+#define NEC_LEADER_MARK_MAX_US           10000U
+#define NEC_LEADER_MARK_TIMEOUT_US       12000U
+#define NEC_LEADER_SPACE_MIN_US          3500U
+#define NEC_LEADER_SPACE_MAX_US          5000U
+#define NEC_LEADER_SPACE_TIMEOUT_US      7000U
+#define NEC_BIT_MARK_TIMEOUT_US          1000U
+#define NEC_BIT_SPACE_TIMEOUT_US         2500U
+#define NEC_BIT_SPACE_MIN_US             200U
+#define NEC_BIT_ONE_THRESHOLD_US         1200U
 
 /**
   * @brief NEC frame data format
   */
-#define NEC_DATA_BYTES               4U
-#define NEC_DATA_BITS                32U
+#define NEC_DATA_BYTES                   4U
+#define NEC_DATA_BITS                    32U
 
 #endif /* __RP2350_H */
diff --git a/drivers/0x0a_ir_cbm/Makefile b/drivers/0x0a_ir_cbm/Makefile
index 785bf61..7fec945 100644
--- a/drivers/0x0a_ir_cbm/Makefile
+++ b/drivers/0x0a_ir_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\,$(BUILD_DIR)) mkdir $(subst /,\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\,$(BUILD_DIR)) rmdir /s /q $(subst /,\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -47,9 +56,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -62,14 +71,11 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
-
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x0a_ir_cbm/Src/image_def.c b/drivers/0x0a_ir_cbm/Src/image_def.c
index 6f8eb7d..e46113a 100644
--- a/drivers/0x0a_ir_cbm/Src/image_def.c
+++ b/drivers/0x0a_ir_cbm/Src/image_def.c
@@ -23,7 +23,8 @@
 #include <stdint.h>
 
 __attribute__((section(".embedded_block"), used))
-const uint8_t picobin_block[] = {
+const uint8_t picobin_block[] = 
+{
   0xD3, 0xDE, 0xFF, 0xFF,
   0x42, 0x01, 0x21, 0x10,
   0xFF, 0x01, 0x00, 0x00,
diff --git a/drivers/0x0a_ir_cbm/Src/main.c b/drivers/0x0a_ir_cbm/Src/main.c
index c91a6a2..a6a83c3 100644
--- a/drivers/0x0a_ir_cbm/Src/main.c
+++ b/drivers/0x0a_ir_cbm/Src/main.c
@@ -111,7 +111,8 @@ int main(void)
 {
   int command;
   _ir_setup();
-  while (1) {
+  while (1) 
+  {
     command = ir_getkey();
     if (command >= 0)
       _print_command((uint8_t)command);
diff --git a/drivers/0x0a_ir_cbm/Src/rp2350_ir.c b/drivers/0x0a_ir_cbm/Src/rp2350_ir.c
index 7c07b0f..4e7d5fe 100644
--- a/drivers/0x0a_ir_cbm/Src/rp2350_ir.c
+++ b/drivers/0x0a_ir_cbm/Src/rp2350_ir.c
@@ -56,7 +56,8 @@ static bool _read_pin(void)
 static int32_t _wait_for_level(bool level, uint32_t timeout_us)
 {
   uint32_t start = _time_us();
-  while (_read_pin() != level) {
+  while (_read_pin() != level) 
+  {
     if ((_time_us() - start) > timeout_us)
       return -1;
   }
@@ -174,8 +175,7 @@ static void _timer_clear_reset(void)
   */
 static void _timer_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_TIMER0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_TIMER0_SHIFT)) == 0) {}
 }
 
 /**
diff --git a/drivers/0x0a_ir_cbm/Src/rp2350_reset.c b/drivers/0x0a_ir_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x0a_ir_cbm/Src/rp2350_reset.c
+++ b/drivers/0x0a_ir_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x0a_ir_cbm/Src/rp2350_uart.c b/drivers/0x0a_ir_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x0a_ir_cbm/Src/rp2350_uart.c
+++ b/drivers/0x0a_ir_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x0a_ir_cbm/Src/rp2350_xosc.c b/drivers/0x0a_ir_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x0a_ir_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x0a_ir_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x0a_ir_cbm/Src/vector_table.c b/drivers/0x0a_ir_cbm/Src/vector_table.c
index 091894b..96fc150 100644
--- a/drivers/0x0a_ir_cbm/Src/vector_table.c
+++ b/drivers/0x0a_ir_cbm/Src/vector_table.c
@@ -29,7 +29,8 @@ extern void Reset_Handler(void);
 typedef void (*vector_func_t)(void);
 
 __attribute__((section(".vectors"), used))
-const void *_vectors[2] = {
+const void *_vectors[2] = 
+{
   &_stack_top,
   Reset_Handler
 };
diff --git a/drivers/0x0a_ir_cbm/uf2conv.py b/drivers/0x0a_ir_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x0a_ir_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x0a_ir_cbm/uf2families.json b/drivers/0x0a_ir_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x0a_ir_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x0b_spi_cbm/Makefile b/drivers/0x0b_spi_cbm/Makefile
index 44a8bc1..bd7673d 100644
--- a/drivers/0x0b_spi_cbm/Makefile
+++ b/drivers/0x0b_spi_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,11 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
-
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x0b_spi_cbm/Src/main.c b/drivers/0x0b_spi_cbm/Src/main.c
index b2fa65f..2b80833 100644
--- a/drivers/0x0b_spi_cbm/Src/main.c
+++ b/drivers/0x0b_spi_cbm/Src/main.c
@@ -62,7 +62,8 @@ static void _print_hex(uint8_t value)
 static void _print_buffer(const char *label, const uint8_t *buf, uint32_t len)
 {
   uart_puts(label);
-  for (uint32_t i = 0; i < len; i++) {
+  for (uint32_t i = 0; i < len; i++) 
+  {
     _print_hex(buf[i]);
     if (i + 1 < len)
       uart_putchar(' ');
@@ -119,7 +120,8 @@ int main(void)
   static const uint32_t len = sizeof(tx);
   uint8_t rx[sizeof(tx)] = {0};
   _spi_setup();
-  while (1) {
+  while (1) 
+  {
     _loopback_transfer(tx, rx, len);
     _clear_buffer(rx, len);
     delay_ms(1000);
diff --git a/drivers/0x0b_spi_cbm/Src/rp2350_reset.c b/drivers/0x0b_spi_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x0b_spi_cbm/Src/rp2350_reset.c
+++ b/drivers/0x0b_spi_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x0b_spi_cbm/Src/rp2350_spi.c b/drivers/0x0b_spi_cbm/Src/rp2350_spi.c
index 537e8c5..7ee21ce 100644
--- a/drivers/0x0b_spi_cbm/Src/rp2350_spi.c
+++ b/drivers/0x0b_spi_cbm/Src/rp2350_spi.c
@@ -47,8 +47,7 @@ static void _spi_clear_reset(void)
   */
 static void _spi_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_SPI0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_SPI0_SHIFT)) == 0) {}
 }
 
 /**
@@ -148,8 +147,7 @@ static void _enable_spi(void)
   */
 static void _wait_tx_not_full(void)
 {
-  while ((SPI0->SSPSR & SPI_SSPSR_TNF_MASK) == 0) {
-  }
+  while ((SPI0->SSPSR & SPI_SSPSR_TNF_MASK) == 0) {}
 }
 
 /**
@@ -158,8 +156,7 @@ static void _wait_tx_not_full(void)
   */
 static void _wait_rx_not_empty(void)
 {
-  while ((SPI0->SSPSR & SPI_SSPSR_RNE_MASK) == 0) {
-  }
+  while ((SPI0->SSPSR & SPI_SSPSR_RNE_MASK) == 0) {}
 }
 
 void spi_release_reset(void)
@@ -214,7 +211,8 @@ void spi_cs_deselect(void)
 
 void spi_transfer(const uint8_t *tx, uint8_t *rx, uint32_t len)
 {
-  for (uint32_t i = 0; i < len; i++) {
+  for (uint32_t i = 0; i < len; i++) 
+  {
     _wait_tx_not_full();
     SPI0->SSPDR = tx[i];
     _wait_rx_not_empty();
diff --git a/drivers/0x0b_spi_cbm/Src/rp2350_uart.c b/drivers/0x0b_spi_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x0b_spi_cbm/Src/rp2350_uart.c
+++ b/drivers/0x0b_spi_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x0b_spi_cbm/Src/rp2350_xosc.c b/drivers/0x0b_spi_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x0b_spi_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x0b_spi_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x0b_spi_cbm/uf2conv.py b/drivers/0x0b_spi_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x0b_spi_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x0b_spi_cbm/uf2families.json b/drivers/0x0b_spi_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x0b_spi_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x0c_multicore_cbm/Makefile b/drivers/0x0c_multicore_cbm/Makefile
index 7ea98b4..1ade403 100644
--- a/drivers/0x0c_multicore_cbm/Makefile
+++ b/drivers/0x0c_multicore_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x0c_multicore_cbm/Src/main.c b/drivers/0x0c_multicore_cbm/Src/main.c
index 9f55c35..e52389e 100644
--- a/drivers/0x0c_multicore_cbm/Src/main.c
+++ b/drivers/0x0c_multicore_cbm/Src/main.c
@@ -42,7 +42,8 @@ static int _extract_digits(uint32_t value, char *tmp)
   int i = 0;
   if (value == 0)
     tmp[i++] = '0';
-  while (value > 0) {
+  while (value > 0) 
+  {
     tmp[i++] = '0' + (char)(value % 10);
     value /= 10;
   }
@@ -110,7 +111,8 @@ static void _print_counter_line(uint32_t sent, uint32_t received)
   */
 static void _core1_main(void)
 {
-  while (1) {
+  while (1) 
+  {
     uint32_t value = multicore_fifo_pop();
     multicore_fifo_push(value + 1);
   }
diff --git a/drivers/0x0c_multicore_cbm/Src/rp2350_multicore.c b/drivers/0x0c_multicore_cbm/Src/rp2350_multicore.c
index 3ff0065..ecd4f97 100644
--- a/drivers/0x0c_multicore_cbm/Src/rp2350_multicore.c
+++ b/drivers/0x0c_multicore_cbm/Src/rp2350_multicore.c
@@ -50,8 +50,7 @@ static void _fifo_drain(void)
   */
 static void _fifo_push_blocking(uint32_t data)
 {
-  while (!(SIO[SIO_FIFO_ST_OFFSET] & SIO_FIFO_ST_RDY_MASK)) {
-  }
+  while (!(SIO[SIO_FIFO_ST_OFFSET] & SIO_FIFO_ST_RDY_MASK)) {}
   SIO[SIO_FIFO_WR_OFFSET] = data;
   __asm__ volatile ("sev");
 }
@@ -62,8 +61,7 @@ static void _fifo_push_blocking(uint32_t data)
   */
 static uint32_t _fifo_pop_blocking(void)
 {
-  while (!(SIO[SIO_FIFO_ST_OFFSET] & SIO_FIFO_ST_VLD_MASK)) {
-  }
+  while (!(SIO[SIO_FIFO_ST_OFFSET] & SIO_FIFO_ST_VLD_MASK)) {}
   return SIO[SIO_FIFO_RD_OFFSET];
 }
 
@@ -75,8 +73,7 @@ static void _set_frce_off_proc1(void)
 {
   volatile uint32_t *set = (volatile uint32_t *)((uintptr_t)&PSM->FRCE_OFF + ATOMIC_SET_OFFSET);
   *set = (1U << PSM_FRCE_OFF_PROC1_SHIFT);
-  while (!(PSM->FRCE_OFF & (1U << PSM_FRCE_OFF_PROC1_SHIFT))) {
-  }
+  while (!(PSM->FRCE_OFF & (1U << PSM_FRCE_OFF_PROC1_SHIFT))) {}
 }
 
 /**
@@ -107,7 +104,8 @@ static void _reset_core1(void)
   */
 static void _send_handshake_word(uint32_t cmd)
 {
-  if (!cmd) {
+  if (!cmd) 
+  {
     _fifo_drain();
     __asm__ volatile ("sev");
   }
diff --git a/drivers/0x0c_multicore_cbm/Src/rp2350_reset.c b/drivers/0x0c_multicore_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x0c_multicore_cbm/Src/rp2350_reset.c
+++ b/drivers/0x0c_multicore_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x0c_multicore_cbm/Src/rp2350_uart.c b/drivers/0x0c_multicore_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x0c_multicore_cbm/Src/rp2350_uart.c
+++ b/drivers/0x0c_multicore_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x0c_multicore_cbm/Src/rp2350_xosc.c b/drivers/0x0c_multicore_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x0c_multicore_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x0c_multicore_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x0c_multicore_cbm/uf2conv.py b/drivers/0x0c_multicore_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x0c_multicore_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x0c_multicore_cbm/uf2families.json b/drivers/0x0c_multicore_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x0c_multicore_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x0d_timer_cbm/Makefile b/drivers/0x0d_timer_cbm/Makefile
index 7f1cfe4..1a276c4 100644
--- a/drivers/0x0d_timer_cbm/Makefile
+++ b/drivers/0x0d_timer_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x0d_timer_cbm/Src/rp2350_reset.c b/drivers/0x0d_timer_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x0d_timer_cbm/Src/rp2350_reset.c
+++ b/drivers/0x0d_timer_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x0d_timer_cbm/Src/rp2350_timer.c b/drivers/0x0d_timer_cbm/Src/rp2350_timer.c
index 37c71e1..c210a78 100644
--- a/drivers/0x0d_timer_cbm/Src/rp2350_timer.c
+++ b/drivers/0x0d_timer_cbm/Src/rp2350_timer.c
@@ -51,8 +51,7 @@ static void _timer_clear_reset_bit(void)
   */
 static void _timer_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_TIMER0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_TIMER0_SHIFT)) == 0) {}
 }
 
 /**
diff --git a/drivers/0x0d_timer_cbm/Src/rp2350_uart.c b/drivers/0x0d_timer_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x0d_timer_cbm/Src/rp2350_uart.c
+++ b/drivers/0x0d_timer_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x0d_timer_cbm/Src/rp2350_xosc.c b/drivers/0x0d_timer_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x0d_timer_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x0d_timer_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x0d_timer_cbm/Src/vector_table.c b/drivers/0x0d_timer_cbm/Src/vector_table.c
index 4989a70..7ec217c 100644
--- a/drivers/0x0d_timer_cbm/Src/vector_table.c
+++ b/drivers/0x0d_timer_cbm/Src/vector_table.c
@@ -34,8 +34,7 @@ extern void TIMER0_IRQ_0_Handler(void);
   */
 static void _default_handler(void)
 {
-  while (1) {
-  }
+  while (1) {}
 }
 
 typedef void (*vector_func_t)(void);
diff --git a/drivers/0x0d_timer_cbm/uf2conv.py b/drivers/0x0d_timer_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x0d_timer_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x0d_timer_cbm/uf2families.json b/drivers/0x0d_timer_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x0d_timer_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x0e_watchdog_cbm/Makefile b/drivers/0x0e_watchdog_cbm/Makefile
index 7d84234..dc822c7 100644
--- a/drivers/0x0e_watchdog_cbm/Makefile
+++ b/drivers/0x0e_watchdog_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -48,9 +57,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -63,14 +72,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x0e_watchdog_cbm/Src/rp2350_reset.c b/drivers/0x0e_watchdog_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x0e_watchdog_cbm/Src/rp2350_reset.c
+++ b/drivers/0x0e_watchdog_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x0e_watchdog_cbm/Src/rp2350_uart.c b/drivers/0x0e_watchdog_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x0e_watchdog_cbm/Src/rp2350_uart.c
+++ b/drivers/0x0e_watchdog_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x0e_watchdog_cbm/Src/rp2350_xosc.c b/drivers/0x0e_watchdog_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x0e_watchdog_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x0e_watchdog_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x0e_watchdog_cbm/uf2conv.py b/drivers/0x0e_watchdog_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x0e_watchdog_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x0e_watchdog_cbm/uf2families.json b/drivers/0x0e_watchdog_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x0e_watchdog_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/drivers/0x0f_flash_cbm/Makefile b/drivers/0x0f_flash_cbm/Makefile
index a7ddf0b..b5353e3 100644
--- a/drivers/0x0f_flash_cbm/Makefile
+++ b/drivers/0x0f_flash_cbm/Makefile
@@ -6,6 +6,15 @@
 #          Compiles, links, and generates UF2 firmware for the RP2350.
 # ------------------------------------------------------------------------------
 
+# OS detection
+ifeq ($(OS),Windows_NT)
+  MKDIR = if not exist $(subst /,\\,$(BUILD_DIR)) mkdir $(subst /,\\,$(BUILD_DIR))
+  RM    = if exist $(subst /,\\,$(BUILD_DIR)) rmdir /s /q $(subst /,\\,$(BUILD_DIR))
+else
+  MKDIR = mkdir -p $(BUILD_DIR)
+  RM    = rm -rf $(BUILD_DIR)
+endif
+
 # Toolchain
 CC      = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -47,9 +56,9 @@ OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SRCS))
 # Rules
 .PHONY: all clean flash
 
-all: $(BUILD_DIR)/$(TARGET).uf2
+all: $(BUILD_DIR)/$(TARGET).bin
 	@echo "==================================="
-	@echo "SUCCESS! Created $(TARGET).bin and $(TARGET).uf2"
+	@echo "SUCCESS! Created $(TARGET).elf and $(TARGET).bin"
 	@echo "==================================="
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR)
@@ -62,14 +71,12 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) -O binary $< $@
 
-$(BUILD_DIR)/$(TARGET).uf2: $(BUILD_DIR)/$(TARGET).bin
-	python3 uf2conv.py -b 0x10000000 -f 0xe48bff59 -o $@ $<
 
 $(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+	$(MKDIR)
 
 clean:
-	rm -rf $(BUILD_DIR)
+	$(RM)
 
 flash: $(BUILD_DIR)/$(TARGET).elf
 	openocd -f interface/cmsis-dap.cfg -f target/rp2350.cfg \
diff --git a/drivers/0x0f_flash_cbm/Src/rp2350_reset.c b/drivers/0x0f_flash_cbm/Src/rp2350_reset.c
index b0e18e8..6f09550 100644
--- a/drivers/0x0f_flash_cbm/Src/rp2350_reset.c
+++ b/drivers/0x0f_flash_cbm/Src/rp2350_reset.c
@@ -28,6 +28,5 @@ void reset_init_subsystem(void)
   value = RESETS->RESET;
   value &= ~(1U << RESETS_RESET_IO_BANK0_SHIFT);
   RESETS->RESET = value;
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_IO_BANK0_SHIFT)) == 0) {}
 }
diff --git a/drivers/0x0f_flash_cbm/Src/rp2350_uart.c b/drivers/0x0f_flash_cbm/Src/rp2350_uart.c
index 44e67a9..a24827a 100644
--- a/drivers/0x0f_flash_cbm/Src/rp2350_uart.c
+++ b/drivers/0x0f_flash_cbm/Src/rp2350_uart.c
@@ -42,8 +42,7 @@ static void _uart_clear_reset_bit(void)
   */
 static void _uart_wait_reset_done(void)
 {
-  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {
-  }
+  while ((RESETS->RESET_DONE & (1U << RESETS_RESET_UART0_SHIFT)) == 0) {}
 }
 
 /**
@@ -99,21 +98,20 @@ bool uart_is_readable(void)
 
 char uart_getchar(void)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_RXFE_MASK) {}
   return (char)(UART_BASE[UART_DR_OFFSET] & 0xFF);
 }
 
 void uart_putchar(char c)
 {
-  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {
-  }
+  while (UART_BASE[UART_FR_OFFSET] & UART_FR_TXFF_MASK) {}
   UART_BASE[UART_DR_OFFSET] = (uint32_t)c;
 }
 
 void uart_puts(const char *str)
 {
-  while (*str) {
+  while (*str) 
+  {
     uart_putchar(*str++);
   }
 }
diff --git a/drivers/0x0f_flash_cbm/Src/rp2350_xosc.c b/drivers/0x0f_flash_cbm/Src/rp2350_xosc.c
index 3383559..324bf96 100644
--- a/drivers/0x0f_flash_cbm/Src/rp2350_xosc.c
+++ b/drivers/0x0f_flash_cbm/Src/rp2350_xosc.c
@@ -26,8 +26,7 @@ void xosc_init(void)
 {
   XOSC->STARTUP = 0x00C4U;
   XOSC->CTRL = 0x00FABAA0U;
-  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {
-  }
+  while ((XOSC->STATUS & (1U << XOSC_STATUS_STABLE_SHIFT)) == 0) {}
 }
 
 void xosc_enable_peri_clk(void)
diff --git a/drivers/0x0f_flash_cbm/uf2conv.py b/drivers/0x0f_flash_cbm/uf2conv.py
deleted file mode 100644
index 529dd96..0000000
--- a/drivers/0x0f_flash_cbm/uf2conv.py
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import struct
-import subprocess
-import re
-import os
-import os.path
-import argparse
-import json
-from time import sleep
-
-
-UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
-UF2_MAGIC_END = 0x0AB16F30  # Ditto
-
-INFO_FILE = "/INFO_UF2.TXT"
-
-appstartaddr = 0x2000
-familyid = 0x0
-
-
-def is_uf2(buf):
-    w = struct.unpack("<II", buf[0:8])
-    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
-
-
-def is_hex(buf):
-    try:
-        w = buf[0:30].decode("utf-8")
-    except UnicodeDecodeError:
-        return False
-    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
-        return True
-    return False
-
-
-def convert_from_uf2(buf):
-    global appstartaddr
-    global familyid
-    numblocks = len(buf) // 512
-    curraddr = None
-    currfamilyid = None
-    families_found = {}
-    prev_flag = None
-    all_flags_same = True
-    outp = []
-    for blockno in range(numblocks):
-        ptr = blockno * 512
-        block = buf[ptr : ptr + 512]
-        hd = struct.unpack(b"<IIIIIIII", block[0:32])
-        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
-            print("Skipping block at " + ptr + "; bad magic")
-            continue
-        if hd[2] & 1:
-            # NO-flash flag set; skip block
-            continue
-        datalen = hd[4]
-        if datalen > 476:
-            assert False, "Invalid UF2 data size at " + ptr
-        newaddr = hd[3]
-        if (hd[2] & 0x2000) and (currfamilyid == None):
-            currfamilyid = hd[7]
-        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
-            currfamilyid = hd[7]
-            curraddr = newaddr
-        if familyid == 0x0 or familyid == hd[7]:
-            appstartaddr = newaddr
-        padding = newaddr - curraddr
-        if padding < 0:
-            assert False, "Block out of order at " + ptr
-        if padding > 10 * 1024 * 1024:
-            assert False, "More than 10M of padding needed at " + ptr
-        if padding % 4 != 0:
-            assert False, "Non-word padding size at " + ptr
-        while padding > 0:
-            padding -= 4
-            outp.append(b"\x00\x00\x00\x00")
-        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
-            outp.append(block[32 : 32 + datalen])
-        curraddr = newaddr + datalen
-        if hd[2] & 0x2000:
-            if hd[7] in families_found.keys():
-                if families_found[hd[7]] > newaddr:
-                    families_found[hd[7]] = newaddr
-            else:
-                families_found[hd[7]] = newaddr
-        if prev_flag == None:
-            prev_flag = hd[2]
-        if prev_flag != hd[2]:
-            all_flags_same = False
-        if blockno == (numblocks - 1):
-            print("--- UF2 File Header Info ---")
-            families = load_families()
-            for family_hex in families_found.keys():
-                family_short_name = ""
-                for name, value in families.items():
-                    if value == family_hex:
-                        family_short_name = name
-                print(
-                    "Family ID is {:s}, hex value is 0x{:08x}".format(
-                        family_short_name, family_hex
-                    )
-                )
-                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
-            if all_flags_same:
-                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
-            else:
-                print("Flags were not all the same")
-            print("----------------------------")
-            if len(families_found) > 1 and familyid == 0x0:
-                outp = []
-                appstartaddr = 0x0
-    return b"".join(outp)
-
-
-def convert_to_carray(file_content):
-    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
-    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
-    for i in range(len(file_content)):
-        if i % 16 == 0:
-            outp += "\n"
-        outp += "0x%02x, " % file_content[i]
-    outp += "\n};\n"
-    return bytes(outp, "utf-8")
-
-
-def convert_to_uf2(file_content):
-    global familyid
-    datapadding = b""
-    while len(datapadding) < 512 - 256 - 32 - 4:
-        datapadding += b"\x00\x00\x00\x00"
-    numblocks = (len(file_content) + 255) // 256
-    outp = []
-    for blockno in range(numblocks):
-        ptr = 256 * blockno
-        chunk = file_content[ptr : ptr + 256]
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            b"<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            ptr + appstartaddr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        while len(chunk) < 256:
-            chunk += b"\x00"
-        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
-        assert len(block) == 512
-        outp.append(block)
-    return b"".join(outp)
-
-
-class Block:
-    def __init__(self, addr, default_data=0xFF):
-        self.addr = addr
-        self.bytes = bytearray([default_data] * 256)
-
-    def encode(self, blockno, numblocks):
-        global familyid
-        flags = 0x0
-        if familyid:
-            flags |= 0x2000
-        hd = struct.pack(
-            "<IIIIIIII",
-            UF2_MAGIC_START0,
-            UF2_MAGIC_START1,
-            flags,
-            self.addr,
-            256,
-            blockno,
-            numblocks,
-            familyid,
-        )
-        hd += self.bytes[0:256]
-        while len(hd) < 512 - 4:
-            hd += b"\x00"
-        hd += struct.pack("<I", UF2_MAGIC_END)
-        return hd
-
-
-def convert_from_hex_to_uf2(buf):
-    global appstartaddr
-    appstartaddr = None
-    upper = 0
-    currblock = None
-    blocks = []
-    for line in buf.split("\n"):
-        if line[0] != ":":
-            continue
-        i = 1
-        rec = []
-        while i < len(line) - 1:
-            rec.append(int(line[i : i + 2], 16))
-            i += 2
-        tp = rec[3]
-        if tp == 4:
-            upper = ((rec[4] << 8) | rec[5]) << 16
-        elif tp == 2:
-            upper = ((rec[4] << 8) | rec[5]) << 4
-        elif tp == 1:
-            break
-        elif tp == 0:
-            addr = upper + ((rec[1] << 8) | rec[2])
-            if appstartaddr == None:
-                appstartaddr = addr
-            i = 4
-            while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
-                    currblock = Block(addr & ~0xFF)
-                    blocks.append(currblock)
-                currblock.bytes[addr & 0xFF] = rec[i]
-                addr += 1
-                i += 1
-    numblocks = len(blocks)
-    resfile = b""
-    for i in range(0, numblocks):
-        resfile += blocks[i].encode(i, numblocks)
-    return resfile
-
-
-def to_str(b):
-    return b.decode("utf-8")
-
-
-def get_drives():
-    drives = []
-    if sys.platform == "win32":
-        r = subprocess.check_output(
-            [
-                "powershell",
-                "-Command",
-                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
-            ]
-        )
-        drive = to_str(r).strip()
-        if drive:
-            drives.append(drive)
-    else:
-        searchpaths = ["/mnt", "/media"]
-        if sys.platform == "darwin":
-            searchpaths = ["/Volumes"]
-        elif sys.platform == "linux":
-            searchpaths += [
-                "/media/" + os.environ["USER"],
-                "/run/media/" + os.environ["USER"],
-            ]
-            if "SUDO_USER" in os.environ.keys():
-                searchpaths += ["/media/" + os.environ["SUDO_USER"]]
-                searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
-
-        for rootpath in searchpaths:
-            if os.path.isdir(rootpath):
-                for d in os.listdir(rootpath):
-                    if os.path.isdir(os.path.join(rootpath, d)):
-                        drives.append(os.path.join(rootpath, d))
-
-    def has_info(d):
-        try:
-            return os.path.isfile(d + INFO_FILE)
-        except:
-            return False
-
-    return list(filter(has_info, drives))
-
-
-def board_id(path):
-    with open(path + INFO_FILE, mode="r") as file:
-        file_content = file.read()
-    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
-
-
-def list_drives():
-    for d in get_drives():
-        print(d, board_id(d))
-
-
-def write_file(name, buf):
-    with open(name, "wb") as f:
-        f.write(buf)
-    print("Wrote %d bytes to %s" % (len(buf), name))
-
-
-def load_families():
-    # The expectation is that the `uf2families.json` file is in the same
-    # directory as this script. Make a path that works using `__file__`
-    # which contains the full path to this script.
-    filename = "uf2families.json"
-    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-    with open(pathname) as f:
-        raw_families = json.load(f)
-
-    families = {}
-    for family in raw_families:
-        families[family["short_name"]] = int(family["id"], 0)
-
-    return families
-
-
-def main():
-    global appstartaddr, familyid
-
-    def error(msg):
-        print(msg, file=sys.stderr)
-        sys.exit(1)
-
-    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
-    parser.add_argument(
-        "input",
-        metavar="INPUT",
-        type=str,
-        nargs="?",
-        help="input file (HEX, BIN or UF2)",
-    )
-    parser.add_argument(
-        "-b",
-        "--base",
-        dest="base",
-        type=str,
-        default="0x2000",
-        help="set base address of application for BIN format (default: 0x2000)",
-    )
-    parser.add_argument(
-        "-f",
-        "--family",
-        dest="family",
-        type=str,
-        default="0x0",
-        help="specify familyID - number or name (default: 0x0)",
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        metavar="FILE",
-        dest="output",
-        type=str,
-        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
-    )
-    parser.add_argument(
-        "-d", "--device", dest="device_path", help="select a device path to flash"
-    )
-    parser.add_argument(
-        "-l", "--list", action="store_true", help="list connected devices"
-    )
-    parser.add_argument(
-        "-c", "--convert", action="store_true", help="do not flash, just convert"
-    )
-    parser.add_argument(
-        "-D", "--deploy", action="store_true", help="just flash, do not convert"
-    )
-    parser.add_argument(
-        "-w", "--wait", action="store_true", help="wait for device to flash"
-    )
-    parser.add_argument(
-        "-C",
-        "--carray",
-        action="store_true",
-        help="convert binary file to a C array, not UF2",
-    )
-    parser.add_argument(
-        "-i",
-        "--info",
-        action="store_true",
-        help="display header information from UF2, do not convert",
-    )
-    args = parser.parse_args()
-    appstartaddr = int(args.base, 0)
-
-    families = load_families()
-
-    if args.family.upper() in families:
-        familyid = families[args.family.upper()]
-    else:
-        try:
-            familyid = int(args.family, 0)
-        except ValueError:
-            error(
-                "Family ID needs to be a number or one of: "
-                + ", ".join(families.keys())
-            )
-
-    if args.list:
-        list_drives()
-    else:
-        if not args.input:
-            error("Need input file")
-        with open(args.input, mode="rb") as f:
-            inpbuf = f.read()
-        from_uf2 = is_uf2(inpbuf)
-        ext = "uf2"
-        if args.deploy:
-            outbuf = inpbuf
-        elif from_uf2 and not args.info:
-            outbuf = convert_from_uf2(inpbuf)
-            ext = "bin"
-        elif from_uf2 and args.info:
-            outbuf = ""
-            convert_from_uf2(inpbuf)
-        elif is_hex(inpbuf):
-            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
-        elif args.carray:
-            outbuf = convert_to_carray(inpbuf)
-            ext = "h"
-        else:
-            outbuf = convert_to_uf2(inpbuf)
-        if not args.deploy and not args.info:
-            print(
-                "Converted to %s, output size: %d, start address: 0x%x"
-                % (ext, len(outbuf), appstartaddr)
-            )
-        if args.convert or ext != "uf2":
-            if args.output == None:
-                args.output = "flash." + ext
-        if args.output:
-            write_file(args.output, outbuf)
-        if ext == "uf2" and not args.convert and not args.info:
-            drives = get_drives()
-            if len(drives) == 0:
-                if args.wait:
-                    print("Waiting for drive to deploy...")
-                    while len(drives) == 0:
-                        sleep(0.1)
-                        drives = get_drives()
-                elif not args.output:
-                    error("No drive to deploy.")
-            for d in drives:
-                print("Flashing %s (%s)" % (d, board_id(d)))
-                write_file(d + "/NEW.UF2", outbuf)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/drivers/0x0f_flash_cbm/uf2families.json b/drivers/0x0f_flash_cbm/uf2families.json
deleted file mode 100644
index 39373c4..0000000
--- a/drivers/0x0f_flash_cbm/uf2families.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "short_name": "RP2040",
-        "id": "0xe48bff56",
-        "description": "Raspberry Pi RP2040"
-    },
-    {
-        "short_name": "RP2350-ARM-S",
-        "id": "0xe48bff59",
-        "description": "Raspberry Pi RP2350, ARM, Secure"
-    },
-    {
-        "short_name": "RP2350-ARM-NS",
-        "id": "0xe48bff5a",
-        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
-    },
-    {
-        "short_name": "RP2350-RISCV",
-        "id": "0xe48bff5b",
-        "description": "Raspberry Pi RP2350, RISC-V"
-    }
-]
\ No newline at end of file
diff --git a/uf2conv.py b/uf2conv.py
index d6dd7a8..529dd96 100644
--- a/uf2conv.py
+++ b/uf2conv.py
@@ -10,9 +10,9 @@ import json
 from time import sleep
 
 
-UF2_MAGIC_START0 = 0x0A324655 # "UF2\n"
-UF2_MAGIC_START1 = 0x9E5D5157 # Randomly selected
-UF2_MAGIC_END    = 0x0AB16F30 # Ditto
+UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
+UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
+UF2_MAGIC_END = 0x0AB16F30  # Ditto
 
 INFO_FILE = "/INFO_UF2.TXT"
 
@@ -24,15 +24,17 @@ def is_uf2(buf):
     w = struct.unpack("<II", buf[0:8])
     return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
 
+
 def is_hex(buf):
     try:
         w = buf[0:30].decode("utf-8")
     except UnicodeDecodeError:
         return False
-    if w[0] == ':' and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
+    if w[0] == ":" and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
         return True
     return False
 
+
 def convert_from_uf2(buf):
     global appstartaddr
     global familyid
@@ -45,7 +47,7 @@ def convert_from_uf2(buf):
     outp = []
     for blockno in range(numblocks):
         ptr = blockno * 512
-        block = buf[ptr:ptr + 512]
+        block = buf[ptr : ptr + 512]
         hd = struct.unpack(b"<IIIIIIII", block[0:32])
         if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
             print("Skipping block at " + ptr + "; bad magic")
@@ -62,12 +64,12 @@ def convert_from_uf2(buf):
         if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
             currfamilyid = hd[7]
             curraddr = newaddr
-            if familyid == 0x0 or familyid == hd[7]:
-                appstartaddr = newaddr
+        if familyid == 0x0 or familyid == hd[7]:
+            appstartaddr = newaddr
         padding = newaddr - curraddr
         if padding < 0:
             assert False, "Block out of order at " + ptr
-        if padding > 10*1024*1024:
+        if padding > 10 * 1024 * 1024:
             assert False, "More than 10M of padding needed at " + ptr
         if padding % 4 != 0:
             assert False, "Non-word padding size at " + ptr
@@ -95,7 +97,11 @@ def convert_from_uf2(buf):
                 for name, value in families.items():
                     if value == family_hex:
                         family_short_name = name
-                print("Family ID is {:s}, hex value is 0x{:08x}".format(family_short_name,family_hex))
+                print(
+                    "Family ID is {:s}, hex value is 0x{:08x}".format(
+                        family_short_name, family_hex
+                    )
+                )
                 print("Target Address is 0x{:08x}".format(families_found[family_hex]))
             if all_flags_same:
                 print("All block flag values consistent, 0x{:04x}".format(hd[2]))
@@ -107,6 +113,7 @@ def convert_from_uf2(buf):
                 appstartaddr = 0x0
     return b"".join(outp)
 
+
 def convert_to_carray(file_content):
     outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
     outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
@@ -117,6 +124,7 @@ def convert_to_carray(file_content):
     outp += "\n};\n"
     return bytes(outp, "utf-8")
 
+
 def convert_to_uf2(file_content):
     global familyid
     datapadding = b""
@@ -126,13 +134,21 @@ def convert_to_uf2(file_content):
     outp = []
     for blockno in range(numblocks):
         ptr = 256 * blockno
-        chunk = file_content[ptr:ptr + 256]
+        chunk = file_content[ptr : ptr + 256]
         flags = 0x0
         if familyid:
             flags |= 0x2000
-        hd = struct.pack(b"<IIIIIIII",
-            UF2_MAGIC_START0, UF2_MAGIC_START1,
-            flags, ptr + appstartaddr, 256, blockno, numblocks, familyid)
+        hd = struct.pack(
+            b"<IIIIIIII",
+            UF2_MAGIC_START0,
+            UF2_MAGIC_START1,
+            flags,
+            ptr + appstartaddr,
+            256,
+            blockno,
+            numblocks,
+            familyid,
+        )
         while len(chunk) < 256:
             chunk += b"\x00"
         block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
@@ -140,6 +156,7 @@ def convert_to_uf2(file_content):
         outp.append(block)
     return b"".join(outp)
 
+
 class Block:
     def __init__(self, addr, default_data=0xFF):
         self.addr = addr
@@ -150,28 +167,37 @@ class Block:
         flags = 0x0
         if familyid:
             flags |= 0x2000
-        hd = struct.pack("<IIIIIIII",
-            UF2_MAGIC_START0, UF2_MAGIC_START1,
-            flags, self.addr, 256, blockno, numblocks, familyid)
+        hd = struct.pack(
+            "<IIIIIIII",
+            UF2_MAGIC_START0,
+            UF2_MAGIC_START1,
+            flags,
+            self.addr,
+            256,
+            blockno,
+            numblocks,
+            familyid,
+        )
         hd += self.bytes[0:256]
         while len(hd) < 512 - 4:
             hd += b"\x00"
         hd += struct.pack("<I", UF2_MAGIC_END)
         return hd
 
+
 def convert_from_hex_to_uf2(buf):
     global appstartaddr
     appstartaddr = None
     upper = 0
     currblock = None
     blocks = []
-    for line in buf.split('\n'):
+    for line in buf.split("\n"):
         if line[0] != ":":
             continue
         i = 1
         rec = []
         while i < len(line) - 1:
-            rec.append(int(line[i:i+2], 16))
+            rec.append(int(line[i : i + 2], 16))
             i += 2
         tp = rec[3]
         if tp == 4:
@@ -186,10 +212,10 @@ def convert_from_hex_to_uf2(buf):
                 appstartaddr = addr
             i = 4
             while i < len(rec) - 1:
-                if not currblock or currblock.addr & ~0xff != addr & ~0xff:
-                    currblock = Block(addr & ~0xff)
+                if not currblock or currblock.addr & ~0xFF != addr & ~0xFF:
+                    currblock = Block(addr & ~0xFF)
                     blocks.append(currblock)
-                currblock.bytes[addr & 0xff] = rec[i]
+                currblock.bytes[addr & 0xFF] = rec[i]
                 addr += 1
                 i += 1
     numblocks = len(blocks)
@@ -198,17 +224,21 @@ def convert_from_hex_to_uf2(buf):
         resfile += blocks[i].encode(i, numblocks)
     return resfile
 
+
 def to_str(b):
     return b.decode("utf-8")
 
+
 def get_drives():
     drives = []
     if sys.platform == "win32":
-        r = subprocess.check_output([
-            "powershell",
-            "-Command",
-            '(Get-WmiObject Win32_LogicalDisk -Filter "VolumeName=\'RPI-RP2\'").DeviceID'
-            ])
+        r = subprocess.check_output(
+            [
+                "powershell",
+                "-Command",
+                "(Get-WmiObject Win32_LogicalDisk -Filter \"VolumeName='RPI-RP2'\").DeviceID",
+            ]
+        )
         drive = to_str(r).strip()
         if drive:
             drives.append(drive)
@@ -217,7 +247,10 @@ def get_drives():
         if sys.platform == "darwin":
             searchpaths = ["/Volumes"]
         elif sys.platform == "linux":
-            searchpaths += ["/media/" + os.environ["USER"], "/run/media/" + os.environ["USER"]]
+            searchpaths += [
+                "/media/" + os.environ["USER"],
+                "/run/media/" + os.environ["USER"],
+            ]
             if "SUDO_USER" in os.environ.keys():
                 searchpaths += ["/media/" + os.environ["SUDO_USER"]]
                 searchpaths += ["/run/media/" + os.environ["SUDO_USER"]]
@@ -228,7 +261,6 @@ def get_drives():
                     if os.path.isdir(os.path.join(rootpath, d)):
                         drives.append(os.path.join(rootpath, d))
 
-
     def has_info(d):
         try:
             return os.path.isfile(d + INFO_FILE)
@@ -239,7 +271,7 @@ def get_drives():
 
 
 def board_id(path):
-    with open(path + INFO_FILE, mode='r') as file:
+    with open(path + INFO_FILE, mode="r") as file:
         file_content = file.read()
     return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
 
@@ -273,34 +305,70 @@ def load_families():
 
 def main():
     global appstartaddr, familyid
+
     def error(msg):
         print(msg, file=sys.stderr)
         sys.exit(1)
-    parser = argparse.ArgumentParser(description='Convert to UF2 or flash directly.')
-    parser.add_argument('input', metavar='INPUT', type=str, nargs='?',
-                        help='input file (HEX, BIN or UF2)')
-    parser.add_argument('-b', '--base', dest='base', type=str,
-                        default="0x2000",
-                        help='set base address of application for BIN format (default: 0x2000)')
-    parser.add_argument('-f', '--family', dest='family', type=str,
-                        default="0x0",
-                        help='specify familyID - number or name (default: 0x0)')
-    parser.add_argument('-o', '--output', metavar="FILE", dest='output', type=str,
-                        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible')
-    parser.add_argument('-d', '--device', dest="device_path",
-                        help='select a device path to flash')
-    parser.add_argument('-l', '--list', action='store_true',
-                        help='list connected devices')
-    parser.add_argument('-c', '--convert', action='store_true',
-                        help='do not flash, just convert')
-    parser.add_argument('-D', '--deploy', action='store_true',
-                        help='just flash, do not convert')
-    parser.add_argument('-w', '--wait', action='store_true',
-                        help='wait for device to flash')
-    parser.add_argument('-C', '--carray', action='store_true',
-                        help='convert binary file to a C array, not UF2')
-    parser.add_argument('-i', '--info', action='store_true',
-                        help='display header information from UF2, do not convert')
+
+    parser = argparse.ArgumentParser(description="Convert to UF2 or flash directly.")
+    parser.add_argument(
+        "input",
+        metavar="INPUT",
+        type=str,
+        nargs="?",
+        help="input file (HEX, BIN or UF2)",
+    )
+    parser.add_argument(
+        "-b",
+        "--base",
+        dest="base",
+        type=str,
+        default="0x2000",
+        help="set base address of application for BIN format (default: 0x2000)",
+    )
+    parser.add_argument(
+        "-f",
+        "--family",
+        dest="family",
+        type=str,
+        default="0x0",
+        help="specify familyID - number or name (default: 0x0)",
+    )
+    parser.add_argument(
+        "-o",
+        "--output",
+        metavar="FILE",
+        dest="output",
+        type=str,
+        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible',
+    )
+    parser.add_argument(
+        "-d", "--device", dest="device_path", help="select a device path to flash"
+    )
+    parser.add_argument(
+        "-l", "--list", action="store_true", help="list connected devices"
+    )
+    parser.add_argument(
+        "-c", "--convert", action="store_true", help="do not flash, just convert"
+    )
+    parser.add_argument(
+        "-D", "--deploy", action="store_true", help="just flash, do not convert"
+    )
+    parser.add_argument(
+        "-w", "--wait", action="store_true", help="wait for device to flash"
+    )
+    parser.add_argument(
+        "-C",
+        "--carray",
+        action="store_true",
+        help="convert binary file to a C array, not UF2",
+    )
+    parser.add_argument(
+        "-i",
+        "--info",
+        action="store_true",
+        help="display header information from UF2, do not convert",
+    )
     args = parser.parse_args()
     appstartaddr = int(args.base, 0)
 
@@ -312,14 +380,17 @@ def main():
         try:
             familyid = int(args.family, 0)
         except ValueError:
-            error("Family ID needs to be a number or one of: " + ", ".join(families.keys()))
+            error(
+                "Family ID needs to be a number or one of: "
+                + ", ".join(families.keys())
+            )
 
     if args.list:
         list_drives()
     else:
         if not args.input:
             error("Need input file")
-        with open(args.input, mode='rb') as f:
+        with open(args.input, mode="rb") as f:
             inpbuf = f.read()
         from_uf2 = is_uf2(inpbuf)
         ext = "uf2"
@@ -339,8 +410,10 @@ def main():
         else:
             outbuf = convert_to_uf2(inpbuf)
         if not args.deploy and not args.info:
-            print("Converted to %s, output size: %d, start address: 0x%x" %
-                  (ext, len(outbuf), appstartaddr))
+            print(
+                "Converted to %s, output size: %d, start address: 0x%x"
+                % (ext, len(outbuf), appstartaddr)
+            )
         if args.convert or ext != "uf2":
             if args.output == None:
                 args.output = "flash." + ext
diff --git a/uf2families.json b/uf2families.json
index cd21783..39373c4 100644
--- a/uf2families.json
+++ b/uf2families.json
@@ -1,382 +1,22 @@
 [
     {
-        "id": "0x16573617",
-        "short_name": "ATMEGA32",
-        "description": "Microchip (Atmel) ATmega32"
-    },
-    {
-        "id": "0x1851780a",
-        "short_name": "SAML21",
-        "description": "Microchip (Atmel) SAML21"
-    },
-    {
-        "id": "0x1b57745f",
-        "short_name": "NRF52",
-        "description": "Nordic NRF52"
-    },
-    {
-        "id": "0x1c5f21b0",
-        "short_name": "ESP32",
-        "description": "ESP32"
-    },
-    {
-        "id": "0x1e1f432d",
-        "short_name": "STM32L1",
-        "description": "ST STM32L1xx"
-    },
-    {
-        "id": "0x202e3a91",
-        "short_name": "STM32L0",
-        "description": "ST STM32L0xx"
-    },
-    {
-        "id": "0x21460ff0",
-        "short_name": "STM32WL",
-        "description": "ST STM32WLxx"
-    },
-    {
-        "id": "0x22e0d6fc",
-        "short_name": "RTL8710B",
-        "description": "Realtek AmebaZ RTL8710B"
-    },
-    {
-        "id": "0x2abc77ec",
-        "short_name": "LPC55",
-        "description": "NXP LPC55xx"
-    },
-    {
-        "id": "0x300f5633",
-        "short_name": "STM32G0",
-        "description": "ST STM32G0xx"
-    },
-    {
-        "id": "0x31d228c6",
-        "short_name": "GD32F350",
-        "description": "GD32F350"
-    },
-    {
-        "id": "0x3379CFE2",
-        "short_name": "RTL8720D",
-        "description": "Realtek AmebaD RTL8720D"
-    },
-    {
-        "id": "0x04240bdf",
-        "short_name": "STM32L5",
-        "description": "ST STM32L5xx"
-    },
-    {
-        "id": "0x4c71240a",
-        "short_name": "STM32G4",
-        "description": "ST STM32G4xx"
-    },
-    {
-        "id": "0x4fb2d5bd",
-        "short_name": "MIMXRT10XX",
-        "description": "NXP i.MX RT10XX"
-    },
-    {
-        "id": "0x51e903a8",
-        "short_name": "XR809",
-        "description": "Xradiotech 809"
-    },
-    {
-        "id": "0x53b80f00",
-        "short_name": "STM32F7",
-        "description": "ST STM32F7xx"
-    },
-    {
-        "id": "0x55114460",
-        "short_name": "SAMD51",
-        "description": "Microchip (Atmel) SAMD51"
-    },
-    {
-        "id": "0x57755a57",
-        "short_name": "STM32F4",
-        "description": "ST STM32F4xx"
-    },
-    {
-        "id": "0x5a18069b",
-        "short_name": "FX2",
-        "description": "Cypress FX2"
-    },
-    {
-        "id": "0x5d1a0a2e",
-        "short_name": "STM32F2",
-        "description": "ST STM32F2xx"
-    },
-    {
-        "id": "0x5ee21072",
-        "short_name": "STM32F1",
-        "description": "ST STM32F103"
-    },
-    {
-        "id": "0x621e937a",
-        "short_name": "NRF52833",
-        "description": "Nordic NRF52833"
-    },
-    {
-        "id": "0x647824b6",
-        "short_name": "STM32F0",
-        "description": "ST STM32F0xx"
-    },
-    {
-        "id": "0x675a40b0",
-        "short_name": "BK7231U",
-        "description": "Beken 7231U/7231T"
-    },
-    {
-        "id": "0x68ed2b88",
-        "short_name": "SAMD21",
-        "description": "Microchip (Atmel) SAMD21"
-    },
-    {
-        "id": "0x6a82cc42",
-        "short_name": "BK7251",
-        "description": "Beken 7251/7252"
-    },
-    {
-        "id": "0x6b846188",
-        "short_name": "STM32F3",
-        "description": "ST STM32F3xx"
-    },
-    {
-        "id": "0x6d0922fa",
-        "short_name": "STM32F407",
-        "description": "ST STM32F407"
-    },
-    {
-        "id": "0x4e8f1c5d",
-        "short_name": "STM32H5",
-        "description": "ST STM32H5xx"
-    },
-    {
-        "id": "0x6db66082",
-        "short_name": "STM32H7",
-        "description": "ST STM32H7xx"
-    },
-    {
-        "id": "0x70d16653",
-        "short_name": "STM32WB",
-        "description": "ST STM32WBxx"
-    },
-    {
-        "id": "0x7b3ef230",
-        "short_name": "BK7231N",
-        "description": "Beken 7231N"
-    },
-    {
-        "id": "0x7eab61ed",
-        "short_name": "ESP8266",
-        "description": "ESP8266"
-    },
-    {
-        "id": "0x7f83e793",
-        "short_name": "KL32L2",
-        "description": "NXP KL32L2x"
-    },
-    {
-        "id": "0x8fb060fe",
-        "short_name": "STM32F407VG",
-        "description": "ST STM32F407VG"
-    },
-    {
-        "id": "0x9fffd543",
-        "short_name": "RTL8710A",
-        "description": "Realtek Ameba1 RTL8710A"
-    },
-    {
-        "id": "0xada52840",
-        "short_name": "NRF52840",
-        "description": "Nordic NRF52840"
-    },
-    {
-        "id": "0x820d9a5f",
-        "short_name": "NRF52820",
-        "description": "Nordic NRF52820_xxAA"
-    },
-    {
-        "id": "0xbfdd4eee",
-        "short_name": "ESP32S2",
-        "description": "ESP32-S2"
-    },
-    {
-        "id": "0xc47e5767",
-        "short_name": "ESP32S3",
-        "description": "ESP32-S3"
-    },
-    {
-        "id": "0xd42ba06c",
-        "short_name": "ESP32C3",
-        "description": "ESP32-C3"
-    },
-    {
-        "id": "0x2b88d29c",
-        "short_name": "ESP32C2",
-        "description": "ESP32-C2"
-    },
-    {
-        "id": "0x332726f6",
-        "short_name": "ESP32H2",
-        "description": "ESP32-H2"
-    },
-    {
-        "id": "0x540ddf62",
-        "short_name": "ESP32C6",
-        "description": "ESP32-C6"
-    },
-    {
-        "id": "0x3d308e94",
-        "short_name": "ESP32P4",
-        "description": "ESP32-P4"
-    },
-    {
-        "id": "0xf71c0343",
-        "short_name": "ESP32C5",
-        "description": "ESP32-C5"
-    },
-    {
-        "id": "0x77d850c4",
-        "short_name": "ESP32C61",
-        "description": "ESP32-C61"
-    },
-    {
-        "id": "0xb6dd00af",
-        "short_name": "ESP32H21",
-        "description": "ESP32-H21"
-    },
-    {
-        "id": "0x9e0baa8a",
-        "short_name": "ESP32H4",
-        "description": "ESP32-H4"
-    },
-    {
-        "id": "0xde1270b7",
-        "short_name": "BL602",
-        "description": "Boufallo 602"
-    },
-    {
-        "id": "0xe08f7564",
-        "short_name": "RTL8720C",
-        "description": "Realtek AmebaZ2 RTL8720C"
-    },
-    {
-        "id": "0xe48bff56",
         "short_name": "RP2040",
+        "id": "0xe48bff56",
         "description": "Raspberry Pi RP2040"
     },
     {
-        "id": "0xe48bff57",
-        "short_name": "RP2XXX_ABSOLUTE",
-        "description": "Raspberry Pi Microcontrollers: Absolute (unpartitioned) download"
-    },
-    {
-        "id": "0xe48bff58",
-        "short_name": "RP2XXX_DATA",
-        "description": "Raspberry Pi Microcontrollers: Data partition download"
-    },
-    {
+        "short_name": "RP2350-ARM-S",
         "id": "0xe48bff59",
-        "short_name": "RP2350_ARM_S",
-        "description": "Raspberry Pi RP2350, Secure Arm image"
+        "description": "Raspberry Pi RP2350, ARM, Secure"
     },
     {
+        "short_name": "RP2350-ARM-NS",
         "id": "0xe48bff5a",
-        "short_name": "RP2350_RISCV",
-        "description": "Raspberry Pi RP2350, RISC-V image"
+        "description": "Raspberry Pi RP2350, ARM, Non-Secure"
     },
     {
+        "short_name": "RP2350-RISCV",
         "id": "0xe48bff5b",
-        "short_name": "RP2350_ARM_NS",
-        "description": "Raspberry Pi RP2350, Non-secure Arm image"
-    },
-    {
-        "id": "0x00ff6919",
-        "short_name": "STM32L4",
-        "description": "ST STM32L4xx"
-    },
-    {
-        "id": "0x9af03e33",
-        "short_name": "GD32VF103",
-        "description": "GigaDevice GD32VF103"
-    },
-    {
-        "id": "0x4f6ace52",
-        "short_name": "CSK4",
-        "description": "LISTENAI CSK300x/400x"
-    },
-    {
-        "id": "0x6e7348a8",
-        "short_name": "CSK6",
-        "description": "LISTENAI CSK60xx"
-    },
-    {
-        "id": "0x11de784a",
-        "short_name": "M0SENSE",
-        "description": "M0SENSE BL702"
-    },
-    {
-        "id": "0x4b684d71",
-        "short_name": "MaixPlay-U4",
-        "description": "Sipeed MaixPlay-U4(BL618)"
-    },
-    {
-        "id": "0x9517422f",
-        "short_name": "RZA1LU",
-        "description": "Renesas RZ/A1LU (R7S7210xx)"
-    },
-    {
-        "id": "0x2dc309c5",
-        "short_name": "STM32F411xE",
-        "description": "ST STM32F411xE"
-    },
-    {
-        "id": "0x06d1097b",
-        "short_name": "STM32F411xC",
-        "description": "ST STM32F411xC"
-    },
-    {
-        "id": "0x72721d4e",
-        "short_name": "NRF52832xxAA",
-        "description": "Nordic NRF52832xxAA"
-    },
-    {
-        "id": "0x6f752678",
-        "short_name": "NRF52832xxAB",
-        "description": "Nordic NRF52832xxAB"
-    },
-    {
-        "id": "0xa0c97b8e",
-        "short_name": "AT32F415",
-        "description": "ArteryTek AT32F415"
-    },
-    {
-        "id": "0x699b62ec",
-        "short_name": "CH32V",
-        "description": "WCH CH32V2xx and CH32V3xx"
-    },
-    {
-        "id": "0x7be8976d",
-        "short_name": "RA4M1",
-        "description": "Renesas RA4M1"
-    },
-    {
-        "id": "0x7410520a",
-        "short_name": "MAX32690",
-        "description": "Analog Devices MAX32690"
-    },
-    {
-        "id": "0xd63f8632",
-        "short_name": "MAX32650",
-        "description": "Analog Devices MAX32650/1/2"
-    },
-    {
-        "id": "0xf0c30d71",
-        "short_name": "MAX32666",
-        "description": "Analog Devices MAX32665/6"
-    },
-    {
-        "id": "0x91d3fd18",
-        "short_name": "MAX78002",
-        "description": "Analog Devices MAX78002"
+        "description": "Raspberry Pi RP2350, RISC-V"
     }
-]
+]
\ No newline at end of file