aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-11 00:20:10 -0700
committerGitHub <noreply@github.com>2021-08-11 00:20:10 -0700
commit71ce2b0d79eb3c09c056d91c787e9c793f645b37 (patch)
tree68a09b289f3e81afc0cfe503dc3de11e3fedd8c3
parent3161f10b1f4c95fdf857b6f3ce9572cf6fdcf7f1 (diff)
downloadqmk_firmware-71ce2b0d79eb3c09c056d91c787e9c793f645b37.tar.gz
qmk_firmware-71ce2b0d79eb3c09c056d91c787e9c793f645b37.zip
Poker87C and Poker87D Refactor (#13961)
Diffstat
-rw-r--r--keyboards/poker87c/config.h8
-rw-r--r--keyboards/poker87c/info.json110
-rw-r--r--keyboards/poker87c/keymaps/default/keymap.c28
-rw-r--r--keyboards/poker87c/keymaps/via/keymap.c56
-rw-r--r--keyboards/poker87c/poker87c.h20
-rw-r--r--keyboards/poker87c/rules.mk11
-rw-r--r--keyboards/poker87d/config.h8
-rw-r--r--keyboards/poker87d/info.json113
-rw-r--r--keyboards/poker87d/keymaps/default/keymap.c30
-rw-r--r--keyboards/poker87d/keymaps/via/keymap.c62
-rw-r--r--keyboards/poker87d/poker87d.h23
-rw-r--r--keyboards/poker87d/rules.mk11
12 files changed, 360 insertions, 120 deletions
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
index 9c4608aee..e01df80ec 100644
--- a/keyboards/poker87c/config.h
+++ b/keyboards/poker87c/config.h
@@ -19,11 +19,11 @@
19#include "config_common.h" 19#include "config_common.h"
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0xFEED 22#define VENDOR_ID 0x6D66 // "mf" - mfkiiyd
23#define PRODUCT_ID 0x6060 23#define PRODUCT_ID 0x087C // "87C"
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER Hotswap 25#define MANUFACTURER mfkiiyd
26#define PRODUCT POKER-87 26#define PRODUCT POKER-87C Hotswap
27 27
28/* key matrix size */ 28/* key matrix size */
29#define MATRIX_ROWS 6 29#define MATRIX_ROWS 6
diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json
index a620daf54..ff68cfaa1 100644
--- a/keyboards/poker87c/info.json
+++ b/keyboards/poker87c/info.json
@@ -1,11 +1,14 @@
1{ 1{
2 "keyboard_name": "POKER-87", 2 "keyboard_name": "POKER-87C",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "mfkiiyd",
5 "width": 18.25, 5 "width": 18.25,
6 "height": 6.5, 6 "height": 6.5,
7 "layout_aliases": {
8 "LAYOUT": "LAYOUT_all"
9 },
7 "layouts": { 10 "layouts": {
8 "LAYOUT": { 11 "LAYOUT_all": {
9 "layout": [ 12 "layout": [
10 {"label":"K00 (E6,D1)", "x":0, "y":0}, 13 {"label":"K00 (E6,D1)", "x":0, "y":0},
11 {"label":"K01 (E6,D0)", "x":2, "y":0}, 14 {"label":"K01 (E6,D0)", "x":2, "y":0},
@@ -23,6 +26,7 @@
23 {"label":"K0D (E6,B4)", "x":15.25, "y":0}, 26 {"label":"K0D (E6,B4)", "x":15.25, "y":0},
24 {"label":"K0E (E6,B0)", "x":16.25, "y":0}, 27 {"label":"K0E (E6,B0)", "x":16.25, "y":0},
25 {"label":"K3D (F0,B4)", "x":17.25, "y":0}, 28 {"label":"K3D (F0,B4)", "x":17.25, "y":0},
29
26 {"label":"K10 (B7,D1)", "x":0, "y":1.5}, 30 {"label":"K10 (B7,D1)", "x":0, "y":1.5},
27 {"label":"K11 (B7,D0)", "x":1, "y":1.5}, 31 {"label":"K11 (B7,D0)", "x":1, "y":1.5},
28 {"label":"K12 (B7,F7)", "x":2, "y":1.5}, 32 {"label":"K12 (B7,F7)", "x":2, "y":1.5},
@@ -41,6 +45,7 @@
41 {"label":"K5B (D7,F4)", "x":15.25, "y":1.5}, 45 {"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
42 {"label":"K5C (D7,F1)", "x":16.25, "y":1.5}, 46 {"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
43 {"label":"K3E (F0,B0)", "x":17.25, "y":1.5}, 47 {"label":"K3E (F0,B0)", "x":17.25, "y":1.5},
48
44 {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5}, 49 {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5},
45 {"label":"K21 (D4,D0)", "x":1.5, "y":2.5}, 50 {"label":"K21 (D4,D0)", "x":1.5, "y":2.5},
46 {"label":"K22 (D4,F7)", "x":2.5, "y":2.5}, 51 {"label":"K22 (D4,F7)", "x":2.5, "y":2.5},
@@ -58,6 +63,7 @@
58 {"label":"K2E (D4,B0)", "x":15.25, "y":2.5}, 63 {"label":"K2E (D4,B0)", "x":15.25, "y":2.5},
59 {"label":"K5D (D7,B4)", "x":16.25, "y":2.5}, 64 {"label":"K5D (D7,B4)", "x":16.25, "y":2.5},
60 {"label":"K5E (D7,B0)", "x":17.25, "y":2.5}, 65 {"label":"K5E (D7,B0)", "x":17.25, "y":2.5},
66
61 {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75}, 67 {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75},
62 {"label":"K31 (F0,D0)", "x":1.75, "y":3.5}, 68 {"label":"K31 (F0,D0)", "x":1.75, "y":3.5},
63 {"label":"K32 (F0,F7)", "x":2.75, "y":3.5}, 69 {"label":"K32 (F0,F7)", "x":2.75, "y":3.5},
@@ -71,6 +77,7 @@
71 {"label":"K3A (F0,B5)", "x":10.75, "y":3.5}, 77 {"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
72 {"label":"K3B (F0,F4)", "x":11.75, "y":3.5}, 78 {"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
73 {"label":"K3C (F0,F1)", "x":12.75, "y":3.5, "w":2.25}, 79 {"label":"K3C (F0,F1)", "x":12.75, "y":3.5, "w":2.25},
80
74 {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":1.25}, 81 {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":1.25},
75 {"label":"K41 (D6,D0)", "x":1.25, "y":4.5}, 82 {"label":"K41 (D6,D0)", "x":1.25, "y":4.5},
76 {"label":"K42 (D6,F7)", "x":2.25, "y":4.5}, 83 {"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
@@ -86,6 +93,7 @@
86 {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":1.75}, 93 {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":1.75},
87 {"label":"K4D (D6,B4)", "x":14, "y":4.5}, 94 {"label":"K4D (D6,B4)", "x":14, "y":4.5},
88 {"label":"K4E (D6,B0)", "x":16.25, "y":4.5}, 95 {"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
96
89 {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25}, 97 {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
90 {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25}, 98 {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
91 {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25}, 99 {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25},
@@ -98,6 +106,102 @@
98 {"label":"K59 (D7,C6)", "x":16.25, "y":5.5}, 106 {"label":"K59 (D7,C6)", "x":16.25, "y":5.5},
99 {"label":"K5A (D7,B5)", "x":17.25, "y":5.5} 107 {"label":"K5A (D7,B5)", "x":17.25, "y":5.5}
100 ] 108 ]
109 },
110 "LAYOUT_tkl_ansi": {
111 "layout": [
112 {"x": 0, "y": 0},
113 {"x": 2, "y": 0},
114 {"x": 3, "y": 0},
115 {"x": 4, "y": 0},
116 {"x": 5, "y": 0},
117 {"x": 6.5, "y": 0},
118 {"x": 7.5, "y": 0},
119 {"x": 8.5, "y": 0},
120 {"x": 9.5, "y": 0},
121 {"x": 11, "y": 0},
122 {"x": 12, "y": 0},
123 {"x": 13, "y": 0},
124 {"x": 14, "y": 0},
125 {"x": 15.25, "y": 0},
126 {"x": 16.25, "y": 0},
127 {"x": 17.25, "y": 0},
128
129 {"x": 0, "y": 1.5},
130 {"x": 1, "y": 1.5},
131 {"x": 2, "y": 1.5},
132 {"x": 3, "y": 1.5},
133 {"x": 4, "y": 1.5},
134 {"x": 5, "y": 1.5},
135 {"x": 6, "y": 1.5},
136 {"x": 7, "y": 1.5},
137 {"x": 8, "y": 1.5},
138 {"x": 9, "y": 1.5},
139 {"x": 10, "y": 1.5},
140 {"x": 11, "y": 1.5},
141 {"x": 12, "y": 1.5},
142 {"x": 13, "y": 1.5, "w": 2},
143 {"x": 15.25, "y": 1.5},
144 {"x": 16.25, "y": 1.5},
145 {"x": 17.25, "y": 1.5},
146
147 {"x": 0, "y": 2.5, "w": 1.5},
148 {"x": 1.5, "y": 2.5},
149 {"x": 2.5, "y": 2.5},
150 {"x": 3.5, "y": 2.5},
151 {"x": 4.5, "y": 2.5},
152 {"x": 5.5, "y": 2.5},
153 {"x": 6.5, "y": 2.5},
154 {"x": 7.5, "y": 2.5},
155 {"x": 8.5, "y": 2.5},
156 {"x": 9.5, "y": 2.5},
157 {"x": 10.5, "y": 2.5},
158 {"x": 11.5, "y": 2.5},
159 {"x": 12.5, "y": 2.5},
160 {"x": 13.5, "y": 2.5, "w": 1.5},
161 {"x": 15.25, "y": 2.5},
162 {"x": 16.25, "y": 2.5},
163 {"x": 17.25, "y": 2.5},
164
165 {"x": 0, "y": 3.5, "w": 1.75},
166 {"x": 1.75, "y": 3.5},
167 {"x": 2.75, "y": 3.5},
168 {"x": 3.75, "y": 3.5},
169 {"x": 4.75, "y": 3.5},
170 {"x": 5.75, "y": 3.5},
171 {"x": 6.75, "y": 3.5},
172 {"x": 7.75, "y": 3.5},
173 {"x": 8.75, "y": 3.5},
174 {"x": 9.75, "y": 3.5},
175 {"x": 10.75, "y": 3.5},
176 {"x": 11.75, "y": 3.5},
177 {"x": 12.75, "y": 3.5, "w": 2.25},
178
179 {"x": 0, "y": 4.5, "w": 2.25},
180 {"x": 2.25, "y": 4.5},
181 {"x": 3.25, "y": 4.5},
182 {"x": 4.25, "y": 4.5},
183 {"x": 5.25, "y": 4.5},
184 {"x": 6.25, "y": 4.5},
185 {"x": 7.25, "y": 4.5},
186 {"x": 8.25, "y": 4.5},
187 {"x": 9.25, "y": 4.5},
188 {"x": 10.25, "y": 4.5},
189 {"x": 11.25, "y": 4.5},
190 {"x": 12.25, "y": 4.5, "w": 2.75},
191 {"x": 16.25, "y": 4.5},
192
193 {"x": 0, "y": 5.5, "w": 1.25},
194 {"x": 1.25, "y": 5.5, "w": 1.25},
195 {"x": 2.5, "y": 5.5, "w": 1.25},
196 {"x": 3.75, "y": 5.5, "w": 6.25},
197 {"x": 10, "y": 5.5, "w": 1.25},
198 {"x": 11.25, "y": 5.5, "w": 1.25},
199 {"x": 12.5, "y": 5.5, "w": 1.25},
200 {"x": 13.75, "y": 5.5, "w": 1.25},
201 {"x": 15.25, "y": 5.5},
202 {"x": 16.25, "y": 5.5},
203 {"x": 17.25, "y": 5.5}
204 ]
101 } 205 }
102 } 206 }
103} 207}
diff --git a/keyboards/poker87c/keymaps/default/keymap.c b/keyboards/poker87c/keymaps/default/keymap.c
index 7bc0912da..4be088c0f 100644
--- a/keyboards/poker87c/keymaps/default/keymap.c
+++ b/keyboards/poker87c/keymaps/default/keymap.c
@@ -17,21 +17,21 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_all(
21 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_SLCK, KC_PAUS, 21 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_SLCK, KC_PAUS,
22 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, 22 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,
23 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, 23 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,
24 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, 24 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,
25 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, 25 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,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 [1] = LAYOUT( 28 [1] = LAYOUT_all(
29 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, _______, _______, _______, 31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, 33 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU,
34 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT 34 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
35 ), 35 ),
36 36
37}; 37};
diff --git a/keyboards/poker87c/keymaps/via/keymap.c b/keyboards/poker87c/keymaps/via/keymap.c
index 2840ae043..59c5b359b 100644
--- a/keyboards/poker87c/keymaps/via/keymap.c
+++ b/keyboards/poker87c/keymaps/via/keymap.c
@@ -17,36 +17,36 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_all(
21 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_SLCK, KC_PAUS, 21 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_SLCK, KC_PAUS,
22 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, 22 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,
23 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, 23 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,
24 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, 24 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,
25 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, 25 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,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 [1] = LAYOUT( 28 [1] = LAYOUT_all(
29 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, _______, _______, _______, 31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, 33 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU,
34 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT 34 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
35 ), 35 ),
36 [2] = LAYOUT( 36 [2] = LAYOUT_all(
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
43 ), 43 ),
44 [3] = LAYOUT( 44 [3] = LAYOUT_all(
45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
51 ), 51 ),
52}; 52};
diff --git a/keyboards/poker87c/poker87c.h b/keyboards/poker87c/poker87c.h
index 454f9b598..c8cdccf44 100644
--- a/keyboards/poker87c/poker87c.h
+++ b/keyboards/poker87c/poker87c.h
@@ -18,7 +18,9 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT( \ 21#define XXX KC_NO
22
23#define LAYOUT_all( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D, \ 24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K5B, K5C, K3E, \ 25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K5B, K5C, K3E, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K5D, K5E, \ 26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K5D, K5E, \
@@ -34,4 +36,18 @@
34 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \ 36 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
35} 37}
36 38
37 39#define LAYOUT_tkl_ansi( \
40 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D, \
41 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K5B, K5C, K3E, \
42 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K5D, K5E, \
43 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
44 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, \
45 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A \
46) { \
47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
50 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
51 { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
52 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
53}
diff --git a/keyboards/poker87c/rules.mk b/keyboards/poker87c/rules.mk
index 4ae94ca96..6f3a6021e 100644
--- a/keyboards/poker87c/rules.mk
+++ b/keyboards/poker87c/rules.mk
@@ -8,10 +8,10 @@ BOOTLOADER = atmel-dfu
8# change yes to no to disable 8# change yes to no to disable
9# 9#
10BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = no # Mouse keys 11MOUSEKEY_ENABLE = no # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration 14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
@@ -21,7 +21,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth 21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output 22AUDIO_ENABLE = no # Audio output
23 23
24KEY_LOCK_ENABLE = no # Enable KC_LOCK support 24LAYOUTS = tkl_ansi
25
26# generated by KBFirmware JSON to QMK Parser
27# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index eeac6bc4d..7cf87340e 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -19,11 +19,11 @@
19#include "config_common.h" 19#include "config_common.h"
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0xFEED 22#define VENDOR_ID 0x6D66 // "mf" - mfkiiyd
23#define PRODUCT_ID 0x6060 23#define PRODUCT_ID 0x087D // "87D"
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER Hotswap 25#define MANUFACTURER mfkiiyd
26#define PRODUCT POKER-87 26#define PRODUCT POKER-87D Hotswap
27 27
28/* key matrix size */ 28/* key matrix size */
29#define MATRIX_ROWS 6 29#define MATRIX_ROWS 6
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 5a5eda432..50c1a7560 100644
--- a/keyboards/poker87d/info.json
+++ b/keyboards/poker87d/info.json
@@ -1,11 +1,14 @@
1{ 1{
2 "keyboard_name": "POKER-87", 2 "keyboard_name": "POKER-87D",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "mfkiiyd",
5 "width": 18.25, 5 "width": 18.25,
6 "height": 6.5, 6 "height": 6.5,
7 "layout_aliases": {
8 "LAYOUT": "LAYOUT_all"
9 },
7 "layouts": { 10 "layouts": {
8 "LAYOUT": { 11 "LAYOUT_all": {
9 "layout": [ 12 "layout": [
10 {"label":"K00 (E6,D1)", "x":0, "y":0}, 13 {"label":"K00 (E6,D1)", "x":0, "y":0},
11 {"label":"K01 (E6,D0)", "x":2, "y":0}, 14 {"label":"K01 (E6,D0)", "x":2, "y":0},
@@ -23,6 +26,7 @@
23 {"label":"K0D (E6,B4)", "x":15.25, "y":0}, 26 {"label":"K0D (E6,B4)", "x":15.25, "y":0},
24 {"label":"K0E (E6,B0)", "x":16.25, "y":0}, 27 {"label":"K0E (E6,B0)", "x":16.25, "y":0},
25 {"label":"K3D (F0,B4)", "x":17.25, "y":0}, 28 {"label":"K3D (F0,B4)", "x":17.25, "y":0},
29
26 {"label":"K10 (B7,D1)", "x":0, "y":1.5}, 30 {"label":"K10 (B7,D1)", "x":0, "y":1.5},
27 {"label":"K11 (B7,D0)", "x":1, "y":1.5}, 31 {"label":"K11 (B7,D0)", "x":1, "y":1.5},
28 {"label":"K12 (B7,F7)", "x":2, "y":1.5}, 32 {"label":"K12 (B7,F7)", "x":2, "y":1.5},
@@ -41,6 +45,7 @@
41 {"label":"K5B (D7,F4)", "x":15.25, "y":1.5}, 45 {"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
42 {"label":"K5C (D7,F1)", "x":16.25, "y":1.5}, 46 {"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
43 {"label":"K3E (F0,B0)", "x":17.25, "y":1.5}, 47 {"label":"K3E (F0,B0)", "x":17.25, "y":1.5},
48
44 {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5}, 49 {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5},
45 {"label":"K21 (D4,D0)", "x":1.5, "y":2.5}, 50 {"label":"K21 (D4,D0)", "x":1.5, "y":2.5},
46 {"label":"K22 (D4,F7)", "x":2.5, "y":2.5}, 51 {"label":"K22 (D4,F7)", "x":2.5, "y":2.5},
@@ -54,10 +59,10 @@
54 {"label":"K2A (D4,B5)", "x":10.5, "y":2.5}, 59 {"label":"K2A (D4,B5)", "x":10.5, "y":2.5},
55 {"label":"K2B (D4,F4)", "x":11.5, "y":2.5}, 60 {"label":"K2B (D4,F4)", "x":11.5, "y":2.5},
56 {"label":"K2C (D4,F1)", "x":12.5, "y":2.5, "w":1.25}, 61 {"label":"K2C (D4,F1)", "x":12.5, "y":2.5, "w":1.25},
57 {"label":"K3C (F0,F1)", "x":13.75, "y":2.5, "w":1.25, "h":2},
58 {"label":"K2E (D4,B0)", "x":15.25, "y":2.5}, 62 {"label":"K2E (D4,B0)", "x":15.25, "y":2.5},
59 {"label":"K5D (D7,B4)", "x":16.25, "y":2.5}, 63 {"label":"K5D (D7,B4)", "x":16.25, "y":2.5},
60 {"label":"K5E (D7,B0)", "x":17.25, "y":2.5}, 64 {"label":"K5E (D7,B0)", "x":17.25, "y":2.5},
65
61 {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75}, 66 {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75},
62 {"label":"K31 (F0,D0)", "x":1.75, "y":3.5}, 67 {"label":"K31 (F0,D0)", "x":1.75, "y":3.5},
63 {"label":"K32 (F0,F7)", "x":2.75, "y":3.5}, 68 {"label":"K32 (F0,F7)", "x":2.75, "y":3.5},
@@ -71,6 +76,8 @@
71 {"label":"K3A (F0,B5)", "x":10.75, "y":3.5}, 76 {"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
72 {"label":"K3B (F0,F4)", "x":11.75, "y":3.5}, 77 {"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
73 {"label":"K2D (D4,B4)", "x":12.75, "y":3.5}, 78 {"label":"K2D (D4,B4)", "x":12.75, "y":3.5},
79 {"label":"K3C (F0,F1)", "x":13.75, "y":2.5, "w":1.25, "h":2},
80
74 {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":1.25}, 81 {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":1.25},
75 {"label":"K41 (D6,D0)", "x":1.25, "y":4.5}, 82 {"label":"K41 (D6,D0)", "x":1.25, "y":4.5},
76 {"label":"K42 (D6,F7)", "x":2.25, "y":4.5}, 83 {"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
@@ -86,6 +93,7 @@
86 {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":1.75}, 93 {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":1.75},
87 {"label":"K4D (D6,B4)", "x":14, "y":4.5}, 94 {"label":"K4D (D6,B4)", "x":14, "y":4.5},
88 {"label":"K4E (D6,B0)", "x":16.25, "y":4.5}, 95 {"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
96
89 {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25}, 97 {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
90 {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25}, 98 {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
91 {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25}, 99 {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25},
@@ -98,6 +106,103 @@
98 {"label":"K59 (D7,C6)", "x":16.25, "y":5.5}, 106 {"label":"K59 (D7,C6)", "x":16.25, "y":5.5},
99 {"label":"K5A (D7,B5)", "x":17.25, "y":5.5} 107 {"label":"K5A (D7,B5)", "x":17.25, "y":5.5}
100 ] 108 ]
109 },
110 "LAYOUT_tkl_iso": {
111 "layout": [
112 {"x": 0, "y": 0},
113 {"x": 2, "y": 0},
114 {"x": 3, "y": 0},
115 {"x": 4, "y": 0},
116 {"x": 5, "y": 0},
117 {"x": 6.5, "y": 0},
118 {"x": 7.5, "y": 0},
119 {"x": 8.5, "y": 0},
120 {"x": 9.5, "y": 0},
121 {"x": 11, "y": 0},
122 {"x": 12, "y": 0},
123 {"x": 13, "y": 0},
124 {"x": 14, "y": 0},
125 {"x": 15.25, "y": 0},
126 {"x": 16.25, "y": 0},
127 {"x": 17.25, "y": 0},
128
129 {"x": 0, "y": 1.5},
130 {"x": 1, "y": 1.5},
131 {"x": 2, "y": 1.5},
132 {"x": 3, "y": 1.5},
133 {"x": 4, "y": 1.5},
134 {"x": 5, "y": 1.5},
135 {"x": 6, "y": 1.5},
136 {"x": 7, "y": 1.5},
137 {"x": 8, "y": 1.5},
138 {"x": 9, "y": 1.5},
139 {"x": 10, "y": 1.5},
140 {"x": 11, "y": 1.5},
141 {"x": 12, "y": 1.5},
142 {"x": 13, "y": 1.5, "w": 2},
143 {"x": 15.25, "y": 1.5},
144 {"x": 16.25, "y": 1.5},
145 {"x": 17.25, "y": 1.5},
146
147 {"x": 0, "y": 2.5, "w": 1.5},
148 {"x": 1.5, "y": 2.5},
149 {"x": 2.5, "y": 2.5},
150 {"x": 3.5, "y": 2.5},
151 {"x": 4.5, "y": 2.5},
152 {"x": 5.5, "y": 2.5},
153 {"x": 6.5, "y": 2.5},
154 {"x": 7.5, "y": 2.5},
155 {"x": 8.5, "y": 2.5},
156 {"x": 9.5, "y": 2.5},
157 {"x": 10.5, "y": 2.5},
158 {"x": 11.5, "y": 2.5},
159 {"x": 12.5, "y": 2.5},
160 {"x": 15.25, "y": 2.5},
161 {"x": 16.25, "y": 2.5},
162 {"x": 17.25, "y": 2.5},
163
164 {"x": 0, "y": 3.5, "w": 1.75},
165 {"x": 1.75, "y": 3.5},
166 {"x": 2.75, "y": 3.5},
167 {"x": 3.75, "y": 3.5},
168 {"x": 4.75, "y": 3.5},
169 {"x": 5.75, "y": 3.5},
170 {"x": 6.75, "y": 3.5},
171 {"x": 7.75, "y": 3.5},
172 {"x": 8.75, "y": 3.5},
173 {"x": 9.75, "y": 3.5},
174 {"x": 10.75, "y": 3.5},
175 {"x": 11.75, "y": 3.5},
176 {"x": 12.75, "y": 3.5},
177 {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
178
179 {"x": 0, "y": 4.5, "w": 1.25},
180 {"x": 1.25, "y": 4.5},
181 {"x": 2.25, "y": 4.5},
182 {"x": 3.25, "y": 4.5},
183 {"x": 4.25, "y": 4.5},
184 {"x": 5.25, "y": 4.5},
185 {"x": 6.25, "y": 4.5},
186 {"x": 7.25, "y": 4.5},
187 {"x": 8.25, "y": 4.5},
188 {"x": 9.25, "y": 4.5},
189 {"x": 10.25, "y": 4.5},
190 {"x": 11.25, "y": 4.5},
191 {"x": 12.25, "y": 4.5, "w": 2.75},
192 {"x": 16.25, "y": 4.5},
193
194 {"x": 0, "y": 5.5, "w": 1.25},
195 {"x": 1.25, "y": 5.5, "w": 1.25},
196 {"x": 2.5, "y": 5.5, "w": 1.25},
197 {"x": 3.75, "y": 5.5, "w": 6.25},
198 {"x": 10, "y": 5.5, "w": 1.25},
199 {"x": 11.25, "y": 5.5, "w": 1.25},
200 {"x": 12.5, "y": 5.5, "w": 1.25},
201 {"x": 13.75, "y": 5.5, "w": 1.25},
202 {"x": 15.25, "y": 5.5},
203 {"x": 16.25, "y": 5.5},
204 {"x": 17.25, "y": 5.5}
205 ]
101 } 206 }
102 } 207 }
103} 208}
diff --git a/keyboards/poker87d/keymaps/default/keymap.c b/keyboards/poker87d/keymaps/default/keymap.c
index ab0318573..8adc58ae1 100644
--- a/keyboards/poker87d/keymaps/default/keymap.c
+++ b/keyboards/poker87d/keymaps/default/keymap.c
@@ -17,21 +17,23 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20
21 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_SLCK, KC_PAUS, 21 [0] = LAYOUT_all(
22 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, 22 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_SLCK, KC_PAUS,
23 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_ENT, KC_DEL, KC_END, KC_PGDN, 23 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,
24 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_NUHS, 24 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_DEL, KC_END, KC_PGDN,
25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP, 25 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_NUHS, KC_ENT,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
27 ), 28 ),
28 [1] = LAYOUT( 29
29 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 [1] = LAYOUT_all(
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, 33 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT 35 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU,
36 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
35 ), 37 ),
36 38
37}; 39};
diff --git a/keyboards/poker87d/keymaps/via/keymap.c b/keyboards/poker87d/keymaps/via/keymap.c
index a75465d22..b2eff1ce3 100644
--- a/keyboards/poker87d/keymaps/via/keymap.c
+++ b/keyboards/poker87d/keymaps/via/keymap.c
@@ -18,39 +18,41 @@
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 20
21 [0] = LAYOUT( 21 [0] = LAYOUT_all(
22 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_SLCK, KC_PAUS, 22 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_SLCK, KC_PAUS,
23 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, 23 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,
24 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_ENT, KC_DEL, KC_END, KC_PGDN, 24 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_DEL, KC_END, KC_PGDN,
25 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_NUHS, 25 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_NUHS, KC_ENT,
26 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP, 26 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
28 ), 28 ),
29 [1] = LAYOUT( 29
30 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 [1] = LAYOUT_all(
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, 33 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______,
35 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT 35 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU,
36 _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
36 ), 37 ),
37 38
38 [2] = LAYOUT( 39 [2] = LAYOUT_all(
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
45 ), 46 ),
46 47
47 [3] = LAYOUT( 48 [3] = LAYOUT_all(
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 51 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 52 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
52 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 53 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
53 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 54 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
54 ), 55 ),
56
55}; 57};
56 58
diff --git a/keyboards/poker87d/poker87d.h b/keyboards/poker87d/poker87d.h
index f414e4bb5..8ea11b012 100644
--- a/keyboards/poker87d/poker87d.h
+++ b/keyboards/poker87d/poker87d.h
@@ -18,11 +18,13 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT( \ 21#define XXX KC_NO
22
23#define LAYOUT_all( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D, \ 24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K5B, K5C, K3E, \ 25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K5B, K5C, K3E, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, K2E, K5D, K5E, \ 26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K5D, K5E, \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, \ 27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3C, \
26 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ 28 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
27 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A \ 29 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A \
28) { \ 30) { \
@@ -34,3 +36,18 @@
34 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \ 36 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
35} 37}
36 38
39#define LAYOUT_tkl_iso( \
40 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D, \
41 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K5B, K5C, K3E, \
42 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K5D, K5E, \
43 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3C, \
44 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, \
45 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A \
46) { \
47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
50 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
51 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
52 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
53}
diff --git a/keyboards/poker87d/rules.mk b/keyboards/poker87d/rules.mk
index 4ae94ca96..e11be918d 100644
--- a/keyboards/poker87d/rules.mk
+++ b/keyboards/poker87d/rules.mk
@@ -8,10 +8,10 @@ BOOTLOADER = atmel-dfu
8# change yes to no to disable 8# change yes to no to disable
9# 9#
10BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = no # Mouse keys 11MOUSEKEY_ENABLE = no # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration 14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
@@ -21,7 +21,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth 21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output 22AUDIO_ENABLE = no # Audio output
23 23
24KEY_LOCK_ENABLE = no # Enable KC_LOCK support 24LAYOUTS = tkl_iso
25
26# generated by KBFirmware JSON to QMK Parser
27# https://noroadsleft.github.io/kbf_qmk_converter/
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 03:36:22 +0000