summaryrefslogtreecommitdiff
path: root/keyboards/wuque
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2023-03-23 01:41:42 -0700
committerDrashna Jael're <drashna@live.com>2023-03-23 01:41:42 -0700
commit73f4718f16893341cfcc7814247deb605657ff27 (patch)
tree78f78d7199cf2fd3aac3f64cbba68f523ba11710 /keyboards/wuque
parentb01dc36fbf09c3ebf8efe1bac54205ace1b1c6cc (diff)
parentbb4abc8a9fdbfbb8ee8af92ec14d6f1b4cea0b04 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/wuque')
-rw-r--r--keyboards/wuque/tata80/wkl/info.json14
-rw-r--r--keyboards/wuque/tata80/wkl/keymaps/default/keymap.c8
-rw-r--r--keyboards/wuque/tata80/wkl/keymaps/via/keymap.c16
-rw-r--r--keyboards/wuque/tata80/wkl/wkl.h8
4 files changed, 22 insertions, 24 deletions
diff --git a/keyboards/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/info.json
index 47089bf7a1..166511380c 100644
--- a/keyboards/wuque/tata80/wkl/info.json
+++ b/keyboards/wuque/tata80/wkl/info.json
@@ -34,6 +34,7 @@
{ "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 },
@@ -102,14 +103,11 @@
{ "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
{ "label": "\u2191", "x": 16.25, "y": 4.25 },
- { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
- { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
- { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
- { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
- { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
- { "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 },
- { "label": "Win", "x": 12.5, "y": 5.25, "w": 1.25 },
- { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.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": "Fn", "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 }
diff --git a/keyboards/wuque/tata80/wkl/keymaps/default/keymap.c b/keyboards/wuque/tata80/wkl/keymaps/default/keymap.c
index 8f135e2587..94310988e3 100644
--- a/keyboards/wuque/tata80/wkl/keymaps/default/keymap.c
+++ b/keyboards/wuque/tata80/wkl/keymaps/default/keymap.c
@@ -18,19 +18,19 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- 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_PSCR, KC_SCRL, KC_PAUS,
+ 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_SCRL, 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_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
- _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/wuque/tata80/wkl/keymaps/via/keymap.c b/keyboards/wuque/tata80/wkl/keymaps/via/keymap.c
index 597bbacc08..73568d966c 100644
--- a/keyboards/wuque/tata80/wkl/keymaps/via/keymap.c
+++ b/keyboards/wuque/tata80/wkl/keymaps/via/keymap.c
@@ -17,35 +17,35 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- 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_PSCR, KC_SCRL, KC_PAUS,
+ 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_SCRL, 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_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
- _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/wuque/tata80/wkl/wkl.h b/keyboards/wuque/tata80/wkl/wkl.h
index 9795f51321..2981f26d55 100644
--- a/keyboards/wuque/tata80/wkl/wkl.h
+++ b/keyboards/wuque/tata80/wkl/wkl.h
@@ -27,18 +27,18 @@
* represents the switch matrix.
*/
#define LAYOUT( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k014, k015, k016, \
+ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, \
k400, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k413, k415, \
- k500, k501, k502, k506, k509, k510, k511, k513, k514, k515, k516 \
+ k500, k502, k506, k509, k513, k514, k515, k516 \
) \
{ \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k014, k015, k016 }, \
+ { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016 }, \
{ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116 }, \
{ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216 }, \
{ k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, KC_NO, k313, KC_NO, KC_NO, KC_NO }, \
{ k400, KC_NO, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, KC_NO, k413, KC_NO, k415, KC_NO }, \
- { k500, k501, k502, KC_NO, KC_NO, KC_NO, k506, KC_NO, KC_NO, k509, k510, k511, KC_NO, k513, k514, k515, k516 } \
+ { k500, KC_NO, k502, KC_NO, KC_NO, KC_NO, k506, KC_NO, KC_NO, k509, KC_NO, KC_NO, KC_NO, k513, k514, k515, k516 } \
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 18:19:53 +0000