Merge remote-tracking branch 'origin/develop' into xap

keyboards/tkc/california/info.json

@@ -23,133 +23,262 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ansi_split_bs_rshift"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_ansi": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [6, 1], "x": 11, "y": 0},
-                {"matrix": [6, 2], "x": 12, "y": 0},
-                {"matrix": [6, 3], "x": 13, "y": 0},
-                {"matrix": [6, 4], "x": 14, "y": 0},
-
-                {"matrix": [6, 5], "x": 15.5, "y": 0},
-
-                {"matrix": [6, 6], "x": 17, "y": 0},
-                {"matrix": [6, 7], "x": 18, "y": 0},
-                {"matrix": [6, 8], "x": 19, "y": 0},
-                {"matrix": [6, 9], "x": 20, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [7, 0], "x": 10, "y": 1.5},
-                {"matrix": [7, 1], "x": 11, "y": 1.5},
-                {"matrix": [7, 2], "x": 12, "y": 1.5},
-                {"matrix": [7, 3], "x": 13, "y": 1.5},
-                {"matrix": [7, 4], "x": 14, "y": 1.5},
-
-                {"matrix": [7, 5], "x": 15.5, "y": 1.5},
-
-                {"matrix": [7, 6], "x": 17, "y": 1.5},
-                {"matrix": [7, 7], "x": 18, "y": 1.5},
-                {"matrix": [7, 8], "x": 19, "y": 1.5},
-                {"matrix": [7, 9], "x": 20, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
-                {"matrix": [8, 0], "x": 9.5, "y": 2.5},
-                {"matrix": [8, 1], "x": 10.5, "y": 2.5},
-                {"matrix": [8, 2], "x": 11.5, "y": 2.5},
-                {"matrix": [8, 3], "x": 12.5, "y": 2.5},
-                {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [8, 5], "x": 15.5, "y": 2.5},
-
-                {"matrix": [8, 6], "x": 17, "y": 2.5},
-                {"matrix": [8, 7], "x": 18, "y": 2.5},
-                {"matrix": [8, 8], "x": 19, "y": 2.5},
-                {"matrix": [8, 9], "x": 20, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
-                {"matrix": [9, 0], "x": 9.75, "y": 3.5},
-                {"matrix": [9, 1], "x": 10.75, "y": 3.5},
-                {"matrix": [9, 2], "x": 11.75, "y": 3.5},
-                {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [9, 6], "x": 17, "y": 3.5},
-                {"matrix": [9, 7], "x": 18, "y": 3.5},
-                {"matrix": [9, 8], "x": 19, "y": 3.5},
-                {"matrix": [9, 9], "x": 20, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [10, 0], "x": 10.25, "y": 4.5},
-                {"matrix": [10, 1], "x": 11.25, "y": 4.5},
-                {"matrix": [10, 2], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"matrix": [10, 4], "x": 14, "y": 4.5},
-
-                {"matrix": [10, 5], "x": 15.5, "y": 4.75},
-
-                {"matrix": [10, 6], "x": 17, "y": 4.5},
-                {"matrix": [10, 7], "x": 18, "y": 4.5},
-                {"matrix": [10, 8], "x": 19, "y": 4.5},
-                {"matrix": [10, 9], "x": 20, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [11, 0], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [11, 2], "x": 12.5, "y": 5.5, "w": 1.25},
-
-                {"matrix": [11, 4], "x": 14.5, "y": 5.75},
-                {"matrix": [11, 5], "x": 15.5, "y": 5.75},
-                {"matrix": [11, 6], "x": 16.5, "y": 5.75},
-
-                {"matrix": [11, 7], "x": 18, "y": 5.5},
-                {"matrix": [11, 8], "x": 19, "y": 5.5},
-                {"matrix": [11, 9], "x": 20, "y": 5.5}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [6, 1], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [6, 2], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [6, 3], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [6, 4], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 5], "x": 15.25, "y": 0},
+
+                {"label": "Home", "matrix": [6, 6], "x": 16.5, "y": 0},
+                {"label": "End", "matrix": [6, 7], "x": 17.5, "y": 0},
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 18.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [7, 0], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [7, 1], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [7, 2], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [7, 4], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Page Up", "matrix": [7, 5], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [7, 6], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [7, 7], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [7, 8], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [7, 9], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [8, 0], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [8, 1], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [8, 2], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [8, 3], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [8, 4], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Page Down", "matrix": [8, 5], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [8, 6], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [8, 7], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [8, 8], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [8, 9], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [9, 0], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [9, 1], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [9, 2], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [9, 3], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "4", "matrix": [9, 6], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [9, 7], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [9, 8], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [9, 9], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [10, 0], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [10, 1], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [10, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [10, 5], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [10, 6], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [10, 7], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [10, 8], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [10, 9], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.5, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 8], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [11, 0], "x": 11.75, "y": 5.25},
+                {"label": "Ctrl", "matrix": [11, 2], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 4], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [11, 5], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [11, 6], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [11, 7], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [11, 8], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [11, 9], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [6, 1], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [6, 2], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [6, 3], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [6, 4], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 5], "x": 15.25, "y": 0},
+
+                {"label": "Home", "matrix": [6, 6], "x": 16.5, "y": 0},
+                {"label": "End", "matrix": [6, 7], "x": 17.5, "y": 0},
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 18.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [7, 0], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [7, 1], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [7, 2], "x": 12, "y": 1.25},
+                {"label": "Delete", "matrix": [7, 3], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"label": "Page Up", "matrix": [7, 5], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [7, 6], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [7, 7], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [7, 8], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [7, 9], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [8, 0], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [8, 1], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [8, 2], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [8, 3], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [8, 4], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Page Down", "matrix": [8, 5], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [8, 6], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [8, 7], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [8, 8], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [8, 9], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [9, 0], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [9, 1], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [9, 2], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [9, 3], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "4", "matrix": [9, 6], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [9, 7], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [9, 8], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [9, 9], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [10, 0], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [10, 1], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [10, 2], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [10, 4], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [10, 5], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [10, 6], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [10, 7], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [10, 8], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [10, 9], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.5, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 8], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [11, 0], "x": 11.75, "y": 5.25},
+                {"label": "Ctrl", "matrix": [11, 2], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 4], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [11, 5], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [11, 6], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [11, 7], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [11, 8], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [11, 9], "x": 19.5, "y": 5.25}
             ]
         }
     }

keyboards/tkc/california/keymaps/default/keymap.c

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all( /* Base */
+  [0] = LAYOUT_ansi_split_bs_rshift( /* Base */
     
 	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SCRL,KC_PAUS,
     KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_PGUP,KC_NUM,KC_PSLS,KC_PAST,KC_PMNS,

keyboards/tkc/california/keymaps/via/keymap.c

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all( /* Base */
+  [0] = LAYOUT_ansi_split_bs_rshift( /* Base */
     
 	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SCRL,KC_PAUS,
     KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_PGUP,KC_NUM,KC_PSLS,KC_PAST,KC_PMNS,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,MO(1),KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT,KC_MENU, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
 	
-	[1] = LAYOUT_all( /* Function */
+	[1] = LAYOUT_ansi_split_bs_rshift( /* Function */
     
 	_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,

keyboards/tkc/california/matrix_diagram.md

@@ -0,0 +1,25 @@
+# Matrix Diagram for TKC California
+
+```
+                                                    ┌───────┐
+                                                    │74     │ 2u Backspace
+                                                    └───────┘
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │61 │62 │63 │64 ││65 ││66 │67 │68 │69 │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┘└───┴───┴───┴───┘ 
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │70 │71 │72 │73 │74 ││75 ││76 │77 │78 │79 │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤   ┌───┐
+│20   │22 │23 │24 │25 │26 │27 │28 │29 │80 │81 │82 │83 │84   ││85 ││86 │87 │88 │89 │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤   │99 │ 2u Numpad Plus
+│30    │32 │33 │34 │35 │36 │37 │38 │39 │90 │91 │92 │93      │     │96 │97 │98 │99 │   │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ├───┼───┼───┼───┤   ├───┤
+│40      │42 │43 │44 │45 │46 │47 │48 │49 │A0 │A1 │A2    │A4 │┌───┐│A6 │A7 │A8 │A9 │   │   │
+├────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┼───┘│A5 │└───┼───┼───┼───┤   │B9 │ 2u Numpad Enter
+│50  │51 │52  │55                         │58  │B0 │B2  │┌───┼───┼───┐│B7 │B8 │B9 │   │   │
+└────┴───┴────┴───────────────────────────┴────┴───┴────┘│B4 │B5 │B6 │└───┴───┴───┘   └───┘
+                                                         └───┴───┴───┘
+                                                 ┌──────────┐
+                                                 │A2        │ 2.75u LShift
+                                                 └──────────┘
+```