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

10 files changed, 587 insertions, 0 deletions

diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
new file mode 100644
index 0000000000..af0a162810
--- /dev/null
+++ b/keyboards/tkc/portico68v2/config.h
@@ -0,0 +1,106 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x544B //TK
+#define PRODUCT_ID      0x0012 //Portico68v2
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    TKC
+#define PRODUCT         Portico68v2
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { B6, C6, C7, F7, D2 }
+#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, F6, F5, F4, F1, B0, B1, B2, B3 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define DRIVER_ADDR_1 0b0110000
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 82
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define DRIVER_INDICATOR_LED_TOTAL 0
+#define RGB_MATRIX_CENTER { 116, 32 }
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// #define RGB_MATRIX_LED_PROCESS_LIMIT 5
+// #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json
new file mode 100644
index 0000000000..d3ea7cb264
--- /dev/null
+++ b/keyboards/tkc/portico68v2/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "TKC Portico68 v2",
+    "url": "",
+    "maintainer": "TerryMathews",
+    "layouts": {
+        "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico68v2/keymaps/default/keymap.c b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d8ecbe1c0a
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+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_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_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, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
+        KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
+        _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+    )
+};
diff --git a/keyboards/tkc/portico68v2/keymaps/via/config.h b/keyboards/tkc/portico68v2/keymaps/via/config.h
new file mode 100644
index 0000000000..39b11550cf
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/tkc/portico68v2/keymaps/via/keymap.c b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b8fd68f625
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
@@ -0,0 +1,121 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+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_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_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, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
+        KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
+        _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    )
+};
+
+void via_qmk_rgblight_get_value(uint8_t *data) {
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_rgblight_brightness: {
+            value_data[0] = rgb_matrix_get_val();
+            break;
+        }
+        case id_qmk_rgblight_effect: {
+            value_data[0] = rgb_matrix_get_flags() ? rgb_matrix_get_mode() : 0;
+            break;
+        }
+        case id_qmk_rgblight_effect_speed: {
+            value_data[0] = rgb_matrix_get_speed();
+            break;
+        }
+        case id_qmk_rgblight_color: {
+            value_data[0] = rgb_matrix_get_hue();
+            value_data[1] = rgb_matrix_get_sat();
+            break;
+        }
+    }
+}
+
+void via_qmk_rgblight_set_value(uint8_t *data) {
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_rgblight_brightness: {
+            rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
+            break;
+        }
+        case id_qmk_rgblight_effect: {
+            if (value_data[0] == 0) {
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+            } else {
+                rgb_matrix_mode_noeeprom(value_data[0]);
+                rgb_matrix_set_flags(LED_FLAG_MODIFIER|LED_FLAG_UNDERGLOW|LED_FLAG_KEYLIGHT);
+            }
+            break;
+        }
+        case id_qmk_rgblight_effect_speed: {
+            rgb_matrix_set_speed_noeeprom(value_data[0]);
+            break;
+        }
+        case id_qmk_rgblight_color: {
+            rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val());
+            break;
+        }
+    }
+}
+
+void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+    uint8_t *command_id = &(data[0]);
+    uint8_t *command_data = &(data[1]);
+    switch (*command_id) {
+        case id_lighting_set_value:
+            via_qmk_rgblight_set_value(command_data);
+            break;
+        case id_lighting_get_value:
+            via_qmk_rgblight_get_value(command_data);
+            break;
+        case id_lighting_save:
+            eeconfig_update_rgb_matrix();
+            break;
+        default:
+            // Unhandled message.
+            *command_id = id_unhandled;
+            break;
+    }
+}
diff --git a/keyboards/tkc/portico68v2/keymaps/via/rules.mk b/keyboards/tkc/portico68v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
new file mode 100644
index 0000000000..8e98034ca5
--- /dev/null
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -0,0 +1,145 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "portico68v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB1 */
+    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB2 */
+    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB3 */
+    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB4 */
+    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB5 */
+    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB6 */
+    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB7 */
+    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB8 */
+    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB9 */
+    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB10 */
+    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB11 */
+    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB12 */
+    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB13 */
+    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB14 */
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB15 */
+    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB16 */
+    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB17 */
+    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB18 */
+    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB19 */
+    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
+    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB21 */
+    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB22 */
+    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB23 */
+    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB24 */
+    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB25 */
+    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB26 */
+    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB27 */
+    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB28 */
+    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB29 */
+    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB30 */
+    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB31 */
+    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB32 */
+    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33 */
+    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB34 */
+    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB35 */
+    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB36 */
+    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB37 */
+    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB38 */
+    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB39 */
+    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB40 */
+    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB41 */
+    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB42 */
+    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB43 */
+    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB44 */
+    {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB45 */
+    {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB46 */
+    {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47 */
+    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB48 */
+    {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB49 */
+    {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB50 */
+    {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB51 */
+    {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB52 */
+    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB53 */
+    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB54 */
+    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB55 */
+    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB56 */
+    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB57 */
+    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB58 */
+    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB59 */
+    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB60 */
+    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB61 */
+    {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB62 */
+    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB63 */
+    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB64 */
+    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB65 */
+    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB66 */
+    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB67 */
+
+    {0,CS36_SW1,CS35_SW1,CS34_SW1}, /* RGB68 */
+    {0,CS36_SW2,CS35_SW2,CS34_SW2}, /* RGB69 */
+    {0,CS36_SW3,CS35_SW3,CS34_SW3}, /* RGB70 */
+    {0,CS36_SW4,CS35_SW4,CS34_SW4}, /* RGB71 */
+    {0,CS36_SW5,CS35_SW5,CS34_SW5}, /* RGB72 */
+    {0,CS36_SW6,CS35_SW6,CS34_SW6}, /* RGB73 */
+    {0,CS36_SW7,CS35_SW7,CS34_SW7}, /* RGB74 */
+    {0,CS36_SW8,CS35_SW8,CS34_SW8}, /* RGB75 */
+    {0,CS36_SW9,CS35_SW9,CS34_SW9}, /* RGB76 */
+    {0,CS39_SW1,CS38_SW1,CS37_SW1}, /* RGB77 */
+    {0,CS39_SW2,CS38_SW2,CS37_SW2}, /* RGB78 */
+    {0,CS39_SW3,CS38_SW3,CS37_SW3}, /* RGB79 */
+    {0,CS39_SW4,CS38_SW4,CS37_SW4}, /* RGB80 */
+    {0,CS39_SW5,CS38_SW5,CS37_SW5}, /* RGB81 */
+    {0,CS39_SW6,CS38_SW6,CS37_SW6}, /* RGB82 */
+};
+
+led_config_t g_led_config = {
+    {
+	    {  0,      1,  2,      3,      4,      5,  6,      7,      8,      9, 10, 11, 12,     13, 14 },
+        { 15,     16, 17,     18,     19,     20, 21,     22,     23,     24, 25, 26, 27,     28, 29 },
+        { 30,     31, 32,     33,     34,     35, 36,     37,     38,     39, 40, 41, 42, NO_LED, 43 },
+        { 44, NO_LED, 45,     46,     47,     48, 49,     50,     51,     52, 53, 54, 55,     56, 57 },
+        { 58,     59, 60, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64,     65, 66 }
+    }, {
+        {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 203,   0 }, { 224,   0 },
+        {   4,  16 }, {  23,  16 }, {  38,  16 }, {  53,  16 }, {  68,  16 }, {  83,  16 }, {  98,  16 }, { 113,  16 }, { 128,  16 }, { 143,  16 }, { 158,  16 }, { 173,  16 }, { 188,  16 }, { 206,  16 }, { 224,  16 },
+        {   6,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 },               { 201,  32 }, { 224,  32 },
+        {   9,  48 },               {  34,  48 }, {  49,  48 }, {  64,  48 }, {  79,  48 }, {  94,  48 }, { 109,  48 }, { 124,  48 }, { 139,  48 }, { 154,  48 }, { 169,  48 }, { 189,  48 }, { 210,  48 }, { 224,  48 },
+        {   2,  64 }, {  21,  64 }, {  39,  64 },                                           {  96,  64 },                                           { 152,  64 }, { 171,  64 }, { 195,  64 }, { 210,  64 }, { 224,  64 },
+        {0,0},{180,0},{224,0},{200,64},{224,64},{224,32},{44,0},{88,0},{136,0},{0,32},{0,64},{24,64},{78,64},{112,64},{146,64}
+}, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4,
+        4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4,          4,          4, 4, 4, 4, 4,
+        2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+    }
+};
+
+void rgb_matrix_indicators_kb(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+            rgb_matrix_set_color(i, 0xFF, 0xFF, 0xFF);
+        }
+    }
+    else {
+         if (rgb_matrix_get_flags() == LED_FLAG_NONE) {
+            for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+                rgb_matrix_set_color(i, 0, 0, 0);
+            }
+        }
+    }
+}
+#endif
diff --git a/keyboards/tkc/portico68v2/portico68v2.h b/keyboards/tkc/portico68v2/portico68v2.h
new file mode 100644
index 0000000000..3cbe46d560
--- /dev/null
+++ b/keyboards/tkc/portico68v2/portico68v2.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#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,\
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E \
+) { \
+    { 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, XXX, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/tkc/portico68v2/readme.md b/keyboards/tkc/portico68v2/readme.md
new file mode 100644
index 0000000000..df031fabe8
--- /dev/null
+++ b/keyboards/tkc/portico68v2/readme.md
@@ -0,0 +1,21 @@
+# TKC Portico68 v2
+
+![TKC Portico68](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.
+
+* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
+* 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):
+
+    make tkc/portico68v2:default
+
+Flashing example for this keyboard:
+
+    make tkc/portico68v2:default:flash
+
+See 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/tkc/portico68v2/rules.mk b/keyboards/tkc/portico68v2/rules.mk
new file mode 100644
index 0000000000..f8e7ced981
--- /dev/null
+++ b/keyboards/tkc/portico68v2/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes         # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = no            # Console for debug
+COMMAND_ENABLE = yes           # Commands for debug and configuration
+NKRO_ENABLE = yes              # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+AUDIO_ENABLE = no              # Audio output
+LTO_ENABLE = yes			   # Compile-time optimizations
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
\ No newline at end of file