aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-07-23 11:21:45 +0000
committerQMK Bot <[email protected]>2024-07-23 11:21:45 +0000
commitadb884761d503ff59e462eaf093b04889c3c8e66 (patch)
tree7c81af52ccc8b35e19c39625ba0565f9030fec93
parente8103722bcbce957ebf15da34b80571b49737572 (diff)
parent622dc5625042bc765bb3ff96e3601b5caddf4512 (diff)
downloadqmk_firmware-adb884761d503ff59e462eaf093b04889c3c8e66.tar.gz
qmk_firmware-adb884761d503ff59e462eaf093b04889c3c8e66.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/kingly_keys/ave/ortho/keyboard.json11
-rw-r--r--keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c10
-rw-r--r--keyboards/kingly_keys/ave/staggered/keyboard.json8
-rw-r--r--keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c10
4 files changed, 24 insertions, 15 deletions
diff --git a/keyboards/kingly_keys/ave/ortho/keyboard.json b/keyboards/kingly_keys/ave/ortho/keyboard.json
index d277e68e47..27fb2666a2 100644
--- a/keyboards/kingly_keys/ave/ortho/keyboard.json
+++ b/keyboards/kingly_keys/ave/ortho/keyboard.json
@@ -45,8 +45,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_ortho_all": "LAYOUT_all",
+ "LAYOUT_ortho_2x2u": "LAYOUT_2x2u_space",
+ "LAYOUT_ortho_big_boy": "LAYOUT_7u_space"
+ },
"layouts": {
- "LAYOUT_ortho_all": {
+ "LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.5, "y": 0},
@@ -111,7 +116,7 @@
{"matrix": [4, 12], "x": 12.5, "y": 4.5}
]
},
- "LAYOUT_ortho_2x2u": {
+ "LAYOUT_2x2u_space": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.5, "y": 0},
@@ -174,7 +179,7 @@
{"matrix": [4, 12], "x": 12.5, "y": 4.5}
]
},
- "LAYOUT_ortho_big_boy": {
+ "LAYOUT_7u_space": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.5, "y": 0},
diff --git a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
index db0dfe46f6..d23666862e 100644
--- a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │End │ │CTL │GUI │ALT │FUNC│LOWR│ │ │RISE│Left│Down│ Up │Rght│
* └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
*/
- [_QWERTY] = LAYOUT_ortho_all(
+ [_QWERTY] = LAYOUT_all(
KC_MUTE, KC_ESC, KC_BSLS, KC_MINUS, KC_EQUAL,
KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │STOP│ │ │ │ │ │ │ │ │ │ │ │ │ │
* └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
*/
- [_LOWER] = LAYOUT_ortho_all(
+ [_LOWER] = LAYOUT_all(
_______, _______, KC_LBRC, KC_RBRC, KC_GRAVE,
KC_MPLY, _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
KC_MNXT, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DQT,
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
* └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
*/
- [_RAISE] = LAYOUT_ortho_all(
+ [_RAISE] = LAYOUT_all(
KC_PSCR, _______, KC_LCBR, KC_RCBR, KC_TILD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
* └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
*/
- [_FUNCTION] = LAYOUT_ortho_all(
+ [_FUNCTION] = LAYOUT_all(
TD(TD_RST), RGB_TOG, KC_F11, KC_F12, KC_F13,
_______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
// * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
// */
-// [<LAYER>] = LAYOUT_ortho_all(
+// [<LAYER>] = LAYOUT_all(
// _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kingly_keys/ave/staggered/keyboard.json b/keyboards/kingly_keys/ave/staggered/keyboard.json
index 3f5bf70ce8..5fcb1657e3 100644
--- a/keyboards/kingly_keys/ave/staggered/keyboard.json
+++ b/keyboards/kingly_keys/ave/staggered/keyboard.json
@@ -45,8 +45,12 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_staggered": "LAYOUT_all",
+ "LAYOUT_staggered_big_boy": "LAYOUT_6u25_space"
+ },
"layouts": {
- "LAYOUT_staggered": {
+ "LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
@@ -111,7 +115,7 @@
{"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
]
},
- "LAYOUT_staggered_big_boy": {
+ "LAYOUT_6u25_space": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
index b5631ad436..8d9c6a045f 100644
--- a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │End │ │LCtrl│GUI │ALT │ LOWR │ │RAlt │RCTL│FUNC │
* └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
*/
- [_QWERTY] = LAYOUT_staggered(
+ [_QWERTY] = LAYOUT_all(
KC_MUTE, KC_ESC, KC_LPRN, KC_RPRN, KC_SCLN,
KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ _ │ │ │ │ │ │ │ │ │ │
* └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
*/
- [_LOWER] = LAYOUT_staggered(
+ [_LOWER] = LAYOUT_all(
_______, _______, KC_LBRC, KC_RBRC, KC_COLON,
KC_MINUS, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
KC_BSLS, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, _______, TD(TD_DBQT),
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ │ │ │ │ │ ? │ │
* └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
*/
- [_RAISE] = LAYOUT_staggered(
+ [_RAISE] = LAYOUT_all(
KC_PSCR, _______, KC_LCBR, KC_RCBR, KC_PLUS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______,
_______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______,
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ │ │ │ │ │ │ │
* └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
*/
- [_FUNCTION] = LAYOUT_staggered(
+ [_FUNCTION] = LAYOUT_all(
TD(TD_RST), RGB_TOG, KC_F11, KC_F12, KC_F13,
_______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_EQUAL,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// * │ │ │ │ │ │ │ │ │ │ │
// * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
// */
-// [<_LAYER>] = LAYOUT_staggered(
+// [<_LAYER>] = LAYOUT_all(
// _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,