aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-11 09:48:25 -0700
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-11 09:48:25 -0700
commit345f6dc4e6910ab11907dfa5382edb12d57a1d7b (patch)
treeb57d00ab7fe59a47f4035ab7463dec5090ef6464 /keyboards
parentf4c447f2dfd9146664e3e985cac743abf17ac060 (diff)
parent02ac0f89c4665f5fc6e57559a8c49d363117fbc0 (diff)
downloadqmk_firmware-345f6dc4e6910ab11907dfa5382edb12d57a1d7b.tar.gz
qmk_firmware-345f6dc4e6910ab11907dfa5382edb12d57a1d7b.zip
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in: - keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk - Conflicts from PR 13961 - keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c - Conflict from PR 13947
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/handwired/3dp660/config.h8
-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
-rw-r--r--keyboards/rpiguy9907/southpaw66/config.h4
-rw-r--r--keyboards/runes/vaengr/config.h147
-rw-r--r--keyboards/runes/vaengr/info.json72
-rw-r--r--keyboards/runes/vaengr/keymaps/default/keymap.c56
-rw-r--r--keyboards/runes/vaengr/keymaps/default/readme.md13
-rw-r--r--keyboards/runes/vaengr/keymaps/via/keymap.c56
-rw-r--r--keyboards/runes/vaengr/keymaps/via/rules.mk2
-rw-r--r--keyboards/runes/vaengr/readme.md23
-rw-r--r--keyboards/runes/vaengr/rules.mk22
-rw-r--r--keyboards/runes/vaengr/vaengr.c17
-rw-r--r--keyboards/runes/vaengr/vaengr.h41
-rw-r--r--keyboards/tronguylabs/m122_3270/bluepill/chconf.h29
-rw-r--r--keyboards/tronguylabs/m122_3270/bluepill/config.h29
-rw-r--r--keyboards/tronguylabs/m122_3270/bluepill/readme.md2
-rw-r--r--keyboards/tronguylabs/m122_3270/bluepill/rules.mk7
-rw-r--r--keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c68
-rw-r--r--keyboards/tronguylabs/m122_3270/keymaps/default/readme.md29
-rw-r--r--keyboards/yatara/drink_me/config.h2
31 files changed, 961 insertions, 146 deletions
diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h
index e719cf2c2..60ab13dea 100644
--- a/keyboards/handwired/3dp660/config.h
+++ b/keyboards/handwired/3dp660/config.h
@@ -19,11 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20#include "config_common.h" 20#include "config_common.h"
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0xFEED 22#define VENDOR_ID 0x676F // "go" - gooberpsycho
23#define PRODUCT_ID 0x6075 23#define PRODUCT_ID 0x3660 // "3" "660"
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER Handwired 25#define MANUFACTURER gooberpsycho
26#define PRODUCT 3dp660 26#define PRODUCT 3dp660 Handwired
27 27
28#define TAPPING_TERM 400 28#define TAPPING_TERM 400
29 29
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 e4f825960..e8b066aeb 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 = lite # Enable Bootmagic Lite 10BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
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 e4f825960..704121140 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 = lite # Enable Bootmagic Lite 10BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
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/
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h
index 242b4a7c4..b5cef39a6 100644
--- a/keyboards/rpiguy9907/southpaw66/config.h
+++ b/keyboards/rpiguy9907/southpaw66/config.h
@@ -18,8 +18,8 @@
18 18
19#include "config_common.h" 19#include "config_common.h"
20/* USB Device descriptor parameter */ 20/* USB Device descriptor parameter */
21#define VENDOR_ID 0xFEED 21#define VENDOR_ID 0x9907 // "9907" - rpiguy9907
22#define PRODUCT_ID 0x6077 22#define PRODUCT_ID 0x5366 // "S" "66"
23#define DEVICE_VER 0x0001 23#define DEVICE_VER 0x0001
24#define MANUFACTURER rpiguy9907 24#define MANUFACTURER rpiguy9907
25#define PRODUCT Southpaw66 25#define PRODUCT Southpaw66
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
new file mode 100644
index 000000000..4f66a4d38
--- /dev/null
+++ b/keyboards/runes/vaengr/config.h
@@ -0,0 +1,147 @@
1/*
2Copyright 2021 Vicktor
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter */
23#define VENDOR_ID 0x726E
24#define PRODUCT_ID 0x7661
25#define DEVICE_VER 0x0001
26#define MANUFACTURER Rune
27#define PRODUCT Vængr
28
29/* key matrix size */
30#define MATRIX_ROWS 5
31#define MATRIX_COLS 12
32
33/*
34 * Keyboard Matrix Assignments
35 *
36 * Change this to how you wired your keyboard
37 * COLS: AVR pins used for columns, left to right
38 * ROWS: AVR pins used for rows, top to bottom
39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
41 *
42 */
43#define MATRIX_ROW_PINS { C7, E6, D5, B3, B7 }
44#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 }
45#define UNUSED_PINS
46
47/* COL2ROW, ROW2COL */
48#define DIODE_DIRECTION COL2ROW
49
50/*
51 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
52 */
53// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
54
55//#define LED_NUM_LOCK_PIN B0
56//#define LED_CAPS_LOCK_PIN B1
57//#define LED_SCROLL_LOCK_PIN B2
58//#define LED_COMPOSE_PIN B3
59//#define LED_KANA_PIN B4
60
61// #define BACKLIGHT_PIN
62// #define BACKLIGHT_LEVELS 3
63// #define BACKLIGHT_BREATHING
64
65#define RGB_DI_PIN D3
66// #define RGB_DI_PIN B0
67#ifdef RGB_DI_PIN
68#define RGBLIGHT_EFFECT_BREATHING
69#define RGBLIGHT_EFFECT_RAINBOW_MOOD
70#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
71#define RGBLIGHT_EFFECT_SNAKE
72#define RGBLIGHT_EFFECT_KNIGHT
73#define RGBLIGHT_EFFECT_CHRISTMAS
74#define RGBLIGHT_EFFECT_STATIC_GRADIENT
75#define RGBLIGHT_EFFECT_RGB_TEST
76#define RGBLIGHT_EFFECT_ALTERNATING
77#define RGBLIGHT_EFFECT_TWINKLE
78#define RGBLED_NUM 3
79#define RGBLIGHT_HUE_STEP 10
80#define RGBLIGHT_SAT_STEP 17
81#define RGBLIGHT_VAL_STEP 17
82// # define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
83#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
84/*== customize breathing effect ==*/
85/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
86//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
87/*==== use exp() and sin() ====*/
88//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
89//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
90#endif
91
92/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
93#define DEBOUNCE 5
94
95/* define if matrix has ghost (lacks anti-ghosting diodes) */
96//#define MATRIX_HAS_GHOST
97
98
99/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
100 * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
101 */
102//#define GRAVE_ESC_CTRL_OVERRIDE
103
104/*
105 * Force NKRO
106 *
107 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
108 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
109 * makefile for this to work.)
110 *
111 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
112 * until the next keyboard reset.
113 *
114 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
115 * fully operational during normal computer usage.
116 *
117 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
118 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
119 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
120 * power-up.
121 *
122 */
123#define FORCE_NKRO
124
125/*
126 * Feature disable options
127 * These options are also useful to firmware size reduction.
128 */
129
130/* disable debug print */
131//#define NO_DEBUG
132
133/* disable print */
134//#define NO_PRINT
135
136/* disable action features */
137//#define NO_ACTION_LAYER
138//#define NO_ACTION_TAPPING
139//#define NO_ACTION_ONESHOT
140
141/* disable these deprecated features by default */
142#define NO_ACTION_MACRO
143#define NO_ACTION_FUNCTION
144
145/* Bootmagic Lite key configuration */
146//#define BOOTMAGIC_LITE_ROW 0
147//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json
new file mode 100644
index 000000000..e4f9a4bd3
--- /dev/null
+++ b/keyboards/runes/vaengr/info.json
@@ -0,0 +1,72 @@
1{
2 "keyboard_name": "Runes Vængr",
3 "url": "https://www.runes.id",
4 "maintainer": "Vicktor",
5 "width": 12,
6 "height": 5,
7 "layouts": {
8 "LAYOUT": {
9 "layout": [
10 {"label": "K00", "x": 0, "y": 0},
11 {"label": "K10", "x": 1, "y": 0},
12 {"label": "K20", "x": 2, "y": 0},
13 {"label": "K30", "x": 3, "y": 0},
14 {"label": "K40", "x": 4, "y": 0},
15 {"label": "K50", "x": 5, "y": 0},
16 {"label": "K60", "x": 6, "y": 0},
17 {"label": "K70", "x": 7, "y": 0},
18 {"label": "K80", "x": 8, "y": 0},
19 {"label": "K90", "x": 9, "y": 0},
20 {"label": "K100", "x": 10, "y": 0},
21 {"label": "K110", "x": 11, "y": 0},
22 {"label": "K01", "x": 0, "y": 1},
23 {"label": "K11", "x": 1, "y": 1},
24 {"label": "K21", "x": 2, "y": 1},
25 {"label": "K31", "x": 3, "y": 1},
26 {"label": "K41", "x": 4, "y": 1},
27 {"label": "K51", "x": 5, "y": 1},
28 {"label": "K61", "x": 6, "y": 1},
29 {"label": "K71", "x": 7, "y": 1},
30 {"label": "K81", "x": 8, "y": 1},
31 {"label": "K91", "x": 9, "y": 1},
32 {"label": "K101", "x": 10, "y": 1},
33 {"label": "K111", "x": 11, "y": 1},
34 {"label": "K02", "x": 0, "y": 2},
35 {"label": "K12", "x": 1, "y": 2},
36 {"label": "K22", "x": 2, "y": 2},
37 {"label": "K32", "x": 3, "y": 2},
38 {"label": "K42", "x": 4, "y": 2},
39 {"label": "K52", "x": 5, "y": 2},
40 {"label": "K62", "x": 6, "y": 2},
41 {"label": "K72", "x": 7, "y": 2},
42 {"label": "K82", "x": 8, "y": 2},
43 {"label": "K92", "x": 9, "y": 2},
44 {"label": "K102", "x": 10, "y": 2},
45 {"label": "K112", "x": 11, "y": 2},
46 {"label": "K03", "x": 0, "y": 3},
47 {"label": "K13", "x": 1, "y": 3},
48 {"label": "K23", "x": 2, "y": 3},
49 {"label": "K33", "x": 3, "y": 3},
50 {"label": "K43", "x": 4, "y": 3},
51 {"label": "K53", "x": 5, "y": 3},
52 {"label": "K63", "x": 6, "y": 3},
53 {"label": "K73", "x": 7, "y": 3},
54 {"label": "K83", "x": 8, "y": 3},
55 {"label": "K93", "x": 9, "y": 3},
56 {"label": "K103", "x": 10, "y": 3},
57 {"label": "K113", "x": 11, "y": 3},
58 {"label": "K04", "x": 0, "y": 4},
59 {"label": "K14", "x": 1, "y": 4},
60 {"label": "K24", "x": 2, "y": 4},
61 {"label": "K34", "x": 3, "y": 4},
62 {"label": "K44", "x": 4, "y": 4},
63 {"label": "K54", "x": 5, "y": 4, "w":2},
64 {"label": "K74", "x": 7, "y": 4},
65 {"label": "K84", "x": 8, "y": 4},
66 {"label": "K94", "x": 9, "y": 4},
67 {"label": "K104", "x": 10, "y": 4},
68 {"label": "K114", "x": 11, "y": 4}
69 ]
70 }
71 }
72}
diff --git a/keyboards/runes/vaengr/keymaps/default/keymap.c b/keyboards/runes/vaengr/keymaps/default/keymap.c
new file mode 100644
index 000000000..5bd2f1219
--- /dev/null
+++ b/keyboards/runes/vaengr/keymaps/default/keymap.c
@@ -0,0 +1,56 @@
1/* Copyright 2021 Vicktor
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18// Defines names for use in layer keycodes and the keymap
19enum layer_names {
20 _BASE,
21 _LOWER,
22 _RAISE,
23 _DOUBLE,
24};
25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 // /* Base */
28
29 [_BASE] = LAYOUT(
30 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
31 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
32 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
33 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT,
34 KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, MO(1), KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT),
35
36 [_LOWER] = LAYOUT(
37 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
38 KC_TRNS, KC_PGUP, KC_HOME, KC_DEL, KC_BSPC, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_MINS, KC_EQL, KC_BSLS,
39 KC_TRNS, KC_PGDN, KC_END, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
40 KC_TRNS, KC_PSCR, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_SLCK, KC_PAUS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
42
43 [_RAISE] = LAYOUT(
44 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_NLCK, KC_P7, KC_P8, KC_P9, KC_TRNS,
45 KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_TRNS,
46 KC_TRNS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_TRNS, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PPLS,
47 KC_TRNS, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_TRNS, KC_PSLS, KC_P0, KC_PDOT, KC_PEQL, KC_PENT,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
49
50 [_DOUBLE] = LAYOUT(
51 KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
54 KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_FORWARD, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
56};
diff --git a/keyboards/runes/vaengr/keymaps/default/readme.md b/keyboards/runes/vaengr/keymaps/default/readme.md
new file mode 100644
index 000000000..3a5339cfa
--- /dev/null
+++ b/keyboards/runes/vaengr/keymaps/default/readme.md
@@ -0,0 +1,13 @@
1# The default keymap for Vængr
2
3Layer 0 (Default):
4![Layer 0](https://i.imgur.com/0g3Iw2q.png)
5
6Layer 1:
7![Layer 1](https://i.imgur.com/i1qYu4P.png)
8
9Layer 2:
10![Layer 2](https://i.imgur.com/oGo0Iss.png)
11
12Layer 3:
13![Layer 3](https://i.imgur.com/tOjiGn3.png) \ No newline at end of file
diff --git a/keyboards/runes/vaengr/keymaps/via/keymap.c b/keyboards/runes/vaengr/keymaps/via/keymap.c
new file mode 100644
index 000000000..5bd2f1219
--- /dev/null
+++ b/keyboards/runes/vaengr/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
1/* Copyright 2021 Vicktor
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18// Defines names for use in layer keycodes and the keymap
19enum layer_names {
20 _BASE,
21 _LOWER,
22 _RAISE,
23 _DOUBLE,
24};
25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 // /* Base */
28
29 [_BASE] = LAYOUT(
30 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
31 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
32 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
33 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT,
34 KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, MO(1), KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT),
35
36 [_LOWER] = LAYOUT(
37 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
38 KC_TRNS, KC_PGUP, KC_HOME, KC_DEL, KC_BSPC, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_MINS, KC_EQL, KC_BSLS,
39 KC_TRNS, KC_PGDN, KC_END, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
40 KC_TRNS, KC_PSCR, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_SLCK, KC_PAUS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
42
43 [_RAISE] = LAYOUT(
44 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_NLCK, KC_P7, KC_P8, KC_P9, KC_TRNS,
45 KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_TRNS,
46 KC_TRNS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_TRNS, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PPLS,
47 KC_TRNS, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_TRNS, KC_PSLS, KC_P0, KC_PDOT, KC_PEQL, KC_PENT,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
49
50 [_DOUBLE] = LAYOUT(
51 KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
54 KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_FORWARD, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
56};
diff --git a/keyboards/runes/vaengr/keymaps/via/rules.mk b/keyboards/runes/vaengr/keymaps/via/rules.mk
new file mode 100644
index 000000000..43061db1d
--- /dev/null
+++ b/keyboards/runes/vaengr/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/runes/vaengr/readme.md b/keyboards/runes/vaengr/readme.md
new file mode 100644
index 000000000..54e3b8017
--- /dev/null
+++ b/keyboards/runes/vaengr/readme.md
@@ -0,0 +1,23 @@
1# Vængr
2
3![Vængr](https://i.imgur.com/bwN7SzF.jpg)
4
5Vængr [/ˈwɛ̃ːŋɡr̩/] (Old Norse: Wings)
6
75x12 hotswap ortholinear keyboard based on atmega32u4 mcu.
8
9* Keyboard Maintainer: [Vicktor](https://github.com/vicktorhu)
10* Hardware Supported: atmega32u4
11* Hardware Availability: [Website](https://www.runes.id) -- Currently Indonesia only
12
13Reset the keyboard with **Lower** + **Upper** + **Del** or by pressing the reset button on the PCB.
14
15Make example for this keyboard (after setting up your build environment):
16
17 make vaengr:default
18
19Flashing example for this keyboard:
20
21 make vaengr:default:flash
22
23See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/runes/vaengr/rules.mk b/keyboards/runes/vaengr/rules.mk
new file mode 100644
index 000000000..27ffc1f24
--- /dev/null
+++ b/keyboards/runes/vaengr/rules.mk
@@ -0,0 +1,22 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = atmel-dfu
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration
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
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/runes/vaengr/vaengr.c b/keyboards/runes/vaengr/vaengr.c
new file mode 100644
index 000000000..7bea62149
--- /dev/null
+++ b/keyboards/runes/vaengr/vaengr.c
@@ -0,0 +1,17 @@
1/* Copyright 2021 Vicktor
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "vaengr.h"
diff --git a/keyboards/runes/vaengr/vaengr.h b/keyboards/runes/vaengr/vaengr.h
new file mode 100644
index 000000000..985867a93
--- /dev/null
+++ b/keyboards/runes/vaengr/vaengr.h
@@ -0,0 +1,41 @@
1/* Copyright 2021 Vicktor
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21/* This is a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
29#define LAYOUT( \
30 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, \
31 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, \
32 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, \
33 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, \
34 K40, K41, K42, K43, K44, K45, K47, K48, K49, K410, K411 \
35) { \
36 {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011 }, \
37 {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111 }, \
38 {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211 }, \
39 {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311 }, \
40 {K40, K41, K42, K43, K44, K45, KC_NO, K47, K48, K49, K410, K411 } \
41}
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/chconf.h b/keyboards/tronguylabs/m122_3270/bluepill/chconf.h
new file mode 100644
index 000000000..c7a982aed
--- /dev/null
+++ b/keyboards/tronguylabs/m122_3270/bluepill/chconf.h
@@ -0,0 +1,29 @@
1/* Copyright 2020 QMK
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17/*
18 * This file was auto-generated by:
19 * `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
20 */
21
22#pragma once
23
24#define CH_CFG_ST_TIMEDELTA 0
25
26#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
27
28#include_next <chconf.h>
29
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/config.h b/keyboards/tronguylabs/m122_3270/bluepill/config.h
new file mode 100644
index 000000000..f59eaaacb
--- /dev/null
+++ b/keyboards/tronguylabs/m122_3270/bluepill/config.h
@@ -0,0 +1,29 @@
1/* Copyright 2021 James R. Maynard III <jaymaynard@gmail.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19// place overrides below
20
21// Blackpill pin assignments: reversed the rows from the Teensy version for easier PCB layout
22// DO NOT USE the following pins: A9 (has pulldown on it), A11/A12 (USB lines), B2 (external pulldown)
23// C13 has an LED, and C13/C14/C15 are best used as inputs (with DIODE_DIRECTION set to ROW2COL, the
24// rows are inputs). Note that every usable I/O pin is used.
25#define MATRIX_COL_PINS { B1, B10, B11, B12, B13, B14, B15, A8, B0, A10, A7, A6, A15, B3, B4, B5, B6, B7, B8, B9 }
26#define MATRIX_ROW_PINS { C13, C14, C15, A1, A2, A3, A4, A5 }
27
28// The BluePill version is version 3
29#define DEVICE_VER 0x0003
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/readme.md b/keyboards/tronguylabs/m122_3270/bluepill/readme.md
new file mode 100644
index 000000000..a8d92432d
--- /dev/null
+++ b/keyboards/tronguylabs/m122_3270/bluepill/readme.md
@@ -0,0 +1,2 @@
1# BluePill controller for m122-3270
2This directory contains the BluePill-specific definitions for the M122-3270 keyboard.
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk
new file mode 100644
index 000000000..023c22cd2
--- /dev/null
+++ b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk
@@ -0,0 +1,7 @@
1# Overrides for the Bluepill version
2
3# MCU name
4MCU = STM32F103
5
6# Bootloader selection
7BOOTLOADER = stm32duino
diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
index fb4813f67..b32eb33ec 100644
--- a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
+++ b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
@@ -21,8 +21,11 @@ enum custom_keycodes {
21 JM_GRLS, // < and > on one key 21 JM_GRLS, // < and > on one key
22 JM_CBRC, // { and } on one key 22 JM_CBRC, // { and } on one key
23 JM_CENT, // cent sign and ! on one key 23 JM_CENT, // cent sign and ! on one key
24 JM_DPA1, // DUP/PA1,
25 JM_FPA2, // FldMk/PA2,
24 JM_JUMP, // JUMP/PA3, 26 JM_JUMP, // JUMP/PA3,
25 JM_DEL // Delete 27 JM_DEL, // Delete
28 JM_NSLC // NumLock/ScrollLock on one key
26}; 29};
27 30
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -31,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
31 KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, 34 KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
32 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 35 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
33 36
34 KC_NO, KC_NO, 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_ESC, KC_PGUP, KC_PGDN, KC_NLCK, KC_SLCK, KC_PAST, KC_PSLS, 37 KC_NO, KC_NO, 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_NO, KC_PGUP, KC_PGDN, KC_ESC, JM_NSLC, KC_PAST, KC_PSLS,
35 KC_NO, KC_PAUS, 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_END, KC_INS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, 38 KC_NO, KC_PAUS, 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_END, KC_INS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS,
36 KC_NO, KC_NO, 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_BSLS, KC_UP, KC_P4, KC_P5, KC_P6, KC_PMNS, 39 KC_NO, KC_NO, 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_BSLS, KC_UP, KC_P4, KC_P5, KC_P6, KC_PMNS,
37 KC_PSCR, KC_NO, KC_LSFT, JM_GRLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_HOME, KC_RIGHT, KC_P1, KC_P2, KC_P3, KC_PENT, 40 KC_PSCR, KC_NO, KC_LSFT, JM_GRLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_HOME, KC_RIGHT, KC_P1, KC_P2, KC_P3, KC_PENT,
@@ -43,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 A(KC_F1), A(KC_F2), A(KC_F3), A(KC_F4), A(KC_F5), A(KC_F6), A(KC_F7), A(KC_F8), A(KC_F9), A(KC_F10), A(KC_F11), A(KC_F12), 46 A(KC_F1), A(KC_F2), A(KC_F3), A(KC_F4), A(KC_F5), A(KC_F6), A(KC_F7), A(KC_F8), A(KC_F9), A(KC_F10), A(KC_F11), A(KC_F12),
44 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 47 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
45 48
46 A(KC_A), A(KC_C), 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, A(KC_1), A(KC_2), JM_JUMP, KC_NO, KC_NO, KC_PCMM, KC_SPC, 49 A(KC_A), A(KC_C), 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, JM_DPA1, JM_FPA2, JM_JUMP, KC_ESC, JM_NSLC, KC_PCMM, KC_SPC,
47 KC_CRSEL, KC_PAUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JM_CENT, KC_BSLS, S(KC_ENT), S(KC_TAB), KC_INS, JM_DEL, KC_P7, KC_P8, KC_P9, KC_TAB, 50 KC_CRSEL, KC_PAUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JM_CENT, KC_BSLS, S(KC_ENT), S(KC_TAB), KC_INS, JM_DEL, KC_P7, KC_P8, KC_P9, KC_TAB,
48 KC_EXSEL, A(KC_E), KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, JM_CBRC, KC_UP, KC_P4, KC_P5, KC_P6, KC_PMNS, 51 KC_EXSEL, A(KC_E), KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, JM_CBRC, KC_UP, KC_P4, KC_P5, KC_P6, KC_PMNS,
49 A(KC_B), C(KC_C), KC_LSFT, JM_GRLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JM_COMM, JM_DOT, KC_SLSH, KC_RSFT, KC_LEFT, A(KC_H), KC_RIGHT, KC_P1, KC_P2, KC_P3, KC_PENT, 52 A(KC_B), C(KC_C), KC_LSFT, JM_GRLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JM_COMM, JM_DOT, KC_SLSH, KC_RSFT, KC_LEFT, A(KC_H), KC_RIGHT, KC_P1, KC_P2, KC_P3, KC_PENT,
@@ -62,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
62 _______, _______, _______, _______, MO(3), _______, _______, _______, _______, _______ 65 _______, _______, _______, _______, MO(3), _______, _______, _______, _______, _______
63 ), 66 ),
64 67
65// Firmware layer, accessed by the Zoom/Space key pair (hold both down) 68 // Firmware layer, accessed by the Zoom/Space key pair (hold both down)
66 [3] = LAYOUT( 69 [3] = LAYOUT(
67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 70 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 71 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -96,11 +99,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
96 break; 99 break;
97 case JM_GRLS: 100 case JM_GRLS:
98 if (left_shift_down || right_shift_down) { 101 if (left_shift_down || right_shift_down) {
99 if (record->event.pressed) { 102 if(record->event.pressed) {
100 SEND_STRING(">"); 103 SEND_STRING(">");
101 } 104 }
102 } else { 105 } else {
103 if (record->event.pressed) { 106 if(record->event.pressed) {
104 SEND_STRING("<"); 107 SEND_STRING("<");
105 } 108 }
106 } 109 }
@@ -111,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
111 SEND_STRING("}"); 114 SEND_STRING("}");
112 } 115 }
113 } else { 116 } else {
114 if (record->event.pressed) { 117 if(record->event.pressed) {
115 SEND_STRING("{"); 118 SEND_STRING("{");
116 } 119 }
117 } 120 }
@@ -121,14 +124,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
121 if (record->event.pressed) { 124 if (record->event.pressed) {
122 SEND_STRING("!"); 125 SEND_STRING("!");
123 } 126 }
124 } else { 127 } else { // This assumes that the Linux Compose has been set to Scroll Lock
125 if (record->event.pressed) { 128 if (record->event.pressed) {
126 SEND_STRING("<"); // TODO: what does tn3270 want for a cent sign? 129 tap_code16(KC_SLCK);
130 SEND_STRING("c/");
127 } 131 }
128 } 132 }
129 return false; 133 return false;
130 case JM_COMM: 134 case JM_COMM:
131 if (record->event.pressed) { 135 if (record->event.pressed){
132 SEND_STRING(","); 136 SEND_STRING(",");
133 } 137 }
134 return false; 138 return false;
@@ -137,6 +141,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
137 SEND_STRING("."); 141 SEND_STRING(".");
138 } 142 }
139 return false; 143 return false;
144 case JM_DPA1:
145 if (left_shift_down || right_shift_down) {
146 if (record->event.pressed) {
147 tap_code16(C(KC_D));
148 }
149 return false;
150 } else {
151 if(record->event.pressed) {
152 tap_code16(A(KC_1));
153 }
154 return false;
155 }
156 break;
157 case JM_FPA2:
158 if (left_shift_down || right_shift_down) {
159 if (record->event.pressed) {
160 tap_code16(C(KC_F));
161 }
162 return false;
163 } else {
164 if(record->event.pressed) {
165 tap_code16(A(KC_2));
166 }
167 return false;
168 }
169 break;
140 case JM_JUMP: 170 case JM_JUMP:
141 if (record->event.pressed) { 171 if (record->event.pressed) {
142 if (left_alt_down || right_alt_down) { 172 if (left_alt_down || right_alt_down) {
@@ -161,6 +191,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
161 } 191 }
162 } 192 }
163 return false; 193 return false;
194 case JM_NSLC:
195 if (left_shift_down || right_shift_down) {
196 if (record->event.pressed) {
197 register_code(KC_NLCK);
198 }
199 else {
200 unregister_code(KC_NLCK);
201 }
202 } else {
203 if (record->event.pressed) {
204 register_code(KC_SLCK);
205 }
206 else {
207 unregister_code(KC_SLCK);
208 }
209 }
210 return false;
164 } 211 }
212
165 return true; 213 return true;
166} 214}
diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/readme.md b/keyboards/tronguylabs/m122_3270/keymaps/default/readme.md
index 3b59718ed..cab833dd3 100644
--- a/keyboards/tronguylabs/m122_3270/keymaps/default/readme.md
+++ b/keyboards/tronguylabs/m122_3270/keymaps/default/readme.md
@@ -1,16 +1,17 @@
1# Default keymap for m122-3270 1# Default keymap for m122-3270
2 2
3This keymap is intended to make the PC/3270 122-key IBM keyboard work as closely as possible to the standard 3This keymap is intended to make the PC/3270 122-key IBM keyboard work as closely as possible to the standard
4PC/3270 keyboard's original mapping. Two layers are defined: layer 0 is the PC layout, using the blue legends 4PC/3270 keyboard's (part number 1397000) original mapping. Two layers are defined: layer 0 is the PC layout,
5on the PC/3270 keys (as shipped by Unicomp; I don't have the original keycaps, and I know there are a few 5using the blue legends on the PC/3270 keys (as shipped by Unicomp; I don't have the original keycaps, and I
6differences), while layer 1 is the 3270 layout, with keycodes selected to make the x3270 suite do the right 6know there are a few differences), while layer 1 is the 3270 layout, with keycodes selected to make the `x3270`
7thing with each key as pressed. The idea here is, eventually, to get x3270 and friends to automatically 7suite do the right thing with each key as pressed. The idea here is, eventually, to get `x3270` to
8shift the keyboard to layer 1 when they gain focus. 8automatically shift the keyboard to layer 1 when it gains focus.
9 9
10When layer 0 is active, the PA1 key is Escape, the Reset and Enter keys are Control, and the comma and dot keys 10When layer 0 is active, the upper left key of the 10-key pad is Escape, the Reset and Enter keys are Control, and
11act like normal PC keys (< and >, repectively, when shifted). The Ctrl key (bottom right of the left-side 10-key 11the comma and dot keys act like normal PC keys (< and >, repectively, when shifted). The Ctrl key (bottom right
12cluster) is always the left GUI key. PA2 and Jump/PA3 are PgUp and PgDn, respectively, and the backtab key is 12of the left-side 10-key cluster) is always the left GUI key. PA2 and Jump/PA3 are PgUp and PgDn, respectively,
13End. The Rule/Home key is Home. 13and the backtab key is End. The Rule/Home key is Home. The key next to the Escape key is Scroll Lock when unshifted,
14and Num Lock when shifted.
14 15
15When layer 1 is active, the keys do their labeled functions. The only keys that don't do anything are CrSel, 16When layer 1 is active, the keys do their labeled functions. The only keys that don't do anything are CrSel,
16ExSel, and Jump, though only a few of the alternate functions (on the front of the keys) work: left/right/delete 17ExSel, and Jump, though only a few of the alternate functions (on the front of the keys) work: left/right/delete
@@ -22,3 +23,13 @@ To manually switch to layer 1, hold the Zoom key (the one on the far lower left
22Attn (the one at the top left of that block of 10). Holding the Zoom key and the spacebar gets you to keys that 23Attn (the one at the top left of that block of 10). Holding the Zoom key and the spacebar gets you to keys that
23control QMK itself: Zoom-space-R resets to the bootloader, Zoom-space-E erases the EEPROM (which currently does 24control QMK itself: Zoom-space-R resets to the bootloader, Zoom-space-E erases the EEPROM (which currently does
24nothing), and Zoom-space-D turns the debugger on and off. 25nothing), and Zoom-space-D turns the debugger on and off.
26
27Note that you need to set your Linux system to use the Scroll Lock key as the Compose key in order to get the
28cent sign to register as intended, and add the following lines to a file in your home directory named `.x3270pro`
29to make Dup and Field Mark work:
30```
31x3270.keymap.m122: #override \
32 Ctrl<Key>F: FieldMark()\n\
33 Ctrl<Key>D: Dup()
34```
35You need to then invoke `x3270` with the parameter `-keymap m122` to activate those definitions.
diff --git a/keyboards/yatara/drink_me/config.h b/keyboards/yatara/drink_me/config.h
index ab066761f..10573092c 100644
--- a/keyboards/yatara/drink_me/config.h
+++ b/keyboards/yatara/drink_me/config.h
@@ -19,7 +19,7 @@
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 0x5961 // "Ya" - Yatara
23#define PRODUCT_ID 0x1470 23#define PRODUCT_ID 0x1470
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER Yatara 25#define MANUFACTURER Yatara
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 13:23:00 +0000