From acb6b56fca2260ef1f2b823a6fe202a538cdee56 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sat, 9 Jul 2022 10:36:29 +0800
Subject: [PATCH 1/3] Refactor effect with smaller array
---
.../animations/pixel_fractal_anim.h | 45 +++++--------------
1 file changed, 11 insertions(+), 34 deletions(-)
diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index 906da1a48ede..24bc5a0b5a22 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -1,19 +1,5 @@
-/* Copyright (C) 2021 @filterpaper
- *
- * 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 .
- */
-
+// Copyright (C) 2021 @filterpaper
+// SPDX-License-Identifier: GPL-2.0-or-later
// Inspired from 4x12 fractal created by @schwarzgrau
#ifdef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
@@ -22,7 +8,7 @@ RGB_MATRIX_EFFECT(PIXEL_FRACTAL)
static bool PIXEL_FRACTAL(effect_params_t* params) {
# define MID_COL MATRIX_COLS / 2
- static bool led[MATRIX_ROWS][MATRIX_COLS];
+ static bool led[MATRIX_ROWS][MID_COL];
static uint32_t wait_timer = 0;
if (wait_timer > g_rgb_timer) {
@@ -39,38 +25,29 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
- for (uint8_t l = 0; l < MID_COL - 1; ++l) { // Light and move left columns outwards
+ // Light and copy columns outward
+ for (uint8_t l = 0; l < MID_COL - 1; ++l) {
if (led[h][l]) {
rgb_matrix_set_color(g_led_config.matrix_co[h][l], rgb.r, rgb.g, rgb.b);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], rgb.r, rgb.g, rgb.b);
} else {
rgb_matrix_set_color(g_led_config.matrix_co[h][l], 0, 0, 0);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], 0, 0, 0);
}
led[h][l] = led[h][l + 1];
}
- for (uint8_t r = MATRIX_COLS - 1; r > MID_COL; --r) { // Light and move right columns outwards
- if (led[h][r]) {
- rgb_matrix_set_color(g_led_config.matrix_co[h][r], rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(g_led_config.matrix_co[h][r], 0, 0, 0);
- }
- led[h][r] = led[h][r - 1];
- }
-
// Light both middle columns
- if (led[h][MID_COL]) {
- rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL], rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL], 0, 0, 0);
- }
if (led[h][MID_COL - 1]) {
rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], rgb.r, rgb.g, rgb.b);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], rgb.r, rgb.g, rgb.b);
} else {
rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], 0, 0, 0);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], 0, 0, 0);
}
- // Generate new random fractal columns
- led[h][MID_COL] = led[h][MID_COL - 1] = (random8() & 3) ? false : true;
+ // Generate new random fractal column
+ led[h][MID_COL - 1] = (random8() & 3) ? false : true;
}
wait_timer = g_rgb_timer + interval();
From 9c0e847254890667ddc0158383ba6e8954dc75e0 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 14 Jul 2022 15:54:52 +0800
Subject: [PATCH 2/3] Add RGB_MATRIX_USE_LIMITS call
---
.../animations/pixel_fractal_anim.h | 57 ++++++++++---------
1 file changed, 30 insertions(+), 27 deletions(-)
diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index 24bc5a0b5a22..f8736c90de3a 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 @filterpaper
+// Copyright (C) 2022 @filterpaper
// SPDX-License-Identifier: GPL-2.0-or-later
// Inspired from 4x12 fractal created by @schwarzgrau
@@ -9,11 +9,7 @@ RGB_MATRIX_EFFECT(PIXEL_FRACTAL)
static bool PIXEL_FRACTAL(effect_params_t* params) {
# define MID_COL MATRIX_COLS / 2
static bool led[MATRIX_ROWS][MID_COL];
-
static uint32_t wait_timer = 0;
- if (wait_timer > g_rgb_timer) {
- return false;
- }
inline uint32_t interval(void) {
return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
@@ -23,35 +19,42 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
rgb_matrix_set_color_all(0, 0, 0);
}
- RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
- for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
- // Light and copy columns outward
- for (uint8_t l = 0; l < MID_COL - 1; ++l) {
- if (led[h][l]) {
- rgb_matrix_set_color(g_led_config.matrix_co[h][l], rgb.r, rgb.g, rgb.b);
- rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], rgb.r, rgb.g, rgb.b);
+ RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+ if (g_rgb_timer > wait_timer) {
+
+ RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
+ for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
+
+ // Light and copy columns outward
+ for (uint8_t l = 0; l < MID_COL - 1; ++l) {
+ if (led[h][l]) {
+ rgb_matrix_set_color(g_led_config.matrix_co[h][l], rgb.r, rgb.g, rgb.b);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], rgb.r, rgb.g, rgb.b);
+ } else {
+ rgb_matrix_set_color(g_led_config.matrix_co[h][l], 0, 0, 0);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], 0, 0, 0);
+ }
+ led[h][l] = led[h][l + 1];
+ }
+
+ // Light both middle columns
+ if (led[h][MID_COL - 1]) {
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], rgb.r, rgb.g, rgb.b);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], rgb.r, rgb.g, rgb.b);
} else {
- rgb_matrix_set_color(g_led_config.matrix_co[h][l], 0, 0, 0);
- rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], 0, 0, 0);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], 0, 0, 0);
+ rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], 0, 0, 0);
}
- led[h][l] = led[h][l + 1];
- }
- // Light both middle columns
- if (led[h][MID_COL - 1]) {
- rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], rgb.r, rgb.g, rgb.b);
- rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], 0, 0, 0);
- rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], 0, 0, 0);
+ // Generate new random fractal column
+ led[h][MID_COL - 1] = (random8() & 3) ? false : true;
}
- // Generate new random fractal column
- led[h][MID_COL - 1] = (random8() & 3) ? false : true;
+ wait_timer = g_rgb_timer + interval();
}
- wait_timer = g_rgb_timer + interval();
- return false;
+ return rgb_matrix_check_finished_leds(led_max);
}
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_PIXEL_FRACTAL
From 341961f38992c2493d7e8cbcc08a6fae9f0b7665 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sun, 17 Jul 2022 09:24:24 +0800
Subject: [PATCH 3/3] Remove spaces
Co-authored-by: Drashna Jaelre
---
quantum/rgb_matrix/animations/pixel_fractal_anim.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index f8736c90de3a..b26d5c41004e 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -8,7 +8,7 @@ RGB_MATRIX_EFFECT(PIXEL_FRACTAL)
static bool PIXEL_FRACTAL(effect_params_t* params) {
# define MID_COL MATRIX_COLS / 2
- static bool led[MATRIX_ROWS][MID_COL];
+ static bool led[MATRIX_ROWS][MID_COL];
static uint32_t wait_timer = 0;
inline uint32_t interval(void) {
@@ -22,10 +22,8 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
if (g_rgb_timer > wait_timer) {
-
RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
-
// Light and copy columns outward
for (uint8_t l = 0; l < MID_COL - 1; ++l) {
if (led[h][l]) {