drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

RGB Matrix: driver naming cleanups (#21594)

Browse source
This commit is contained in:
Ryan 2023-08-23 10:00:03 +10:00 • committed by GitHub
parent dfb6d38f08
commit 37bc949945
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
513 changed files with 1166 additions and 1170 deletions
Download patch file Download diff file Expand all files Collapse all files

40
keyboards/neson_design/700e/700e.c
View file

@ -107,12 +107,12 @@ static void self_testing(void)
switch(rgb_state.testing) {
case ST_STAGE_1:
if (rgb_state.index !=0 ) {
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
}
if (rgb_state.index >= ST_LEFT_END) {
for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
if (rgb_state.index == ST_LEFT_END) {
rgb_state.index = ST_LEFT_BEGIN;
@ -131,20 +131,20 @@ static void self_testing(void)
break;
case ST_STAGE_2: {
// clear all
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
int i = 0;
// light left and right
for (i = 0; i < ST_LEFT_SIZE; i++) {
IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
is31fl3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
}
for (i = 0; i < ST_RIGHT_SIZE; i++) {
IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
is31fl3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
}
if (rgb_state.dir) {
// left to right
for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
if (rgb_state.index == ST_RIGHT_BEGIN) {
@ -154,7 +154,7 @@ static void self_testing(void)
} else {
// right to left
for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
@ -174,7 +174,7 @@ static void self_testing(void)
break;
case ST_STAGE_3:
if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
}
// light left and right
@ -193,11 +193,11 @@ static void self_testing(void)
} else {
// left
for (int i = 0; i < rgb_state.index+1; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
// right
for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index ++;
}
@ -295,16 +295,16 @@ void matrix_init_kb(void)
writePinLow(LED_CAPS_LOCK_PIN);
i2c_init();
IS31FL3731_init(DRIVER_ADDR_1);
is31fl3731_init(DRIVER_ADDR_1);
#ifdef DRIVER_ADDR_2
IS31FL3731_init(DRIVER_ADDR_2);
is31fl3731_init(DRIVER_ADDR_2);
#endif
for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
IS31FL3731_set_led_control_register(index, true, true, true);
is31fl3731_set_led_control_register(index, true, true, true);
}
IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
#ifdef DRIVER_ADDR_2
IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
#endif
update_ticks();
matrix_init_user();
@ -321,7 +321,7 @@ void housekeeping_task_kb(void)
self_testing();
} else if (rgb_state.state == CAPS_ALERT) {
if (rgb_state.alert) {
IS31FL3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B);
is31fl3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B);
LED_TYPE leds[4];
for (int i = 0; i < 4; i++) {
leds[i].r = ALERM_LED_G;
@ -330,7 +330,7 @@ void housekeeping_task_kb(void)
}
ws2812_setleds(leds, 4);
} else {
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
LED_TYPE leds[4] = {0};
ws2812_setleds(leds, 4);
}
@ -341,9 +341,9 @@ void housekeeping_task_kb(void)
}
}
IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
#ifdef DRIVER_ADDR_2
IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
#endif
housekeeping_task_user();
@ -354,7 +354,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
if (rgb_state.state != NORMAL) return;
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
}
LED_TYPE leds[4];
for (int i = 0; i < 4; i++) {

40
keyboards/neson_design/n6/n6.c
View file

@ -111,12 +111,12 @@ static void self_testing(void)
switch(rgb_state.testing) {
case ST_STAGE_1:
if (rgb_state.index !=0 ) {
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
}
if (rgb_state.index >= ST_LEFT_END) {
for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
if (rgb_state.index == ST_LEFT_END) {
rgb_state.index = ST_LEFT_BEGIN;
@ -135,20 +135,20 @@ static void self_testing(void)
break;
case ST_STAGE_2: {
// clear all
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
int i = 0;
// light left and right
for (i = 0; i < ST_LEFT_SIZE; i++) {
IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
is31fl3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
}
for (i = 0; i < ST_RIGHT_SIZE; i++) {
IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
is31fl3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
}
if (rgb_state.dir) {
// left to right
for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
if (rgb_state.index == ST_RIGHT_BEGIN) {
@ -158,7 +158,7 @@ static void self_testing(void)
} else {
// right to left
for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
@ -178,7 +178,7 @@ static void self_testing(void)
break;
case ST_STAGE_3:
if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
}
// light left and right
@ -197,11 +197,11 @@ static void self_testing(void)
} else {
// left
for (int i = 0; i < rgb_state.index+1; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
// right
for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index ++;
}
@ -299,16 +299,16 @@ void matrix_init_kb(void)
writePinLow(LED_CAPS_LOCK_PIN);
i2c_init();
IS31FL3731_init(DRIVER_ADDR_1);
is31fl3731_init(DRIVER_ADDR_1);
#ifdef DRIVER_ADDR_2
IS31FL3731_init(DRIVER_ADDR_2);
is31fl3731_init(DRIVER_ADDR_2);
#endif
for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
IS31FL3731_set_led_control_register(index, true, true, true);
is31fl3731_set_led_control_register(index, true, true, true);
}
IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
#ifdef DRIVER_ADDR_2
IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
#endif
update_ticks();
matrix_init_user();
@ -327,13 +327,13 @@ void housekeeping_task_kb(void)
.b = 0x00,
};
if (rgb_state.alert) {
IS31FL3731_set_color_all(led.r, led.g, led.b);
is31fl3731_set_color_all(led.r, led.g, led.b);
ws2812_setleds(&led, 1);
} else {
led.r = 0;
led.g = 0;
led.b = 0;
IS31FL3731_set_color_all(0, 0, 0);
is31fl3731_set_color_all(0, 0, 0);
ws2812_setleds(&led, 1);
}
@ -343,9 +343,9 @@ void housekeeping_task_kb(void)
}
}
IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
#ifdef DRIVER_ADDR_2
IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
#endif
housekeeping_task_user();
@ -356,7 +356,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
if (rgb_state.state != NORMAL) return;
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
}
ws2812_setleds(start_led+RGB_MATRIX_LED_COUNT, 1);
}