Change DRIVER_LED_COUNT
to {LED,RGB}_MATRIX_LED_COUNT
(#18399)
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
|
||||
|
||||
#define RGB_DI_PIN A7
|
||||
#define DRIVER_LED_TOTAL 91
|
||||
#define RGB_MATRIX_LED_COUNT 91
|
||||
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
||||
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
|
@@ -23,7 +23,7 @@
|
||||
#define DRIVER_COUNT 2
|
||||
#define DRIVER_1_LED_TOTAL 32
|
||||
#define DRIVER_2_LED_TOTAL 36
|
||||
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
||||
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
||||
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
||||
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
|
@@ -17,7 +17,7 @@
|
||||
#include "adelais.h"
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
|
||||
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
|
||||
{0, C2_1, C3_1, C4_1}, //D102-A0-0
|
||||
{0, C5_1, C6_1, C7_1}, //D108-A1-1
|
||||
|
@@ -51,7 +51,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
// 0b1110110 AD <-> SDA
|
||||
#define DRIVER_ADDR_1 0b0110010
|
||||
#define DRIVER_COUNT 1
|
||||
#define DRIVER_LED_TOTAL 66
|
||||
#define RGB_MATRIX_LED_COUNT 66
|
||||
|
||||
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
||||
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
|
||||
|
@@ -17,7 +17,7 @@
|
||||
#include "rev3.h"
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
|
||||
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
{0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */
|
||||
{0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */
|
||||
{0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */
|
||||
|
@@ -31,7 +31,7 @@
|
||||
// 0b1110110 AD <-> SDA
|
||||
#define DRIVER_ADDR_1 0b1110110
|
||||
#define DRIVER_COUNT 1
|
||||
#define DRIVER_LED_TOTAL 25
|
||||
#define RGB_MATRIX_LED_COUNT 25
|
||||
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
||||
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
|
||||
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
||||
|
@@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
|
||||
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
// left CA
|
||||
{0, C5_2, C6_2, C7_2}, //D2-0
|
||||
{0, C1_1, C3_2, C4_2}, //D20-1
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
#define RGB_DI_PIN A15
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
# define DRIVER_LED_TOTAL 72
|
||||
# define RGB_MATRIX_LED_COUNT 72
|
||||
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
||||
# define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
|
||||
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
|
@@ -21,7 +21,7 @@
|
||||
#define DRIVER_COUNT 2
|
||||
#define DRIVER_1_LED_TOTAL 44
|
||||
#define DRIVER_2_LED_TOTAL 34
|
||||
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
||||
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
||||
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
||||
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
|
@@ -17,7 +17,7 @@
|
||||
#include "rev2.h"
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
|
||||
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
/* Refer to IS31 manual for these locations
|
||||
* driver
|
||||
* | R location
|
||||
|
@@ -89,5 +89,5 @@
|
||||
//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
||||
#define DRIVER_ADDR_1 0b0110010
|
||||
#define DRIVER_COUNT 1
|
||||
#define DRIVER_LED_TOTAL 91
|
||||
#define RGB_MATRIX_LED_COUNT 91
|
||||
#define DRIVER_INDICATOR_LED_TOTAL 0
|
||||
|
@@ -17,7 +17,7 @@
|
||||
#include "rgb_rev1.h"
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
|
||||
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
{0, CS34_SW1, CS35_SW1, CS36_SW1}, //D92-K00-0
|
||||
{0, CS37_SW1, CS38_SW1, CS39_SW1}, //D94-K01-1
|
||||
{0, CS31_SW1, CS32_SW1, CS33_SW1}, //D96-K02-2
|
||||
|
@@ -45,7 +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_MATRIX_LED_COUNT 42
|
||||
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
||||
#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)
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user