diff options
author | Ryan <fauxpark@gmail.com> | 2023-10-04 20:12:50 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-04 20:12:50 +1100 |
commit | d99dbe4d56a5d414b8d131bf703257172af91b70 (patch) | |
tree | fa8b7212734413a48e3232fdc45f30047e62fa3d /keyboards/input_club | |
parent | c0f16be50fec33cdb30386ac512efb900f3f7470 (diff) |
Update ISSI LED types (#22099)
Diffstat (limited to 'keyboards/input_club')
-rw-r--r-- | keyboards/input_club/ergodox_infinity/ergodox_infinity.c | 4 | ||||
-rw-r--r-- | keyboards/input_club/infinity60/led/led.c | 2 | ||||
-rw-r--r-- | keyboards/input_club/k_type/is31fl3733-dual.c | 8 | ||||
-rw-r--r-- | keyboards/input_club/k_type/is31fl3733-dual.h | 6 | ||||
-rw-r--r-- | keyboards/input_club/k_type/k_type.c | 2 | ||||
-rw-r--r-- | keyboards/input_club/whitefox/whitefox.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c index 70cd26a3f3..8f245d9fa3 100644 --- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c +++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c @@ -171,7 +171,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { #endif #ifdef LED_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { // The numbers in the comments are the led numbers DXX on the PCB /* Refer to IS31 manual for these locations * driver @@ -195,7 +195,7 @@ const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { // 71 70 69 { 0, C3_7 }, { 0, C2_7 }, { 0, C1_7 }, // Right half (mirrored) -// Due to how LED_MATRIX_SPLIT is implemented, only the first half of g_is31_leds is actually used. +// Due to how LED_MATRIX_SPLIT is implemented, only the first half of g_is31fl3731_leds is actually used. // Luckily, the right half has the same LED pinouts, just mirrored. // 45 44 43 42 41 40 39 { 0, C2_2 }, { 0, C1_2 }, { 0, C5_1 }, { 0, C4_1 }, { 0, C3_1 }, { 0, C2_1 }, { 0, C1_1 }, diff --git a/keyboards/input_club/infinity60/led/led.c b/keyboards/input_club/infinity60/led/led.c index ef29d12a29..a6a63e202d 100644 --- a/keyboards/input_club/infinity60/led/led.c +++ b/keyboards/input_club/infinity60/led/led.c @@ -4,7 +4,7 @@ #include "quantum.h" #ifdef LED_MATRIX_ENABLE -const is31_led g_is31_leds[LED_MATRIX_LED_COUNT] = { +const is31fl3731_led_t g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | LED address diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c index 851b56a37d..ea523eea1f 100644 --- a/keyboards/input_club/k_type/is31fl3733-dual.c +++ b/keyboards/input_club/k_type/is31fl3733-dual.c @@ -172,9 +172,9 @@ void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) { } void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { - is31_led led; + is31fl3733_led_t led; if (index >= 0 && index < RGB_MATRIX_LED_COUNT) { - memcpy_P(&led, (&g_is31_leds[index]), sizeof(led)); + memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led)); if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) { return; @@ -193,8 +193,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; - memcpy_P(&led, (&g_is31_leds[index]), sizeof(led)); + is31fl3733_led_t led; + memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led)); uint8_t control_register_r = led.r / 8; uint8_t control_register_g = led.g / 8; diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h index 796708f507..7a43bc49f4 100644 --- a/keyboards/input_club/k_type/is31fl3733-dual.h +++ b/keyboards/input_club/k_type/is31fl3733-dual.h @@ -39,14 +39,14 @@ #define IS31FL3733_I2C_ADDRESS_VCC_SDA 0x5E #define IS31FL3733_I2C_ADDRESS_VCC_VCC 0x5F -typedef struct is31_led { +typedef struct is31fl3733_led_t { uint8_t driver : 2; uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31_led; +} __attribute__((packed)) is31fl3733_led_t; -extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT]; +extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT]; void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync); bool is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data); diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c index 0d0b763b20..c6d06b51dc 100644 --- a/keyboards/input_club/k_type/k_type.c +++ b/keyboards/input_club/k_type/k_type.c @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef RGB_MATRIX_ENABLE # include "is31fl3733-dual.h" -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = { { 0, B_1, A_1, C_1 }, { 0, B_2, A_2, C_2 }, { 0, B_3, A_3, C_3 }, diff --git a/keyboards/input_club/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c index b0f0f03776..63c6a49240 100644 --- a/keyboards/input_club/whitefox/whitefox.c +++ b/keyboards/input_club/whitefox/whitefox.c @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum.h" #ifdef LED_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { // The numbers in the comments are the led numbers DXX on the PCB /* Refer to IS31 manual for these locations * driver |