TKC Portico: layout macro/Configurator touch-up (#12897)

author: James Young <18669334+noroadsleft@users.noreply.github.com> 2021-05-14 08:41:02 -0700
committer: GitHub <noreply@github.com> 2021-05-14 08:41:02 -0700
commit: 9c68e27aceb186990da1beaba122c48cc7a8c8ee (patch)
tree: 8ef2d62dbb53d7c81132f2cf6ed8e43069cbb147
parent: 02e19123718d8693ff06665f762abbfbe7072201 (diff)
download: qmk_firmware-9c68e27aceb186990da1beaba122c48cc7a8c8ee.tar.gz
qmk_firmware-9c68e27aceb186990da1beaba122c48cc7a8c8ee.zip
6 files changed, 97 insertions, 88 deletions
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index dd8431b71..59a5e420d 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -1,79 +1,87 @@
 {
-    "keyboard_name": "TKC Portico", 
+    "keyboard_name": "TKC Portico",
-    "url": "", 
+    "url": "",
-    "maintainer": "TerryMathews", 
+    "maintainer": "TerryMathews",
-    "width": 16, 
+    "width": 16,
-    "height": 5, 
+    "height": 5,
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker",
+    },
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
            "layout": [
-                        {"label":"~", "x":0, "y":0}, 
+                {"label":"~", "x":0, "y":0},
-                        {"label":"!", "x":1, "y":0}, 
+                {"label":"!", "x":1, "y":0},
-                        {"label":"@", "x":2, "y":0}, 
+                {"label":"@", "x":2, "y":0},
-                        {"label":"#", "x":3, "y":0}, 
+                {"label":"#", "x":3, "y":0},
-                        {"label":"$", "x":4, "y":0}, 
+                {"label":"$", "x":4, "y":0},
-                        {"label":"%", "x":5, "y":0}, 
+                {"label":"%", "x":5, "y":0},
-                        {"label":"^", "x":6, "y":0}, 
+                {"label":"^", "x":6, "y":0},
-                        {"label":"&", "x":7, "y":0}, 
+                {"label":"&", "x":7, "y":0},
-                        {"label":"*", "x":8, "y":0}, 
+                {"label":"*", "x":8, "y":0},
-                        {"label":"(", "x":9, "y":0}, 
+                {"label":"(", "x":9, "y":0},
-                        {"label":")", "x":10, "y":0}, 
+                {"label":")", "x":10, "y":0},
-                        {"label":"_", "x":11, "y":0}, 
+                {"label":"_", "x":11, "y":0},
-                        {"label":"+", "x":12, "y":0}, 
+                {"label":"+", "x":12, "y":0},
-                        {"label":"Backspace", "x":13, "y":0, "w":2}, 
+                {"label":"Backspace", "x":13, "y":0, "w":2},
-                        {"label":"Home", "x":15, "y":0}, 
+                {"label":"Home", "x":15, "y":0},
-                        {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-                        {"label":"Q", "x":1.5, "y":1}, 
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                        {"label":"W", "x":2.5, "y":1}, 
+                {"label":"Q", "x":1.5, "y":1},
-                        {"label":"E", "x":3.5, "y":1}, 
+                {"label":"W", "x":2.5, "y":1},
-                        {"label":"R", "x":4.5, "y":1}, 
+                {"label":"E", "x":3.5, "y":1},
-                        {"label":"T", "x":5.5, "y":1}, 
+                {"label":"R", "x":4.5, "y":1},
-                        {"label":"Y", "x":6.5, "y":1}, 
+                {"label":"T", "x":5.5, "y":1},
-                        {"label":"U", "x":7.5, "y":1}, 
+                {"label":"Y", "x":6.5, "y":1},
-                        {"label":"I", "x":8.5, "y":1}, 
+                {"label":"U", "x":7.5, "y":1},
-                        {"label":"O", "x":9.5, "y":1}, 
+                {"label":"I", "x":8.5, "y":1},
-                        {"label":"P", "x":10.5, "y":1}, 
+                {"label":"O", "x":9.5, "y":1},
-                        {"label":"{", "x":11.5, "y":1}, 
+                {"label":"P", "x":10.5, "y":1},
-                        {"label":"}", "x":12.5, "y":1}, 
+                {"label":"{", "x":11.5, "y":1},
-                        {"label":"|", "x":13.5, "y":1, "w":1.5}, 
+                {"label":"}", "x":12.5, "y":1},
-                        {"label":"PgUp", "x":15, "y":1}, 
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                        {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
+                {"label":"PgUp", "x":15, "y":1},
-                        {"label":"A", "x":1.75, "y":2}, 
-                        {"label":"S", "x":2.75, "y":2}, 
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                        {"label":"D", "x":3.75, "y":2}, 
+                {"label":"A", "x":1.75, "y":2},
-                        {"label":"F", "x":4.75, "y":2}, 
+                {"label":"S", "x":2.75, "y":2},
-                        {"label":"G", "x":5.75, "y":2}, 
+                {"label":"D", "x":3.75, "y":2},
-                        {"label":"H", "x":6.75, "y":2}, 
+                {"label":"F", "x":4.75, "y":2},
-                        {"label":"J", "x":7.75, "y":2}, 
+                {"label":"G", "x":5.75, "y":2},
-                        {"label":"K", "x":8.75, "y":2}, 
+                {"label":"H", "x":6.75, "y":2},
-                        {"label":"L", "x":9.75, "y":2}, 
+                {"label":"J", "x":7.75, "y":2},
-                        {"label":":", "x":10.75, "y":2}, 
+                {"label":"K", "x":8.75, "y":2},
-                        {"label":"\"", "x":11.75, "y":2}, 
+                {"label":"L", "x":9.75, "y":2},
-                        {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
+                {"label":":", "x":10.75, "y":2},
-                        {"label":"PgDn", "x":15, "y":2}, 
+                {"label":"\"", "x":11.75, "y":2},
-                        {"label":"Shift", "x":0, "y":3, "w":2.25}, 
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                        {"label":"Z", "x":2.25, "y":3}, 
+                {"label":"PgDn", "x":15, "y":2},
-                        {"label":"X", "x":3.25, "y":3}, 
-                        {"label":"C", "x":4.25, "y":3}, 
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                        {"label":"V", "x":5.25, "y":3}, 
+                {"label":"Z", "x":2.25, "y":3},
-                        {"label":"B", "x":6.25, "y":3}, 
+                {"label":"X", "x":3.25, "y":3},
-                        {"label":"N", "x":7.25, "y":3}, 
+                {"label":"C", "x":4.25, "y":3},
-                        {"label":"M", "x":8.25, "y":3}, 
+                {"label":"V", "x":5.25, "y":3},
-                        {"label":"<", "x":9.25, "y":3}, 
+                {"label":"B", "x":6.25, "y":3},
-                        {"label":">", "x":10.25, "y":3}, 
+                {"label":"N", "x":7.25, "y":3},
-                        {"label":"?", "x":11.25, "y":3}, 
+                {"label":"M", "x":8.25, "y":3},
-                        {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
+                {"label":"<", "x":9.25, "y":3},
-                        {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3}, 
+                {"label":">", "x":10.25, "y":3},
-                        {"label":"End", "x":15, "y":3}, 
+                {"label":"?", "x":11.25, "y":3},
-                        {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                        {"label":"Win", "x":1.25, "y":4, "w":1.25}, 
+                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3},
-                        {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
+                {"label":"End", "x":15, "y":3},
-                        {"x":3.75, "y":4, "w":6.25}, 
-                        {"label":"Fn", "x":10, "y":4, "w":1.25}, 
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                        {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, 
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                        {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13, "y":4}, 
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                        {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14, "y":4}, 
+                {"x":3.75, "y":4, "w":6.25},
-                        {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15, "y":4}]
+                {"label":"Fn", "x":10, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
+                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13, "y":4},
+                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14, "y":4},
+                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15, "y":4}
+            ]
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/keyboards/tkc/portico/keymaps/default/keymap.c b/keyboards/tkc/portico/keymaps/default/keymap.c
index 41034ce6d..bbc68c3b9 100644
--- a/keyboards/tkc/portico/keymaps/default/keymap.c
+++ b/keyboards/tkc/portico/keymaps/default/keymap.c
@@ -18,28 +18,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
+    [0] = LAYOUT_65_ansi_blocker(
        KC_GESC,    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,
        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_PGUP,
        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_PGDN,
        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_END,
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                               MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
    ),
-    [1] = LAYOUT_all(
+    [1] = LAYOUT_65_ansi_blocker(
        KC_GESC,   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_DEL, KC_HOME,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   RESET, KC_PGUP,
        KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
        KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
        _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
    ),
-    [2] = LAYOUT_all(
+    [2] = LAYOUT_65_ansi_blocker(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
    ),
-    [3] = LAYOUT_all(
+    [3] = LAYOUT_65_ansi_blocker(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/tkc/portico/keymaps/via/keymap.c b/keyboards/tkc/portico/keymaps/via/keymap.c
index 41034ce6d..bbc68c3b9 100644
--- a/keyboards/tkc/portico/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico/keymaps/via/keymap.c
@@ -18,28 +18,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
+    [0] = LAYOUT_65_ansi_blocker(
        KC_GESC,    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,
        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_PGUP,
        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_PGDN,
        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_END,
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                               MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
    ),
-    [1] = LAYOUT_all(
+    [1] = LAYOUT_65_ansi_blocker(
        KC_GESC,   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_DEL, KC_HOME,
        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   RESET, KC_PGUP,
        KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
        KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
        _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
    ),
-    [2] = LAYOUT_all(
+    [2] = LAYOUT_65_ansi_blocker(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
    ),
-    [3] = LAYOUT_all(
+    [3] = LAYOUT_65_ansi_blocker(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/tkc/portico/portico.h b/keyboards/tkc/portico/portico.h
index 6aac8fdbb..7add42943 100644
--- a/keyboards/tkc/portico/portico.h
+++ b/keyboards/tkc/portico/portico.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XXX KC_NO
-#define LAYOUT_all( \
+#define LAYOUT_65_ansi_blocker( \
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
diff --git a/keyboards/tkc/portico/readme.md b/keyboards/tkc/portico/readme.md
index ff73822c8..ce7fae76f 100644
--- a/keyboards/tkc/portico/readme.md
+++ b/keyboards/tkc/portico/readme.md
@@ -1,14 +1,13 @@
 # TKC Portico
-![Photo](https://cdn.shopify.com/s/files/1/1679/2319/products/Portico_BoW_1_590x.png?v=1604373859)
+![TKC Portico](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/tkc/portico/portico-clear_overhead_1024x1024.webp)
-A 65% keyboard kit with per-key and underglow RGB lighting
+A 65% keyboard kit with per-key and underglow RGB lighting.
 * Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
-* Hardware Supported: TKC Portico
+* Hardware Supported: TKC Portico (ATmega32U4)
-* Hardware Availability: TBA
+* Hardware Availability: [TheKey.Company](https://thekey.company/products/portico-keyboard)
-        
 Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
 Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk
index f6dc3311c..1cbcd95d6 100644
--- a/keyboards/tkc/portico/rules.mk
+++ b/keyboards/tkc/portico/rules.mk
@@ -22,3 +22,5 @@ BLUETOOTH_ENABLE = no          # Enable Bluetooth
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
 RGB_MATRIX_DRIVER = IS31FL3731
+LAYOUTS = 65_ansi_blocker
author	James Young <18669334+noroadsleft@users.noreply.github.com>	2021-05-14 08:41:02 -0700
committer	GitHub <noreply@github.com>	2021-05-14 08:41:02 -0700
commit	9c68e27aceb186990da1beaba122c48cc7a8c8ee (patch)
tree	8ef2d62dbb53d7c81132f2cf6ed8e43069cbb147
parent	02e19123718d8693ff06665f762abbfbe7072201 (diff)
download	qmk_firmware-9c68e27aceb186990da1beaba122c48cc7a8c8ee.tar.gz qmk_firmware-9c68e27aceb186990da1beaba122c48cc7a8c8ee.zip

diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json index dd8431b71..59a5e420d 100644 --- a/keyboards/tkc/portico/info.json +++ b/keyboards/tkc/portico/info.json
@@ -1,79 +1,87 @@
1	{	1	{
2	"keyboard_name": "TKC Portico",	2	"keyboard_name": "TKC Portico",
3	"url": "",	3	"url": "",
4	"maintainer": "TerryMathews",	4	"maintainer": "TerryMathews",
5	"width": 16,	5	"width": 16,
6	"height": 5,	6	"height": 5,
		7	"layout_aliases": {
		8	"LAYOUT_all": "LAYOUT_65_ansi_blocker",
		9	},
7	"layouts": {	10	"layouts": {
8	"LAYOUT": {	11	"LAYOUT_65_ansi_blocker": {
9	"layout": [	12	"layout": [
10	{"label":"~", "x":0, "y":0},	13	{"label":"~", "x":0, "y":0},
11	{"label":"!", "x":1, "y":0},	14	{"label":"!", "x":1, "y":0},
12	{"label":"@", "x":2, "y":0},	15	{"label":"@", "x":2, "y":0},
13	{"label":"#", "x":3, "y":0},	16	{"label":"#", "x":3, "y":0},
14	{"label":"$", "x":4, "y":0},	17	{"label":"$", "x":4, "y":0},
15	{"label":"%", "x":5, "y":0},	18	{"label":"%", "x":5, "y":0},
16	{"label":"^", "x":6, "y":0},	19	{"label":"^", "x":6, "y":0},
17	{"label":"&", "x":7, "y":0},	20	{"label":"&", "x":7, "y":0},
18	{"label":"*", "x":8, "y":0},	21	{"label":"*", "x":8, "y":0},
19	{"label":"(", "x":9, "y":0},	22	{"label":"(", "x":9, "y":0},
20	{"label":")", "x":10, "y":0},	23	{"label":")", "x":10, "y":0},
21	{"label":"_", "x":11, "y":0},	24	{"label":"_", "x":11, "y":0},
22	{"label":"+", "x":12, "y":0},	25	{"label":"+", "x":12, "y":0},
23	{"label":"Backspace", "x":13, "y":0, "w":2},	26	{"label":"Backspace", "x":13, "y":0, "w":2},
24	{"label":"Home", "x":15, "y":0},	27	{"label":"Home", "x":15, "y":0},
25	{"label":"Tab", "x":0, "y":1, "w":1.5},	28
26	{"label":"Q", "x":1.5, "y":1},	29	{"label":"Tab", "x":0, "y":1, "w":1.5},
27	{"label":"W", "x":2.5, "y":1},	30	{"label":"Q", "x":1.5, "y":1},
28	{"label":"E", "x":3.5, "y":1},	31	{"label":"W", "x":2.5, "y":1},
29	{"label":"R", "x":4.5, "y":1},	32	{"label":"E", "x":3.5, "y":1},
30	{"label":"T", "x":5.5, "y":1},	33	{"label":"R", "x":4.5, "y":1},
31	{"label":"Y", "x":6.5, "y":1},	34	{"label":"T", "x":5.5, "y":1},
32	{"label":"U", "x":7.5, "y":1},	35	{"label":"Y", "x":6.5, "y":1},
33	{"label":"I", "x":8.5, "y":1},	36	{"label":"U", "x":7.5, "y":1},
34	{"label":"O", "x":9.5, "y":1},	37	{"label":"I", "x":8.5, "y":1},
35	{"label":"P", "x":10.5, "y":1},	38	{"label":"O", "x":9.5, "y":1},
36	{"label":"{", "x":11.5, "y":1},	39	{"label":"P", "x":10.5, "y":1},
37	{"label":"}", "x":12.5, "y":1},	40	{"label":"{", "x":11.5, "y":1},
38	{"label":"\|", "x":13.5, "y":1, "w":1.5},	41	{"label":"}", "x":12.5, "y":1},
39	{"label":"PgUp", "x":15, "y":1},	42	{"label":"\|", "x":13.5, "y":1, "w":1.5},
40	{"label":"Caps Lock", "x":0, "y":2, "w":1.75},	43	{"label":"PgUp", "x":15, "y":1},
41	{"label":"A", "x":1.75, "y":2},	44
42	{"label":"S", "x":2.75, "y":2},	45	{"label":"Caps Lock", "x":0, "y":2, "w":1.75},
43	{"label":"D", "x":3.75, "y":2},	46	{"label":"A", "x":1.75, "y":2},
44	{"label":"F", "x":4.75, "y":2},	47	{"label":"S", "x":2.75, "y":2},
45	{"label":"G", "x":5.75, "y":2},	48	{"label":"D", "x":3.75, "y":2},
46	{"label":"H", "x":6.75, "y":2},	49	{"label":"F", "x":4.75, "y":2},
47	{"label":"J", "x":7.75, "y":2},	50	{"label":"G", "x":5.75, "y":2},
48	{"label":"K", "x":8.75, "y":2},	51	{"label":"H", "x":6.75, "y":2},
49	{"label":"L", "x":9.75, "y":2},	52	{"label":"J", "x":7.75, "y":2},
50	{"label":":", "x":10.75, "y":2},	53	{"label":"K", "x":8.75, "y":2},
51	{"label":"\"", "x":11.75, "y":2},	54	{"label":"L", "x":9.75, "y":2},
52	{"label":"Enter", "x":12.75, "y":2, "w":2.25},	55	{"label":":", "x":10.75, "y":2},
53	{"label":"PgDn", "x":15, "y":2},	56	{"label":"\"", "x":11.75, "y":2},
54	{"label":"Shift", "x":0, "y":3, "w":2.25},	57	{"label":"Enter", "x":12.75, "y":2, "w":2.25},
55	{"label":"Z", "x":2.25, "y":3},	58	{"label":"PgDn", "x":15, "y":2},
56	{"label":"X", "x":3.25, "y":3},	59
57	{"label":"C", "x":4.25, "y":3},	60	{"label":"Shift", "x":0, "y":3, "w":2.25},
58	{"label":"V", "x":5.25, "y":3},	61	{"label":"Z", "x":2.25, "y":3},
59	{"label":"B", "x":6.25, "y":3},	62	{"label":"X", "x":3.25, "y":3},
60	{"label":"N", "x":7.25, "y":3},	63	{"label":"C", "x":4.25, "y":3},
61	{"label":"M", "x":8.25, "y":3},	64	{"label":"V", "x":5.25, "y":3},
62	{"label":"<", "x":9.25, "y":3},	65	{"label":"B", "x":6.25, "y":3},
63	{"label":">", "x":10.25, "y":3},	66	{"label":"N", "x":7.25, "y":3},
64	{"label":"?", "x":11.25, "y":3},	67	{"label":"M", "x":8.25, "y":3},
65	{"label":"Shift", "x":12.25, "y":3, "w":1.75},	68	{"label":"<", "x":9.25, "y":3},
66	{"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3},	69	{"label":">", "x":10.25, "y":3},
67	{"label":"End", "x":15, "y":3},	70	{"label":"?", "x":11.25, "y":3},
68	{"label":"Ctrl", "x":0, "y":4, "w":1.25},	71	{"label":"Shift", "x":12.25, "y":3, "w":1.75},
69	{"label":"Win", "x":1.25, "y":4, "w":1.25},	72	{"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3},
70	{"label":"Alt", "x":2.5, "y":4, "w":1.25},	73	{"label":"End", "x":15, "y":3},
71	{"x":3.75, "y":4, "w":6.25},	74
72	{"label":"Fn", "x":10, "y":4, "w":1.25},	75	{"label":"Ctrl", "x":0, "y":4, "w":1.25},
73	{"label":"Ctrl", "x":11.25, "y":4, "w":1.25},	76	{"label":"Win", "x":1.25, "y":4, "w":1.25},
74	{"label":"<i class='kb kb-Arrows-Left'></i>", "x":13, "y":4},	77	{"label":"Alt", "x":2.5, "y":4, "w":1.25},
75	{"label":"<i class='kb kb-Arrows-Down'></i>", "x":14, "y":4},	78	{"x":3.75, "y":4, "w":6.25},
76	{"label":"<i class='kb kb-Arrows-Right'></i>", "x":15, "y":4}]	79	{"label":"Fn", "x":10, "y":4, "w":1.25},
		80	{"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
		81	{"label":"<i class='kb kb-Arrows-Left'></i>", "x":13, "y":4},
		82	{"label":"<i class='kb kb-Arrows-Down'></i>", "x":14, "y":4},
		83	{"label":"<i class='kb kb-Arrows-Right'></i>", "x":15, "y":4}
		84	]
77	}	85	}
78	}	86	}
79	} \ No newline at end of file	87	}


diff --git a/keyboards/tkc/portico/keymaps/default/keymap.c b/keyboards/tkc/portico/keymaps/default/keymap.c index 41034ce6d..bbc68c3b9 100644 --- a/keyboards/tkc/portico/keymaps/default/keymap.c +++ b/keyboards/tkc/portico/keymaps/default/keymap.c
@@ -18,28 +18,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18	#include QMK_KEYBOARD_H	18	#include QMK_KEYBOARD_H
19		19
20	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	20	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21	[0] = LAYOUT_all(	21	[0] = LAYOUT_65_ansi_blocker(
22	KC_GESC, 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,	22	KC_GESC, 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,
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_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_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_ENT, 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, KC_PGDN,
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, KC_END,	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, KC_END,
26	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT	26	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
27	),	27	),
28	[1] = LAYOUT_all(	28	[1] = LAYOUT_65_ansi_blocker(
29	KC_GESC, 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_DEL, KC_HOME,	29	KC_GESC, 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_DEL, KC_HOME,
30	_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,	30	_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,
31	KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, KC_PGDN,	31	KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, KC_PGDN,
32	KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,	32	KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
33	_______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT	33	_______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
34	),	34	),
35	[2] = LAYOUT_all(	35	[2] = LAYOUT_65_ansi_blocker(
36	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	36	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
37	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	37	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	38	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	39	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40	_______, _______, _______, _______, _______, _______, _______, _______, _______	40	_______, _______, _______, _______, _______, _______, _______, _______, _______
41	),	41	),
42	[3] = LAYOUT_all(	42	[3] = LAYOUT_65_ansi_blocker(
43	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	43	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	44	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
45	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	45	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,


diff --git a/keyboards/tkc/portico/keymaps/via/keymap.c b/keyboards/tkc/portico/keymaps/via/keymap.c index 41034ce6d..bbc68c3b9 100644 --- a/keyboards/tkc/portico/keymaps/via/keymap.c +++ b/keyboards/tkc/portico/keymaps/via/keymap.c
@@ -18,28 +18,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18	#include QMK_KEYBOARD_H	18	#include QMK_KEYBOARD_H
19		19
20	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	20	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21	[0] = LAYOUT_all(	21	[0] = LAYOUT_65_ansi_blocker(
22	KC_GESC, 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,	22	KC_GESC, 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,
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_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_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_ENT, 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, KC_PGDN,
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, KC_END,	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, KC_END,
26	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT	26	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
27	),	27	),
28	[1] = LAYOUT_all(	28	[1] = LAYOUT_65_ansi_blocker(
29	KC_GESC, 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_DEL, KC_HOME,	29	KC_GESC, 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_DEL, KC_HOME,
30	_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,	30	_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,
31	KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, KC_PGDN,	31	KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, KC_PGDN,
32	KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,	32	KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
33	_______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT	33	_______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
34	),	34	),
35	[2] = LAYOUT_all(	35	[2] = LAYOUT_65_ansi_blocker(
36	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	36	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
37	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	37	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	38	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	39	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40	_______, _______, _______, _______, _______, _______, _______, _______, _______	40	_______, _______, _______, _______, _______, _______, _______, _______, _______
41	),	41	),
42	[3] = LAYOUT_all(	42	[3] = LAYOUT_65_ansi_blocker(
43	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	43	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	44	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
45	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	45	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,


diff --git a/keyboards/tkc/portico/portico.h b/keyboards/tkc/portico/portico.h index 6aac8fdbb..7add42943 100644 --- a/keyboards/tkc/portico/portico.h +++ b/keyboards/tkc/portico/portico.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21		21
22	#define XXX KC_NO	22	#define XXX KC_NO
23		23
24	#define LAYOUT_all( \	24	#define LAYOUT_65_ansi_blocker( \
25	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \	25	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
26	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \	26	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
27	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \	27	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \


diff --git a/keyboards/tkc/portico/readme.md b/keyboards/tkc/portico/readme.md index ff73822c8..ce7fae76f 100644 --- a/keyboards/tkc/portico/readme.md +++ b/keyboards/tkc/portico/readme.md
@@ -1,14 +1,13 @@
1	# TKC Portico	1	# TKC Portico
2		2
3	![Photo](https://cdn.shopify.com/s/files/1/1679/2319/products/Portico_BoW_1_590x.png?v=1604373859)	3	![TKC Portico](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/tkc/portico/portico-clear_overhead_1024x1024.webp)
4		4
5	A 65% keyboard kit with per-key and underglow RGB lighting	5	A 65% keyboard kit with per-key and underglow RGB lighting.
6		6
7	* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)	7	* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
8	* Hardware Supported: TKC Portico	8	* Hardware Supported: TKC Portico (ATmega32U4)
9	* Hardware Availability: TBA	9	* Hardware Availability: [TheKey.Company](https://thekey.company/products/portico-keyboard)
10		10
11
12	Reset board into bootloader by holding down Esc key while plugging in USB-C cable.	11	Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
13		12
14	Make example for this keyboard (after setting up your build environment):	13	Make example for this keyboard (after setting up your build environment):


diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk index f6dc3311c..1cbcd95d6 100644 --- a/keyboards/tkc/portico/rules.mk +++ b/keyboards/tkc/portico/rules.mk
@@ -22,3 +22,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
22	AUDIO_ENABLE = no # Audio output	22	AUDIO_ENABLE = no # Audio output
23	RGB_MATRIX_ENABLE = yes # Use RGB matrix	23	RGB_MATRIX_ENABLE = yes # Use RGB matrix
24	RGB_MATRIX_DRIVER = IS31FL3731	24	RGB_MATRIX_DRIVER = IS31FL3731
		25
		26	LAYOUTS = 65_ansi_blocker