diff options
| author | a_p_u_r_o <applause@elfmimi.jp> | 2020-10-04 03:15:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-04 05:15:44 +1100 |
| commit | 1fe7743af88cf0d65800d3ccfc1c59d1c2d65db2 (patch) | |
| tree | e420104f54c22db35aac0eb36736824876439633 /drivers | |
| parent | a0467fda3816e7c87d8cd0b2584ed701ff78375e (diff) | |
| download | qmk_firmware-1fe7743af88cf0d65800d3ccfc1c59d1c2d65db2.tar.gz qmk_firmware-1fe7743af88cf0d65800d3ccfc1c59d1c2d65db2.zip | |
IS31FL3741 driver fixup (#10519)
* Fix issue with data transfer of CS1_SW7 to CS18_SW7.
* Fix issue with handling of scaling register buffer's dirty flag.
* Remove unused extern declaration.
* Compaction of struct is31_led utilizing bit fields.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/issi/is31fl3741.c | 5 | ||||
| -rw-r--r-- | drivers/issi/is31fl3741.h | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/issi/is31fl3741.c b/drivers/issi/is31fl3741.c index bc434fb29..1b533c9b6 100644 --- a/drivers/issi/is31fl3741.c +++ b/drivers/issi/is31fl3741.c | |||
| @@ -97,14 +97,13 @@ bool IS31FL3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) { | |||
| 97 | IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM0); | 97 | IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM0); |
| 98 | 98 | ||
| 99 | for (int i = 0; i < 342; i += 18) { | 99 | for (int i = 0; i < 342; i += 18) { |
| 100 | g_twi_transfer_buffer[0] = i % 180; | ||
| 101 | |||
| 102 | if (i == 180) { | 100 | if (i == 180) { |
| 103 | // unlock the command register and select PG2 | 101 | // unlock the command register and select PG2 |
| 104 | IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); | 102 | IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); |
| 105 | IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM1); | 103 | IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM1); |
| 106 | } | 104 | } |
| 107 | 105 | ||
| 106 | g_twi_transfer_buffer[0] = i % 180; | ||
| 108 | memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 18); | 107 | memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 18); |
| 109 | 108 | ||
| 110 | #if ISSI_PERSISTENCE > 0 | 109 | #if ISSI_PERSISTENCE > 0 |
| @@ -251,4 +250,6 @@ void IS31FL3741_set_scaling_registers(const is31_led *pled, uint8_t red, uint8_t | |||
| 251 | g_scaling_registers[pled->driver][pled->r] = red; | 250 | g_scaling_registers[pled->driver][pled->r] = red; |
| 252 | g_scaling_registers[pled->driver][pled->g] = green; | 251 | g_scaling_registers[pled->driver][pled->g] = green; |
| 253 | g_scaling_registers[pled->driver][pled->b] = blue; | 252 | g_scaling_registers[pled->driver][pled->b] = blue; |
| 253 | |||
| 254 | g_scaling_registers_update_required[pled->driver] = true; | ||
| 254 | } | 255 | } |
diff --git a/drivers/issi/is31fl3741.h b/drivers/issi/is31fl3741.h index ed5350932..2df0c5b1a 100644 --- a/drivers/issi/is31fl3741.h +++ b/drivers/issi/is31fl3741.h | |||
| @@ -23,14 +23,13 @@ | |||
| 23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
| 24 | 24 | ||
| 25 | typedef struct is31_led { | 25 | typedef struct is31_led { |
| 26 | uint8_t driver : 2; | 26 | uint32_t driver : 2; |
| 27 | uint16_t r; | 27 | uint32_t r : 10; |
| 28 | uint16_t g; | 28 | uint32_t g : 10; |
| 29 | uint16_t b; | 29 | uint32_t b : 10; |
| 30 | } __attribute__((packed)) is31_led; | 30 | } __attribute__((packed)) is31_led; |
| 31 | 31 | ||
| 32 | extern const is31_led g_is31_leds[DRIVER_LED_TOTAL]; | 32 | extern const is31_led g_is31_leds[DRIVER_LED_TOTAL]; |
| 33 | extern const is31_led g_is31_indicator_leds[DRIVER_INDICATOR_LED_TOTAL]; | ||
| 34 | 33 | ||
| 35 | void IS31FL3741_init(uint8_t addr); | 34 | void IS31FL3741_init(uint8_t addr); |
| 36 | void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data); | 35 | void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data); |
