From 269c7b6e5b58aaa260dfa4e7e08884b1f26d598a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 14 Sep 2023 10:57:44 -0700
Subject: [PATCH] Mechlovin Zed65 910 Layout Standardization (#22018)
* Add layout/matrix diagram
[docs]
* Rename `LAYOUT_65_iso_tsangan_split_bs` to `LAYOUT_iso_split_bs`
[refactor]
* Rename `LAYOUT_65_ansi_tsangan` to `LAYOUT_ansi`
[refactor]
* Rename `LAYOUT_65_ansi_blocker_tsangan` to `LAYOUT_ansi_blocker_tsangan`
[refactor]
* Rename `LAYOUT_65_ansi_tsangan_split_bs` to `LAYOUT_all`
[refactor]
---
keyboards/mechlovin/zed65/910/info.json | 14 +++++++---
.../zed65/910/keymaps/default/keymap.c | 2 +-
.../mechlovin/zed65/910/keymaps/via/keymap.c | 2 +-
.../mechlovin/zed65/910/matrix_diagram.md | 27 +++++++++++++++++++
4 files changed, 39 insertions(+), 6 deletions(-)
create mode 100644 keyboards/mechlovin/zed65/910/matrix_diagram.md
diff --git a/keyboards/mechlovin/zed65/910/info.json b/keyboards/mechlovin/zed65/910/info.json
index 7874c09e2dd..d1de863c039 100644
--- a/keyboards/mechlovin/zed65/910/info.json
+++ b/keyboards/mechlovin/zed65/910/info.json
@@ -42,8 +42,14 @@
"pin": "A7",
"driver": "spi"
},
+ "layout_aliases": {
+ "LAYOUT_65_iso_tsangan_split_bs": "LAYOUT_iso_split_bs",
+ "LAYOUT_65_ansi_tsangan": "LAYOUT_ansi",
+ "LAYOUT_65_ansi_blocker_tsangan": "LAYOUT_ansi_blocker_tsangan",
+ "LAYOUT_65_ansi_tsangan_split_bs": "LAYOUT_all"
+ },
"layouts": {
- "LAYOUT_65_iso_tsangan_split_bs": {
+ "LAYOUT_iso_split_bs": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -120,7 +126,7 @@
{"matrix": [4, 14], "x": 15, "y": 4}
]
},
- "LAYOUT_65_ansi_tsangan_split_bs": {
+ "LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -197,7 +203,7 @@
{"matrix": [4, 14], "x": 15, "y": 4}
]
},
- "LAYOUT_65_ansi_tsangan": {
+ "LAYOUT_ansi": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -273,7 +279,7 @@
]
},
- "LAYOUT_65_ansi_blocker_tsangan": {
+ "LAYOUT_ansi_blocker_tsangan": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c b/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c
index 1c530e8420b..f4c829bedd3 100644
--- a/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_65_ansi_tsangan_split_bs(
+ [0] = LAYOUT_all(
KC_ESC, 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_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
diff --git a/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c b/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c
index d41ff034722..80dee5ced0d 100644
--- a/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_65_ansi_tsangan_split_bs(
+ [0] = LAYOUT_all(
KC_ESC, 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_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
diff --git a/keyboards/mechlovin/zed65/910/matrix_diagram.md b/keyboards/mechlovin/zed65/910/matrix_diagram.md
new file mode 100644
index 00000000000..5cebdb1748b
--- /dev/null
+++ b/keyboards/mechlovin/zed65/910/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for Mechlovin Studio Zed65 910 Rev1
+
+```
+ ┌───────┐
+ 2u Backspace │0D │
+ └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┐ ┌─────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │1D │ │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│40 │41 │42 │46 │49 │4A │4B │4C │4D │4E │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+┌────────┐ ┌──────────┐
+│30 │ 2.25u LShift 2.75u RShift │3C │
+└────────┘ └──────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┐
+│40 │41 │42 │46 │49 │4A │ Blocker
+└────┴────┴────┴────────────────────────┴────┴────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40 │41 │42 │46 │4A │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```