Merge remote-tracking branch 'origin/master' into develop

6 files changed, 97 insertions, 88 deletions

diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index dd8431b718..59a5e420da 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -1,79 +1,87 @@
 {
-    "keyboard_name": "TKC Portico", 
-    "url": "", 
-    "maintainer": "TerryMathews", 
-    "width": 16, 
-    "height": 5, 
+    "keyboard_name": "TKC Portico",
+    "url": "",
+    "maintainer": "TerryMathews",
+    "width": 16,
+    "height": 5,
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker",
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
-			{"label":"~", "x":0, "y":0}, 
-			{"label":"!", "x":1, "y":0}, 
-			{"label":"@", "x":2, "y":0}, 
-			{"label":"#", "x":3, "y":0}, 
-			{"label":"$", "x":4, "y":0}, 
-			{"label":"%", "x":5, "y":0}, 
-			{"label":"^", "x":6, "y":0}, 
-			{"label":"&", "x":7, "y":0}, 
-			{"label":"*", "x":8, "y":0}, 
-			{"label":"(", "x":9, "y":0}, 
-			{"label":")", "x":10, "y":0}, 
-			{"label":"_", "x":11, "y":0}, 
-			{"label":"+", "x":12, "y":0}, 
-			{"label":"Backspace", "x":13, "y":0, "w":2}, 
-			{"label":"Home", "x":15, "y":0}, 
-			{"label":"Tab", "x":0, "y":1, "w":1.5}, 
-			{"label":"Q", "x":1.5, "y":1}, 
-			{"label":"W", "x":2.5, "y":1}, 
-			{"label":"E", "x":3.5, "y":1}, 
-			{"label":"R", "x":4.5, "y":1}, 
-			{"label":"T", "x":5.5, "y":1}, 
-			{"label":"Y", "x":6.5, "y":1}, 
-			{"label":"U", "x":7.5, "y":1}, 
-			{"label":"I", "x":8.5, "y":1}, 
-			{"label":"O", "x":9.5, "y":1}, 
-			{"label":"P", "x":10.5, "y":1}, 
-			{"label":"{", "x":11.5, "y":1}, 
-			{"label":"}", "x":12.5, "y":1}, 
-			{"label":"|", "x":13.5, "y":1, "w":1.5}, 
-			{"label":"PgUp", "x":15, "y":1}, 
-			{"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-			{"label":"A", "x":1.75, "y":2}, 
-			{"label":"S", "x":2.75, "y":2}, 
-			{"label":"D", "x":3.75, "y":2}, 
-			{"label":"F", "x":4.75, "y":2}, 
-			{"label":"G", "x":5.75, "y":2}, 
-			{"label":"H", "x":6.75, "y":2}, 
-			{"label":"J", "x":7.75, "y":2}, 
-			{"label":"K", "x":8.75, "y":2}, 
-			{"label":"L", "x":9.75, "y":2}, 
-			{"label":":", "x":10.75, "y":2}, 
-			{"label":"\"", "x":11.75, "y":2}, 
-			{"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-			{"label":"PgDn", "x":15, "y":2}, 
-			{"label":"Shift", "x":0, "y":3, "w":2.25}, 
-			{"label":"Z", "x":2.25, "y":3}, 
-			{"label":"X", "x":3.25, "y":3}, 
-			{"label":"C", "x":4.25, "y":3}, 
-			{"label":"V", "x":5.25, "y":3}, 
-			{"label":"B", "x":6.25, "y":3}, 
-			{"label":"N", "x":7.25, "y":3}, 
-			{"label":"M", "x":8.25, "y":3}, 
-			{"label":"<", "x":9.25, "y":3}, 
-			{"label":">", "x":10.25, "y":3}, 
-			{"label":"?", "x":11.25, "y":3}, 
-			{"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-			{"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3}, 
-			{"label":"End", "x":15, "y":3}, 
-			{"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-			{"label":"Win", "x":1.25, "y":4, "w":1.25}, 
-			{"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-			{"x":3.75, "y":4, "w":6.25}, 
-			{"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}]
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Home", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"PgUp", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgDn", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3},
+                {"label":"End", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"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 41034ce6d7..bbc68c3b93 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 41034ce6d7..bbc68c3b93 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 6aac8fdbb7..7add429432 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 ff73822c85..ce7fae76fa 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 Availability: TBA
+* Hardware Supported: TKC Portico (ATmega32U4)
+* 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 f6dc3311c6..1cbcd95d6a 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