diff options
| author | Andrew-Fahmy <andrewj.fahmy@gmail.com> | 2021-02-27 23:38:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 16:38:13 +1100 |
| commit | e6f7da403676b491ac278d5b793d18a0d114477e (patch) | |
| tree | 0ff47ca4b6b0dbed7bbebdafb262183d9c55d9c9 /keyboards/k_type/keymaps/rgb | |
| parent | 7190971b44a53a099addd79ca98d5bb64ba087e1 (diff) | |
| download | qmk_firmware-e6f7da403676b491ac278d5b793d18a0d114477e.tar.gz qmk_firmware-e6f7da403676b491ac278d5b793d18a0d114477e.zip | |
Fixing K-type RGB lighting (#11551)
* initial rgb driver fix
* added underglow LEDs and fixed typo in RGB locations
* removed test code
* added my key maps
* updated rgb keymap to work with changes
* refactored my code to make it more maintainable and updated keymaps.
* added GPL licence
Diffstat (limited to 'keyboards/k_type/keymaps/rgb')
| -rw-r--r-- | keyboards/k_type/keymaps/rgb/config.h | 25 | ||||
| -rw-r--r-- | keyboards/k_type/keymaps/rgb/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/k_type/keymaps/rgb/readme.md | 4 |
3 files changed, 22 insertions, 11 deletions
diff --git a/keyboards/k_type/keymaps/rgb/config.h b/keyboards/k_type/keymaps/rgb/config.h index 206b76f2b6..4c5d234545 100644 --- a/keyboards/k_type/keymaps/rgb/config.h +++ b/keyboards/k_type/keymaps/rgb/config.h @@ -2,22 +2,31 @@ #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR + +# define RGB_MATRIX_LED_FLUSH_LIMIT 100 + // i2c_master defines +# define I2C_COUNT 2 + +# define I2C1_BANK GPIOB # 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 USE_I2C2 +# define I2C2_BANK GPIOC +# 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_ADDR_2 0b1010000 # define DRIVER_COUNT 2 # define DRIVER_1_LED_TOTAL 64 -//# define DRIVER_2_LED_TOTAL 55 -# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL +# define DRIVER_2_LED_TOTAL 55 +# define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) #endif diff --git a/keyboards/k_type/keymaps/rgb/keymap.c b/keyboards/k_type/keymaps/rgb/keymap.c index 4ed15e5d66..88f5eaa37b 100644 --- a/keyboards/k_type/keymaps/rgb/keymap.c +++ b/keyboards/k_type/keymaps/rgb/keymap.c @@ -8,12 +8,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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 + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/k_type/keymaps/rgb/readme.md b/keyboards/k_type/keymaps/rgb/readme.md index 794052c57a..330321976c 100644 --- a/keyboards/k_type/keymaps/rgb/readme.md +++ b/keyboards/k_type/keymaps/rgb/readme.md @@ -2,4 +2,6 @@ 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. +The keyboard should now support full RGB lightings. The lighting animations are running at 10 fps for performance reasons. +You can configure this by changing the `RGB_MATRIX_LED_FLUSH_LIMIT` inside the `config.h` file to a lower value. +For example `RGB_MATRIX_LED_FLUSH_LIMIT 16` would mean that the animations run every 16 ms or at 60 fps. |