Added Simple VIA support + LED Matrix updated

keyboards/k_pro_v1_tkl/config.h

@@ -28,9 +28,12 @@
 // 11 AD <-> VCC
 // ADDR represents A1:A0 of the 7-bit address.
 // The result is: 0b11101(ADDR)
-#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
 
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 33
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define ENCODERS_PAD_A { B8 }
+#define ENCODERS_PAD_B { B9 }

keyboards/k_pro_v1_tkl/halconf.h

@@ -0,0 +1,3 @@
+#pragma once
+#define HAL_USE_I2C TRUE
+#include_next <halconf.h>

keyboards/k_pro_v1_tkl/info.json

@@ -1,7 +1,7 @@
 {
-    "manufacturer": "ksmosna",
+    "manufacturer": "Smosna",
     "keyboard_name": "k_pro_v1_tkl",
-    "maintainer": "ksmosna",
+    "maintainer": "Krzysztof Smosna",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
     "features": {
@@ -20,8 +20,8 @@
     "url": "",
     "usb": {
         "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
+        "pid": "0x0001",
+        "vid": "0x5301"
     },
     "layouts": {
         "LAYOUT_tkl_ansi": {

keyboards/k_pro_v1_tkl/k_pro_v1_tkl.c

@@ -1,3 +1,7 @@
+#include "quantum.h"
+#include "i2c_master.h"
+#include "drivers/led/issi/is31fl3733.h"
+
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
@@ -102,4 +106,30 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
     {1, SW7_CS14,   SW8_CS14,   SW9_CS14}, //Left
     {1, SW7_CS15,   SW8_CS15,   SW9_CS15}, //Down
     {1, SW7_CS16,   SW8_CS16,   SW9_CS16}, //Right
-}
+};
+
+led_config_t g_led_config = { {
+  // Key Matrix to LED Index
+  {   NO_LED, 0, NO_LED,      1,      2,      3,  4,      5,      6,      7,  8,  9, 10,     11, 12, NO_LED, NO_LED, NO_LED },
+  {   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, 43,     44, 45,     46,     47, 48 },
+  {   49,    50,     51,     52,     53,     54, 55,     56,     57,     58, 59, 60, 61, NO_LED, 62,     63,     64, 65 },
+  {   66,    67, NO_LED,     68,     69,     70, 71,     72,     73,     74, 75, 76, 77, NO_LED, 78, NO_LED,     79, NO_LED },
+  {   80,    81,     82, NO_LED, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, 84, 85, 86,     87, 88,     89,     90, 91 },
+}, {
+  // LED Index to Physical Position
+  { 24,  6 }, { 46,  6 }, { 57,  6 }, { 68,  6 }, {  79,  6 }, {  95,  6 }, {  106,  6 }, {  117,  6 }, {  128,  6 }, {  144,  6 }, {  155,  6 }, {  166,  6 }, {  177,  6 },
+  { 10,  20 }, { 24,  20 }, { 35,  20 }, { 46,  20 }, { 57,  20 }, { 68,  20 }, {  79,  20 }, {  90,  20 }, {  101,  20 }, {  112,  20 }, {  123,  20 }, {  134,  20 }, {  145,  20 }, {  156,  20 }, {  171,  20 }, {  191,  20 }, {  202,  20 }, {  213,  20 },
+  { 10,  31 }, { 27,  31 }, { 41,  31 }, { 52,  31 }, { 63,  31 }, { 74,  31 }, {  85,  31 }, {  96,  31 }, {  107,  31 }, {  118,  31 }, {  129,  31 }, {  140,  31 }, {  151,  31 }, {  162,  31 }, {  174,  31 }, {  191,  31 }, {  202,  31 }, {  213,  31 },
+  { 10,  42 }, { 29,  42 }, { 44,  42 }, { 55,  42 }, { 66,  42 }, { 77,  42 }, {  88,  42 }, {  99,  42 }, {  110,  42 }, {  121,  42 }, {  132,  42 }, {  143,  42 }, {  154,  42 }, {  170,  42 }, {  191,  42 }, {  202,  42 }, {  213,  42 },
+  { 10,  53 }, { 31,  53 }, { 49,  53 }, { 60,  53 }, { 71,  53 }, { 82,  53 }, {  93,  53 }, {  104,  53 }, {  115,  53 }, {  126,  53 }, {  137,  53 }, {  148,  53 }, {  167,  53 }, {  202,  53 },
+  { 10,  64 }, { 25,  64 }, { 39,  64 }, { 53,  64 }, { 94,  64 }, { 135,  64 }, {  149,  64 }, {  163,  64 }, {  177,  64 }, {  191,  64 }, {  202,  64 }, {  213,  64 }
+}, {
+  // LED Index to Flag
+     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, 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
+} };

keyboards/k_pro_v1_tkl/keymaps/VIA/keymap.c

@@ -0,0 +1,83 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ 
+     * │Kno│   │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│
+     * └───┘   └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘
+     * ┌───┐   ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │M1 │   │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │PSc│Scr│Pse│
+     * ├───┤   ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │M2 │   │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Ins│Hom│PgU│
+     * ├───┤   ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤
+     * │M3 │   │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │ │Del│End│PgD│
+     * ├───┤   ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┼───┼───┘  
+     * │M4 │   │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├───┤   ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │M5 │   │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │
+     * └───┘   └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_ansi(
+        KC_MUTE,   KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+
+        KC_NO,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NO,   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_INS,  KC_HOME, KC_PGUP,
+        KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,     KC_DEL,  KC_END,  KC_PGDN,
+        KC_NO,   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_NO,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_ansi(
+        KC_NO,   KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+
+        KC_NO,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NO,   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_INS,  KC_HOME, KC_PGUP,
+        KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,     KC_DEL,  KC_END,  KC_PGDN,
+        KC_NO,   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_NO,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [2] = LAYOUT_tkl_ansi(
+        KC_NO,   KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+
+        KC_NO,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NO,   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_INS,  KC_HOME, KC_PGUP,
+        KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,     KC_DEL,  KC_END,  KC_PGDN,
+        KC_NO,   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_NO,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [3] = LAYOUT_tkl_ansi(
+        KC_NO,   KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+
+        KC_NO,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NO,   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_INS,  KC_HOME, KC_PGUP,
+        KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,     KC_DEL,  KC_END,  KC_PGDN,
+        KC_NO,   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_NO,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
+
+#if defined (ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+};
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+
+    // Host Keyboard RGB backlight status
+    oled_write_P(PSTR("-----"), false);
+    oled_write_P(PSTR("Light"), false);
+    return false;
+}
+#endif

keyboards/k_pro_v1_tkl/keymaps/VIA/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

keyboards/k_pro_v1_tkl/keymaps/default/keymap.c

@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┘   └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
      */
     [0] = LAYOUT_tkl_ansi(
-        KC_NO,   KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MUTE,   KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
 
         KC_NO,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_NO,   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_INS,  KC_HOME, KC_PGUP,
@@ -31,6 +31,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+#if defined (ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
+};
+#endif
+
 #ifdef OLED_ENABLE
 bool oled_task_user(void) {
     // Host Keyboard LED Status

keyboards/k_pro_v1_tkl/mcuconf.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE

keyboards/k_pro_v1_tkl/rules.mk

@@ -1,8 +1,11 @@
-# This file intentionally left blank
+I2C_DRIVER_REQUIRED = yes
+
 OLED_ENABLE = yes
 OLED_DRIVER = ssd1306
 OLED_TRANSPORT = i2c
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = is31fl3731
+RGB_MATRIX_DRIVER = is31fl3733
 
+ENCODER_ENABLE = yes
+ENCODER_MAP_ENABLE = yes