is31fl3733: driver naming cleanups (#21905)
This commit is contained in:
		
							parent
							
								
									2d41443e6a
								
							
						
					
					
						commit
						1cbb5ae99e
					
				| @ -83,13 +83,13 @@ You can use between 1 and 4 IS31FL3733 IC's. Do not specify `DRIVER_ADDR_<N>` de | ||||
| 
 | ||||
| | Variable | Description | Default | | ||||
| |----------|-------------|---------| | ||||
| | `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 | | ||||
| | `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 | | ||||
| | `ISSI_PWM_FREQUENCY` | (Optional) PWM Frequency Setting - IS31FL3733B only | 0 | | ||||
| | `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF | | ||||
| | `ISSI_SWPULLUP` | (Optional) Set the value of the SWx lines on-chip de-ghosting resistors | PUR_0R (Disabled) | | ||||
| | `ISSI_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) | | ||||
| | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | | | ||||
| | `IS31FL3733_I2C_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 | | ||||
| | `IS31FL3733_I2C_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 | | ||||
| | `IS31FL3733_PWM_FREQUENCY` | (Optional) PWM Frequency Setting - IS31FL3733B only | 0 | | ||||
| | `IS31FL3733_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF | | ||||
| | `IS31FL3733_SWPULLUP` | (Optional) Set the value of the SWx lines on-chip de-ghosting resistors | PUR_0R (Disabled) | | ||||
| | `IS31FL3733_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) | | ||||
| | `IS31FL3733_DRIVER_COUNT` | (Required) How many RGB driver IC's are present | | | ||||
| | `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | | | ||||
| | `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | | | ||||
| | `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | | | ||||
| @ -100,17 +100,17 @@ You can use between 1 and 4 IS31FL3733 IC's. Do not specify `DRIVER_ADDR_<N>` de | ||||
| | `DRIVER_SYNC_3` | (Optional) Sync configuration for the third RGB driver | 0 | | ||||
| | `DRIVER_SYNC_4` | (Optional) Sync configuration for the fourth RGB driver | 0 | | ||||
| 
 | ||||
| The IS31FL3733 IC's have on-chip resistors that can be enabled to allow for de-ghosting of the RGB matrix. By default these resistors are not enabled (`ISSI_SWPULLUP`/`ISSI_CSPULLUP` are given the value of`PUR_0R`), the values that can be set to enable de-ghosting are as follows: | ||||
| The IS31FL3733 IC's have on-chip resistors that can be enabled to allow for de-ghosting of the RGB matrix. By default these resistors are not enabled (`IS31FL3733_SWPULLUP`/`IS31FL3733_CSPULLUP` are given the value of `IS31FL3733_PUR_0R`), the values that can be set to enable de-ghosting are as follows: | ||||
| 
 | ||||
| | `ISSI_SWPULLUP/ISSI_CSPULLUP` | Description | | ||||
| | `IS31FL3733_SWPULLUP/IS31FL3733_CSPULLUP` | Description | | ||||
| |----------------------|-------------| | ||||
| | `PUR_0R` | (default) Do not use the on-chip resistors/enable de-ghosting | | ||||
| | `PUR_05KR` | The 0.5k Ohm resistor used during blanking period (t_NOL) | | ||||
| | `PUR_3KR` | The 3k Ohm resistor used at all times | | ||||
| | `PUR_4KR` | The 4k Ohm resistor used at all times | | ||||
| | `PUR_8KR` | The 8k Ohm resistor used at all times | | ||||
| | `PUR_16KR` | The 16k Ohm resistor used at all times | | ||||
| | `PUR_32KR` | The 32k Ohm resistor used during blanking period (t_NOL) | | ||||
| | `IS31FL3733_PUR_0R` | (default) Do not use the on-chip resistors/enable de-ghosting | | ||||
| | `IS31FL3733_PUR_05KR` | The 0.5k Ohm resistor used during blanking period (t_NOL) | | ||||
| | `IS31FL3733_PUR_3KR` | The 3k Ohm resistor used at all times | | ||||
| | `IS31FL3733_PUR_4KR` | The 4k Ohm resistor used at all times | | ||||
| | `IS31FL3733_PUR_8KR` | The 8k Ohm resistor used at all times | | ||||
| | `IS31FL3733_PUR_16KR` | The 16k Ohm resistor used at all times | | ||||
| | `IS31FL3733_PUR_32KR` | The 32k Ohm resistor used during blanking period (t_NOL) | | ||||
| 
 | ||||
| Here is an example using 2 drivers. | ||||
| 
 | ||||
| @ -128,7 +128,7 @@ Here is an example using 2 drivers. | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1010011 | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_1_LED_TOTAL 58 | ||||
| #define DRIVER_2_LED_TOTAL 10 | ||||
| #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) | ||||
|  | ||||
| @ -19,6 +19,7 @@ | ||||
|  */ | ||||
| 
 | ||||
| #include "is31fl3733-simple.h" | ||||
| #include <string.h> | ||||
| #include "i2c_master.h" | ||||
| #include "wait.h" | ||||
| 
 | ||||
| @ -32,46 +33,46 @@ | ||||
| // 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 IS31FL3733_I2C_ADDRESS_DEFAULT 0x50 | ||||
| 
 | ||||
| #define ISSI_COMMANDREGISTER 0xFD | ||||
| #define ISSI_COMMANDREGISTER_WRITELOCK 0xFE | ||||
| #define ISSI_INTERRUPTMASKREGISTER 0xF0 | ||||
| #define ISSI_INTERRUPTSTATUSREGISTER 0xF1 | ||||
| #define IS31FL3733_COMMANDREGISTER 0xFD | ||||
| #define IS31FL3733_COMMANDREGISTER_WRITELOCK 0xFE | ||||
| #define IS31FL3733_INTERRUPTMASKREGISTER 0xF0 | ||||
| #define IS31FL3733_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 IS31FL3733_PAGE_LEDCONTROL 0x00 // PG0
 | ||||
| #define IS31FL3733_PAGE_PWM 0x01        // PG1
 | ||||
| #define IS31FL3733_PAGE_AUTOBREATH 0x02 // PG2
 | ||||
| #define IS31FL3733_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
 | ||||
| #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
 | ||||
| 
 | ||||
| #ifndef ISSI_TIMEOUT | ||||
| #    define ISSI_TIMEOUT 100 | ||||
| #ifndef IS31FL3733_I2C_TIMEOUT | ||||
| #    define IS31FL3733_I2C_TIMEOUT 100 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_PERSISTENCE | ||||
| #    define ISSI_PERSISTENCE 0 | ||||
| #ifndef IS31FL3733_I2C_PERSISTENCE | ||||
| #    define IS31FL3733_I2C_PERSISTENCE 0 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_PWM_FREQUENCY | ||||
| #    define ISSI_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 | ||||
| #ifndef IS31FL3733_PWM_FREQUENCY | ||||
| #    define IS31FL3733_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_SWPULLUP | ||||
| #    define ISSI_SWPULLUP PUR_0R | ||||
| #ifndef IS31FL3733_SWPULLUP | ||||
| #    define IS31FL3733_SWPULLUP IS31FL3733_PUR_0R | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_CSPULLUP | ||||
| #    define ISSI_CSPULLUP PUR_0R | ||||
| #ifndef IS31FL3733_CSPULLUP | ||||
| #    define IS31FL3733_CSPULLUP IS31FL3733_PUR_0R | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_GLOBALCURRENT | ||||
| #    define ISSI_GLOBALCURRENT 0xFF | ||||
| #ifndef IS31FL3733_GLOBALCURRENT | ||||
| #    define IS31FL3733_GLOBALCURRENT 0xFF | ||||
| #endif | ||||
| 
 | ||||
| // Transfer buffer for TWITransmitData()
 | ||||
| @ -83,34 +84,34 @@ 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[LED_DRIVER_COUNT][192]; | ||||
| bool    g_pwm_buffer_update_required[LED_DRIVER_COUNT] = {false}; | ||||
| uint8_t g_pwm_buffer[IS31FL3733_DRIVER_COUNT][192]; | ||||
| bool    g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false}; | ||||
| 
 | ||||
| /* There's probably a better way to init this... */ | ||||
| #if LED_DRIVER_COUNT == 1 | ||||
| uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}}; | ||||
| #elif LED_DRIVER_COUNT == 2 | ||||
| uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}, {0}}; | ||||
| #elif LED_DRIVER_COUNT == 3 | ||||
| uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}, {0}, {0}}; | ||||
| #elif LED_DRIVER_COUNT == 4 | ||||
| uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}, {0}, {0}, {0}}; | ||||
| #if IS31FL3733_DRIVER_COUNT == 1 | ||||
| uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][24] = {{0}}; | ||||
| #elif IS31FL3733_DRIVER_COUNT == 2 | ||||
| uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][24] = {{0}, {0}}; | ||||
| #elif IS31FL3733_DRIVER_COUNT == 3 | ||||
| uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][24] = {{0}, {0}, {0}}; | ||||
| #elif IS31FL3733_DRIVER_COUNT == 4 | ||||
| uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][24] = {{0}, {0}, {0}, {0}}; | ||||
| #endif | ||||
| bool g_led_control_registers_update_required[LED_DRIVER_COUNT] = {false}; | ||||
| bool g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT] = {false}; | ||||
| 
 | ||||
| bool is31fl3733_write_register(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(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) { | ||||
| #if IS31FL3733_I2C_PERSISTENCE > 0 | ||||
|     for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) { | ||||
|         if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|             return false; | ||||
|         } | ||||
|     } | ||||
| #else | ||||
|     if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) { | ||||
|     if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|         return false; | ||||
|     } | ||||
| #endif | ||||
| @ -131,14 +132,14 @@ bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) { | ||||
|         // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
 | ||||
|         memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16); | ||||
| 
 | ||||
| #if ISSI_PERSISTENCE > 0 | ||||
|         for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) { | ||||
|             if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) { | ||||
| #if IS31FL3733_I2C_PERSISTENCE > 0 | ||||
|         for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) { | ||||
|             if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|                 return false; | ||||
|             } | ||||
|         } | ||||
| #else | ||||
|         if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) { | ||||
|         if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|             return false; | ||||
|         } | ||||
| #endif | ||||
| @ -154,20 +155,20 @@ void is31fl3733_init(uint8_t addr, uint8_t sync) { | ||||
|     // Sync is passed so set it according to the datasheet.
 | ||||
| 
 | ||||
|     // Unlock the command register.
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
| 
 | ||||
|     // Select PG0
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_LEDCONTROL); | ||||
|     // Turn off all LEDs.
 | ||||
|     for (int i = 0x00; i <= 0x17; i++) { | ||||
|         is31fl3733_write_register(addr, i, 0x00); | ||||
|     } | ||||
| 
 | ||||
|     // Unlock the command register.
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
| 
 | ||||
|     // Select PG1
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); | ||||
|     is31fl3733_write_register(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++) { | ||||
| @ -175,18 +176,18 @@ void is31fl3733_init(uint8_t addr, uint8_t sync) { | ||||
|     } | ||||
| 
 | ||||
|     // Unlock the command register.
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
| 
 | ||||
|     // Select PG3
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_FUNCTION); | ||||
|     // Set de-ghost pull-up resistors (SWx)
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_REG_SWPULLUP, IS31FL3733_SWPULLUP); | ||||
|     // Set de-ghost pull-down resistors (CSx)
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_REG_CSPULLUP, IS31FL3733_CSPULLUP); | ||||
|     // Set global current to maximum.
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_REG_GLOBALCURRENT, IS31FL3733_GLOBALCURRENT); | ||||
|     // Disable software shutdown.
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01); | ||||
|     is31fl3733_write_register(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); | ||||
| @ -230,8 +231,8 @@ void is31fl3733_set_led_control_register(uint8_t index, bool value) { | ||||
| 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(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_PWM); | ||||
| 
 | ||||
|         // If any of the transactions fail we risk writing dirty PG0,
 | ||||
|         // refresh page 0 just in case.
 | ||||
| @ -245,8 +246,8 @@ 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(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_LEDCONTROL); | ||||
|         for (int i = 0; i < 24; i++) { | ||||
|             is31fl3733_write_register(addr, i, g_led_control_registers[index][i]); | ||||
|         } | ||||
|  | ||||
| @ -22,9 +22,40 @@ | ||||
| 
 | ||||
| #include <stdint.h> | ||||
| #include <stdbool.h> | ||||
| #include <string.h> | ||||
| #include "progmem.h" | ||||
| 
 | ||||
| // ======== DEPRECATED DEFINES - DO NOT USE ========
 | ||||
| #ifdef LED_DRIVER_COUNT | ||||
| #    define IS31FL3733_DRIVER_COUNT LED_DRIVER_COUNT | ||||
| #endif | ||||
| #ifdef ISSI_TIMEOUT | ||||
| #    define IS31FL3733_I2C_TIMEOUT ISSI_TIMEOUT | ||||
| #endif | ||||
| #ifdef ISSI_PERSISTENCE | ||||
| #    define IS31FL3733_I2C_PERSISTENCE ISSI_PERSISTENCE | ||||
| #endif | ||||
| #ifdef ISSI_PWM_FREQUENCY | ||||
| #    define IS31FL3733_PWM_FREQUENCY ISSI_PWM_FREQUENCY | ||||
| #endif | ||||
| #ifdef ISSI_SWPULLUP | ||||
| #    define IS31FL3733_SWPULLUP ISSI_SWPULLUP | ||||
| #endif | ||||
| #ifdef ISSI_CSPULLUP | ||||
| #    define IS31FL3733_CSPULLUP ISSI_CSPULLUP | ||||
| #endif | ||||
| #ifdef ISSI_GLOBALCURRENT | ||||
| #    define IS31FL3733_GLOBALCURRENT ISSI_GLOBALCURRENT | ||||
| #endif | ||||
| 
 | ||||
| #define PUR_0R IS31FL3733_PUR_0R | ||||
| #define PUR_05KR IS31FL3733_PUR_05KR | ||||
| #define PUR_3KR IS31FL3733_PUR_3KR | ||||
| #define PUR_4KR IS31FL3733_PUR_4KR | ||||
| #define PUR_8KR IS31FL3733_PUR_8KR | ||||
| #define PUR_16KR IS31FL3733_PUR_16KR | ||||
| #define PUR_32KR IS31FL3733_PUR_32KR | ||||
| // ========
 | ||||
| 
 | ||||
| typedef struct is31_led { | ||||
|     uint8_t driver : 2; | ||||
|     uint8_t v; | ||||
| @ -48,13 +79,13 @@ void is31fl3733_set_led_control_register(uint8_t index, bool value); | ||||
| void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index); | ||||
| void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index); | ||||
| 
 | ||||
| #define PUR_0R 0x00   // No PUR resistor
 | ||||
| #define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
 | ||||
| #define PUR_3KR 0x03  // 3.0k Ohm resistor on all the time
 | ||||
| #define PUR_4KR 0x04  // 4.0k Ohm resistor on all the time
 | ||||
| #define PUR_8KR 0x05  // 8.0k Ohm resistor on all the time
 | ||||
| #define PUR_16KR 0x06 // 16k Ohm resistor on all the time
 | ||||
| #define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 | ||||
| #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 A_1 0x00 | ||||
| #define A_2 0x01 | ||||
|  | ||||
| @ -18,6 +18,7 @@ | ||||
|  */ | ||||
| 
 | ||||
| #include "is31fl3733.h" | ||||
| #include <string.h> | ||||
| #include "i2c_master.h" | ||||
| #include "wait.h" | ||||
| 
 | ||||
| @ -31,46 +32,46 @@ | ||||
| // 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 IS31FL3733_I2C_ADDRESS_DEFAULT 0x50 | ||||
| 
 | ||||
| #define ISSI_COMMANDREGISTER 0xFD | ||||
| #define ISSI_COMMANDREGISTER_WRITELOCK 0xFE | ||||
| #define ISSI_INTERRUPTMASKREGISTER 0xF0 | ||||
| #define ISSI_INTERRUPTSTATUSREGISTER 0xF1 | ||||
| #define IS31FL3733_COMMANDREGISTER 0xFD | ||||
| #define IS31FL3733_COMMANDREGISTER_WRITELOCK 0xFE | ||||
| #define IS31FL3733_INTERRUPTMASKREGISTER 0xF0 | ||||
| #define IS31FL3733_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 IS31FL3733_PAGE_LEDCONTROL 0x00 // PG0
 | ||||
| #define IS31FL3733_PAGE_PWM 0x01        // PG1
 | ||||
| #define IS31FL3733_PAGE_AUTOBREATH 0x02 // PG2
 | ||||
| #define IS31FL3733_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
 | ||||
| #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
 | ||||
| 
 | ||||
| #ifndef ISSI_TIMEOUT | ||||
| #    define ISSI_TIMEOUT 100 | ||||
| #ifndef IS31FL3733_I2C_TIMEOUT | ||||
| #    define IS31FL3733_I2C_TIMEOUT 100 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_PERSISTENCE | ||||
| #    define ISSI_PERSISTENCE 0 | ||||
| #ifndef IS31FL3733_I2C_PERSISTENCE | ||||
| #    define IS31FL3733_I2C_PERSISTENCE 0 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_PWM_FREQUENCY | ||||
| #    define ISSI_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 | ||||
| #ifndef IS31FL3733_PWM_FREQUENCY | ||||
| #    define IS31FL3733_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_SWPULLUP | ||||
| #    define ISSI_SWPULLUP PUR_0R | ||||
| #ifndef IS31FL3733_SWPULLUP | ||||
| #    define IS31FL3733_SWPULLUP IS31FL3733_PUR_0R | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_CSPULLUP | ||||
| #    define ISSI_CSPULLUP PUR_0R | ||||
| #ifndef IS31FL3733_CSPULLUP | ||||
| #    define IS31FL3733_CSPULLUP IS31FL3733_PUR_0R | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_GLOBALCURRENT | ||||
| #    define ISSI_GLOBALCURRENT 0xFF | ||||
| #ifndef IS31FL3733_GLOBALCURRENT | ||||
| #    define IS31FL3733_GLOBALCURRENT 0xFF | ||||
| #endif | ||||
| 
 | ||||
| // Transfer buffer for TWITransmitData()
 | ||||
| @ -82,25 +83,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][192]; | ||||
| bool    g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false}; | ||||
| 
 | ||||
| uint8_t g_led_control_registers[DRIVER_COUNT][24]             = {0}; | ||||
| bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false}; | ||||
| uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][24]             = {0}; | ||||
| bool    g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT] = {false}; | ||||
| 
 | ||||
| bool is31fl3733_write_register(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(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) { | ||||
| #if IS31FL3733_I2C_PERSISTENCE > 0 | ||||
|     for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) { | ||||
|         if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|             return false; | ||||
|         } | ||||
|     } | ||||
| #else | ||||
|     if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) { | ||||
|     if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|         return false; | ||||
|     } | ||||
| #endif | ||||
| @ -119,18 +120,16 @@ bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) { | ||||
|         // Copy the data from i to i+15.
 | ||||
|         // Device will auto-increment register for data after the first byte
 | ||||
|         // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
 | ||||
|         for (int j = 0; j < 16; j++) { | ||||
|             g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j]; | ||||
|         } | ||||
|         memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16); | ||||
| 
 | ||||
| #if ISSI_PERSISTENCE > 0 | ||||
|         for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) { | ||||
|             if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) { | ||||
| #if IS31FL3733_I2C_PERSISTENCE > 0 | ||||
|         for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) { | ||||
|             if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|                 return false; | ||||
|             } | ||||
|         } | ||||
| #else | ||||
|         if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) { | ||||
|         if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) { | ||||
|             return false; | ||||
|         } | ||||
| #endif | ||||
| @ -146,20 +145,20 @@ void is31fl3733_init(uint8_t addr, uint8_t sync) { | ||||
|     // Sync is passed so set it according to the datasheet.
 | ||||
| 
 | ||||
|     // Unlock the command register.
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
| 
 | ||||
|     // Select PG0
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_LEDCONTROL); | ||||
|     // Turn off all LEDs.
 | ||||
|     for (int i = 0x00; i <= 0x17; i++) { | ||||
|         is31fl3733_write_register(addr, i, 0x00); | ||||
|     } | ||||
| 
 | ||||
|     // Unlock the command register.
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
| 
 | ||||
|     // Select PG1
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); | ||||
|     is31fl3733_write_register(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++) { | ||||
| @ -167,18 +166,18 @@ void is31fl3733_init(uint8_t addr, uint8_t sync) { | ||||
|     } | ||||
| 
 | ||||
|     // Unlock the command register.
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
| 
 | ||||
|     // Select PG3
 | ||||
|     is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_FUNCTION); | ||||
|     // Set de-ghost pull-up resistors (SWx)
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_REG_SWPULLUP, IS31FL3733_SWPULLUP); | ||||
|     // Set de-ghost pull-down resistors (CSx)
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_REG_CSPULLUP, IS31FL3733_CSPULLUP); | ||||
|     // Set global current to maximum.
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT); | ||||
|     is31fl3733_write_register(addr, IS31FL3733_REG_GLOBALCURRENT, IS31FL3733_GLOBALCURRENT); | ||||
|     // Disable software shutdown.
 | ||||
|     is31fl3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01); | ||||
|     is31fl3733_write_register(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); | ||||
| @ -238,26 +237,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) { | ||||
|     if (g_pwm_buffer_update_required[index]) { | ||||
|         // Firstly we need to unlock the command register and select PG1.
 | ||||
|         is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_PWM); | ||||
| 
 | ||||
|         // If any of the transactions fail we risk writing dirty PG0,
 | ||||
|         // refresh page 0 just in case.
 | ||||
|         if (!is31fl3733_write_pwm_buffer(addr, g_pwm_buffer[index])) { | ||||
|             g_led_control_registers_update_required[index] = true; | ||||
|         } | ||||
|         g_pwm_buffer_update_required[index] = false; | ||||
|     } | ||||
|     g_pwm_buffer_update_required[index] = false; | ||||
| } | ||||
| 
 | ||||
| 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(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_LEDCONTROL); | ||||
|         for (int i = 0; i < 24; i++) { | ||||
|             is31fl3733_write_register(addr, i, g_led_control_registers[index][i]); | ||||
|         } | ||||
|         g_led_control_registers_update_required[index] = false; | ||||
|     } | ||||
|     g_led_control_registers_update_required[index] = false; | ||||
| } | ||||
|  | ||||
| @ -23,6 +23,38 @@ | ||||
| #include <stdbool.h> | ||||
| #include "progmem.h" | ||||
| 
 | ||||
| // ======== DEPRECATED DEFINES - DO NOT USE ========
 | ||||
| #ifdef DRIVER_COUNT | ||||
| #    define IS31FL3733_DRIVER_COUNT DRIVER_COUNT | ||||
| #endif | ||||
| #ifdef ISSI_TIMEOUT | ||||
| #    define IS31FL3733_I2C_TIMEOUT ISSI_TIMEOUT | ||||
| #endif | ||||
| #ifdef ISSI_PERSISTENCE | ||||
| #    define IS31FL3733_I2C_PERSISTENCE ISSI_PERSISTENCE | ||||
| #endif | ||||
| #ifdef ISSI_PWM_FREQUENCY | ||||
| #    define IS31FL3733_PWM_FREQUENCY ISSI_PWM_FREQUENCY | ||||
| #endif | ||||
| #ifdef ISSI_SWPULLUP | ||||
| #    define IS31FL3733_SWPULLUP ISSI_SWPULLUP | ||||
| #endif | ||||
| #ifdef ISSI_CSPULLUP | ||||
| #    define IS31FL3733_CSPULLUP ISSI_CSPULLUP | ||||
| #endif | ||||
| #ifdef ISSI_GLOBALCURRENT | ||||
| #    define IS31FL3733_GLOBALCURRENT ISSI_GLOBALCURRENT | ||||
| #endif | ||||
| 
 | ||||
| #define PUR_0R IS31FL3733_PUR_0R | ||||
| #define PUR_05KR IS31FL3733_PUR_05KR | ||||
| #define PUR_3KR IS31FL3733_PUR_3KR | ||||
| #define PUR_4KR IS31FL3733_PUR_4KR | ||||
| #define PUR_8KR IS31FL3733_PUR_8KR | ||||
| #define PUR_16KR IS31FL3733_PUR_16KR | ||||
| #define PUR_32KR IS31FL3733_PUR_32KR | ||||
| // ========
 | ||||
| 
 | ||||
| typedef struct is31_led { | ||||
|     uint8_t driver : 2; | ||||
|     uint8_t r; | ||||
| @ -48,13 +80,13 @@ 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); | ||||
| void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index); | ||||
| 
 | ||||
| #define PUR_0R 0x00   // No PUR resistor
 | ||||
| #define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
 | ||||
| #define PUR_3KR 0x03  // 3.0k Ohm resistor on all the time
 | ||||
| #define PUR_4KR 0x04  // 4.0k Ohm resistor on all the time
 | ||||
| #define PUR_8KR 0x05  // 8.0k Ohm resistor on all the time
 | ||||
| #define PUR_16KR 0x06 // 16k Ohm resistor on all the time
 | ||||
| #define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 | ||||
| #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 A_1 0x00 | ||||
| #define A_2 0x01 | ||||
|  | ||||
| @ -22,9 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define LOCKING_RESYNC_ENABLE | ||||
| 
 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define RGB_MATRIX_LED_COUNT 62 | ||||
| #define ISSI_PWM_FREQUENCY 0b010 | ||||
| #define IS31FL3733_PWM_FREQUENCY 0b010 | ||||
| 
 | ||||
| #define RGB_MATRIX_DEFAULT_VAL 80 | ||||
| #define RGB_MATRIX_KEYPRESSES | ||||
|  | ||||
| @ -20,7 +20,7 @@ | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1010011 | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_1_LED_TOTAL 45 | ||||
| #define DRIVER_2_LED_TOTAL 45 | ||||
| 
 | ||||
|  | ||||
| @ -38,7 +38,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define I2C1_SCL_PAL_MODE 4 | ||||
|  | ||||
| @ -35,7 +35,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 3 | ||||
| #define IS31FL3733_DRIVER_COUNT 3 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define DRIVER_ADDR_3 0b1110110 | ||||
|  | ||||
| @ -35,7 +35,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define I2C1_SCL_PAL_MODE 4 | ||||
|  | ||||
| @ -62,6 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #    define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
 | ||||
| #    define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 64 | ||||
| #endif | ||||
|  | ||||
| @ -34,6 +34,6 @@ | ||||
| #    define DISABLE_RGB_MATRIX_SOLID_SPLASH | ||||
| #    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 63 | ||||
| #endif | ||||
|  | ||||
| @ -35,7 +35,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define I2C1_OPMODE OPMODE_I2C | ||||
|  | ||||
| @ -16,9 +16,9 @@ | ||||
| 
 | ||||
| #define DRIVER_ADDR_1 0b1010011 | ||||
| #define DRIVER_ADDR_2 0b1011111 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 111 | ||||
| #define ISSI_PWM_FREQUENCY 0b010 // 26k
 | ||||
| #define IS31FL3733_PWM_FREQUENCY 0b010 // 26k
 | ||||
| 
 | ||||
| #define RGB_DISABLE_WHEN_USB_SUSPENDED | ||||
| #define RGB_MATRIX_DEFAULT_VAL 100 | ||||
|  | ||||
| @ -16,9 +16,9 @@ | ||||
| 
 | ||||
| #define DRIVER_ADDR_1 0b1010011 | ||||
| #define DRIVER_ADDR_2 0b1011111 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 119 | ||||
| #define ISSI_PWM_FREQUENCY 0b010 // 26k
 | ||||
| #define IS31FL3733_PWM_FREQUENCY 0b010 // 26k
 | ||||
| 
 | ||||
| #define RGB_DISABLE_WHEN_USB_SUSPENDED | ||||
| #define RGB_MATRIX_DEFAULT_VAL 100 | ||||
|  | ||||
| @ -11,9 +11,9 @@ | ||||
| 
 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1011111 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 111 | ||||
| #define ISSI_PWM_FREQUENCY 0b010 // 26k
 | ||||
| #define IS31FL3733_PWM_FREQUENCY 0b010 // 26k
 | ||||
| 
 | ||||
| #define RGB_DISABLE_WHEN_USB_SUSPENDED | ||||
| #define RGB_MATRIX_KEYPRESSES | ||||
|  | ||||
| @ -17,9 +17,9 @@ | ||||
| #define DRIVER_ADDR_1 0b1010011 | ||||
| #define DRIVER_ADDR_2 0b1011111 | ||||
| #define DRIVER_ADDR_3 0b1010000 | ||||
| #define DRIVER_COUNT 3 | ||||
| #define IS31FL3733_DRIVER_COUNT 3 | ||||
| #define RGB_MATRIX_LED_COUNT 166 | ||||
| #define ISSI_PWM_FREQUENCY 0b010 // 26k
 | ||||
| #define IS31FL3733_PWM_FREQUENCY 0b010 // 26k
 | ||||
| 
 | ||||
| #define RGB_DISABLE_WHEN_USB_SUSPENDED | ||||
| #define RGB_MATRIX_DEFAULT_VAL 100 | ||||
|  | ||||
| @ -48,7 +48,7 @@ | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1010011 | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) | ||||
| 
 | ||||
| /* I2C Alternate function settings */ | ||||
|  | ||||
| @ -56,6 +56,6 @@ | ||||
| 
 | ||||
| #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 63 | ||||
| #endif | ||||
|  | ||||
| @ -54,6 +54,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 63 | ||||
| #endif | ||||
|  | ||||
| @ -70,6 +70,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 63 | ||||
| #endif | ||||
|  | ||||
| @ -56,6 +56,6 @@ | ||||
| 
 | ||||
| #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 61 | ||||
| #endif | ||||
|  | ||||
| @ -54,6 +54,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 61 | ||||
| #endif | ||||
|  | ||||
| @ -70,6 +70,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 61 | ||||
| #endif | ||||
|  | ||||
| @ -56,6 +56,6 @@ | ||||
| 
 | ||||
| #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 62 | ||||
| #endif | ||||
|  | ||||
| @ -51,6 +51,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 62 | ||||
| #endif | ||||
|  | ||||
| @ -70,6 +70,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1      0b1010000 | ||||
| #    define DRIVER_COUNT       1 | ||||
| #    define IS31FL3733_DRIVER_COUNT       1 | ||||
| #    define RGB_MATRIX_LED_COUNT   62 | ||||
| #endif | ||||
|  | ||||
| @ -49,7 +49,7 @@ | ||||
| #define ENABLE_RGB_MATRIX_TYPING_HEATMAP | ||||
| #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define RGB_MATRIX_LED_COUNT 64 | ||||
| #endif | ||||
| #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 | ||||
|  | ||||
| @ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| // ADDR2 represents A3:A2 of the 7-bit address.
 | ||||
| // The result is: 0b101(ADDR2)(ADDR1)
 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define RGB_MATRIX_LED_COUNT 64 | ||||
| 
 | ||||
| // RGB Matrix Animation modes. Explicitly enabled
 | ||||
|  | ||||
| @ -6,5 +6,5 @@ | ||||
| 
 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| 
 | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define RGB_MATRIX_LED_COUNT 63 | ||||
|  | ||||
| @ -27,7 +27,7 @@ | ||||
|     /* RGB Matrix config */ | ||||
|     #define DRIVER_ADDR_1 0b1011111 | ||||
|     #define DRIVER_ADDR_2 0b1010000 | ||||
|     #define DRIVER_COUNT 2 | ||||
|     #define IS31FL3733_DRIVER_COUNT 2 | ||||
|     #define DRIVER_1_LED_TOTAL 63 | ||||
|     #define DRIVER_2_LED_TOTAL 64 | ||||
| 
 | ||||
|  | ||||
| @ -73,6 +73,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 62 | ||||
| #endif | ||||
|  | ||||
| @ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 } | ||||
| #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 64 | ||||
| 
 | ||||
| // These define which keys in the matrix are alphas/mods
 | ||||
|  | ||||
| @ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 } | ||||
| #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 64 | ||||
| 
 | ||||
| // These define which keys in the matrix are alphas/mods
 | ||||
|  | ||||
| @ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 } | ||||
| #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 64 | ||||
| 
 | ||||
| // These define which keys in the matrix are alphas/mods
 | ||||
|  | ||||
| @ -39,7 +39,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define I2C1_SDA_PIN B7 | ||||
|  | ||||
| @ -26,7 +26,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (4 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| /* WB32 MCU has no default definition */ | ||||
| #define I2C1_OPMODE OPMODE_I2C | ||||
|  | ||||
| @ -105,7 +105,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_ADDR_2 0b1010000 | ||||
| #    define DRIVER_COUNT 2 | ||||
| #    define IS31FL3733_DRIVER_COUNT 2 | ||||
| #    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) | ||||
|  | ||||
| @ -16,8 +16,6 @@ | ||||
|  * 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" | ||||
| @ -32,30 +30,46 @@ | ||||
| // 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 IS31FL3733_I2C_ADDRESS_DEFAULT 0x50 | ||||
| 
 | ||||
| #define ISSI_COMMANDREGISTER 0xFD | ||||
| #define ISSI_COMMANDREGISTER_WRITELOCK 0xFE | ||||
| #define ISSI_INTERRUPTMASKREGISTER 0xF0 | ||||
| #define ISSI_INTERRUPTSTATUSREGISTER 0xF1 | ||||
| #define IS31FL3733_COMMANDREGISTER 0xFD | ||||
| #define IS31FL3733_COMMANDREGISTER_WRITELOCK 0xFE | ||||
| #define IS31FL3733_INTERRUPTMASKREGISTER 0xF0 | ||||
| #define IS31FL3733_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 IS31FL3733_PAGE_LEDCONTROL 0x00 // PG0
 | ||||
| #define IS31FL3733_PAGE_PWM 0x01        // PG1
 | ||||
| #define IS31FL3733_PAGE_AUTOBREATH 0x02 // PG2
 | ||||
| #define IS31FL3733_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
 | ||||
| #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
 | ||||
| 
 | ||||
| #ifndef ISSI_TIMEOUT | ||||
| #    define ISSI_TIMEOUT 5000 | ||||
| #ifndef IS31FL3733_I2C_TIMEOUT | ||||
| #    define IS31FL3733_I2C_TIMEOUT 100 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef ISSI_PERSISTENCE | ||||
| #    define ISSI_PERSISTENCE 0 | ||||
| #ifndef IS31FL3733_I2C_PERSISTENCE | ||||
| #    define IS31FL3733_I2C_PERSISTENCE 0 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef IS31FL3733_PWM_FREQUENCY | ||||
| #    define IS31FL3733_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 | ||||
| #endif | ||||
| 
 | ||||
| #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 | ||||
| 
 | ||||
| // Transfer buffer for TWITransmitData()
 | ||||
| @ -67,25 +81,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][192]; | ||||
| 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][24]             = {{0}, {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 | ||||
| @ -108,14 +122,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 | ||||
| @ -131,38 +145,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++) { | ||||
|         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++) { | ||||
|         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) { | ||||
|     is31_led led; | ||||
|     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) { | ||||
|         is31_led led = g_is31_leds[index]; | ||||
|         memcpy_P(&led, (&g_is31_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; | ||||
| @ -177,7 +205,8 @@ void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { | ||||
| } | ||||
| 
 | ||||
| void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { | ||||
|     is31_led led = g_is31_leds[index]; | ||||
|     is31_led led; | ||||
|     memcpy_P(&led, (&g_is31_leds[index]), sizeof(led)); | ||||
| 
 | ||||
|     uint8_t control_register_r = led.r / 8; | ||||
|     uint8_t control_register_g = led.g / 8; | ||||
| @ -208,8 +237,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 +252,11 @@ 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); | ||||
|         is31fl3733_write_register(index, addr, IS31FL3733_COMMANDREGISTER_WRITELOCK, 0xC5); | ||||
|         is31fl3733_write_register(index, addr, IS31FL3733_COMMANDREGISTER, IS31FL3733_PAGE_LEDCONTROL); | ||||
|         for (int i = 0; i < 24; i++) { | ||||
|             is31fl3733_write_register(index, addr, i, g_led_control_registers[index][i]); | ||||
|         } | ||||
|     } | ||||
|     g_led_control_registers_update_required[index] = false; | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -47,6 +47,14 @@ 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); | ||||
| 
 | ||||
| #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 A_1 0x00 | ||||
| #define A_2 0x01 | ||||
| #define A_3 0x02 | ||||
|  | ||||
| @ -15,11 +15,10 @@ | ||||
|  */ | ||||
| 
 | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| 
 | ||||
| #include "rgb_matrix.h" | ||||
| #include "i2c_master.h" | ||||
| #include "is31fl3733-dual.h" | ||||
| #include "gpio.h" | ||||
| #    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); | ||||
| @ -52,5 +51,4 @@ const rgb_matrix_driver_t rgb_matrix_driver = { | ||||
|     .set_color = is31fl3733_set_color, | ||||
|     .set_color_all = is31fl3733_set_color_all, | ||||
| }; | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -18,9 +18,7 @@ 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] = { | ||||
|     { 0, B_1,  A_1,  C_1  }, | ||||
| @ -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,7 +213,6 @@ 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. | ||||
| @ -228,7 +222,7 @@ void matrix_init_kb(void) { | ||||
| #    endif | ||||
|     rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD), | ||||
|     rgb_matrix_set_flags(LED_FLAG_ALL); | ||||
| #endif | ||||
| 
 | ||||
|     matrix_init_user(); | ||||
| } | ||||
| #endif | ||||
|  | ||||
| @ -54,6 +54,6 @@ | ||||
| // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define RGB_MATRIX_LED_COUNT 52 | ||||
| #endif | ||||
|  | ||||
| @ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 } | ||||
| #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 128 | ||||
| 
 | ||||
| // These define which keys in the matrix are alphas/mods
 | ||||
|  | ||||
| @ -17,7 +17,7 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| /* RGB Matrix Driver Configuration */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1011111 | ||||
| 
 | ||||
|  | ||||
| @ -16,14 +16,6 @@ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| /* DIP switch */ | ||||
| #define DIP_SWITCH_MATRIX_GRID  { {0,1} } | ||||
| 
 | ||||
| /* RGB Matrix Driver Configuration */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1011111 | ||||
| 
 | ||||
| /* RGB Matrix Configuration */ | ||||
| #define DRIVER_1_LED_TOTAL 59 | ||||
| #define DRIVER_2_LED_TOTAL 24 | ||||
|  | ||||
| @ -64,7 +64,7 @@ | ||||
| #define ENABLE_RGB_MATRIX_SOLID_SPLASH | ||||
| #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_1_LED_TOTAL 63 | ||||
| //#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 | ||||
| 
 | ||||
|  | ||||
| @ -19,7 +19,7 @@ | ||||
| 
 | ||||
| #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 2 | ||||
| #    define IS31FL3733_DRIVER_COUNT 2 | ||||
| #    define DRIVER_1_LED_TOTAL 63 | ||||
| #    define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL | ||||
| 
 | ||||
|  | ||||
| @ -27,7 +27,7 @@ | ||||
| #    define DISABLE_RGB_MATRIX_RAINDROPS | ||||
| #    define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define DRIVER_1_LED_TOTAL 64 | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -77,7 +77,7 @@ | ||||
| // are compiled unconditionally).
 | ||||
| 
 | ||||
| // Configure the IS31FL3733 driver for per-key RGB LEDs
 | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_1_LED_TOTAL 61 | ||||
| 
 | ||||
|  | ||||
| @ -68,6 +68,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 60 | ||||
| #endif | ||||
|  | ||||
| @ -54,6 +54,6 @@ | ||||
| // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | ||||
| 
 | ||||
| #    define DRIVER_ADDR_1 0b1010000 | ||||
| #    define DRIVER_COUNT 1 | ||||
| #    define IS31FL3733_DRIVER_COUNT 1 | ||||
| #    define RGB_MATRIX_LED_COUNT 62 | ||||
| #endif | ||||
|  | ||||
| @ -37,7 +37,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define I2C1_OPMODE OPMODE_I2C | ||||
|  | ||||
| @ -38,7 +38,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define I2C1_OPMODE OPMODE_I2C | ||||
|  | ||||
| @ -35,7 +35,7 @@ | ||||
| #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) | ||||
| 
 | ||||
| /* I2C Config for LED Driver */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1110100 | ||||
| #define DRIVER_ADDR_2 0b1110111 | ||||
| #define I2C1_SCL_PAL_MODE 4 | ||||
|  | ||||
| @ -24,7 +24,7 @@ | ||||
| #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| 
 | ||||
| #define DRIVER_COUNT 1 | ||||
| #define IS31FL3733_DRIVER_COUNT 1 | ||||
| #define RGB_MATRIX_LED_COUNT 64 | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 } | ||||
| #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 128 | ||||
| 
 | ||||
| // These define which keys in the matrix are alphas/mods
 | ||||
|  | ||||
| @ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 } | ||||
| #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 128 | ||||
| 
 | ||||
| // These define which keys in the matrix are alphas/mods
 | ||||
|  | ||||
| @ -24,7 +24,7 @@ | ||||
| 	#define RGB_MATRIX_LED_PROCESS_LIMIT 20 | ||||
| 	#define RGB_MATRIX_LED_FLUSH_LIMIT 26 | ||||
| 	#define DRIVER_ADDR_1 0b1010000 | ||||
|     #define DRIVER_COUNT 1 | ||||
|     #define IS31FL3733_DRIVER_COUNT 1 | ||||
| 	#define RGB_MATRIX_LED_COUNT 64 | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -20,7 +20,7 @@ | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1010011 | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_1_LED_TOTAL 45 | ||||
| #define DRIVER_2_LED_TOTAL 45 | ||||
| 
 | ||||
|  | ||||
| @ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 } | ||||
| #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } | ||||
| 
 | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define RGB_MATRIX_LED_COUNT 128 | ||||
| 
 | ||||
| // These define which keys in the matrix are alphas/mods
 | ||||
|  | ||||
| @ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| 
 | ||||
| /* RGB Matrix driver config */ | ||||
| #define DRIVER_COUNT 2 | ||||
| #define IS31FL3733_DRIVER_COUNT 2 | ||||
| #define DRIVER_ADDR_1 0b1010000 | ||||
| #define DRIVER_ADDR_2 0b1010011 | ||||
| #define DRIVER_1_LED_TOTAL 46 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user