diff options
Diffstat (limited to 'keyboards/input_club')
26 files changed, 392 insertions, 1301 deletions
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index 7db6119a1c..0f9b239466 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -43,8 +43,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LED_BRIGHTNESS_HI 255 /* LED matrix driver */ -#define LED_DRIVER_ADDR_1 0x74 -#define LED_DRIVER_COUNT 1 +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +#define IS31FL3731_DRIVER_COUNT 1 #define LED_MATRIX_LED_COUNT 76 #define LED_MATRIX_SPLIT { 38, 38 } #define LED_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c index b8f0d4ae13..8f245d9fa3 100644 --- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c +++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c @@ -117,9 +117,6 @@ void matrix_init_kb(void) { * Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c), * and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot. */ -# if !defined(LED_MATRIX_DEFAULT_SPD) -# define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2 -# endif led_matrix_set_speed(LED_MATRIX_DEFAULT_SPD); led_matrix_set_flags(LED_FLAG_ALL); #endif @@ -174,7 +171,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { #endif #ifdef LED_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { // The numbers in the comments are the led numbers DXX on the PCB /* Refer to IS31 manual for these locations * driver @@ -198,7 +195,7 @@ const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { // 71 70 69 { 0, C3_7 }, { 0, C2_7 }, { 0, C1_7 }, // Right half (mirrored) -// Due to how LED_MATRIX_SPLIT is implemented, only the first half of g_is31_leds is actually used. +// Due to how LED_MATRIX_SPLIT is implemented, only the first half of g_is31fl3731_leds is actually used. // Luckily, the right half has the same LED pinouts, just mirrored. // 45 44 43 42 41 40 39 { 0, C2_2 }, { 0, C1_2 }, { 0, C5_1 }, { 0, C4_1 }, { 0, C3_1 }, { 0, C2_1 }, { 0, C1_1 }, diff --git a/keyboards/input_club/infinity60/halconf.h b/keyboards/input_club/infinity60/halconf.h deleted file mode 100644 index f2a330b416..0000000000 --- a/keyboards/input_club/infinity60/halconf.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 QMK - * - * 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/>. - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/infinity60/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - -#pragma once - -#define HAL_USE_I2C TRUE - -#include_next <halconf.h> - diff --git a/keyboards/input_club/infinity60/keymaps/default/keymap.c b/keyboards/input_club/infinity60/keymaps/default/keymap.c index 8f571a2b9e..29ee5a378e 100644 --- a/keyboards/input_club/infinity60/keymaps/default/keymap.c +++ b/keyboards/input_club/infinity60/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/input_club/infinity60/keymaps/jpetermans/config.h b/keyboards/input_club/infinity60/keymaps/jpetermans/config.h deleted file mode 100644 index 1949a9ad9d..0000000000 --- a/keyboards/input_club/infinity60/keymaps/jpetermans/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -//overrides -#undef TAPPING_TOGGLE -#define TAPPING_TOGGLE 2 - diff --git a/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c deleted file mode 100644 index d82517b662..0000000000 --- a/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c +++ /dev/null @@ -1,264 +0,0 @@ -#include QMK_KEYBOARD_H -#include "led_controller.h" - -//Define Layer Names -#define _BASE 0 -#define _NUMPAD 1 -#define _FNAV 2 -#define _MEDIA 3 -#define _TILDE 4 - -//IS31 chip has 8 available led pages, using 0 for all leds and 7 for single toggles -#define max_pages 6 - -enum led_modes { - MODE_ALL, - MODE_GAME, - MODE_SINGLE, - MODE_PAGE, - MODE_FLASH -}; - -enum macro_id { - LED_ALL = SAFE_RANGE, - LED_GAME, - LED_BACKLIGHT, - LED_BRIGHT, - LED_DIM, - LED_SINGLE, - LED_PAGE, - LED_FLASH -}; - -uint8_t current_layer_global = 0; -uint8_t led_mode_global = MODE_SINGLE; -uint8_t backlight_status_global = 1; //init on/off state of backlight -uint32_t led_layer_state = 0; - -/* ================================== - * KEYMAPS - * ==================================*/ - -const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Default Layer - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs| - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| - * |-----------------------------------------------------------| - * |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Enter | - * |-----------------------------------------------------------| - * |Shif| | Z| X| C| V| B| N| M| ,| .| /|Shift | - * |-----------------------------------------------------------| - * |Ctrl|Gui |Alt | Space |Alt |Gui | FN | Ctrl | - * `-----------------------------------------------------------' - */ - /* default */ - [_BASE] = LAYOUT_60_ansi_split_bs_rshift( - KC_ESC, 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_BSLS,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_BSPC, - TT(_FNAV), 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,LM(_TILDE, MOD_LSFT),KC_NO, - KC_LCTL, KC_LGUI,KC_LALT, LT(_FNAV, KC_SPC), KC_RALT,TG(_NUMPAD),MO(_MEDIA), KC_RCTL - ), - - /* numpad */ - [_NUMPAD] = LAYOUT_60_ansi_split_bs_rshift( - _______,_______,_______,_______,_______,_______,_______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,_______,_______,KC_NO, - _______,_______,_______,_______,_______,_______,_______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,_______,_______, - MO(_FNAV),_______,_______,_______,_______,_______,_______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,_______, - _______,_______,_______,_______,_______,_______,_______, KC_P0,KC_COMM,KC_PDOT,KC_PPLS, _______,KC_NO, - _______,_______,_______, TO(_BASE), _______,_______,_______,_______ - ), - - /* F-, arrow, and media keys */ - [_FNAV] = LAYOUT_60_ansi_split_bs_rshift( - KC_GRV, 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_CAPS,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,_______,_______,KC_DEL, - _______,_______,KC_BTN2,_______,_______,_______,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,_______,_______, - _______,KC_APP,KC_BTN1,KC_CALC,_______,_______,KC_END,_______,_______,_______,_______,_______,KC_NO, - _______,_______,_______, _______, C(A(KC_DEL)),KC_NUM,_______,_______ - ), - - /* media */ - [_MEDIA] = LAYOUT_60_ansi_split_bs_rshift( - _______,LED_SINGLE,LED_PAGE,LED_FLASH,_______,_______,_______, _______, _______, _______,KC_MUTE, KC_VOLD, KC_VOLU,_______,KC_NO, - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______, - _______,_______,_______,_______,_______,LED_GAME,_______, _______, _______, _______,_______, _______,_______, - _______,_______,LED_ALL ,LED_BRIGHT,LED_DIM,LED_BACKLIGHT,_______, _______, KC_MPRV, KC_MNXT,KC_MSTP, _______,KC_NO, - _______,_______,_______, KC_MPLY, _______,_______, _______,_______ - ), - /* ~ */ - [_TILDE] = LAYOUT_60_ansi_split_bs_rshift( - KC_GRV,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,KC_NO, - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______, - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______, - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,KC_NO, - _______,_______,_______, _______, _______,_______, _______,_______ - ), - /* template */ - [5] = LAYOUT_60_ansi_split_bs_rshift( - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,KC_NO, - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______, - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______, - _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,KC_NO, - _______,_______,_______, _______, _______,_______, _______,_______ - ), -}; - -/* ================================== - * LED MAPPING - * ==================================*/ - -/* - Infinity60 LED MAP - 11 12 13 14 15 16 17 18 21 22 23 24 25 26 27* - 28 31 32 33 34 35 36 37 38 41 42 43 44 45 - 46 47 48 51 52 53 54 55 56 57 58 61 62 - 63 64 65 66 67 68 71 72 73 74 75 76 77* - 78 81 82 83 84 85 86 87 - *Unused in Alphabet Layout -*/ - -//======== full page arrays ========= -//any change in array size needs to be mirrored in matrix_init_user -uint8_t led_numpad[16] = { - 18,21,22,23, - 37,38,41,42, - 55,56,57,58, - 72,73,74,75 -}; -//LED Page 2 - _Nav -uint8_t led_nav[12] = { - 38, - 47,48, 55,56,57, - 64,65,66 -}; -//LED Page 3 - _Media -uint8_t led_media[15] = { - 12,13,14, 23,24,25, - 65,66,67,68, 73,74,75, - 83, 86 -}; -//LED Page 4 - _Game "WASD" -uint8_t led_game[5] = { - 11, - 32, - 47,48,51 -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - msg_t msg; - - switch(keycode) { - case LED_ALL: - if(record->event.pressed) { - led_mode_global = led_mode_global == MODE_ALL ? MODE_SINGLE : MODE_ALL; - msg=TOGGLE_ALL; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - } - return false; - - case LED_BACKLIGHT: - if(record->event.pressed) { - backlight_status_global ^= 1; - msg=(backlight_status_global << 8) | TOGGLE_BACKLIGHT; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - } - return false; - - case LED_GAME: - if(record->event.pressed) { - led_mode_global = led_mode_global == MODE_GAME ? MODE_SINGLE : MODE_GAME; - - msg=(4 << 8) | DISPLAY_PAGE; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - } - return false; - - case LED_BRIGHT: - if(record->event.pressed) { - msg=(1 << 8) | STEP_BRIGHTNESS; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - } - return false; - - case LED_DIM: - if(record->event.pressed) { - msg=(0 << 8) | STEP_BRIGHTNESS; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - } - return false; - - //set led_mode for matrix_scan to toggle leds - case LED_SINGLE: - led_mode_global = MODE_SINGLE; - return false; - case LED_PAGE: - led_mode_global = MODE_PAGE; - return false; - case LED_FLASH: - led_mode_global = MODE_FLASH; - return false; - - } - return true; -} - -// Runs just one time when the keyboard initializes. -void matrix_init_user(void) { - - led_controller_init(); - - // Write predefined led pages. - write_led_page(_NUMPAD, led_numpad, 16); - chThdSleepMilliseconds(10); - - write_led_page(_FNAV, led_nav, 12); - chThdSleepMilliseconds(10); - - write_led_page(_MEDIA, led_media, 15); - chThdSleepMilliseconds(10); - - write_led_page(4, led_game, 5); - chThdSleepMilliseconds(1000); -}; - -// Loops constantly in the background. -void matrix_scan_user(void) { - uint8_t page; - uint8_t led_pin_byte; - msg_t msg; - - if (backlight_status_global == 0) {//backlight is off, skip the rest - return; - } - - if (led_layer_state != layer_state && led_mode_global != MODE_GAME && led_mode_global != MODE_ALL) { - //check mode - //Turn on layer indicator or page depending on mode - switch(led_mode_global) { - case MODE_FLASH: //flash preset page leds then single indicator - page = get_highest_layer(layer_state) > max_pages ? 7 : get_highest_layer(layer_state); - msg=(page << 8) | DISPLAY_PAGE; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - chThdSleepMilliseconds(500); - //flow to display single layer leds - - case MODE_SINGLE: //light layer indicators for all active layers - led_pin_byte = layer_state & 0xFF; - msg=(7 << 8) | DISPLAY_PAGE; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - msg=(1 << 16) | (led_pin_byte << 8) | SET_FULL_ROW; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - break; - - case MODE_PAGE: //display pre-defined led page - page = get_highest_layer(layer_state) > max_pages ? 7 : get_highest_layer(layer_state); - msg=(page << 8) | DISPLAY_PAGE; - chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); - break; - } - led_layer_state = layer_state; - } -} diff --git a/keyboards/input_club/infinity60/keymaps/jpetermans/readme.md b/keyboards/input_club/infinity60/keymaps/jpetermans/readme.md deleted file mode 100644 index 00421015bd..0000000000 --- a/keyboards/input_club/infinity60/keymaps/jpetermans/readme.md +++ /dev/null @@ -1,87 +0,0 @@ -Backlight for Infinity60 -======================== - -## Led Controller Specs - -The Infinity60 (revision 1.1a) pcb uses the IS31FL3731C matrix LED driver from ISSI [(datasheet)](http://www.issi.com/WW/pdf/31FL3731C.pdf). The IS31 has the ability to control two led matrices (A & B), each matrix controlling 9 pins, each pin controlling 8 leds. The Infinity only utilizes matrix A. - -Infinity60 LED Map: -digits mean "row" and "col", i.e. 45 means pin 4, column 5 in the IS31 datasheet -```c - 11 12 13 14 15 16 17 18 21 22 23 24 25 26 27* - 28 31 32 33 34 35 36 37 38 41 42 43 44 45 - 46 47 48 51 52 53 54 55 56 57 58 61 62 - 63 64 65 66 67 68 71 72 73 74 75 76 77* - 78 81 82 83 84 85 86 87 -``` -*Unused in Alphabet Layout - -The IS31 includes 8 led pages (or frames) 0-7 than can be displayed, and each page consists of 144 bytes. -- **bytes 0 - 17** - LED control (on/off). - * 18 bytes which alternate between A and B matrices (A1, B1, A2, B2, ..). - * Each byte controls the 8 leds on that pin with bits (8 to 1). -- **bytes 8 - 35** - Blink control. - * Same as LED control above, but sets blink on/off. -- **bytes 36 - 143** - PWM control. - * One byte per LED, sets PWM from 0 to 255. - * Same as above, the register alternates, every 8 *bytes* (not bits) between the A & B matrices. - -## Led Controller Code -In the Infinity60 project folder, led_controller.c sets up ability to write led layers at startup or control leds on demand as part of fn_actions. By default led_controller.c assumes page 0 will be used for full on/off. The remaining 7 pages (1-7) are free for preset led maps or single led actions at init or on demand. Communication with the IS31 is primarily done through the led_mailbox using chMBPost described further below under "Sending messages in Keymap.c". This code is based on work matt3o and flabbergast did for tmk firmware on the [whitefox](https://github.com/tmk/whitefox). - -One function is available to directly set leds without the mailbox: -``` -write_led_page(page#, array of leds by address, # of addresses in array) -``` -This function saves a full page to the controller using a supplied array of led locations such as: -```c -uint8_t led_numpad[16] = { - 18,21,22,23, - 37,38,41,42, - 55,56,57,58, - 72,73,74,75 -} -write_led_page(5, led_numpad, 16); -``` - -Remaining led control is done through the led mailbox using these message types: -- **SET_FULL_ROW** (3 bytes) - message type, 8-bit mask, and row#. Sets all leds on one pin per the bit mask. -- **OFF_LED, ON_LED, TOGGLE_LED** (3 bytes) - message type, led address, and page#. Off/on/toggle specific led. -- **BLINK_OFF_LED, BLINK_ON_LED, BLINK_TOGGLE_LED** (3 bytes) - message type, led address, and page#. Set blink Off/on/toggle for specific led. -- **TOGGLE_ALL** (1 byte) - Turn on/off full backlight. -- **TOGGLE_BACKLIGHT** (2 bytes) - message type, on/off. Sets backlight completely off, no leds will display. -- **DISPLAY_PAGE** (2 bytes) - message type, page to display. Switch to specific pre-set page. -- **RESET_PAGE** (2 bytes) - message type, page to reset. Reset/erase specific page. -- **TOGGLE_NUM_LOCK** (2 bytes) - message type, on/off (NUM_LOCK_LED_ADDRESS). Toggle numlock on/off. Usually run with the `set_leds` function to check state of numlock or capslock. If all leds are on (e.i. TOGGLE_ALL) then this sets numlock to blink instead (this is still a little buggy if toggling on/off quickly). -- **TOGGLE_CAPS_LOCK** (2 bytes) - message type, on/off (CAPS_LOCK_LED_ADDRESS). Same as numlock. -- **STEP_BRIGHTNESS** (2 bytes) - message type, and step up (1) or step down (0). Increase or decrease led brightness. - -## Sending messages in Keymap.c -Sending an action to the led mailbox is done using chMBPost: -``` -chMBPost(&led_mailbox, message, timeout); -``` -- &led_mailbox - pointer to led mailbox -- message - up to 4 bytes but most messages use only 2. First byte (LSB) is the message type, the remaining three bytes are the message to process. -- timeout is TIME_IMMEDIATE - -An example: -```c -//set the message to be sent. First byte (LSB) is the message type, and second is the led address -msg=(42 << 8) | ON_LED; - -//send msg to the led mailbox -chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); -``` - -Another: -```c -msg=(46 << 8) | BLINK_TOGGLE_LED; -chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); -``` - -Finally, SET_FULL_ROW requires an extra byte with row information in the message so sending this message looks like: -```c -msg=(row<<16) | (led_pin_byte << 8) | SET_FULL_ROW; -chMBPost(&led_mailbox, msg, TIME_IMMEDIATE); -``` diff --git a/keyboards/input_club/infinity60/led.c b/keyboards/input_club/infinity60/led.c deleted file mode 100644 index 33871bcc49..0000000000 --- a/keyboards/input_club/infinity60/led.c +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> -Copyright 2017 jpetermans <tibcmhhm@gmail.com> - -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 <hal.h> - -#include "led.h" - -#include "led_controller.h" - -/* WARNING! This function needs to be callable from - * both regular threads and ISRs, unlocked (during resume-from-sleep). - * In particular, I2C functions (interrupt-driven) should NOT be called from here. - */ -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - msg_t msg; - - if (led_state.num_lock) { - chSysUnconditionalLock(); - msg=(1 << 8) | TOGGLE_NUM_LOCK; - chMBPostI(&led_mailbox, msg); - chSysUnconditionalUnlock(); - } else { - chSysUnconditionalLock(); - msg=(0 << 8) | TOGGLE_NUM_LOCK; - chMBPostI(&led_mailbox, msg); - chSysUnconditionalUnlock(); - } - if (led_state.caps_lock) { - chSysUnconditionalLock(); - msg=(1 << 8) | TOGGLE_CAPS_LOCK; - chMBPostI(&led_mailbox, msg); - chSysUnconditionalUnlock(); - } else { - chSysUnconditionalLock(); - msg=(0 << 8) | TOGGLE_CAPS_LOCK; - chMBPostI(&led_mailbox, msg); - chSysUnconditionalUnlock(); - } - } - return false; -} diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h new file mode 100644 index 0000000000..b783ce0287 --- /dev/null +++ b/keyboards/input_club/infinity60/led/config.h @@ -0,0 +1,15 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define LED_MATRIX_LED_COUNT 63 + +#define IS31FL3731_DRIVER_COUNT 1 +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND + +#define I2C1_CLOCK_SPEED 400000 +#define I2C1_SCL_PIN B0 +#define I2C1_SDA_PIN B1 +#define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2 +#define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2 diff --git a/keyboards/input_club/infinity60/led/halconf.h b/keyboards/input_club/infinity60/led/halconf.h new file mode 100644 index 0000000000..50c7d00001 --- /dev/null +++ b/keyboards/input_club/infinity60/led/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_I2C TRUE + +#include_next <halconf.h> diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/info.json index 7a9b924a71..f16554d245 100644 --- a/keyboards/input_club/infinity60/led/info.json +++ b/keyboards/input_club/infinity60/led/info.json @@ -3,5 +3,97 @@ "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0"], "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "features": { + "led_matrix": true + }, + "led_matrix": { + "driver": "is31fl3731", + "animations": { + "breathing": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "solid_splash": true, + "solid_multisplash": true, + "wave_left_right": true, + "wave_up_down": true + }, + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 144, "y": 0, "flags": 4}, + {"matrix": [1, 1], "x": 160, "y": 0, "flags": 4}, + {"matrix": [1, 2], "x": 176, "y": 0, "flags": 4}, + {"matrix": [1, 3], "x": 192, "y": 0, "flags": 4}, + {"matrix": [1, 4], "x": 208, "y": 0, "flags": 1}, + {"matrix": [1, 5], "x": 224, "y": 0, "flags": 1}, + + {"matrix": [1, 6], "x": 0, "y": 16, "flags": 1}, + {"matrix": [1, 7], "x": 17, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 35, "y": 16, "flags": 4}, + {"matrix": [2, 0], "x": 52, "y": 16, "flags": 4}, + {"matrix": [2, 1], "x": 69, "y": 16, "flags": 4}, + {"matrix": [2, 2], "x": 86, "y": 16, "flags": 4}, + {"matrix": [2, 3], "x": 103, "y": 16, "flags": 4}, + {"matrix": [2, 4], "x": 121, "y": 16, "flags": 4}, + {"matrix": [2, 5], "x": 138, "y": 16, "flags": 4}, + {"matrix": [2, 6], "x": 155, "y": 16, "flags": 4}, + {"matrix": [2, 7], "x": 172, "y": 16, "flags": 4}, + {"matrix": [2, 8], "x": 190, "y": 16, "flags": 4}, + {"matrix": [3, 0], "x": 207, "y": 16, "flags": 4}, + {"matrix": [3, 1], "x": 224, "y": 16, "flags": 4}, + + {"matrix": [3, 2], "x": 0, "y": 32, "flags": 9}, + {"matrix": [3, 3], "x": 19, "y": 32, "flags": 4}, + {"matrix": [3, 4], "x": 37, "y": 32, "flags": 4}, + {"matrix": [3, 5], "x": 56, "y": 32, "flags": 4}, + {"matrix": [3, 6], "x": 75, "y": 32, "flags": 4}, + {"matrix": [3, 7], "x": 93, "y": 32, "flags": 4}, + {"matrix": [3, 8], "x": 112, "y": 32, "flags": 4}, + {"matrix": [4, 0], "x": 131, "y": 32, "flags": 4}, + {"matrix": [4, 1], "x": 149, "y": 32, "flags": 4}, + {"matrix": [4, 2], "x": 168, "y": 32, "flags": 4}, + {"matrix": [4, 3], "x": 187, "y": 32, "flags": 4}, + {"matrix": [4, 4], "x": 205, "y": 32, "flags": 4}, + {"matrix": [4, 5], "x": 224, "y": 32, "flags": 1}, + + {"matrix": [4, 6], "x": 0, "y": 48, "flags": 1}, + {"matrix": [4, 7], "x": 19, "y": 48, "flags": 4}, + {"matrix": [4, 8], "x": 37, "y": 48, "flags": 4}, + {"matrix": [5, 0], "x": 56, "y": 48, "flags": 4}, + {"matrix": [5, 1], "x": 75, "y": 48, "flags": 4}, + {"matrix": [5, 2], "x": 93, "y": 48, "flags": 4}, + {"matrix": [5, 3], "x": 112, "y": 48, "flags": 4}, + {"matrix": [5, 4], "x": 131, "y": 48, "flags": 4}, + {"matrix": [5, 5], "x": 149, "y": 48, "flags": 4}, + {"matrix": [5, 6], "x": 168, "y": 48, "flags": 4}, + {"matrix": [5, 7], "x": 187, "y": 48, "flags": 4}, + {"matrix": [5, 8], "x": 205, "y": 48, "flags": 1}, + {"matrix": [6, 0], "x": 224, "y": 48, "flags": 1}, + + {"matrix": [6, 1], "x": 0, "y": 64, "flags": 1}, + {"matrix": [6, 2], "x": 32, "y": 64, "flags": 1}, + {"matrix": [6, 3], "x": 64, "y": 64, "flags": 1}, + {"matrix": [6, 4], "x": 96, "y": 64, "flags": 4}, + {"matrix": [6, 5], "x": 128, "y": 64, "flags": 1}, + {"matrix": [6, 6], "x": 160, "y": 64, "flags": 1}, + {"matrix": [6, 7], "x": 192, "y": 64, "flags": 1}, + {"matrix": [6, 8], "x": 224, "y": 64, "flags": 1} + ] + } } diff --git a/keyboards/input_club/infinity60/led/led.c b/keyboards/input_club/infinity60/led/led.c new file mode 100644 index 0000000000..a6a63e202d --- /dev/null +++ b/keyboards/input_club/infinity60/led/led.c @@ -0,0 +1,83 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +#ifdef LED_MATRIX_ENABLE +const is31fl3731_led_t g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | LED address + * | | */ + {0, C1_1}, // LED1 + {0, C1_2}, // LED2 + {0, C1_3}, // LED3 + {0, C1_4}, // LED4 + {0, C1_5}, // LED5 + {0, C1_6}, // LED6 + {0, C1_7}, // LED7 + {0, C1_8}, // LED8 + + {0, C2_1}, // LED9 + {0, C2_2}, // LED10 + {0, C2_3}, // LED11 + {0, C2_4}, // LED12 + {0, C2_5}, // LED13 + {0, C2_6}, // LED14/114 + {0, C2_7}, // LED15 + {0, C2_8}, // LED16 + + {0, C3_1}, // LED17 + {0, C3_2}, // LED18 + {0, C3_3}, // LED19 + {0, C3_4}, // LED20 + {0, C3_5}, // LED21 + {0, C3_6}, // LED22 + {0, C3_7}, // LED23 + {0, C3_8}, // LED24 + + {0, C4_1}, // LED25 + {0, C4_2}, // LED26 + {0, C4_3}, // LED27 + {0, C4_4}, // LED28 + {0, C4_5}, // LED29 + {0, C4_6}, // LED30 + {0, C4_7}, // LED31 + {0, C4_8}, // LED32 + + {0, C5_1}, // LED33 + {0, C5_2}, // LED34 + {0, C5_3}, // LED35 + {0, C5_4}, // LED36 + {0, C5_5}, // LED37 + {0, C5_6}, // LED38 + {0, C5_7}, // LED39 + {0, C5_8}, // LED40 + + {0, C6_1}, // LED41 + {0, C6_2}, // LED42 + {0, C6_3}, // LED43 + {0, C6_4}, // LED44 + {0, C6_5}, // LED45 + {0, C6_6}, // LED46 + {0, C6_7}, // LED47 + {0, C6_8}, // LED48 + + {0, C7_1}, // LED49 + {0, C7_2}, // LED50 + {0, C7_3}, // LED51 + {0, C7_4}, // LED52 + {0, C7_5}, // LED53 + {0, C7_6}, // LED54/154 + {0, C7_7}, // LED55 + {0, C7_8}, // LED56/156 + + {0, C8_1}, // LED57/157 + {0, C8_2}, // LED58/158 + {0, C8_3}, // LED59/159 + {0, C8_4}, // LED60/160 + {0, C8_5}, // LED61/161 + {0, C8_6}, // LED62/162 + {0, C8_7} // LED63/163 +}; +#endif diff --git a/keyboards/input_club/infinity60/led/rules.mk b/keyboards/input_club/infinity60/led/rules.mk index d48f3b73a5..e69de29bb2 100644 --- a/keyboards/input_club/infinity60/led/rules.mk +++ b/keyboards/input_club/infinity60/led/rules.mk @@ -1,3 +0,0 @@ -# project specific files -SRC += led.c \ - led_controller.c
\ No newline at end of file diff --git a/keyboards/input_club/infinity60/led_controller.c b/keyboards/input_club/infinity60/led_controller.c deleted file mode 100644 index 5ea0ae804c..0000000000 --- a/keyboards/input_club/infinity60/led_controller.c +++ /dev/null @@ -1,488 +0,0 @@ -/* -Copyright 2016 flabbergast <s3+flabbergast@sdfeu.org> -Copyright 2017 jpetermans <tibcmhhm@gmail.com> - -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/>. -*/ - -/* - * LED controller code - * IS31FL3731C matrix LED driver from ISSI - * datasheet: http://www.issi.com/WW/pdf/31FL3731C.pdf - */ - -#include <ch.h> -#include <hal.h> -#include "print.h" -#include "led.h" -#include "host.h" - -#include "led_controller.h" - -#include "suspend.h" - -#include "usb_main.h" - -/* Infinity60 LED MAP - - digits mean "row" and "col", i.e. 45 means C4-5 in the IS31 datasheet, matrix A - - 11 12 13 14 15 16 17 18 21 22 23 24 25 26 27* - 28 31 32 33 34 35 36 37 38 41 42 43 44 45 - 46 47 48 51 52 53 54 55 56 57 58 61 62 - 63 64 65 66 67 68 71 72 73 74 75 76 77* - 78 81 82 83 84 85 86 87 - -*Unused in Alphabet Layout -*/ - -/* - each page has 0xB4 bytes - 0 - 0x11: LED control (on/off): - order: CA1, CB1, CA2, CB2, .... (CA - matrix A, CB - matrix B) - CAn controls Cn-8 .. Cn-1 (LSbit) - 0x12 - 0x23: blink control (like "LED control") - 0x24 - 0xB3: PWM control: byte per LED, 0xFF max on - order same as above (CA 1st row (8bytes), CB 1st row (8bytes), ...) -*/ - -// Which LED should be used for CAPS LOCK indicator -#if !defined(CAPS_LOCK_LED_ADDRESS) -#define CAPS_LOCK_LED_ADDRESS 46 -#endif - -#if !defined(NUM_LOCK_LED_ADDRESS) -#define NUM_LOCK_LED_ADDRESS 85 -#endif - -/* Which LED should breathe during sleep */ -#if !defined(BREATHE_LED_ADDRESS) -#define BREATHE_LED_ADDRESS CAPS_LOCK_LED_ADDRESS -#endif - -/* ================= - * ChibiOS I2C setup - * ================= */ -static const I2CConfig i2ccfg = { - 400000 // clock speed (Hz); 400kHz max for IS31 -}; - -/* ============== - * variables - * ============== */ -// internal communication buffers -uint8_t tx[2] __attribute__((aligned(2))); -uint8_t rx[1] __attribute__((aligned(2))); - -// buffer for sending the whole page at once (used also as a temp buffer) -uint8_t full_page[0xB4+1] = {0}; - -// LED mask (which LEDs are present, selected by bits) -// IC60 pcb uses only CA matrix. -// Each byte is a control pin for 8 leds ordered 8-1 -const uint8_t all_on_leds_mask[0x12] = { - 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, - 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x7F, 0x00, 0x00, 0x00 -}; - -// array to hold brightness pwm steps -const uint8_t pwm_levels[5] = { - 0x00, 0x16, 0x4E, 0xA1, 0xFF -}; - -// array to write to pwm register -uint8_t pwm_register_array[9] = {0}; - - -/* ============================ - * communication functions - * ============================ */ -msg_t is31_select_page(uint8_t page) { - tx[0] = IS31_COMMANDREGISTER; - tx[1] = page; - return i2cMasterTransmitTimeout(&I2CD1, IS31_ADDR_DEFAULT, tx, 2, NULL, 0, TIME_US2I(IS31_TIMEOUT)); -} - -msg_t is31_write_data(uint8_t page, uint8_t *buffer, uint8_t size) { - is31_select_page(page); - return i2cMasterTransmitTimeout(&I2CD1, IS31_ADDR_DEFAULT, buffer, size, NULL, 0, TIME_US2I(IS31_TIMEOUT)); -} - -msg_t is31_write_register(uint8_t page, uint8_t reg, uint8_t data) { - is31_select_page(page); - tx[0] = reg; - tx[1] = data; - return i2cMasterTransmitTimeout(&I2CD1, IS31_ADDR_DEFAULT, tx, 2, NULL, 0, TIME_US2I(IS31_TIMEOUT)); -} - -msg_t is31_read_register(uint8_t page, uint8_t reg, uint8_t *result) { - is31_select_page(page); - - tx[0] = reg; - return i2cMasterTransmitTimeout(&I2CD1, IS31_ADDR_DEFAULT, tx, 1, result, 1, TIME_US2I(IS31_TIMEOUT)); -} - -/* ======================== - * initialise the IS31 chip - * ======================== */ -void is31_init(void) { - // just to be sure that it's all zeroes - __builtin_memset(full_page,0,0xB4+1); - // zero function page, all registers (assuming full_page is all zeroes) - is31_write_data(IS31_FUNCTIONREG, full_page, 0xD + 1); - // disable hardware shutdown - palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL); - palSetPad(GPIOB, 16); - chThdSleepMilliseconds(10); - // software shutdown - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON); - chThdSleepMilliseconds(10); - // zero function page, all registers - is31_write_data(IS31_FUNCTIONREG, full_page, 0xD + 1); - chThdSleepMilliseconds(10); - // software shutdown disable (i.e. turn stuff on) - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF); - chThdSleepMilliseconds(10); - // zero all LED registers on all 8 pages - uint8_t i; - for(i=0; i<8; i++) { - is31_write_data(i, full_page, 0xB4 + 1); - chThdSleepMilliseconds(5); - } -} - -/* ================== - * LED control thread - * ================== */ -#define LED_MAILBOX_NUM_MSGS 5 -static msg_t led_mailbox_queue[LED_MAILBOX_NUM_MSGS]; -mailbox_t led_mailbox; -static THD_WORKING_AREA(waLEDthread, 256); -static THD_FUNCTION(LEDthread, arg) { - (void)arg; - chRegSetThreadName("LEDthread"); - - uint8_t i; - uint8_t control_register_word[2] = {0};//2 bytes: register address, byte to write - uint8_t led_control_reg[0x13] = {0};//led control register start address + 0x12 bytes - - //persistent status variables - uint8_t pwm_step_status, page_status, capslock_status, numlock_status; - - //mailbox variables - uint8_t temp, msg_type; - uint8_t msg_args[3]; - msg_t msg; - - // initialize persistent variables - pwm_step_status = 4; //full brightness - page_status = 0; //start frame 0 (all off/on) - led_t led_state = host_keyboard_led_state(); - numlock_status = led_state.num_lock ? 1 : 0; - capslock_status = led_state.caps_lock ? 1 : 0; - - while(true) { - // wait for a message (asynchronous) - // (messages are queued (up to LED_MAILBOX_NUM_MSGS) if they can't - // be processed right away - chMBFetchTimeout(&led_mailbox, &msg, TIME_INFINITE); - msg_type = msg & 0xFF; //first byte is action information - msg_args[0] = (msg >> 8) & 0xFF; - msg_args[1] = (msg >> 16) & 0XFF; - msg_args[2] = (msg >> 24) & 0xFF; - - - switch (msg_type){ - case SET_FULL_ROW: - //write full byte to pin address, msg_args[1] = pin #, msg_args[0] = 8 bits to write - //writes only to currently displayed page - write_led_byte(page_status, msg_args[1], msg_args[0]); - break; - - case OFF_LED: - //on/off/toggle single led, msg_args[0] = row/col of led, msg_args[1] = page - set_led_bit(msg_args[1], control_register_word, msg_args[0], 0); - break; - case ON_LED: - set_led_bit(msg_args[1], control_register_word, msg_args[0], 1); - break; - case TOGGLE_LED: - set_led_bit(msg_args[1], control_register_word, msg_args[0], 2); - break; - - case BLINK_OFF_LED: - //on/off/toggle single led, msg_args[0] = row/col of led - set_led_bit(msg_args[1], control_register_word, msg_args[0], 4); - break; - case BLINK_ON_LED: - set_led_bit(msg_args[1], control_register_word, msg_args[0], 5); - break; - case BLINK_TOGGLE_LED: - set_led_bit(msg_args[1], control_register_word, msg_args[0], 6); - break; - - case TOGGLE_ALL: - //turn on/off all leds, msg_args = unused - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON); - chThdSleepMilliseconds(5); - is31_read_register(0, 0x00, &temp); - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF); - - led_control_reg[0] = 0; - - //toggle led mask based on current state (temp) - if (temp==0 || page_status > 0) { - __builtin_memcpy(led_control_reg+1, all_on_leds_mask, 0x12); - } else { - __builtin_memset(led_control_reg+1, 0, 0x12); - } - is31_write_data(0, led_control_reg, 0x13); - - if (page_status > 0) { - is31_write_register(IS31_FUNCTIONREG, IS31_REG_PICTDISP, 0); - - page_status=0; - - //maintain lock leds, reset to off and force recheck to blink of all leds toggled on - numlock_status = 0; - capslock_status = 0; - led_set(host_keyboard_leds()); - } - break; - - case TOGGLE_BACKLIGHT: - //msg_args[0] = on/off - - //populate 9 byte rows to be written to each pin, first byte is register (pin) address - if (msg_args[0] == 1) { - __builtin_memset(pwm_register_array+1, pwm_levels[pwm_step_status], 8); - } else { - __builtin_memset(pwm_register_array+1, 0, 8); - } - - for(i=0; i<8; i++) { - //first byte is register address, every 0x10 9 bytes is A-matrix pwm pins - pwm_register_array[0] = 0x24 + (i * 0x10); - is31_write_data(0,pwm_register_array,9); - } - break; - - case DISPLAY_PAGE: - //msg_args[0] = page to toggle on - if (page_status != msg_args[0]) { - is31_write_register(IS31_FUNCTIONREG, IS31_REG_PICTDISP, msg_args[0]); - page_status = msg_args[0]; - - //maintain lock leds, reset to off and force recheck for new page - numlock_status = 0; - capslock_status = 0; - led_set(host_keyboard_leds()); - } - break; - - case RESET_PAGE: - //led_args[0] = page to reset - led_control_reg[0] = 0; - __builtin_memset(led_control_reg+1, 0, 0x12); - is31_write_data(msg_args[0], led_control_reg, 0x13); - - //repeat for blink register - led_control_reg[0] = 0x12; - is31_write_data(msg_args[0], led_control_reg, 0x13); - break; - - case TOGGLE_NUM_LOCK: - //msg_args[0] = 0 or 1, off/on - if (numlock_status != msg_args[0]) { - set_lock_leds(NUM_LOCK_LED_ADDRESS, msg_args[0], page_status); - numlock_status = msg_args[0]; - } - break; - case TOGGLE_CAPS_LOCK: - //msg_args[0] = 0 or 1, off/on - if (capslock_status != msg_args[0]) { - set_lock_leds(CAPS_LOCK_LED_ADDRESS, msg_args[0], page_status); - capslock_status = msg_args[0]; - } - break; - - case STEP_BRIGHTNESS: - //led_args[0] = step up (1) or down (0) - switch (msg_args[0]) { - case 0: - if (pwm_step_status == 0) { - pwm_step_status = 4; - } else { - pwm_step_status--; - } - break; - - case 1: - if (pwm_step_status == 4) { - pwm_step_status = 0; - } else { - pwm_step_status++; - } - break; - } - - //populate 8 byte arrays to write on each pin - //first byte is register address, every 0x10 9 bytes are A-matrix pwm pins - __builtin_memset(pwm_register_array+1, pwm_levels[pwm_step_status], 8); - - for(i=0; i<8; i++) { - pwm_register_array[0] = 0x24 + (i * 0x10); - is31_write_data(0,pwm_register_array,9); - } - break; - } - } -} - -/* ============================== - * led processing functions - * ============================== */ - -void set_led_bit (uint8_t page, uint8_t *led_control_word, uint8_t led_addr, uint8_t action) { - //returns 2 bytes: led control register address and byte to write - //action: 0 - off, 1 - on, 2 - toggle, 4 - blink on, 5 - blink off, 6 - toggle blink - - uint8_t control_reg_addr, column_bit, column_byte, temp, blink_bit; - - //check for valid led address - if (led_addr < 0 || led_addr > 87 || led_addr % 10 > 8) { - return; - } - - blink_bit = action>>2;//check for blink bit - action &= ~(1<<2); //strip blink bit - - //led_addr tens column is pin#, ones column is bit position in 8-bit mask - control_reg_addr = ((led_addr / 10) % 10 - 1 ) * 0x02;// A-matrix is every other byte - control_reg_addr += blink_bit == 1 ? 0x12 : 0x00;//if blink_bit, shift 12 bytes to blink register - - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON); - chThdSleepMilliseconds(5); - is31_read_register(page, control_reg_addr, &temp);//maintain status of leds on this byte - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF); - - column_bit = 1<<(led_addr % 10 - 1); - column_byte = temp; - - switch(action) { - case 0: - column_byte &= ~column_bit; - break; - case 1: - column_byte |= column_bit; - break; - case 2: - column_byte ^= column_bit; - break; - } - - //return word to be written in register - led_control_word[0] = control_reg_addr; - led_control_word[1] = column_byte; - is31_write_data (page, led_control_word, 0x02); -} - -void write_led_byte (uint8_t page, uint8_t row, uint8_t led_byte) { - uint8_t led_control_word[2] = {0};//register address and on/off byte - - led_control_word[0] = (row - 1 ) * 0x02;// A-matrix is every other byte - led_control_word[1] = led_byte; - is31_write_data(page, led_control_word, 0x02); -} - -void write_led_page (uint8_t page, uint8_t *user_led_array, uint8_t led_count) { - uint8_t i; - uint8_t pin, col; - uint8_t led_control_register[0x13] = {0}; - - __builtin_memset(led_control_register,0,13); - - for(i=0;i<led_count;i++){ - //shift pin by 1 for led register 0x00 address - pin = ((user_led_array[i] / 10) % 10 - 1 ) * 2 + 1; - col = user_led_array[i] % 10 - 1; - led_control_register[pin] |= 1<<(col); - } - - is31_write_data(page, led_control_register, 0x13); -} - -void set_lock_leds(uint8_t led_addr, uint8_t led_action, uint8_t page) { - uint8_t temp; - uint8_t led_control_word[2] = {0}; - - //blink if all leds are on - if (page == 0) { - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON); - chThdSleepMilliseconds(5); - is31_read_register(0, 0x00, &temp); - is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF); - - if (temp == 0xFF) { - led_action |= (1<<2); //set blink bit - } - } - - set_led_bit(page,led_control_word,led_addr,led_action); -} - -/* ===================== - * hook into user keymap - * ===================== */ -void led_controller_init(void) { - uint8_t i; - - /* initialise I2C */ - /* I2C pins */ - palSetPadMode(GPIOB, 0, PAL_MODE_ALTERNATIVE_2); // PTB0/I2C0/SCL - palSetPadMode(GPIOB, 1, PAL_MODE_ALTERNATIVE_2); // PTB1/I2C0/SDA - /* start I2C */ - i2cStart(&I2CD1, &i2ccfg); - // try high drive (from kiibohd) - I2CD1.i2c->C2 |= I2Cx_C2_HDRS; - // try glitch fixing (from kiibohd) - I2CD1.i2c->FLT = 4; - - chThdSleepMilliseconds(10); - - /* initialise IS31 chip */ - is31_init(); - - //set Display Option Register so all pwm intensity is controlled from page 0 - //enable blink and set blink period to 0.27s x rate - is31_write_register(IS31_FUNCTIONREG, IS31_REG_DISPLAYOPT, IS31_REG_DISPLAYOPT_INTENSITY_SAME + IS31_REG_DISPLAYOPT_BLINK_ENABLE + 4); - - /* set full pwm on page 1 */ - pwm_register_array[0] = 0; - __builtin_memset(pwm_register_array+1, 0xFF, 8); - for(i=0; i<8; i++) { - pwm_register_array[0] = 0x24 + (i * 0x10);//first byte of 9 bytes must be register address - is31_write_data(0, pwm_register_array, 9); - chThdSleepMilliseconds(5); - } - - /* enable breathing when the displayed page changes */ - // Fade-in Fade-out, time = 26ms * 2^N, N=3 - is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL1, (3<<4)|3); - is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL2, IS31_REG_BREATHCTRL2_ENABLE|3); - - /* more time consuming LED processing should be offloaded into - * a thread, with asynchronous messaging. */ - chMBObjectInit(&led_mailbox, led_mailbox_queue, LED_MAILBOX_NUM_MSGS); - chThdCreateStatic(waLEDthread, sizeof(waLEDthread), LOWPRIO, LEDthread, NULL); -} diff --git a/keyboards/input_club/infinity60/led_controller.h b/keyboards/input_club/infinity60/led_controller.h deleted file mode 100644 index e4b4717646..0000000000 --- a/keyboards/input_club/infinity60/led_controller.h +++ /dev/null @@ -1,121 +0,0 @@ -/* -Copyright 2016 flabbergast <s3+flabbergast@sdfeu.org> -Copyright 2017 jpetermans <tibcmhhm@gmail.com> - -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/>. -*/ - -#ifndef _LED_CONTROLLER_H_ -#define _LED_CONTROLLER_H_ - -/* ========================= - * communication functions - * ========================= */ - -msg_t is31_write_data(uint8_t page, uint8_t *buffer, uint8_t size); -msg_t is31_write_register(uint8_t page, uint8_t reg, uint8_t data); -msg_t is31_read_register(uint8_t page, uint8_t reg, uint8_t *result); - -/* ============================ - * init functions/definitions - * ============================*/ - -void led_controller_init(void); - -#define CAPS_LOCK_LED_ADDRESS 46 //pin matrix location -#define NUM_LOCK_LED_ADDRESS 85 - -/* ============================= - * IS31 chip related definitions - * ============================= */ - -#define IS31_ADDR_DEFAULT 0x74 - -#define IS31_REG_CONFIG 0x00 -// bits in reg -#define IS31_REG_CONFIG_PICTUREMODE 0x00 -#define IS31_REG_CONFIG_AUTOPLAYMODE 0x08 -#define IS31_REG_CONFIG_AUDIOPLAYMODE 0x18 -// D2:D0 bits are starting frame for autoplay mode - -#define IS31_REG_PICTDISP 0x01 // D2:D0 frame select for picture mode - -#define IS31_REG_AUTOPLAYCTRL1 0x02 -// D6:D4 number of loops (000=infty) -// D2:D0 number of frames to be used - -#define IS31_REG_AUTOPLAYCTRL2 0x03 // D5:D0 delay time (*11ms) - -#define IS31_REG_DISPLAYOPT 0x05 -#define IS31_REG_DISPLAYOPT_INTENSITY_SAME 0x20 // same intensity for all frames -#define IS31_REG_DISPLAYOPT_BLINK_ENABLE 0x08 -// D2:D0 bits blink period time (*0.27s) - -#define IS31_REG_AUDIOSYNC 0x06 -#define IS31_REG_AUDIOSYNC_ENABLE 0x1 - -#define IS31_REG_FRAMESTATE 0x07 - -#define IS31_REG_BREATHCTRL1 0x08 -// D6:D4 fade out time (26ms*2^i) -// D2:D0 fade in time (26ms*2^i) - -#define IS31_REG_BREATHCTRL2 0x09 -#define IS31_REG_BREATHCTRL2_ENABLE 0x10 -// D2:D0 extinguish time (3.5ms*2^i) - -#define IS31_REG_SHUTDOWN 0x0A -#define IS31_REG_SHUTDOWN_OFF 0x1 -#define IS31_REG_SHUTDOWN_ON 0x0 - -#define IS31_REG_AGCCTRL 0x0B -#define IS31_REG_ADCRATE 0x0C - -#define IS31_COMMANDREGISTER 0xFD -#define IS31_FUNCTIONREG 0x0B // helpfully called 'page nine' - -#define IS31_TIMEOUT 10000 // needs to be long enough to write a whole page - -/* ======================================== - * LED Thread related items - * ========================================*/ - -extern mailbox_t led_mailbox; - -void set_led_bit (uint8_t page, uint8_t *led_control_reg, uint8_t led_addr, uint8_t action); -void set_lock_leds (uint8_t led_addr, uint8_t led_action, uint8_t page); -void write_led_byte (uint8_t page, uint8_t row, uint8_t led_byte); -void write_led_page (uint8_t page, uint8_t *led_array, uint8_t led_count); - -// constants for signaling the LED controller thread -enum led_msg_t { - KEY_LIGHT, - SET_FULL_ROW, - OFF_LED, - ON_LED, - TOGGLE_LED, - BLINK_OFF_LED, - BLINK_ON_LED, - BLINK_TOGGLE_LED, - TOGGLE_ALL, - TOGGLE_BACKLIGHT, - DISPLAY_PAGE, - RESET_PAGE, - TOGGLE_NUM_LOCK, - TOGGLE_CAPS_LOCK, - TOGGLE_BREATH, - STEP_BRIGHTNESS -}; - -#endif /* _LED_CONTROLLER_H_ */ diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h index 2a4c7d057c..c188038a82 100644 --- a/keyboards/input_club/k_type/config.h +++ b/keyboards/input_club/k_type/config.h @@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_ONESHOT #ifdef RGB_MATRIX_ENABLE -//#include "gpio.h" // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects @@ -103,10 +102,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # 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 0b1010000 -# define DRIVER_COUNT 2 +# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND +# define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND +# define IS31FL3733_DRIVER_COUNT 2 +# define IS31FL3733_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) # define DRIVER_1_LED_TOTAL 64 # define DRIVER_2_LED_TOTAL 55 -# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +# define RGB_MATRIX_LED_COUNT IS31FL3733_LED_COUNT #endif diff --git a/keyboards/input_club/k_type/i2c_master.h b/keyboards/input_club/k_type/i2c_master.h index d4e9d6878f..db4f12e43c 100644 --- a/keyboards/input_club/k_type/i2c_master.h +++ b/keyboards/input_club/k_type/i2c_master.h @@ -26,6 +26,7 @@ #include <ch.h> #include <hal.h> +#include "gpio.h" #ifndef I2C_COUNT # define I2C_COUNT 1 diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c index 2dec2b0a26..d9cf3b5170 100644 --- a/keyboards/input_club/k_type/is31fl3733-dual.c +++ b/keyboards/input_club/k_type/is31fl3733-dual.c @@ -16,46 +16,64 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef RGB_MATRIX_ENABLE - #include "is31fl3733-dual.h" #include "i2c_master.h" #include "wait.h" -// This is a 7-bit address, that gets left-shifted and bit 0 -// set to 0 for write, 1 for read (as per I2C protocol) -// The address will vary depending on your wiring: -// 00 <-> GND -// 01 <-> SCL -// 10 <-> SDA -// 11 <-> VCC -// ADDR1 represents A1:A0 of the 7-bit address. -// ADDR2 represents A3:A2 of the 7-bit address. -// The result is: 0b101(ADDR2)(ADDR1) -#define ISSI_ADDR_DEFAULT 0x50 - -#define ISSI_COMMANDREGISTER 0xFD -#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE -#define ISSI_INTERRUPTMASKREGISTER 0xF0 -#define ISSI_INTERRUPTSTATUSREGISTER 0xF1 - -#define ISSI_PAGE_LEDCONTROL 0x00 // PG0 -#define ISSI_PAGE_PWM 0x01 // PG1 -#define ISSI_PAGE_AUTOBREATH 0x02 // PG2 -#define ISSI_PAGE_FUNCTION 0x03 // PG3 - -#define ISSI_REG_CONFIGURATION 0x00 // PG3 -#define ISSI_REG_GLOBALCURRENT 0x01 // PG3 -#define ISSI_REG_RESET 0x11 // PG3 -#define ISSI_REG_SWPULLUP 0x0F // PG3 -#define ISSI_REG_CSPULLUP 0x10 // PG3 - -#ifndef ISSI_TIMEOUT -# define ISSI_TIMEOUT 5000 +#define IS31FL3733_COMMANDREGISTER 0xFD +#define IS31FL3733_COMMANDREGISTER_WRITELOCK 0xFE +#define IS31FL3733_INTERRUPTMASKREGISTER 0xF0 +#define IS31FL3733_INTERRUPTSTATUSREGISTER 0xF1 + +#define IS31FL3733_PAGE_LEDCONTROL 0x00 // PG0 +#define IS31FL3733_PAGE_PWM 0x01 // PG1 +#define IS31FL3733_PAGE_AUTOBREATH 0x02 // PG2 +#define IS31FL3733_PAGE_FUNCTION 0x03 // PG3 + +#define IS31FL3733_REG_CONFIGURATION 0x00 // PG3 +#define IS31FL3733_REG_GLOBALCURRENT 0x01 // PG3 +#define IS31FL3733_REG_RESET 0x11 // PG3 +#define IS31FL3733_REG_SWPULLUP 0x0F // PG3 +#define IS31FL3733_REG_CSPULLUP 0x10 // PG3 + +#define IS31FL3733_PWM_REGISTER_COUNT 192 +#define IS31FL3733_LED_CONTROL_REGISTER_COUNT 24 + +#ifndef IS31FL3733_I2C_TIMEOUT +# define IS31FL3733_I2C_TIMEOUT 100 +#endif + +#ifndef IS31FL3733_I2C_PERSISTENCE +# define IS31FL3733_I2C_PERSISTENCE 0 +#endif + +#ifndef IS31FL3733_PWM_FREQUENCY +# define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_8K4_HZ // PFS - IS31FL3733B only #endif -#ifndef ISSI_PERSISTENCE -# define ISSI_PERSISTENCE 0 +#ifndef IS31FL3733_SWPULLUP +# define IS31FL3733_SWPULLUP IS31FL3733_PUR_0R +#endif + +#ifndef IS31FL3733_CSPULLUP +# define IS31FL3733_CSPULLUP IS31FL3733_PUR_0R +#endif + +#ifndef IS31FL3733_GLOBALCURRENT +# define IS31FL3733_GLOBALCURRENT 0xFF +#endif + +#ifndef IS31FL3733_SYNC_1 +# define IS31FL3733_SYNC_1 IS31FL3733_SYNC_NONE +#endif +#ifndef IS31FL3733_SYNC_2 +# define IS31FL3733_SYNC_2 IS31FL3733_SYNC_NONE +#endif +#ifndef IS31FL3733_SYNC_3 +# define IS31FL3733_SYNC_3 IS31FL3733_SYNC_NONE +#endif +#ifndef IS31FL3733_SYNC_4 +# define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE #endif // Transfer buffer for TWITransmitData() @@ -67,25 +85,25 @@ uint8_t g_twi_transfer_buffer[20]; // We could optimize this and take out the unused registers from these // buffers and the transfers in is31fl3733_write_pwm_buffer() but it's // probably not worth the extra complexity. -uint8_t g_pwm_buffer[DRIVER_COUNT][192]; -bool g_pwm_buffer_update_required[DRIVER_COUNT] = {false}; +uint8_t g_pwm_buffer[IS31FL3733_DRIVER_COUNT][IS31FL3733_PWM_REGISTER_COUNT]; +bool g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false}; -uint8_t g_led_control_registers[DRIVER_COUNT][24] = {{0}, {0}}; -bool g_led_control_registers_update_required[DRIVER_COUNT] = {false}; +uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][IS31FL3733_LED_CONTROL_REGISTER_COUNT] = {0}; +bool g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT] = {false}; bool is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data) { // If the transaction fails function returns false. g_twi_transfer_buffer[0] = reg; g_twi_transfer_buffer[1] = data; -#if ISSI_PERSISTENCE > 0 - for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) { - if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 2, TIME_US2I(ISSI_TIMEOUT)) != 0) { +#if IS31FL3733_I2C_PERSISTENCE > 0 + for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) { + if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) { return false; } } #else - if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 2, TIME_US2I(ISSI_TIMEOUT)) != 0) { + if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) { return false; } #endif @@ -99,7 +117,7 @@ bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffe // g_twi_transfer_buffer[] is 20 bytes // Iterate over the pwm_buffer contents at 16 byte intervals. - for (int i = 0; i < 192; i += 16) { + for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) { g_twi_transfer_buffer[0] = i; // Copy the data from i to i+15. // Device will auto-increment register for data after the first byte @@ -108,14 +126,14 @@ bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffe g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j]; } -#if ISSI_PERSISTENCE > 0 - for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) { - if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 17, TIME_US2I(ISSI_TIMEOUT)) != 0) { +#if IS31FL3733_I2C_PERSISTENCE > 0 + for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) { + if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) { return false; } } #else - if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 17, TIME_US2I(ISSI_TIMEOUT)) != 0) { + if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) { return false; } #endif @@ -123,6 +141,24 @@ bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffe return true; } +void is31fl3733_init_drivers(void) { + i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN); + is31fl3733_init(0, IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_1); +# ifdef USE_I2C2 + i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN); + is31fl3733_init(1, IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_2); +# endif + + for (int i = 0; i < IS31FL3733_LED_COUNT; i++) { + is31fl3733_set_led_control_register(i, true, true, true); + } + + is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0); +# ifdef USE_I2C2 + is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_2, 1); +# endif +} + void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) { // In order to avoid the LEDs being driven with garbage data // in the LED driver's PWM registers, shutdown is enabled last. @@ -131,38 +167,52 @@ void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) { // Sync is passed so set it according to the datasheet. // Unlock the command register. - is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); + is31fl3733_write_register(bus, addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); + // Select PG0 - is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); + is31fl3733_write_register(bus, addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_LEDCONTROL); // Turn off all LEDs. - for (int i = 0x00; i <= 0x17; i++) { + for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) { is31fl3733_write_register(bus, addr, i, 0x00); } + // Unlock the command register. - is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); + is31fl3733_write_register(bus, addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); + // Select PG1 - is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); + is31fl3733_write_register(bus, addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_PWM); // Set PWM on all LEDs to 0 // No need to setup Breath registers to PWM as that is the default. - for (int i = 0x00; i <= 0xBF; i++) { + for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) { is31fl3733_write_register(bus, addr, i, 0x00); } + // Unlock the command register. - is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); + is31fl3733_write_register(bus, addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); + // Select PG3 - is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION); + is31fl3733_write_register(bus, addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_FUNCTION); + // Set de-ghost pull-up resistors (SWx) + is31fl3733_write_register(bus, addr, IS31FL3733_REG_SWPULLUP, IS31FL3733_SWPULLUP); + // Set de-ghost pull-down resistors (CSx) + is31fl3733_write_register(bus, addr, IS31FL3733_REG_CSPULLUP, IS31FL3733_CSPULLUP); // Set global current to maximum. - is31fl3733_write_register(bus, addr, ISSI_REG_GLOBALCURRENT, 0xFF); + is31fl3733_write_register(bus, addr, IS31FL3733_REG_GLOBALCURRENT, IS31FL3733_GLOBALCURRENT); // Disable software shutdown. - is31fl3733_write_register(bus, addr, ISSI_REG_CONFIGURATION, (sync << 6) | 0x01); + is31fl3733_write_register(bus, addr, IS31FL3733_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01); + // Wait 10ms to ensure the device has woken up. wait_ms(10); } void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { - if (index >= 0 && index < RGB_MATRIX_LED_COUNT) { - is31_led led = g_is31_leds[index]; + is31fl3733_led_t led; + if (index >= 0 && index < IS31FL3733_LED_COUNT) { + memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led)); + if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) { + return; + } g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.b] = blue; @@ -171,13 +221,14 @@ void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { } void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { - for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) { + for (int i = 0; i < IS31FL3733_LED_COUNT; i++) { is31fl3733_set_color(i, red, green, blue); } } void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { - is31_led led = g_is31_leds[index]; + is31fl3733_led_t led; + memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led)); uint8_t control_register_r = led.r / 8; uint8_t control_register_g = led.g / 8; @@ -208,8 +259,8 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) { if (g_pwm_buffer_update_required[index]) { // Firstly we need to unlock the command register and select PG1. - is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); - is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); + is31fl3733_write_register(index, addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); + is31fl3733_write_register(index, addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_PWM); // If any of the transactions fail we risk writing dirty PG0, // refresh page 0 just in case. @@ -223,14 +274,18 @@ void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) { void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) { if (g_led_control_registers_update_required[index]) { // Firstly we need to unlock the command register and select PG0 - is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); - is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); - for (int i = 0; i < 24; i++) { + is31fl3733_write_register(index, addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); + is31fl3733_write_register(index, addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_LEDCONTROL); + for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) { is31fl3733_write_register(index, addr, i, g_led_control_registers[index][i]); } } g_led_control_registers_update_required[index] = false; } - -#endif +void is31fl3733_flush(void) { + is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0); +# ifdef USE_I2C2 + is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_2, 1); +# endif +} diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h index 1becefbf93..696c234b67 100644 --- a/keyboards/input_club/k_type/is31fl3733-dual.h +++ b/keyboards/input_club/k_type/is31fl3733-dual.h @@ -22,15 +22,33 @@ #include <stdbool.h> #include "progmem.h" -typedef struct is31_led { +#define IS31FL3733_I2C_ADDRESS_GND_GND 0x50 +#define IS31FL3733_I2C_ADDRESS_GND_SCL 0x51 +#define IS31FL3733_I2C_ADDRESS_GND_SDA 0x52 +#define IS31FL3733_I2C_ADDRESS_GND_VCC 0x53 +#define IS31FL3733_I2C_ADDRESS_SCL_GND 0x54 +#define IS31FL3733_I2C_ADDRESS_SCL_SCL 0x55 +#define IS31FL3733_I2C_ADDRESS_SCL_SDA 0x56 +#define IS31FL3733_I2C_ADDRESS_SCL_VCC 0x57 +#define IS31FL3733_I2C_ADDRESS_SDA_GND 0x58 +#define IS31FL3733_I2C_ADDRESS_SDA_SCL 0x59 +#define IS31FL3733_I2C_ADDRESS_SDA_SDA 0x5A +#define IS31FL3733_I2C_ADDRESS_SDA_VCC 0x5B +#define IS31FL3733_I2C_ADDRESS_VCC_GND 0x5C +#define IS31FL3733_I2C_ADDRESS_VCC_SCL 0x5D +#define IS31FL3733_I2C_ADDRESS_VCC_SDA 0x5E +#define IS31FL3733_I2C_ADDRESS_VCC_VCC 0x5F + +typedef struct is31fl3733_led_t { uint8_t driver : 2; uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31_led; +} __attribute__((packed)) is31fl3733_led_t; -extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT]; +extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT]; +void is31fl3733_init_drivers(void); void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync); bool is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data); bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer); @@ -47,6 +65,26 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index); // index is the driver index void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index); +void is31fl3733_flush(void); + +#define IS31FL3733_PUR_0R 0x00 // No PUR resistor +#define IS31FL3733_PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL +#define IS31FL3733_PUR_3KR 0x03 // 3.0k Ohm resistor on all the time +#define IS31FL3733_PUR_4KR 0x04 // 4.0k Ohm resistor on all the time +#define IS31FL3733_PUR_8KR 0x05 // 8.0k Ohm resistor on all the time +#define IS31FL3733_PUR_16KR 0x06 // 16k Ohm resistor on all the time +#define IS31FL3733_PUR_32KR 0x07 // 32k Ohm resistor in t_NOL + +#define IS31FL3733_PWM_FREQUENCY_8K4_HZ 0x00 +#define IS31FL3733_PWM_FREQUENCY_4K2_HZ 0x01 +#define IS31FL3733_PWM_FREQUENCY_26K7_HZ 0x02 +#define IS31FL3733_PWM_FREQUENCY_2K1_HZ 0x03 +#define IS31FL3733_PWM_FREQUENCY_1K05_HZ 0x04 + +#define IS31FL3733_SYNC_NONE 0b00 +#define IS31FL3733_SYNC_MASTER 0b01 +#define IS31FL3733_SYNC_SLAVE 0b10 + #define A_1 0x00 #define A_2 0x01 #define A_3 0x02 diff --git a/keyboards/input_club/k_type/k_type-rgbdriver.c b/keyboards/input_club/k_type/k_type-rgbdriver.c index dc5d4abd67..e4d2d2d04b 100644 --- a/keyboards/input_club/k_type/k_type-rgbdriver.c +++ b/keyboards/input_club/k_type/k_type-rgbdriver.c @@ -15,42 +15,13 @@ */ #ifdef RGB_MATRIX_ENABLE - -#include "rgb_matrix.h" -#include "i2c_master.h" -#include "is31fl3733-dual.h" -#include "gpio.h" - -static void init(void) { - i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN); - is31fl3733_init(0, DRIVER_ADDR_1, 0); -# ifdef USE_I2C2 - i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN); - is31fl3733_init(1, DRIVER_ADDR_2, 0); -# endif - for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) { - bool enabled = true; - // This only caches it for later - is31fl3733_set_led_control_register(index, enabled, enabled, enabled); - } - is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0); -# ifdef USE_I2C2 - is31fl3733_update_led_control_registers(DRIVER_ADDR_2, 1); -# endif -} - -static void flush(void) { - is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0); -# ifdef USE_I2C2 - is31fl3733_update_pwm_buffers(DRIVER_ADDR_2, 1); -# endif -} +# include "rgb_matrix.h" +# include "is31fl3733-dual.h" const rgb_matrix_driver_t rgb_matrix_driver = { - .init = init, - .flush = flush, + .init = is31fl3733_init_drivers, + .flush = is31fl3733_flush, .set_color = is31fl3733_set_color, .set_color_all = is31fl3733_set_color_all, }; - #endif diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c index 23a3895408..e97007fc70 100644 --- a/keyboards/input_club/k_type/k_type.c +++ b/keyboards/input_club/k_type/k_type.c @@ -18,11 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum.h" #ifdef RGB_MATRIX_ENABLE +# include "is31fl3733-dual.h" -#include "is31fl3733-dual.h" - - -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { { 0, B_1, A_1, C_1 }, { 0, B_2, A_2, C_2 }, { 0, B_3, A_3, C_3 }, @@ -202,15 +200,12 @@ led_config_t g_led_config = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, } }; -#endif - void keyboard_pre_init_kb(void) { -#ifdef RGB_MATRIX_ENABLE // Turn on LED controller setPinOutput(B16); writePinHigh(B16); -#endif + keyboard_pre_init_user(); } @@ -218,17 +213,13 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up -#ifdef RGB_MATRIX_ENABLE /* * Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c), * and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot. */ -# if !defined(RGB_MATRIX_DEFAULT_SPD) -# define RGB_MATRIX_DEFAULT_SPD UINT8_MAX / 2 -# endif rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD), rgb_matrix_set_flags(LED_FLAG_ALL); -#endif matrix_init_user(); } +#endif diff --git a/keyboards/input_club/k_type/post_rules.mk b/keyboards/input_club/k_type/post_rules.mk new file mode 100644 index 0000000000..ba750e2624 --- /dev/null +++ b/keyboards/input_club/k_type/post_rules.mk @@ -0,0 +1,5 @@ +ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) + # Additional files for RGB lighting + SRC += k_type-rgbdriver.c is31fl3733-dual.c + QUANTUM_LIB_SRC += i2c_master.c +endif diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk index d7776bb755..684de50562 100644 --- a/keyboards/input_club/k_type/rules.mk +++ b/keyboards/input_club/k_type/rules.mk @@ -13,8 +13,3 @@ AUDIO_ENABLE = no # Audio output # RGB options RGB_MATRIX_ENABLE = no - -# Additional files for RGB lighting -SRC += k_type-rgbdriver.c -QUANTUM_LIB_SRC += i2c_master.c is31fl3733-dual.c - diff --git a/keyboards/input_club/whitefox/board_is31fl3731c.h b/keyboards/input_club/whitefox/board_is31fl3731c.h deleted file mode 100644 index 238d30cb44..0000000000 --- a/keyboards/input_club/whitefox/board_is31fl3731c.h +++ /dev/null @@ -1,106 +0,0 @@ -/* -Copyright 2016 Fred Sundvik <fsundvik@gmail.com> - -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/>. -*/ - -#ifndef _GDISP_LLD_BOARD_H -#define _GDISP_LLD_BOARD_H - -static const I2CConfig i2ccfg = { - 400000 // clock speed (Hz); 400kHz max for IS31 -}; - -static const uint8_t led_mask[] = { - 0xFF, 0x00, /* C1-1 -> C1-16 */ - 0xFF, 0x00, /* C2-1 -> C2-16 */ - 0xFF, 0x00, /* C3-1 -> C3-16 */ - 0xFF, 0x00, /* C4-1 -> C4-16 */ - 0xFF, 0x00, /* C5-1 -> C5-16 */ - 0xFF, 0x00, /* C6-1 -> C6-16 */ - 0xFF, 0x00, /* C7-1 -> C7-16 */ - 0xFF, 0x00, /* C8-1 -> C8-16 */ - 0xFF, 0x00, /* C9-1 -> C9-16 */ -}; - -// The address of the LED -#define LA(c, r) (c + r * 16 ) -// Need to be an address that is not mapped, but inside the range of the controller matrix -#define NA LA(8, 8) - -// The numbers in the comments are the led numbers DXX on the PCB -// The mapping is taken from the schematic of left hand side -static const uint8_t led_mapping[GDISP_SCREEN_HEIGHT][GDISP_SCREEN_WIDTH] = { -// 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 - { LA(0, 0), LA(1, 0), LA(2, 0), LA(3, 0), LA(4, 0), LA(5, 0), LA(6, 0), LA(7, 0), LA(0, 1), LA(1, 1), LA(2, 1), LA(3, 1), LA(4, 1), LA(5, 1), LA(6, 1), LA(7, 1)}, -// 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 - { LA(0, 2), LA(1, 2), LA(2, 2), LA(3, 2), LA(4, 2), LA(5, 2), LA(6, 2), LA(7, 2), LA(0, 3), LA(1, 3), NA, LA(2, 3), LA(3, 3), LA(4, 3), LA(5, 3), LA(6, 3)}, -// 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 - { LA(7, 3), LA(0, 4), LA(1, 4), LA(2, 4), LA(3, 4), LA(4, 4), LA(5, 4), LA(6, 4), LA(7, 4), LA(0, 5), NA, LA(1, 5), LA(2, 5), LA(3, 5), LA(4, 5), LA(5, 5)}, -// 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 - { LA(6, 5), LA(7, 5), LA(0, 6), LA(1, 6), LA(2, 6), LA(3, 6), LA(4, 6), LA(5, 6), LA(6, 6), LA(7, 6), NA, LA(0, 7), LA(1, 7), LA(2, 7), LA(3, 7), LA(4, 7)}, -// 62 63 64 65 66 67 68 69 70 71 - { LA(5, 7), LA(6, 7), LA(7, 7), NA, NA, NA, LA(0, 8), NA, NA, NA, LA(1, 8), LA(2, 8), LA(3, 8), LA(4, 8), LA(5, 8), LA(6, 8)}, -}; - - -#define IS31_ADDR_DEFAULT 0x74 // AD connected to GND -#define IS31_TIMEOUT 5000 - -static GFXINLINE void init_board(GDisplay *g) { - (void) g; - /* I2C pins */ - palSetPadMode(GPIOB, 0, PAL_MODE_ALTERNATIVE_2); // PTB0/I2C0/SCL - palSetPadMode(GPIOB, 1, PAL_MODE_ALTERNATIVE_2); // PTB1/I2C0/SDA - palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL); - palClearPad(GPIOB, 16); - /* start I2C */ - i2cStart(&I2CD1, &i2ccfg); - // try high drive (from kiibohd) - I2CD1.i2c->C2 |= I2Cx_C2_HDRS; - // try glitch fixing (from kiibohd) - I2CD1.i2c->FLT = 4; -} - -static GFXINLINE void post_init_board(GDisplay *g) { - (void) g; -} - -static GFXINLINE const uint8_t* get_led_mask(GDisplay* g) { - (void) g; - return led_mask; -} - -static GFXINLINE uint8_t get_led_address(GDisplay* g, uint16_t x, uint16_t y) -{ - (void) g; - return led_mapping[y][x]; -} - -static GFXINLINE void set_hardware_shutdown(GDisplay* g, bool shutdown) { - (void) g; - if(!shutdown) { - palSetPad(GPIOB, 16); - } - else { - palClearPad(GPIOB, 16); - } -} - -static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) { - (void) g; - i2cMasterTransmitTimeout(&I2CD1, IS31_ADDR_DEFAULT, data, length, 0, 0, TIME_US2I(IS31_TIMEOUT)); -} - -#endif /* _GDISP_LLD_BOARD_H */ diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h index 067b7f4e59..8993c2c760 100644 --- a/keyboards/input_club/whitefox/config.h +++ b/keyboards/input_club/whitefox/config.h @@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LED_BRIGHTNESS_HI 255 /* LED matrix driver */ -#define LED_DRIVER_ADDR_1 0x74 -#define LED_DRIVER_COUNT 1 +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +#define IS31FL3731_DRIVER_COUNT 1 #define LED_MATRIX_LED_COUNT 71 #define LED_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/input_club/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c index 4aa12586f3..63c6a49240 100644 --- a/keyboards/input_club/whitefox/whitefox.c +++ b/keyboards/input_club/whitefox/whitefox.c @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum.h" #ifdef LED_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { // The numbers in the comments are the led numbers DXX on the PCB /* Refer to IS31 manual for these locations * driver @@ -83,9 +83,6 @@ void matrix_init_kb(void) { * Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c), * and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot. */ -# if !defined(LED_MATRIX_DEFAULT_SPD) -# define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2 -# endif led_matrix_set_speed(LED_MATRIX_DEFAULT_SPD), led_matrix_set_flags(LED_FLAG_ALL); #endif |