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

KarlK90 · Nov 23, 2023 · 3a74fa5 · 3a74fa5
2 parents bf0d1fd + 0379d1f
commit 3a74fa5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json
@@ -142,7 +142,7 @@
                 {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
@@ -211,7 +211,7 @@
                 {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
@@ -282,7 +282,7 @@
                 {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
@@ -354,7 +354,7 @@
                 {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
@@ -424,7 +424,7 @@
                 {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
@@ -496,7 +496,7 @@
                 {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},

diff --git a/keyboards/alf/dc60/matrix_diagram.md b/keyboards/alf/dc60/matrix_diagram.md
@@ -2,12 +2,12 @@
 
 Most of these are "best-guess." I was using photos I found on ZFrontier as a
 reference and I don't have the PCB on-hand.
-                                                              - @noroadsleft
-                                                                  2023-01-20
+
+\- @noroadsleft, 2023-11-21
 
 ```
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
-│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │    │0E     │ 2u Backspace
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │    │0D     │ 2u Backspace
 ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤    └─┬─────┤
 │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │      │     │
 ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2D  │ ISO Enter