Merge remote-tracking branch 'qmk/master' into merge-2024-09-07

2024-09-07 19:49:19 -06:00 · 2024-09-07 19:49:19 -06:00 · a780dd1cb1
commit a780dd1cb1
parent bb7961c3c2 f043545144
7600 changed files with 37202 additions and 168275 deletions
--- a/keyboards/cantor/keyboard.json
+++ b/keyboards/cantor/keyboard.json
@ -39,6 +39,9 @@
                    ["A0", "A1", "A2", null, null, null]
                ]
            }
+        },
+        "serial": {
+            "driver": "usart"
        }
    },
    "community_layouts": ["split_3x6_3"],
--- a/keyboards/cantor/rules.mk
+++ b/keyboards/cantor/rules.mk
@ -1 +0,0 @@
-SERIAL_DRIVER = usart