summaryrefslogtreecommitdiffstats
path: root/keyboards/infinity60/led_controller.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/infinity60/led_controller.c')
-rw-r--r--keyboards/infinity60/led_controller.c329
1 files changed, 111 insertions, 218 deletions
diff --git a/keyboards/infinity60/led_controller.c b/keyboards/infinity60/led_controller.c
index 75806d54b5..d4ad0559b7 100644
--- a/keyboards/infinity60/led_controller.c
+++ b/keyboards/infinity60/led_controller.c
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/*
* LED controller code
- * WF uses IS31FL3731C matrix LED driver from ISSI
+ * IS31FL3731C matrix LED driver from ISSI
* datasheet: http://www.issi.com/WW/pdf/31FL3731C.pdf
*/
@@ -56,9 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
order same as above (CA 1st row (8bytes), CB 1st row (8bytes), ...)
*/
-/* Which LED should be used for CAPS LOCK indicator
- * The usual Caps Lock position is C4-6, so the address is
- * 0x24 + (4-1)*0x10 + (8-1) = 0x59 */
+// Which LED should be used for CAPS LOCK indicator
#if !defined(CAPS_LOCK_LED_ADDRESS)
#define CAPS_LOCK_LED_ADDRESS 46
#endif
@@ -72,8 +70,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BREATHE_LED_ADDRESS CAPS_LOCK_LED_ADDRESS
#endif
-#define DEBUG_ENABLED 0
-
/* =================
* ChibiOS I2C setup
* ================= */
@@ -92,7 +88,6 @@ uint8_t rx[1] __attribute__((aligned(2)));
uint8_t full_page[0xB4+1] = {0};
// LED mask (which LEDs are present, selected by bits)
-// See page comment above, control alternates CA matrix/CB matrix
// 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] = {
@@ -145,7 +140,6 @@ void is31_init(void) {
__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);
@@ -182,14 +176,9 @@ static THD_FUNCTION(LEDthread, arg) {
uint8_t pwm_step_status, page_status;
//mailbox variables
- uint8_t temp, msg_type, msg_led;
+ uint8_t temp, msg_type, msg_pin, msg_col, msg_led;
msg_t msg;
-/* //control register variables
- uint8_t page, save_page, save_breath1, save_breath2;
- msg_t msg, retval;
-*/
-
// initialize persistent variables
pwm_step_status = 4; //full brightness
page_status = 0; //start frame 0 (all off/on)
@@ -199,82 +188,71 @@ page_status = 0; //start frame 0 (all off/on)
// (messages are queued (up to LED_MAILBOX_NUM_MSGS) if they can't
// be processed right away)
chMBFetch(&led_mailbox, &msg, TIME_INFINITE);
- msg_type = (msg >> 8) & 0xFF; //first byte is msg type
- msg_led = (msg) & 0xFF; //second byte is action information
-
- xprintf("--------------------\n");
- chThdSleepMilliseconds(10);
- xprintf("mailbox fetch\nmsg: %X\n", msg);
- chThdSleepMilliseconds(10);
- xprintf("type: %X - led: %X\n", msg_type, msg_led);
- chThdSleepMilliseconds(10);
+ msg_col = (msg >> 24) & 0xFF;//if needed
+ msg_pin = (msg >> 16) & 0XFF;//if needed (e.g. SET_FULL_ROW)
+ msg_type = (msg >> 8) & 0xFF; //second byte is msg type
+ msg_led = (msg) & 0xFF; //first byte is action information
switch (msg_type){
- case KEY_LIGHT:
- //TODO: lighting key led on keypress
+ case SET_FULL_ROW:
+ //write full byte to pin address, msg_pin = pin #, msg_led = byte to write
+ //writes only to current page
+ write_led_byte(page_status,msg_pin,msg_led);
break;
-
- //TODO: custom page that is written using keypresses
- //TODO: BLINK_ON/OFF_LED
case OFF_LED:
//on/off/toggle single led, msg_led = row/col of led
- xprintf("OFF_LED\n");
- chThdSleepMilliseconds(10);
set_led_bit(7, control_register_word, msg_led, 0);
is31_write_data (7, control_register_word, 0x02);
break;
-
case ON_LED:
- xprintf("ON_LED\n");
- chThdSleepMilliseconds(10);
set_led_bit(7, control_register_word, msg_led, 1);
is31_write_data (7, control_register_word, 0x02);
break;
-
case TOGGLE_LED:
- xprintf("TOGGLE_LED\n");
- chThdSleepMilliseconds(10);
set_led_bit(7, control_register_word, msg_led, 2);
is31_write_data (7, control_register_word, 0x02);
break;
+ case BLINK_OFF_LED:
+ //on/off/toggle single led, msg_led = row/col of led
+ set_led_bit(7, control_register_word, msg_led, 4);
+ is31_write_data (7, control_register_word, 0x02);
+ break;
+ case BLINK_ON_LED:
+ set_led_bit(7, control_register_word, msg_led, 5);
+ is31_write_data (7, control_register_word, 0x02);
+ break;
+ case BLINK_TOGGLE_LED:
+ set_led_bit(7, control_register_word, msg_led, 6);
+ is31_write_data (7, control_register_word, 0x02);
+ break;
+
case TOGGLE_ALL:
- xprintf("TOGGLE_ALL\n");
- chThdSleepMilliseconds(10);
//msg_led = unused
- is31_read_register(0, 0x00, &temp);//if first byte is on, then toggle frame 0 off
+ is31_read_register(0, 0x00, &temp);
led_control_reg[0] = 0;
+
+ //if first byte is on, then toggle frame 0 off
if (temp==0 || page_status > 0) {
- xprintf("all leds on");
- chThdSleepMilliseconds(10);
__builtin_memcpy(led_control_reg+1, all_on_leds_mask, 0x12);
} else {
- xprintf("all leds off");
- chThdSleepMilliseconds(10);
__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);
- }
- //maintain lock leds
- if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) {
- set_lock_leds(NUM_LOCK_LED_ADDRESS, 1);
- }
- if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
- set_lock_leds(CAPS_LOCK_LED_ADDRESS, 1);
- }
+ page_status=0;
- page_status=0;
+ //maintain lock leds
+ led_set(host_keyboard_leds());
+ }
break;
case TOGGLE_BACKLIGHT:
//msg_led = on/off
- xprintf("TOGGLE_BACKLIGHT\n");
- chThdSleepMilliseconds(10);
//populate the 9 byte rows to be written to each pin, first byte is register (pin) address
if (msg_led == 1) {
@@ -290,132 +268,63 @@ page_status = 0; //start frame 0 (all off/on)
}
break;
- case DISPLAY_PAGE://show single layer indicator or full map of layer
- //msg_led = page to toggle on
- xprintf("DISPLAY_PAGE\n");
- chThdSleepMilliseconds(10);
+ case DISPLAY_PAGE:
+ //msg_led = page to toggle on
if (page_status != msg_led) {
is31_write_register(IS31_FUNCTIONREG, IS31_REG_PICTDISP, msg_led);
+ page_status = msg_led;
+
+ //maintain lock leds
+ led_set(host_keyboard_leds());
}
- page_status = msg_led;
break;
case RESET_PAGE:
- //led_msg = page to reset
+ //led_msg = page to reset
led_control_reg[0] = 0;
__builtin_memset(led_control_reg+1, 0, 0x12);
is31_write_data(msg_led, led_control_reg, 0x13);
-
- //maintain lock leds
- if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) {
- set_lock_leds(NUM_LOCK_LED_ADDRESS, 1);
- }
- if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
- set_lock_leds(CAPS_LOCK_LED_ADDRESS, 1);
- }
break;
case TOGGLE_NUM_LOCK:
- //msg_led = 0 or 1, off/on
- set_lock_leds(NUM_LOCK_LED_ADDRESS, 1);
+ //msg_led = 0 or 1, off/on
+ set_lock_leds(NUM_LOCK_LED_ADDRESS, msg_led, page_status);
break;
-
case TOGGLE_CAPS_LOCK:
- //msg_led = 0 or 1, off/on
- set_lock_leds(CAPS_LOCK_LED_ADDRESS, 1);
+ //msg_led = 0 or 1, off/on
+ set_lock_leds(CAPS_LOCK_LED_ADDRESS, msg_led, page_status);
break;
- //TODO: MODE_BREATH
- case MODE_BREATH:
- break;
case STEP_BRIGHTNESS:
- xprintf("TOGGLE_BACKLIGHT\n");
- chThdSleepMilliseconds(10);
- //led_msg = step pwm up or down
- switch (msg_led) {
- 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 rows to write on each pin
- //first byte is register address, every 0x10 9 bytes are A-register 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_msg = step pwm up or down
+ switch (msg_led) {
+ 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;
+ }
-/* case LED_MSG_SLEEP_LED_ON:
- // save current settings
- is31_read_register(IS31_FUNCTIONREG, IS31_REG_PICTDISP, &save_page);
- is31_read_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL1, &save_breath1);
- is31_read_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL2, &save_breath2);
- // use pages 7 and 8 for (hardware) breathing (assuming they're empty)
- is31_write_register(6, BREATHE_LED_ADDRESS, 0xFF);
- is31_write_register(7, BREATHE_LED_ADDRESS, 0x00);
- is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL1, (6<<4)|6);
- is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL2, IS31_REG_BREATHCTRL2_ENABLE|3);
- retval = MSG_TIMEOUT;
- temp = 6;
- while(retval == MSG_TIMEOUT) {
- // switch to the other page
- is31_write_register(IS31_FUNCTIONREG, IS31_REG_PICTDISP, temp);
- temp = (temp == 6 ? 7 : 6);
- // the times should be sufficiently long for IS31 to finish switching pages
- retval = chMBFetch(&led_mailbox, &msg, MS2ST(temp == 6 ? 4000 : 6000));
+ //populate 8 byte rows to write on each pin
+ //first byte is register address, every 0x10 9 bytes are A-register 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);
}
- // received a message (should be a wakeup), so restore previous state
- chThdSleepMilliseconds(3000); // need to wait until the page change finishes
- // note: any other messages are queued
- is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL1, save_breath1);
- is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL2, save_breath2);
- is31_write_register(IS31_FUNCTIONREG, IS31_REG_PICTDISP, save_page);
- break;
- case LED_MSG_SLEEP_LED_OFF:
- // should not get here; wakeup should be received in the branch above break;
break;
-*/
- xprintf("--------------------\n");
- chThdSleepMilliseconds(10);
}
-#if DEBUG_ENABLED
- uint8_t j, page;
- //debugging code - print full led/blink/pwm registers on each frame
- xprintf("----layer state----: %X\n", layer_state);
- for(i=0;i<8;i++) {
- xprintf("page: %d", i);
- chThdSleepMilliseconds(2);
- for(j=0;j<0xB4;j++){
- is31_read_register(i,j,&temp);
- chThdSleepMilliseconds(2);
- xprintf("%02X, ", temp);
- if(j % 9 == 0){
- xprintf("\n");
- if(j % 18 ==0){
- xprintf("register");
- xprintf("\n");
- }
- }
- chThdSleepMilliseconds(1);
- }
- xprintf("\n");
- }
-#endif
}
}
@@ -424,22 +333,28 @@ page_status = 0; //start frame 0 (all off/on)
* ============================== */
void set_led_bit (uint8_t page, uint8_t *led_control_reg, uint8_t led_addr, uint8_t action) {
- //returns 2 bytes led control register address and byte to write
+ //returns 2 bytes: led control register address and byte to write
+ //0 - bit off, 1 - bit on, 2 - toggle bit
+
+ uint8_t control_reg_addr, column_bit, column_byte, bit_temp, blink_on;
- uint8_t control_reg_addr, column_bit, column_byte, temp;
//check for valid led address
- if (led_addr < 0 || led_addr > 90 || led_addr % 10 > 8) {
- xprintf("Invalid address: %d\n", led_addr);
+ if (led_addr < 0 || led_addr > 87 || led_addr % 10 > 8) {
return;
}
+ //check for blink bit
+ blink_on = action>>2;
+ action &= ~(1<<2); //strip blink bit
+
//first byte is led control register address 0x00
//msg_led tens column is pin#, ones column is bit position in 8-bit mask
control_reg_addr = ((led_addr / 10) % 10 - 1 ) * 0x02;// A-register is every other byte
- column_bit = 1<<(led_addr % 10 - 1);
+ control_reg_addr += blink_on == 1 ? 0x12 : 0x00;//shift 12 bytes to blink register
- is31_read_register(page, control_reg_addr, &temp);//maintain status of leds on this byte
- column_byte = temp;
+ is31_read_register(page, control_reg_addr, &bit_temp);//maintain status of leds on this byte
+ column_bit = 1<<(led_addr % 10 - 1);
+ column_byte = bit_temp;
switch(action) {
case 0:
@@ -458,39 +373,47 @@ void set_led_bit (uint8_t page, uint8_t *led_control_reg, uint8_t led_addr, uint
led_control_reg[1] = column_byte;
}
-void set_lock_leds(uint8_t led_addr, uint8_t led_action) {
- uint8_t page;
- uint8_t led_control_word[2] = {0};
-
- //ignore frame0 if all leds are on or if option set in led_controller.h
- //TODO: blink of all leds are on, clear blink register if not
- //is31_read_register(0, 0x00, &temp);
- //led_addr += temp == 0 ? 0 : 0x12;//send bit to blink register instead
- //start = BACKLIGHT_OFF_LOCK_LED_OFF ? 1 : 0;
+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
- for(page=0; page<8; page++) {
- set_led_bit(page,led_control_word,led_addr,led_action);
- is31_write_data(page, led_control_word, 0x02);
- }
+ led_control_word[0] = (row - 1 ) * 0x02;// A-register 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 row, col;
- uint8_t led_control_register[0x13] = {0};//led control register start address + 0x12 bytes
+ 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++){
- row = ((user_led_array[i] / 10) % 10 - 1 ) * 2 + 1;// 1 byte shift for led register 0x00 address
+ // 1 byte shift 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[row] |= 1<<(col);
+ 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 lock_temp;
+ uint8_t led_control_word[2] = {0};
+
+ //blink if all leds are on
+ if (page == 0) {
+ is31_read_register(0, 0x00, &lock_temp);
+ if (lock_temp == 0xFF) {
+ led_action |= (1<<2); //set blink bit
+ }
+ }
+
+ set_led_bit(page,led_control_word,led_addr,led_action);
+ is31_write_data(page, led_control_word, 0x02);
+}
+
/* =====================
* hook into user keymap
* ===================== */
@@ -513,10 +436,11 @@ void led_controller_init(void) {
/* initialise IS31 chip */
is31_init();
- //set Display Option Register so all pwm intensity is controlled from Frame 0
- is31_write_register(IS31_FUNCTIONREG, IS31_REG_DISPLAYOPT, IS31_REG_DISPLAYOPT_INTENSITY_SAME);
+ //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 Frame 1 */
+ /* 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++) {
@@ -530,39 +454,8 @@ void led_controller_init(void) {
is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL1, (3<<4)|3);
is31_write_register(IS31_FUNCTIONREG, IS31_REG_BREATHCTRL2, IS31_REG_BREATHCTRL2_ENABLE|3);
- // clean up the lock LEDs
- set_lock_leds(NUM_LOCK_LED_ADDRESS, 0);
- set_lock_leds(CAPS_LOCK_LED_ADDRESS, 0);
-
/* 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);
}
-
-//TODO: Don't know equivalent QMK hooks for these
-//
-//void hook_usb_suspend_entry(void) {
-//#ifdef SLEEP_LED_ENABLE
-// chSysLockFromISR();
-// chMBPostI(&led_mailbox, LED_MSG_SLEEP_LED_ON);
-// chSysUnlockFromISR();
-//#endif /* SLEEP_LED_ENABLE */
-//}
-//
-//void hook_usb_suspend_loop(void) {
-// chThdSleepMilliseconds(100);
-// /* Remote wakeup */
-// if((USB_DRIVER.status & 2) && suspend_wakeup_condition()) {
-// send_remote_wakeup(&USB_DRIVER);
-// }
-//}
-//
-//void hook_usb_wakeup(void) {
-//#ifdef SLEEP_LED_ENABLE
-// chSysLockFromISR();
-// chMBPostI(&led_mailbox, LED_MSG_SLEEP_LED_OFF);
-// chSysUnlockFromISR();
-//#endif /* SLEEP_LED_ENABLE */
-//}
-//*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 01:42:05 +0000