Merge remote-tracking branch 'upstream/master' into develop

2023-01-30 18:55:36 +11:00
parent 242b80c63f 2c878b1b16
commit ef6505ad75
54 changed files with 1313 additions and 142 deletions
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -4,8 +4,11 @@
        "pid": "0x1834"
    },
    "community_layouts": ["split_3x6_3"],
+    "layout_aliases": {
+        "LAYOUT_charybdis_3x6": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_charybdis_3x6": {
+        "LAYOUT": {
            "layout": [
                { "label": "L00", "x": 0, "y": 0 },
                { "label": "L01", "x": 1, "y": 0 },