From 0ef07f848368b9626ae6a029c137d361f2655250 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 22 Jun 2023 08:58:19 -0700 Subject: [PATCH 1/5] [style] sort JSON keys in layout objects --- keyboards/viktus/osav2_numpad/info.json | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json index d347631ccc90..ac294276e134 100644 --- a/keyboards/viktus/osav2_numpad/info.json +++ b/keyboards/viktus/osav2_numpad/info.json @@ -84,7 +84,7 @@ {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, - {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} + {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_2u_plus_2u_enter": { @@ -99,14 +99,14 @@ {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, - {"label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 3, "y": 1, "h": 2}, {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, - {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} + {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_2u_enter_2u_zero": { @@ -126,9 +126,9 @@ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4}, + {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "h": 2}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, - {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} + {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_2u_plus_2u_enter_2u_zero": { @@ -143,13 +143,13 @@ {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, - {"label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 3, "y": 1, "h": 2}, {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4}, + {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "h": 2}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, - {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} + {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_mirrored_2u_enter": { @@ -169,7 +169,7 @@ {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, - {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, + {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2}, {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, {"label": "K43", "matrix": [4, 3], "x": 3, "y": 4} @@ -184,14 +184,14 @@ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "K12", "matrix": [1, 2], "x": 2, "y": 1}, {"label": "K13", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1}, + {"label": "K20", "matrix": [2, 0], "x": 0, "y": 1, "h": 2}, {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2}, {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, - {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, + {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2}, {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, {"label": "K43", "matrix": [4, 3], "x": 3, "y": 4} @@ -214,9 +214,9 @@ {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, - {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, + {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2}, {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, - {"label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4} + {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4, "w": 2} ] }, "LAYOUT_mirrored_2u_plus_2u_enter_2u_zero": { @@ -228,16 +228,16 @@ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "K12", "matrix": [1, 2], "x": 2, "y": 1}, {"label": "K13", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1}, + {"label": "K20", "matrix": [2, 0], "x": 0, "y": 1, "h": 2}, {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2}, {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, - {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, + {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2}, {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, - {"label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4} + {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4, "w": 2} ] } } From 24d8da6d399756943bad5ceee22dd3ffcdeef238 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 22 Jun 2023 09:01:14 -0700 Subject: [PATCH 2/5] [chore] correct layout data --- keyboards/viktus/osav2_numpad/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json index ac294276e134..3d9da5bd1919 100644 --- a/keyboards/viktus/osav2_numpad/info.json +++ b/keyboards/viktus/osav2_numpad/info.json @@ -126,7 +126,7 @@ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "h": 2}, + {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "w": 2}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] @@ -147,7 +147,7 @@ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "h": 2}, + {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "w": 2}, {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] From e24d79894eb0b70cedf44705b997c0e0fe2b2f19 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 22 Jun 2023 09:02:48 -0700 Subject: [PATCH 3/5] [refactor] rename LAYOUT_all_split to LAYOUT_ortho_5x4 --- keyboards/viktus/osav2_numpad/info.json | 5 ++++- keyboards/viktus/osav2_numpad/keymaps/default/keymap.c | 2 +- keyboards/viktus/osav2_numpad/keymaps/via/keymap.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json index 3d9da5bd1919..f742486d158c 100644 --- a/keyboards/viktus/osav2_numpad/info.json +++ b/keyboards/viktus/osav2_numpad/info.json @@ -39,8 +39,11 @@ "twinkle": true } }, + "layout_aliases": { + "LAYOUT_all_split": "LAYOUT_ortho_5x4" + }, "layouts": { - "LAYOUT_all_split": { + "LAYOUT_ortho_5x4": { "layout": [ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c b/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c index ce8a1d277417..ac99f1d8c7c7 100644 --- a/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c +++ b/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c @@ -17,7 +17,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all_split( + [0] = LAYOUT_ortho_5x4( KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PEQL, diff --git a/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c b/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c index ce8a1d277417..ac99f1d8c7c7 100644 --- a/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c +++ b/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c @@ -17,7 +17,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all_split( + [0] = LAYOUT_ortho_5x4( KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PEQL, From ea393c3a8ec8e97cf5c934fbcf35a70f3b928edb Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 22 Jun 2023 09:04:03 -0700 Subject: [PATCH 4/5] [refactor] rename LAYOUT_2u_plus_2u_enter_2u_zero to LAYOUT_numpad_5x4 --- keyboards/viktus/osav2_numpad/info.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json index f742486d158c..3674f9e67919 100644 --- a/keyboards/viktus/osav2_numpad/info.json +++ b/keyboards/viktus/osav2_numpad/info.json @@ -40,7 +40,8 @@ } }, "layout_aliases": { - "LAYOUT_all_split": "LAYOUT_ortho_5x4" + "LAYOUT_all_split": "LAYOUT_ortho_5x4", + "LAYOUT_2u_plus_2u_enter_2u_zero": "LAYOUT_numpad_5x4" }, "layouts": { "LAYOUT_ortho_5x4": { @@ -134,7 +135,7 @@ {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] }, - "LAYOUT_2u_plus_2u_enter_2u_zero": { + "LAYOUT_numpad_5x4": { "layout": [ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, From bcc62845bc071ebcee9c2a3fc2ce342c9a076efa Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 22 Jun 2023 09:05:56 -0700 Subject: [PATCH 5/5] [enhancement] enable Community Layout support --- keyboards/viktus/osav2_numpad/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json index 3674f9e67919..941d65f36785 100644 --- a/keyboards/viktus/osav2_numpad/info.json +++ b/keyboards/viktus/osav2_numpad/info.json @@ -43,6 +43,10 @@ "LAYOUT_all_split": "LAYOUT_ortho_5x4", "LAYOUT_2u_plus_2u_enter_2u_zero": "LAYOUT_numpad_5x4" }, + "community_layouts": [ + "ortho_5x4", + "numpad_5x4" + ], "layouts": { "LAYOUT_ortho_5x4": { "layout": [