aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/portal_66/hotswap/hotswap.h38
-rw-r--r--keyboards/portal_66/hotswap/info.json5
-rw-r--r--keyboards/portal_66/hotswap/keymaps/default/keymap.c4
-rw-r--r--keyboards/portal_66/hotswap/keymaps/via/keymap.c8
-rw-r--r--keyboards/portal_66/hotswap/rules.mk2
-rw-r--r--keyboards/portal_66/soldered/info.json167
-rw-r--r--keyboards/portal_66/soldered/keymaps/default/keymap.c4
-rw-r--r--keyboards/portal_66/soldered/keymaps/via/keymap.c8
-rw-r--r--keyboards/portal_66/soldered/rules.mk2
-rw-r--r--keyboards/portal_66/soldered/soldered.h135
10 files changed, 301 insertions, 72 deletions
diff --git a/keyboards/portal_66/hotswap/hotswap.h b/keyboards/portal_66/hotswap/hotswap.h
index 734184dd7..484594b9c 100644
--- a/keyboards/portal_66/hotswap/hotswap.h
+++ b/keyboards/portal_66/hotswap/hotswap.h
@@ -18,16 +18,32 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT( \ 21#define XXX KC_NO
22 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k014, k015, \ 22
23 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \ 23/*
24 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \ 24 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
25 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \ 25 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E │0F │
26 k400, k401, k402, k406, k409, k411, k412, k413, k415 \ 26 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
27 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1F │
28 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
29 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2F │
30 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
31 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3F │
32 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
33 * │40 │41 │42 │46 │49 │4B │ │4C │4D │4F │
34 * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
35 */
36
37#define LAYOUT_65_ansi_blocker( \
38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
39 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
40 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2F, \
41 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
42 k40, k41, k42, k46, k49, k4B, k4C, k4D, k4F \
27) { \ 43) { \
28 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014, k015 }, \ 44 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
29 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \ 45 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
30 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \ 46 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
31 { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \ 47 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
32 { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \ 48 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F } \
33} 49}
diff --git a/keyboards/portal_66/hotswap/info.json b/keyboards/portal_66/hotswap/info.json
index e90bdd881..984134a4e 100644
--- a/keyboards/portal_66/hotswap/info.json
+++ b/keyboards/portal_66/hotswap/info.json
@@ -1,8 +1,11 @@
1{ 1{
2 "keyboard_name": "Portal 66 Hotswap", 2 "keyboard_name": "Portal 66 Hotswap",
3 "maintainer": "matthewdias", 3 "maintainer": "matthewdias",
4 "layout_aliases": {
5 "LAYOUT": "LAYOUT_65_ansi_blocker"
6 },
4 "layouts": { 7 "layouts": {
5 "LAYOUT": { 8 "LAYOUT_65_ansi_blocker": {
6 "layout": [ 9 "layout": [
7 { "x":0, "y":0 }, 10 { "x":0, "y":0 },
8 { "x":1, "y":0 }, 11 { "x":1, "y":0 },
diff --git a/keyboards/portal_66/hotswap/keymaps/default/keymap.c b/keyboards/portal_66/hotswap/keymaps/default/keymap.c
index a476f5984..5f9143a2a 100644
--- a/keyboards/portal_66/hotswap/keymaps/default/keymap.c
+++ b/keyboards/portal_66/hotswap/keymaps/default/keymap.c
@@ -21,14 +21,14 @@ enum layer_names {
21}; 21};
22 22
23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24 [_BASE] = LAYOUT( 24 [_BASE] = LAYOUT_65_ansi_blocker(
25 KC_ESC, 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_HOME, 25 KC_ESC, 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_HOME,
26 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_END, 26 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_END,
27 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, 27 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
28 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, 28 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
29 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT 29 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
30 ), 30 ),
31 [_FN] = LAYOUT( 31 [_FN] = LAYOUT_65_ansi_blocker(
32 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, 32 RESET, 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 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/portal_66/hotswap/keymaps/via/keymap.c b/keyboards/portal_66/hotswap/keymaps/via/keymap.c
index a89f1eee6..7f9878eae 100644
--- a/keyboards/portal_66/hotswap/keymaps/via/keymap.c
+++ b/keyboards/portal_66/hotswap/keymaps/via/keymap.c
@@ -23,28 +23,28 @@ enum layer_names {
23}; 23};
24 24
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 [_L0] = LAYOUT( 26 [_L0] = LAYOUT_65_ansi_blocker(
27 KC_ESC, 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_HOME, 27 KC_ESC, 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_HOME,
28 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_END, 28 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_END,
29 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, 29 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, 30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT 31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
32 ), 32 ),
33 [_L1] = LAYOUT( 33 [_L1] = LAYOUT_65_ansi_blocker(
34 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, 34 RESET, 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 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______ 38 _______, _______, _______, _______, _______, _______, _______, _______, _______
39 ), 39 ),
40 [_L2] = LAYOUT( 40 [_L2] = LAYOUT_65_ansi_blocker(
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
45 _______, _______, _______, _______, _______, _______, _______, _______, _______ 45 _______, _______, _______, _______, _______, _______, _______, _______, _______
46 ), 46 ),
47 [_L3] = LAYOUT( 47 [_L3] = LAYOUT_65_ansi_blocker(
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/portal_66/hotswap/rules.mk b/keyboards/portal_66/hotswap/rules.mk
index c79f74e34..22a1e6726 100644
--- a/keyboards/portal_66/hotswap/rules.mk
+++ b/keyboards/portal_66/hotswap/rules.mk
@@ -19,3 +19,5 @@ NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22
23LAYOUTS = 65_ansi_blocker
diff --git a/keyboards/portal_66/soldered/info.json b/keyboards/portal_66/soldered/info.json
index 730b5400e..de621a2f7 100644
--- a/keyboards/portal_66/soldered/info.json
+++ b/keyboards/portal_66/soldered/info.json
@@ -1,8 +1,14 @@
1{ 1{
2 "keyboard_name": "Portal 66", 2 "keyboard_name": "Portal 66",
3 "maintainer": "matthewdias", 3 "maintainer": "matthewdias",
4 "layout_aliases": {
5 "LAYOUT_65_ansi_split_bs": "LAYOUT_65_ansi_blocker_split_bs",
6 "LAYOUT_65_ansi": "LAYOUT_65_ansi_blocker",
7 "LAYOUT_65_tsangan_split_bs": "LAYOUT_65_ansi_blocker_tsangan_split_bs",
8 "LAYOUT_65_iso": "LAYOUT_65_iso_blocker"
9 },
4 "layouts": { 10 "layouts": {
5 "LAYOUT_65_ansi_split_bs": { 11 "LAYOUT_65_ansi_blocker_split_bs": {
6 "layout": [ 12 "layout": [
7 { "x":0, "y":0 }, 13 { "x":0, "y":0 },
8 { "x":1, "y":0 }, 14 { "x":1, "y":0 },
@@ -78,7 +84,7 @@
78 { "x":15, "y":4 } 84 { "x":15, "y":4 }
79 ] 85 ]
80 }, 86 },
81 "LAYOUT_65_ansi": { 87 "LAYOUT_65_ansi_blocker": {
82 "layout": [ 88 "layout": [
83 { "x":0, "y":0 }, 89 { "x":0, "y":0 },
84 { "x":1, "y":0 }, 90 { "x":1, "y":0 },
@@ -153,7 +159,7 @@
153 { "x":15, "y":4 } 159 { "x":15, "y":4 }
154 ] 160 ]
155 }, 161 },
156 "LAYOUT_65_tsangan_split_bs": { 162 "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
157 "layout": [ 163 "layout": [
158 { "x":0, "y":0 }, 164 { "x":0, "y":0 },
159 { "x":1, "y":0 }, 165 { "x":1, "y":0 },
@@ -228,7 +234,84 @@
228 { "x":15, "y":4 } 234 { "x":15, "y":4 }
229 ] 235 ]
230 }, 236 },
231 "LAYOUT_65_iso": { 237 "LAYOUT_65_iso_blocker_split_bs": {
238 "layout": [
239 { "x":0, "y":0 },
240 { "x":1, "y":0 },
241 { "x":2, "y":0 },
242 { "x":3, "y":0 },
243 { "x":4, "y":0 },
244 { "x":5, "y":0 },
245 { "x":6, "y":0 },
246 { "x":7, "y":0 },
247 { "x":8, "y":0 },
248 { "x":9, "y":0 },
249 { "x":10, "y":0 },
250 { "x":11, "y":0 },
251 { "x":12, "y":0 },
252 { "x":13, "y":0 },
253 { "x":14, "y":0 },
254 { "x":15, "y":0 },
255
256 { "x":0, "y":1, "w":1.5 },
257 { "x":1.5, "y":1 },
258 { "x":2.5, "y":1 },
259 { "x":3.5, "y":1 },
260 { "x":4.5, "y":1 },
261 { "x":5.5, "y":1 },
262 { "x":6.5, "y":1 },
263 { "x":7.5, "y":1 },
264 { "x":8.5, "y":1 },
265 { "x":9.5, "y":1 },
266 { "x":10.5, "y":1 },
267 { "x":11.5, "y":1 },
268 { "x":12.5, "y":1 },
269 { "x":15, "y":1 },
270
271 { "x":0, "y":2, "w":1.75 },
272 { "x":1.75, "y":2 },
273 { "x":2.75, "y":2 },
274 { "x":3.75, "y":2 },
275 { "x":4.75, "y":2 },
276 { "x":5.75, "y":2 },
277 { "x":6.75, "y":2 },
278 { "x":7.75, "y":2 },
279 { "x":8.75, "y":2 },
280 { "x":9.75, "y":2 },
281 { "x":10.75, "y":2 },
282 { "x":11.75, "y":2 },
283 { "x":12.75, "y":2 },
284 { "x":13.75, "y":1, "w":1.25, "h":2 },
285 { "x":15, "y":2 },
286
287 { "x":0, "y":3, "w":1.25 },
288 { "x":1.25, "y":3 },
289 { "x":2.25, "y":3 },
290 { "x":3.25, "y":3 },
291 { "x":4.25, "y":3 },
292 { "x":5.25, "y":3 },
293 { "x":6.25, "y":3 },
294 { "x":7.25, "y":3 },
295 { "x":8.25, "y":3 },
296 { "x":9.25, "y":3 },
297 { "x":10.25, "y":3 },
298 { "x":11.25, "y":3 },
299 { "x":12.25, "y":3, "w":1.75 },
300 { "x":14, "y":3 },
301 { "x":15, "y":3 },
302
303 { "x":0, "y":4, "w":1.25 },
304 { "x":1.25, "y":4, "w":1.25 },
305 { "x":2.5, "y":4, "w":1.25 },
306 { "x":3.75, "y":4, "w":6.25 },
307 { "x":10, "y":4, "w":1.25 },
308 { "x":11.25, "y":4, "w":1.25 },
309 { "x":13, "y":4 },
310 { "x":14, "y":4 },
311 { "x":15, "y":4 }
312 ]
313 },
314 "LAYOUT_65_iso_blocker": {
232 "layout": [ 315 "layout": [
233 { "x":0, "y":0 }, 316 { "x":0, "y":0 },
234 { "x":1, "y":0 }, 317 { "x":1, "y":0 },
@@ -303,6 +386,82 @@
303 { "x":14, "y":4 }, 386 { "x":14, "y":4 },
304 { "x":15, "y":4 } 387 { "x":15, "y":4 }
305 ] 388 ]
389 },
390 "LAYOUT_65_iso_blocker_tsangan_split_bs": {
391 "layout": [
392 { "x":0, "y":0 },
393 { "x":1, "y":0 },
394 { "x":2, "y":0 },
395 { "x":3, "y":0 },
396 { "x":4, "y":0 },
397 { "x":5, "y":0 },
398 { "x":6, "y":0 },
399 { "x":7, "y":0 },
400 { "x":8, "y":0 },
401 { "x":9, "y":0 },
402 { "x":10, "y":0 },
403 { "x":11, "y":0 },
404 { "x":12, "y":0 },
405 { "x":13, "y":0 },
406 { "x":14, "y":0 },
407 { "x":15, "y":0 },
408
409 { "x":0, "y":1, "w":1.5 },
410 { "x":1.5, "y":1 },
411 { "x":2.5, "y":1 },
412 { "x":3.5, "y":1 },
413 { "x":4.5, "y":1 },
414 { "x":5.5, "y":1 },
415 { "x":6.5, "y":1 },
416 { "x":7.5, "y":1 },
417 { "x":8.5, "y":1 },
418 { "x":9.5, "y":1 },
419 { "x":10.5, "y":1 },
420 { "x":11.5, "y":1 },
421 { "x":12.5, "y":1 },
422 { "x":15, "y":1 },
423
424 { "x":0, "y":2, "w":1.75 },
425 { "x":1.75, "y":2 },
426 { "x":2.75, "y":2 },
427 { "x":3.75, "y":2 },
428 { "x":4.75, "y":2 },
429 { "x":5.75, "y":2 },
430 { "x":6.75, "y":2 },
431 { "x":7.75, "y":2 },
432 { "x":8.75, "y":2 },
433 { "x":9.75, "y":2 },
434 { "x":10.75, "y":2 },
435 { "x":11.75, "y":2 },
436 { "x":12.75, "y":2 },
437 { "x":13.75, "y":1, "w":1.25, "h":2 },
438 { "x":15, "y":2 },
439
440 { "x":0, "y":3, "w":1.25 },
441 { "x":1.25, "y":3 },
442 { "x":2.25, "y":3 },
443 { "x":3.25, "y":3 },
444 { "x":4.25, "y":3 },
445 { "x":5.25, "y":3 },
446 { "x":6.25, "y":3 },
447 { "x":7.25, "y":3 },
448 { "x":8.25, "y":3 },
449 { "x":9.25, "y":3 },
450 { "x":10.25, "y":3 },
451 { "x":11.25, "y":3 },
452 { "x":12.25, "y":3, "w":1.75 },
453 { "x":14, "y":3 },
454 { "x":15, "y":3 },
455
456 { "x":0, "y":4, "w":1.5 },
457 { "x":1.5, "y":4, "w":1 },
458 { "x":2.5, "y":4, "w":1.5 },
459 { "x":4, "y":4, "w":7 },
460 { "x":11, "y":4, "w":1.5 },
461 { "x":13, "y":4 },
462 { "x":14, "y":4 },
463 { "x":15, "y":4 }
464 ]
306 } 465 }
307 } 466 }
308} 467}
diff --git a/keyboards/portal_66/soldered/keymaps/default/keymap.c b/keyboards/portal_66/soldered/keymaps/default/keymap.c
index 3260f412a..8b40550b8 100644
--- a/keyboards/portal_66/soldered/keymaps/default/keymap.c
+++ b/keyboards/portal_66/soldered/keymaps/default/keymap.c
@@ -21,14 +21,14 @@ enum layer_names {
21}; 21};
22 22
23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24 [_BASE] = LAYOUT_65_ansi_split_bs( 24 [_BASE] = LAYOUT_65_ansi_blocker_split_bs(
25 KC_ESC, 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_GRV, KC_BSPC, KC_HOME, 25 KC_ESC, 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_GRV, KC_BSPC, KC_HOME,
26 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_END, 26 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_END,
27 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, 27 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
28 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, 28 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
29 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT 29 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
30 ), 30 ),
31 [_FN] = LAYOUT_65_ansi_split_bs( 31 [_FN] = LAYOUT_65_ansi_blocker_split_bs(
32 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, 32 RESET, 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 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/portal_66/soldered/keymaps/via/keymap.c b/keyboards/portal_66/soldered/keymaps/via/keymap.c
index 7ea1f44b0..97c74de1f 100644
--- a/keyboards/portal_66/soldered/keymaps/via/keymap.c
+++ b/keyboards/portal_66/soldered/keymaps/via/keymap.c
@@ -23,28 +23,28 @@ enum layer_names {
23}; 23};
24 24
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 [_L0] = LAYOUT_65_ansi_split_bs( 26 [_L0] = LAYOUT_65_ansi_blocker_split_bs(
27 KC_ESC, 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_GRV, KC_BSPC, KC_HOME, 27 KC_ESC, 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_GRV, KC_BSPC, KC_HOME,
28 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_END, 28 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_END,
29 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, 29 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, 30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT 31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
32 ), 32 ),
33 [_L1] = LAYOUT_65_ansi_split_bs( 33 [_L1] = LAYOUT_65_ansi_blocker_split_bs(
34 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, 34 RESET, 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 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______ 38 _______, _______, _______, _______, _______, _______, _______, _______, _______
39 ), 39 ),
40 [_L2] = LAYOUT_65_ansi_split_bs( 40 [_L2] = LAYOUT_65_ansi_blocker_split_bs(
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
45 _______, _______, _______, _______, _______, _______, _______, _______, _______ 45 _______, _______, _______, _______, _______, _______, _______, _______, _______
46 ), 46 ),
47 [_L3] = LAYOUT_65_ansi_split_bs( 47 [_L3] = LAYOUT_65_ansi_blocker_split_bs(
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/portal_66/soldered/rules.mk b/keyboards/portal_66/soldered/rules.mk
index 9906266f4..01798d604 100644
--- a/keyboards/portal_66/soldered/rules.mk
+++ b/keyboards/portal_66/soldered/rules.mk
@@ -19,3 +19,5 @@ NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22
23LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_iso_blocker 65_iso_blocker_split_bs
diff --git a/keyboards/portal_66/soldered/soldered.h b/keyboards/portal_66/soldered/soldered.h
index 9fde7850d..b2ae9cbaa 100644
--- a/keyboards/portal_66/soldered/soldered.h
+++ b/keyboards/portal_66/soldered/soldered.h
@@ -18,58 +18,105 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT_65_ansi_split_bs( \ 21#define XXX KC_NO
22 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \ 22
23 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \ 23/*
24 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \ 24 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
25 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \ 25 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ │0E │ 2u Backspace
26 k400, k401, k402, k406, k409, k411, k412, k413, k415 \ 26 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤
27 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1F │ │ │
28 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter
29 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2F │ │2C │ │
30 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
31 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3F │
32 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
33 * │40 │41 │42 │46 │49 │4B │ │4C │4D │4F │
34 * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
35 * ┌─────┬───┬─────┬───────────────────────────┬─────┐
36 * │40 │41 │42 │46 │4B │ Tsangan
37 * └─────┴───┴─────┴───────────────────────────┴─────┘
38 */
39
40#define LAYOUT_65_ansi_blocker_split_bs( \
41 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
42 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
43 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2F, \
44 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
45 k40, k41, k42, k46, k49, k4B, k4C, k4D, k4F \
46) { \
47 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
48 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
49 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
50 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
51 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F } \
52}
53
54#define LAYOUT_65_ansi_blocker( \
55 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
56 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
57 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2F, \
58 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
59 k40, k41, k42, k46, k49, k4B, k4C, k4D, k4F \
60) { \
61 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
62 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
63 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
64 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
65 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F } \
66}
67
68#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
69 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
70 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
71 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2F, \
72 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
73 k40, k41, k42, k46, k4B, k4C, k4D, k4F \
27) { \ 74) { \
28 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \ 75 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
29 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \ 76 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
30 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \ 77 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
31 { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \ 78 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
32 { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \ 79 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F } \
33} 80}
34 81
35#define LAYOUT_65_ansi( \ 82#define LAYOUT_65_iso_blocker_split_bs( \
36 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k014, k015, \ 83 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
37 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \ 84 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1F, \
38 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \ 85 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \
39 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \ 86 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
40 k400, k401, k402, k406, k409, k411, k412, k413, k415 \ 87 k40, k41, k42, k46, k49, k4B, k4C, k4D, k4F \
41) { \ 88) { \
42 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014, k015 }, \ 89 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
43 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \ 90 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
44 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \ 91 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
45 { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \ 92 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
46 { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \ 93 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F } \
47} 94}
48 95
49#define LAYOUT_65_tsangan_split_bs( \ 96#define LAYOUT_65_iso_blocker( \
50 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \ 97 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
51 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \ 98 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1F, \
52 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \ 99 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \
53 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \ 100 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
54 k400, k401, k402, k406, k411, k412, k413, k415 \ 101 k40, k41, k42, k46, k49, k4B, k4C, k4D, k4F \
55) { \ 102) { \
56 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \ 103 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
57 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \ 104 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
58 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \ 105 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
59 { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \ 106 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
60 { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, KC_NO, KC_NO, k411, k412, k413, KC_NO, k415 } \ 107 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F } \
61} 108}
62 109
63#define LAYOUT_65_iso( \ 110#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
64 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k014, k015, \ 111 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
65 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k115, \ 112 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1F, \
66 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k215, \ 113 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \
67 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \ 114 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
68 k400, k401, k402, k406, k409, k411, k412, k413, k415 \ 115 k40, k41, k42, k46, k4B, k4C, k4D, k4F \
69) { \ 116) { \
70 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014, k015 }, \ 117 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
71 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, KC_NO, KC_NO, k115 }, \ 118 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
72 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, KC_NO, k215 }, \ 119 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
73 { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \ 120 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
74 { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \ 121 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F } \
75} 122}