Skip to content

Commit

Permalink
Wuque Promise87 WKL Refactor (qmk#17828)
Browse files Browse the repository at this point in the history
  • Loading branch information
@noroadsleft @imhoffman
noroadsleft authored and imhoffman committed Aug 20, 2022
1 parent 70a31d4 commit a37cfa8
Show file tree
Hide file tree
Showing 18 changed files with 304 additions and 131 deletions.
117 changes: 110 additions & 7 deletions keyboards/wuque/promise87/wkl/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,15 @@
"keyboard_name": "promise87",
"url": "https://shop.wuquestudio.com/",
"maintainer": "spbgzh",
"layout_aliases": {
"LAYOUT_all_wkl": "LAYOUT_all",
"LAYOUT_87_wkl": "LAYOUT_tkl_f13_ansi_wkl",
"LAYOUT_87_wkl_split_bs": "LAYOUT_tkl_f13_ansi_wkl_split_bs",
"LAYOUT_87_wkl_split_lshift": "LAYOUT_tkl_f13_ansi_wkl_split_lshift",
"LAYOUT_87_wkl_split_rshift": "LAYOUT_tkl_f13_ansi_wkl_split_rshift"
},
"layouts": {
"LAYOUT_all_wkl": {
"LAYOUT_all": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
Expand Down Expand Up @@ -37,6 +44,7 @@
{ "label": "-", "x": 11, "y": 1.25 },
{ "label": "=", "x": 12, "y": 1.25 },
{ "label": "Backspace", "x": 13, "y": 1.25 },
{ "label": "Backspace1", "x": 14, "y": 1.25 },
{ "label": "Insert", "x": 15.25, "y": 1.25 },
{ "label": "Home", "x": 16.25, "y": 1.25 },
{ "label": "PageUp", "x": 17.25, "y": 1.25 },
Expand Down Expand Up @@ -72,7 +80,6 @@
{ "label": ";", "x": 10.75, "y": 3.25 },
{ "label": "'", "x": 11.75, "y": 3.25 },
{ "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
{ "label": "Backspace1", "x": 14, "y": 1.25 },

{ "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
{ "label": "Shift2", "x": 1.25, "y": 4.25 },
Expand Down Expand Up @@ -100,7 +107,7 @@
{ "label": "\u2192", "x": 17.25, "y": 5.25 }
]
},
"LAYOUT_87_wkl": {
"LAYOUT_tkl_f13_ansi_wkl": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
Expand Down Expand Up @@ -194,7 +201,7 @@
{ "label": "\u2192", "x": 17.25, "y": 5.25 }
]
},
"LAYOUT_87_wkl_split_bs": {
"LAYOUT_tkl_f13_ansi_wkl_split_bs": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
Expand Down Expand Up @@ -228,6 +235,7 @@
{ "label": "-", "x": 11, "y": 1.25 },
{ "label": "=", "x": 12, "y": 1.25 },
{ "label": "Backspace", "x": 13, "y": 1.25 },
{ "label": "Backspace1", "x": 14, "y": 1.25 },
{ "label": "Insert", "x": 15.25, "y": 1.25 },
{ "label": "Home", "x": 16.25, "y": 1.25 },
{ "label": "PageUp", "x": 17.25, "y": 1.25 },
Expand Down Expand Up @@ -263,7 +271,6 @@
{ "label": ";", "x": 10.75, "y": 3.25 },
{ "label": "'", "x": 11.75, "y": 3.25 },
{ "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
{ "label": "Backspace1", "x": 14, "y": 1.25 },

{ "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
{ "label": "Z", "x": 2.25, "y": 4.25 },
Expand All @@ -289,7 +296,7 @@
{ "label": "\u2192", "x": 17.25, "y": 5.25 }
]
},
"LAYOUT_87_wkl_split_lshift": {
"LAYOUT_tkl_f13_ansi_wkl_split_lshift": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
Expand Down Expand Up @@ -384,7 +391,7 @@
{ "label": "\u2192", "x": 17.25, "y": 5.25 }
]
},
"LAYOUT_87_wkl_split_rshift": {
"LAYOUT_tkl_f13_ansi_wkl_split_rshift": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
Expand Down Expand Up @@ -469,6 +476,102 @@
{ "label": "Shift2", "x": 14, "y": 4.25 },
{ "label": "\u2191", "x": 16.25, "y": 4.25 },

{ "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
{ "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
{ "label": "Space","x": 4, "y": 5.25, "w": 7 },
{ "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
{ "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 }
]
},
"LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
{ "label": "F2", "x": 2.25, "y": 0 },
{ "label": "F3", "x": 3.25, "y": 0 },
{ "label": "F4", "x": 4.25, "y": 0 },
{ "label": "F5", "x": 5.5, "y": 0 },
{ "label": "F6", "x": 6.5, "y": 0 },
{ "label": "F7", "x": 7.5, "y": 0 },
{ "label": "F8", "x": 8.5, "y": 0 },
{ "label": "F9", "x": 9.75, "y": 0 },
{ "label": "F10", "x": 10.75, "y": 0 },
{ "label": "F11", "x": 11.75, "y": 0 },
{ "label": "F12", "x": 12.75, "y": 0 },
{ "label": "F13", "x": 14, "y": 0 },
{ "label": "Print", "x": 15.25, "y": 0 },
{ "label": "Scroll", "x": 16.25, "y": 0 },
{ "label": "Pause", "x": 17.25, "y": 0 },

{ "label": "~", "x": 0, "y": 1.25 },
{ "label": "1", "x": 1, "y": 1.25 },
{ "label": "2", "x": 2, "y": 1.25 },
{ "label": "3", "x": 3, "y": 1.25 },
{ "label": "4", "x": 4, "y": 1.25 },
{ "label": "5", "x": 5, "y": 1.25 },
{ "label": "6", "x": 6, "y": 1.25 },
{ "label": "7", "x": 7, "y": 1.25 },
{ "label": "8", "x": 8, "y": 1.25 },
{ "label": "9", "x": 9, "y": 1.25 },
{ "label": "0", "x": 10, "y": 1.25 },
{ "label": "-", "x": 11, "y": 1.25 },
{ "label": "=", "x": 12, "y": 1.25 },
{ "label": "Backspace", "x": 13, "y": 1.25 },
{ "label": "Backspace1", "x": 14, "y": 1.25 },
{ "label": "Insert", "x": 15.25, "y": 1.25 },
{ "label": "Home", "x": 16.25, "y": 1.25 },
{ "label": "PageUp", "x": 17.25, "y": 1.25 },

{ "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 2.25 },
{ "label": "W", "x": 2.5, "y": 2.25 },
{ "label": "E", "x": 3.5, "y": 2.25 },
{ "label": "R", "x": 4.5, "y": 2.25 },
{ "label": "T", "x": 5.5, "y": 2.25 },
{ "label": "Y", "x": 6.5, "y": 2.25 },
{ "label": "U", "x": 7.5, "y": 2.25 },
{ "label": "I", "x": 8.5, "y": 2.25 },
{ "label": "O", "x": 9.5, "y": 2.25 },
{ "label": "P", "x": 10.5, "y": 2.25 },
{ "label": "[", "x": 11.5, "y": 2.25 },
{ "label": "]", "x": 12.5, "y": 2.25 },
{ "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
{ "label": "Delete", "x": 15.25, "y": 2.25 },
{ "label": "End", "x": 16.25, "y": 2.25 },
{ "label": "PageDown", "x": 17.25, "y": 2.25 },

{ "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 3.25 },
{ "label": "S", "x": 2.75, "y": 3.25 },
{ "label": "D", "x": 3.75, "y": 3.25 },
{ "label": "F", "x": 4.75, "y": 3.25 },
{ "label": "G", "x": 5.75, "y": 3.25 },
{ "label": "H", "x": 6.75, "y": 3.25 },
{ "label": "J", "x": 7.75, "y": 3.25 },
{ "label": "K", "x": 8.75, "y": 3.25 },
{ "label": "L", "x": 9.75, "y": 3.25 },
{ "label": ";", "x": 10.75, "y": 3.25 },
{ "label": "'", "x": 11.75, "y": 3.25 },
{ "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },

{ "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
{ "label": "Z", "x": 2.25, "y": 4.25 },
{ "label": "X", "x": 3.25, "y": 4.25 },
{ "label": "C", "x": 4.25, "y": 4.25 },
{ "label": "V", "x": 5.25, "y": 4.25 },
{ "label": "B", "x": 6.25, "y": 4.25 },
{ "label": "N", "x": 7.25, "y": 4.25 },
{ "label": "M", "x": 8.25, "y": 4.25 },
{ "label": ",", "x": 9.25, "y": 4.25 },
{ "label": ".", "x": 10.25, "y": 4.25 },
{ "label": "/", "x": 11.25, "y": 4.25 },
{ "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
{ "label": "Shift2", "x": 14, "y": 4.25 },
{ "label": "\u2191", "x": 16.25, "y": 4.25 },

{ "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
{ "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
{ "label": "Space","x": 4, "y": 5.25, "w": 7 },
Expand Down
1 change: 0 additions & 1 deletion keyboards/wuque/promise87/wkl/keymaps/87_wkl/readme.md
View file

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/wuque/promise87/wkl/keymaps/87_wkl_split_bs/readme.md
View file

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/wuque/promise87/wkl/keymaps/87_wkl_split_lshift/readme.md
View file

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/wuque/promise87/wkl/keymaps/87_wkl_split_rshift/readme.md
View file

This file was deleted.

28 changes: 14 additions & 14 deletions keyboards/wuque/promise87/wkl/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
[0] = LAYOUT_all_wkl(
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_F13, KC_PSCR, KC_SLCK, 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_BSPC,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
[0] = LAYOUT_all(
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_F13, KC_PSCR, KC_SLCK, 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_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all_wkl(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
[1] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
};
28 changes: 14 additions & 14 deletions ...que/promise87/wkl/keymaps/87_wkl/keymap.c → ...keymaps/default_tkl_f13_ansi_wkl/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
[0] = LAYOUT_87_wkl(
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_F13, KC_PSCR, KC_SLCK, 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
[0] = LAYOUT_tkl_f13_ansi_wkl(
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_F13, KC_PSCR, KC_SLCK, 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_87_wkl(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
[1] = LAYOUT_tkl_f13_ansi_wkl(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
};
1 change: 1 addition & 0 deletions keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# The default_tkl_f13_ansi_wkl keymap for promise87
36 changes: 36 additions & 0 deletions keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* Copyright 2022 wuque
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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_tkl_f13_ansi_wkl_split_bs(
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_F13, KC_PSCR, KC_SLCK, 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_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_tkl_f13_ansi_wkl_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
};
Loading

0 comments on commit a37cfa8

Please sign in to comment.