K-Type refactor (#9864)
* K-Type refactor * Declare QMK in product name again * Hopefully fix matrix scanning * Maybe this time * Partial (literally) RGB Matrix support * Put RGB_MATRIX_ENABLE into rgb keymap for now * Add ifdefs for RGB config * Set layer 1 to actually be layer 1... * Update keyboards/k_type/readme.md * Put all RGB config in keymap for now * Set SDB high? * Before `rgb_matrix_init()` would be best * User level, not keyboard * Combating dropped keys * Nope * Readme for RGB keymap * Remove custom matrixpre-develop-merge-nov20
Ryan
5 years ago
committed by
James Young
parent
0f596881b3
commit
629cfc7f5e
@ -1,31 +1,27 @@ |
||||
#include "k_type.h" |
||||
#include QMK_KEYBOARD_H |
||||
|
||||
#define _QW 0 |
||||
#define _L1 1 |
||||
|
||||
const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
||||
[_QW] = KEYMAP( |
||||
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_PSCR, KC_SLCK, KC_PAUS, \
|
||||
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_INS, KC_HOME, KC_PGUP, \
|
||||
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_DEL, KC_END, KC_PGDN, \
|
||||
MO(_L1), 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), |
||||
[_L1] = KEYMAP( |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_VOLU, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPRV, KC_VOLD, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), |
||||
enum layer_names { |
||||
_QW, |
||||
_L1 |
||||
}; |
||||
|
||||
// Runs just one time when the keyboard initializes.
|
||||
void matrix_init_user(void) { |
||||
|
||||
}; |
||||
const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
||||
[_QW] = LAYOUT_tkl_ansi( |
||||
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_PSCR, KC_SLCK, KC_PAUS, |
||||
|
||||
// Runs constantly in the background, in a loop.
|
||||
void matrix_scan_user(void) { |
||||
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_INS, KC_HOME, KC_PGUP, |
||||
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_DEL, KC_END, KC_PGDN, |
||||
MO(_L1), 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
||||
), |
||||
[_L1] = LAYOUT_tkl_ansi( |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
||||
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_VOLU, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPRV, KC_VOLD, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END |
||||
) |
||||
}; |
||||
|
||||
@ -1,11 +1,13 @@ |
||||
#include QMK_KEYBOARD_H |
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
||||
[0] = KEYMAP( |
||||
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_PSCR, KC_SLCK, KC_PAUS, \
|
||||
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_INS, KC_HOME, KC_PGUP, \
|
||||
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_DEL, KC_END, KC_PGDN, \
|
||||
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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), |
||||
[0] = LAYOUT_tkl_ansi( |
||||
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_PSCR, KC_SLCK, KC_PAUS, |
||||
|
||||
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_INS, KC_HOME, KC_PGUP, |
||||
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_DEL, KC_END, KC_PGDN, |
||||
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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
||||
) |
||||
}; |
||||
|
||||
@ -0,0 +1,23 @@ |
||||
#pragma once |
||||
|
||||
#ifdef RGB_MATRIX_ENABLE |
||||
# define RGB_MATRIX_KEYPRESSES |
||||
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL |
||||
|
||||
// i2c_master defines
|
||||
# define I2C1_SCL 0 // A2 on pinout = B0
|
||||
# define I2C1_SDA 1 // A2 on pinout = B1
|
||||
# define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2 |
||||
# define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2 |
||||
//# define I2C2_SCL 10 // A2 on pinout = C10
|
||||
//# define I2C2_SDA 11 // A2 on pinout = C11
|
||||
//# define I2C2_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
|
||||
//# define I2C2_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
|
||||
|
||||
# define DRIVER_ADDR_1 0b1010000 |
||||
# define DRIVER_ADDR_2 0b1010001 |
||||
# define DRIVER_COUNT 2 |
||||
# define DRIVER_1_LED_TOTAL 64 |
||||
//# define DRIVER_2_LED_TOTAL 55
|
||||
# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL |
||||
#endif |
||||
@ -0,0 +1,30 @@ |
||||
#include QMK_KEYBOARD_H |
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
||||
[0] = LAYOUT_tkl_ansi( |
||||
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_PSCR, KC_SLCK, KC_PAUS, |
||||
|
||||
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_INS, KC_HOME, KC_PGUP, |
||||
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_DEL, KC_END, KC_PGDN, |
||||
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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
||||
), |
||||
[1] = LAYOUT_tkl_ansi( |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, |
||||
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
||||
) |
||||
}; |
||||
|
||||
#ifdef RGB_MATRIX_ENABLE |
||||
// Turn off SDB
|
||||
void keyboard_pre_init_user() { |
||||
palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPad(GPIOB, 16); |
||||
} |
||||
#endif |
||||
@ -0,0 +1,5 @@ |
||||
# K-Type RGB Matrix Keymap |
||||
|
||||
This is an experimental keymap adding support for RGB Matrix on the K-Type. |
||||
|
||||
The board has two IS31FL3733 LED controllers, but they are each on different I2C buses, which QMK's `i2c_master` implementation currently does not support. As a result, all the keys after the left shift will not be lit. |
||||
@ -0,0 +1 @@ |
||||
RGB_MATRIX_ENABLE = IS31FL3733
|
||||
@ -1,138 +0,0 @@ |
||||
//#include <stdint.h>
|
||||
//#include <stdbool.h>
|
||||
#include <string.h> |
||||
#include "hal.h" |
||||
#include "timer.h" |
||||
#include "wait.h" |
||||
#include "print.h" |
||||
#include "matrix.h" |
||||
#include "debug.h" |
||||
|
||||
/* matrix state(1:on, 0:off) */ |
||||
static matrix_row_t matrix[MATRIX_ROWS]; |
||||
static matrix_row_t matrix_debouncing[MATRIX_ROWS]; |
||||
static bool debouncing = false; |
||||
static uint16_t debouncing_time = 0; |
||||
|
||||
void matrix_init(void) |
||||
{ |
||||
debug_matrix = true; |
||||
|
||||
/* Column(sense) */ |
||||
palSetPadMode(GPIOD, 5, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOD, 6, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOD, 7, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOC, 1, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOC, 2, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOC, 4, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOC, 5, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOC, 6, PAL_MODE_INPUT_PULLDOWN); |
||||
palSetPadMode(GPIOC, 7, PAL_MODE_INPUT_PULLDOWN); |
||||
|
||||
/* Row(strobe) */ |
||||
palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOB, 3, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOB, 18, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOB, 19, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOC, 8, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOC, 9, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOD, 0, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOD, 1, PAL_MODE_OUTPUT_PUSHPULL); |
||||
palSetPadMode(GPIOD, 4, PAL_MODE_OUTPUT_PUSHPULL); |
||||
|
||||
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); |
||||
memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t)); |
||||
|
||||
matrix_init_quantum(); |
||||
} |
||||
|
||||
uint8_t matrix_scan(void) |
||||
{ |
||||
for (int row = 0; row < MATRIX_ROWS; row++) { |
||||
matrix_row_t data = 0; |
||||
// strobe row
|
||||
switch (row) { |
||||
case 0: palSetPad(GPIOB, 2); break; |
||||
case 1: palSetPad(GPIOB, 3); break; |
||||
case 2: palSetPad(GPIOB, 18); break; |
||||
case 3: palSetPad(GPIOB, 19); break; |
||||
case 4: palSetPad(GPIOC, 0); break; |
||||
case 5: palSetPad(GPIOC, 8); break; |
||||
case 6: palSetPad(GPIOC, 9); break; |
||||
case 7: palSetPad(GPIOD, 0); break; |
||||
case 8: palSetPad(GPIOD, 1); break; |
||||
case 9: palSetPad(GPIOD, 4); break; |
||||
} |
||||
|
||||
// need wait to settle pin state
|
||||
// if you wait too short, or have a too high update rate
|
||||
// the keyboard might freeze, or there might not be enough
|
||||
// processing power to update the LCD screen properly.
|
||||
// 20us, or two ticks at 100000Hz seems to be OK
|
||||
wait_us(20); |
||||
|
||||
// read col data: { PTD5, PTD6, PTD7, PTC1, PTC2, PTC3, PTC4, PTC5, PTC6, PTC7 }
|
||||
data = ((palReadPort(GPIOC) & 0xFEUL) << 2) | |
||||
((palReadPort(GPIOD) & 0xE0UL) >> 5); |
||||
|
||||
// un-strobe row
|
||||
switch (row) { |
||||
case 0: palClearPad(GPIOB, 2); break; |
||||
case 1: palClearPad(GPIOB, 3); break; |
||||
case 2: palClearPad(GPIOB, 18); break; |
||||
case 3: palClearPad(GPIOB, 19); break; |
||||
case 4: palClearPad(GPIOC, 0); break; |
||||
case 5: palClearPad(GPIOC, 8); break; |
||||
case 6: palClearPad(GPIOC, 9); break; |
||||
case 7: palClearPad(GPIOD, 0); break; |
||||
case 8: palClearPad(GPIOD, 1); break; |
||||
case 9: palClearPad(GPIOD, 4); break; |
||||
} |
||||
|
||||
if (matrix_debouncing[row] != data) { |
||||
matrix_debouncing[row] = data; |
||||
debouncing = true; |
||||
debouncing_time = timer_read(); |
||||
} |
||||
} |
||||
|
||||
if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) { |
||||
for (int row = 0; row < MATRIX_ROWS; row++) { |
||||
matrix[row] = matrix_debouncing[row]; |
||||
} |
||||
debouncing = false; |
||||
} |
||||
|
||||
matrix_scan_quantum(); |
||||
return 1; |
||||
} |
||||
|
||||
bool matrix_is_on(uint8_t row, uint8_t col) |
||||
{ |
||||
return (matrix[row] & (1 << col)); |
||||
} |
||||
|
||||
matrix_row_t matrix_get_row(uint8_t row) |
||||
{ |
||||
return matrix[row]; |
||||
} |
||||
|
||||
void matrix_print(void) |
||||
{ |
||||
xprintf("\nr/c 01234567\n"); |
||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) { |
||||
xprintf("%02X: ", row); |
||||
matrix_row_t data = matrix_get_row(row); |
||||
for (int col = 0; col < MATRIX_COLS; col++) { |
||||
if (data & (1<<col)) |
||||
xprintf("1"); |
||||
else |
||||
xprintf("0"); |
||||
} |
||||
xprintf("\n"); |
||||
} |
||||
|
||||
wait_ms(50); |
||||
} |
||||
Loading…
Reference in new issue