From 63a3fc3591f755d1ef6b36269e61df16f4c32707 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 13 Feb 2026 18:21:51 +0000 Subject: [PATCH 1/2] Fix `qmk flash` handling of paths relative to qmk_firmware (#25993) --- lib/python/qmk/path.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py index 1739689adf..3b8bafbd4e 100644 --- a/lib/python/qmk/path.py +++ b/lib/python/qmk/path.py @@ -177,5 +177,17 @@ class FileType(argparse.FileType): """normalize and check exists otherwise magic strings like '-' for stdin resolve to bad paths """ + # TODO: This should not return both Path and TextIOWrapper as consumers + # assume that they can call Path.as_posix without checking type + + # Handle absolute paths and relative paths to CWD norm = normpath(string) - return norm if norm.exists() else super().__call__(string) + if norm.exists(): + return norm + + # Handle relative paths to QMK_HOME + relative = Path(string) + if relative.exists(): + return relative + + return super().__call__(string) From 3ac6f603a80ab7d1f2a336c744f53566553c3330 Mon Sep 17 00:00:00 2001 From: Joshua Diamond Date: Fri, 13 Feb 2026 13:22:06 -0500 Subject: [PATCH 2/2] Mark encoders as such in dmqdesign/spin (#25973) --- keyboards/dmqdesign/spin/keyboard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/dmqdesign/spin/keyboard.json b/keyboards/dmqdesign/spin/keyboard.json index dd3cbaa838..374fb7d7de 100644 --- a/keyboards/dmqdesign/spin/keyboard.json +++ b/keyboards/dmqdesign/spin/keyboard.json @@ -49,19 +49,19 @@ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [1, 0], "x": 1, "y": 0}, {"matrix": [2, 0], "x": 2, "y": 0}, - {"matrix": [2, 4], "x": 3.5, "y": 0}, + {"matrix": [2, 4], "x": 3.5, "y": 0, "encoder": 0}, {"matrix": [0, 1], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, {"matrix": [2, 1], "x": 2, "y": 1}, - {"matrix": [1, 4], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 3.5, "y": 1.5, "encoder": 1}, {"matrix": [0, 2], "x": 0, "y": 2}, {"matrix": [1, 2], "x": 1, "y": 2}, {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [0, 4], "x": 3.5, "y": 3}, + {"matrix": [0, 4], "x": 3.5, "y": 3, "encoder": 2}, {"matrix": [0, 3], "x": 0, "y": 3}, {"matrix": [1, 3], "x": 1, "y": 3}, {"matrix": [2, 3], "x": 2, "y": 3}