diff options
Diffstat (limited to 'keyboards/mechlovin/infinity875')
6 files changed, 57 insertions, 82 deletions
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h index 4f02ed39c9..9a9b8b6236 100644 --- a/keyboards/mechlovin/infinity875/config.h +++ b/keyboards/mechlovin/infinity875/config.h @@ -45,8 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN E2 -#define DRIVER_LED_TOTAL 42 -#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +#define RGB_MATRIX_LED_COUNT 42 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 diff --git a/keyboards/mechlovin/infinity875/keymaps/default/keymap.c b/keyboards/mechlovin/infinity875/keymaps/default/keymap.c index 93073a1722..750a94dab5 100644 --- a/keyboards/mechlovin/infinity875/keymaps/default/keymap.c +++ b/keyboards/mechlovin/infinity875/keymaps/default/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SLCK, KC_PAUS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, diff --git a/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc b/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc index cee6a3f038..627d12bd3c 100644 --- a/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc +++ b/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc @@ -62,7 +62,7 @@ bool effect_runner_all(effect_params_t* params, i_f effect_func) { RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_esc(effect_params_t* params, i_f effect_func) { @@ -77,7 +77,7 @@ bool effect_runner_esc(effect_params_t* params, i_f effect_func) { for (uint8_t i = 1; i < 18; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_f13(effect_params_t* params, i_f effect_func) { @@ -94,7 +94,7 @@ bool effect_runner_f13(effect_params_t* params, i_f effect_func) { for (uint8_t i = 0; i < 14; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_clus(effect_params_t* params, i_f effect_func) { @@ -109,7 +109,7 @@ bool effect_runner_clus(effect_params_t* params, i_f effect_func) { for (uint8_t i = 0; i < 15; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) { @@ -123,7 +123,7 @@ bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) { RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) { @@ -140,7 +140,7 @@ bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) { for (uint8_t i = 1; i < 18; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) { @@ -160,7 +160,7 @@ bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) { for (uint8_t i = 0; i < 14; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) { @@ -177,7 +177,7 @@ bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) { for (uint8_t i = 0; i < 15; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) { @@ -191,7 +191,7 @@ bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) { @@ -208,7 +208,7 @@ bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) for (uint8_t i = 1; i < 18; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) { @@ -228,7 +228,7 @@ bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) for (uint8_t i = 0; i < 14; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func) { @@ -245,7 +245,7 @@ bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func for (uint8_t i = 0; i < 15; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } static void raindrops_set_color_all(int i, effect_params_t* params) { @@ -375,7 +375,7 @@ static bool solid_esc(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Solid F13 @@ -390,7 +390,7 @@ static bool solid_f13(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Solid cluster @@ -404,7 +404,7 @@ static bool solid_clus(effect_params_t* params) { for (uint8_t i = 15 ; i < led_max; i++) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing all @@ -420,7 +420,7 @@ bool breathing_all(effect_params_t* params) { RGB_MATRIX_TEST_LED_FLAGS(); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing ESC @@ -439,7 +439,7 @@ static bool breathing_esc(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing F13 @@ -458,7 +458,7 @@ static bool breathing_f13(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b); - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing cluster @@ -476,7 +476,7 @@ static bool breathing_clus(effect_params_t* params) { RGB_MATRIX_TEST_LED_FLAGS(); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Band Val all @@ -698,7 +698,7 @@ static bool raindrops_all(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_all(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_all(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -707,7 +707,7 @@ static bool raindrops_all(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_all(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Raindrops ESC @@ -715,7 +715,7 @@ static bool raindrops_esc(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_esc(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_esc(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -724,7 +724,7 @@ static bool raindrops_esc(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_esc(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Raindrops F13 @@ -732,7 +732,7 @@ static bool raindrops_f13(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_f13(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_f13(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -741,7 +741,7 @@ static bool raindrops_f13(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_f13(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Raindrops Cluster @@ -749,7 +749,7 @@ static bool raindrops_clus(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_clus(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_clus(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -758,7 +758,7 @@ static bool raindrops_clus(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_clus(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/mechlovin/infinity875/keymaps/via/config.h b/keyboards/mechlovin/infinity875/keymaps/via/config.h deleted file mode 100644 index 74ee03f3f9..0000000000 --- a/keyboards/mechlovin/infinity875/keymaps/via/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Mechlovin' Studio - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#ifdef RGB_MATRIX_ENABLE - -#define VIA_QMK_RGBLIGHT_ENABLE - -#endif diff --git a/keyboards/mechlovin/infinity875/keymaps/via/keymap.c b/keyboards/mechlovin/infinity875/keymaps/via/keymap.c index 283104b5b2..90f39f8698 100644 --- a/keyboards/mechlovin/infinity875/keymaps/via/keymap.c +++ b/keyboards/mechlovin/infinity875/keymaps/via/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SLCK, KC_PAUS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, diff --git a/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc b/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc index cee6a3f038..627d12bd3c 100644 --- a/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc +++ b/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc @@ -62,7 +62,7 @@ bool effect_runner_all(effect_params_t* params, i_f effect_func) { RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_esc(effect_params_t* params, i_f effect_func) { @@ -77,7 +77,7 @@ bool effect_runner_esc(effect_params_t* params, i_f effect_func) { for (uint8_t i = 1; i < 18; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_f13(effect_params_t* params, i_f effect_func) { @@ -94,7 +94,7 @@ bool effect_runner_f13(effect_params_t* params, i_f effect_func) { for (uint8_t i = 0; i < 14; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_clus(effect_params_t* params, i_f effect_func) { @@ -109,7 +109,7 @@ bool effect_runner_clus(effect_params_t* params, i_f effect_func) { for (uint8_t i = 0; i < 15; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) { @@ -123,7 +123,7 @@ bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) { RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) { @@ -140,7 +140,7 @@ bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) { for (uint8_t i = 1; i < 18; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) { @@ -160,7 +160,7 @@ bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) { for (uint8_t i = 0; i < 14; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) { @@ -177,7 +177,7 @@ bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) { for (uint8_t i = 0; i < 15; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) { @@ -191,7 +191,7 @@ bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) { @@ -208,7 +208,7 @@ bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) for (uint8_t i = 1; i < 18; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) { @@ -228,7 +228,7 @@ bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) for (uint8_t i = 0; i < 14; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func) { @@ -245,7 +245,7 @@ bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func for (uint8_t i = 0; i < 15; i++) { rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } static void raindrops_set_color_all(int i, effect_params_t* params) { @@ -375,7 +375,7 @@ static bool solid_esc(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Solid F13 @@ -390,7 +390,7 @@ static bool solid_f13(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Solid cluster @@ -404,7 +404,7 @@ static bool solid_clus(effect_params_t* params) { for (uint8_t i = 15 ; i < led_max; i++) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing all @@ -420,7 +420,7 @@ bool breathing_all(effect_params_t* params) { RGB_MATRIX_TEST_LED_FLAGS(); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing ESC @@ -439,7 +439,7 @@ static bool breathing_esc(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing F13 @@ -458,7 +458,7 @@ static bool breathing_f13(effect_params_t* params) { rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b); - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Breathing cluster @@ -476,7 +476,7 @@ static bool breathing_clus(effect_params_t* params) { RGB_MATRIX_TEST_LED_FLAGS(); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Band Val all @@ -698,7 +698,7 @@ static bool raindrops_all(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_all(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_all(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -707,7 +707,7 @@ static bool raindrops_all(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_all(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Raindrops ESC @@ -715,7 +715,7 @@ static bool raindrops_esc(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_esc(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_esc(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -724,7 +724,7 @@ static bool raindrops_esc(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_esc(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Raindrops F13 @@ -732,7 +732,7 @@ static bool raindrops_f13(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_f13(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_f13(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -741,7 +741,7 @@ static bool raindrops_f13(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_f13(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } // Raindrops Cluster @@ -749,7 +749,7 @@ static bool raindrops_clus(effect_params_t* params) { if (!params->init) { // Change one LED every tick, make sure speed is not 0 if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color_clus(rand() % DRIVER_LED_TOTAL, params); + raindrops_set_color_clus(rand() % RGB_MATRIX_LED_COUNT, params); } return false; } @@ -758,7 +758,7 @@ static bool raindrops_clus(effect_params_t* params) { for (int i = led_min; i < led_max; i++) { raindrops_set_color_clus(i, params); } - return led_max < DRIVER_LED_TOTAL; + return led_max < RGB_MATRIX_LED_COUNT; } #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS |