From 59787a2e515b50eb84b5fb29ae20bfc61b49851f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 24 Sep 2023 12:36:06 +1000 Subject: [PATCH] input_club/infinity60: remove custom 3731 code, convert to LED Matrix (#22117) * input_club/infinity60: remove custom 3731 code, convert to LED Matrix * Add licences --- keyboards/input_club/infinity60/halconf.h | 27 - .../infinity60/keymaps/default/keymap.c | 3 + .../infinity60/keymaps/jpetermans/config.h | 6 - .../infinity60/keymaps/jpetermans/keymap.c | 264 ---------- .../infinity60/keymaps/jpetermans/readme.md | 87 ---- keyboards/input_club/infinity60/led.c | 58 --- keyboards/input_club/infinity60/led/config.h | 15 + keyboards/input_club/infinity60/led/halconf.h | 8 + keyboards/input_club/infinity60/led/info.json | 94 +++- keyboards/input_club/infinity60/led/led.c | 83 +++ keyboards/input_club/infinity60/led/rules.mk | 3 - .../input_club/infinity60/led_controller.c | 488 ------------------ .../input_club/infinity60/led_controller.h | 121 ----- 13 files changed, 202 insertions(+), 1055 deletions(-) delete mode 100644 keyboards/input_club/infinity60/halconf.h delete mode 100644 keyboards/input_club/infinity60/keymaps/jpetermans/config.h delete mode 100644 keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c delete mode 100644 keyboards/input_club/infinity60/keymaps/jpetermans/readme.md delete mode 100644 keyboards/input_club/infinity60/led.c create mode 100644 keyboards/input_club/infinity60/led/config.h create mode 100644 keyboards/input_club/infinity60/led/halconf.h create mode 100644 keyboards/input_club/infinity60/led/led.c delete mode 100644 keyboards/input_club/infinity60/led_controller.c delete mode 100644 keyboards/input_club/infinity60/led_controller.h 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 . - */ - -/* - * 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 - 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 -Copyright 2017 jpetermans - -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 . -*/ - -#include - -#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..035cce88e9 --- /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 LED_DRIVER_ADDR_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 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..ef29d12a29 --- /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 is31_led g_is31_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 -Copyright 2017 jpetermans - -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 . -*/ - -/* - * LED controller code - * IS31FL3731C matrix LED driver from ISSI - * datasheet: http://www.issi.com/WW/pdf/31FL3731C.pdf - */ - -#include -#include -#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;iC2 |= 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 -Copyright 2017 jpetermans - -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 . -*/ - -#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_ */