From d61e5c0027e289ccf48652afa4c442342e7ccf04 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 22 Jun 2021 18:26:23 +1000 Subject: [PATCH] Move LED/RGB Matrix code into their own directories (#13257) --- common_features.mk | 18 ++++++--- .../animations}/alpha_mods_anim.h | 2 +- .../animations}/band_anim.h | 2 +- .../animations}/band_pinwheel_anim.h | 2 +- .../animations}/band_spiral_anim.h | 2 +- .../animations}/breathing_anim.h | 2 +- .../animations}/cycle_left_right_anim.h | 2 +- .../animations}/cycle_out_in_anim.h | 2 +- .../animations}/cycle_up_down_anim.h | 2 +- .../animations}/dual_beacon_anim.h | 2 +- .../animations/led_matrix_effects.inc | 18 +++++++++ .../animations/runners}/effect_runner_dx_dy.h | 0 .../runners}/effect_runner_dx_dy_dist.h | 0 .../animations/runners}/effect_runner_i.h | 0 .../runners}/effect_runner_reactive.h | 0 .../runners}/effect_runner_reactive_splash.h | 0 .../runners}/effect_runner_sin_cos_i.h | 0 .../animations/runners/led_matrix_runners.inc | 6 +++ .../animations}/solid_anim.h | 0 .../animations}/solid_reactive_cross.h | 4 +- .../animations}/solid_reactive_nexus.h | 4 +- .../animations}/solid_reactive_simple_anim.h | 4 +- .../animations}/solid_reactive_wide.h | 4 +- .../animations}/solid_splash_anim.h | 4 +- .../animations}/wave_left_right_anim.h | 2 +- .../animations}/wave_up_down_anim.h | 2 +- quantum/{ => led_matrix}/led_matrix.c | 11 ++---- quantum/{ => led_matrix}/led_matrix.h | 2 +- quantum/{ => led_matrix}/led_matrix_drivers.c | 0 quantum/{ => led_matrix}/led_matrix_types.h | 0 .../led_matrix_effects.inc | 18 --------- .../animations}/alpha_mods_anim.h | 0 .../animations}/breathing_anim.h | 0 .../animations}/colorband_pinwheel_sat_anim.h | 0 .../animations}/colorband_pinwheel_val_anim.h | 0 .../animations}/colorband_sat_anim.h | 0 .../animations}/colorband_spiral_sat_anim.h | 0 .../animations}/colorband_spiral_val_anim.h | 0 .../animations}/colorband_val_anim.h | 0 .../animations}/cycle_all_anim.h | 0 .../animations}/cycle_left_right_anim.h | 0 .../animations}/cycle_out_in_anim.h | 0 .../animations}/cycle_out_in_dual_anim.h | 0 .../animations}/cycle_pinwheel_anim.h | 0 .../animations}/cycle_spiral_anim.h | 0 .../animations}/cycle_up_down_anim.h | 0 .../animations}/digital_rain_anim.h | 0 .../animations}/dual_beacon_anim.h | 0 .../animations}/gradient_left_right_anim.h | 0 .../animations}/gradient_up_down_anim.h | 0 .../animations}/hue_breathing_anim.h | 0 .../animations}/hue_pendulum_anim.h | 0 .../animations}/hue_wave_anim.h | 0 .../animations}/jellybean_raindrops_anim.h | 0 .../animations}/rainbow_beacon_anim.h | 0 .../animations}/rainbow_moving_chevron_anim.h | 0 .../animations}/rainbow_pinwheels_anim.h | 0 .../animations}/raindrops_anim.h | 0 .../animations/rgb_matrix_effects.inc | 37 +++++++++++++++++++ .../animations/runners}/effect_runner_dx_dy.h | 0 .../runners}/effect_runner_dx_dy_dist.h | 0 .../animations/runners}/effect_runner_i.h | 0 .../runners}/effect_runner_reactive.h | 0 .../runners}/effect_runner_reactive_splash.h | 0 .../runners}/effect_runner_sin_cos_i.h | 0 .../animations/runners/rgb_matrix_runners.inc | 6 +++ .../animations}/solid_color_anim.h | 0 .../animations}/solid_reactive_anim.h | 0 .../animations}/solid_reactive_cross.h | 0 .../animations}/solid_reactive_nexus.h | 0 .../animations}/solid_reactive_simple_anim.h | 0 .../animations}/solid_reactive_wide.h | 0 .../animations}/solid_splash_anim.h | 0 .../animations}/splash_anim.h | 0 .../animations}/typing_heatmap_anim.h | 0 quantum/{ => rgb_matrix}/rgb_matrix.c | 11 ++---- quantum/{ => rgb_matrix}/rgb_matrix.h | 2 +- quantum/{ => rgb_matrix}/rgb_matrix_drivers.c | 0 quantum/{ => rgb_matrix}/rgb_matrix_types.h | 0 .../rgb_matrix_effects.inc | 37 ------------------- 80 files changed, 108 insertions(+), 100 deletions(-) rename quantum/{led_matrix_animations => led_matrix/animations}/alpha_mods_anim.h (93%) rename quantum/{led_matrix_animations => led_matrix/animations}/band_anim.h (91%) rename quantum/{led_matrix_animations => led_matrix/animations}/band_pinwheel_anim.h (89%) rename quantum/{led_matrix_animations => led_matrix/animations}/band_spiral_anim.h (90%) rename quantum/{led_matrix_animations => led_matrix/animations}/breathing_anim.h (93%) rename quantum/{led_matrix_animations => led_matrix/animations}/cycle_left_right_anim.h (88%) rename quantum/{led_matrix_animations => led_matrix/animations}/cycle_out_in_anim.h (89%) rename quantum/{led_matrix_animations => led_matrix/animations}/cycle_up_down_anim.h (89%) rename quantum/{led_matrix_animations => led_matrix/animations}/dual_beacon_anim.h (91%) create mode 100644 quantum/led_matrix/animations/led_matrix_effects.inc rename quantum/{led_matrix_runners => led_matrix/animations/runners}/effect_runner_dx_dy.h (100%) rename quantum/{led_matrix_runners => led_matrix/animations/runners}/effect_runner_dx_dy_dist.h (100%) rename quantum/{led_matrix_runners => led_matrix/animations/runners}/effect_runner_i.h (100%) rename quantum/{led_matrix_runners => led_matrix/animations/runners}/effect_runner_reactive.h (100%) rename quantum/{led_matrix_runners => led_matrix/animations/runners}/effect_runner_reactive_splash.h (100%) rename quantum/{led_matrix_runners => led_matrix/animations/runners}/effect_runner_sin_cos_i.h (100%) create mode 100644 quantum/led_matrix/animations/runners/led_matrix_runners.inc rename quantum/{led_matrix_animations => led_matrix/animations}/solid_anim.h (100%) rename quantum/{led_matrix_animations => led_matrix/animations}/solid_reactive_cross.h (88%) rename quantum/{led_matrix_animations => led_matrix/animations}/solid_reactive_nexus.h (87%) rename quantum/{led_matrix_animations => led_matrix/animations}/solid_reactive_simple_anim.h (80%) rename quantum/{led_matrix_animations => led_matrix/animations}/solid_reactive_wide.h (86%) rename quantum/{led_matrix_animations => led_matrix/animations}/solid_splash_anim.h (87%) rename quantum/{led_matrix_animations => led_matrix/animations}/wave_left_right_anim.h (89%) rename quantum/{led_matrix_animations => led_matrix/animations}/wave_up_down_anim.h (89%) rename quantum/{ => led_matrix}/led_matrix.c (97%) rename quantum/{ => led_matrix}/led_matrix.h (99%) rename quantum/{ => led_matrix}/led_matrix_drivers.c (100%) rename quantum/{ => led_matrix}/led_matrix_types.h (100%) delete mode 100644 quantum/led_matrix_animations/led_matrix_effects.inc rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/alpha_mods_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/breathing_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/colorband_pinwheel_sat_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/colorband_pinwheel_val_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/colorband_sat_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/colorband_spiral_sat_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/colorband_spiral_val_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/colorband_val_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/cycle_all_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/cycle_left_right_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/cycle_out_in_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/cycle_out_in_dual_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/cycle_pinwheel_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/cycle_spiral_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/cycle_up_down_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/digital_rain_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/dual_beacon_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/gradient_left_right_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/gradient_up_down_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/hue_breathing_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/hue_pendulum_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/hue_wave_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/jellybean_raindrops_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/rainbow_beacon_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/rainbow_moving_chevron_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/rainbow_pinwheels_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/raindrops_anim.h (100%) create mode 100644 quantum/rgb_matrix/animations/rgb_matrix_effects.inc rename quantum/{rgb_matrix_runners => rgb_matrix/animations/runners}/effect_runner_dx_dy.h (100%) rename quantum/{rgb_matrix_runners => rgb_matrix/animations/runners}/effect_runner_dx_dy_dist.h (100%) rename quantum/{rgb_matrix_runners => rgb_matrix/animations/runners}/effect_runner_i.h (100%) rename quantum/{rgb_matrix_runners => rgb_matrix/animations/runners}/effect_runner_reactive.h (100%) rename quantum/{rgb_matrix_runners => rgb_matrix/animations/runners}/effect_runner_reactive_splash.h (100%) rename quantum/{rgb_matrix_runners => rgb_matrix/animations/runners}/effect_runner_sin_cos_i.h (100%) create mode 100644 quantum/rgb_matrix/animations/runners/rgb_matrix_runners.inc rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/solid_color_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/solid_reactive_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/solid_reactive_cross.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/solid_reactive_nexus.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/solid_reactive_simple_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/solid_reactive_wide.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/solid_splash_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/splash_anim.h (100%) rename quantum/{rgb_matrix_animations => rgb_matrix/animations}/typing_heatmap_anim.h (100%) rename quantum/{ => rgb_matrix}/rgb_matrix.c (98%) rename quantum/{ => rgb_matrix}/rgb_matrix.h (99%) rename quantum/{ => rgb_matrix}/rgb_matrix_drivers.c (100%) rename quantum/{ => rgb_matrix}/rgb_matrix_types.h (100%) delete mode 100644 quantum/rgb_matrix_animations/rgb_matrix_effects.inc diff --git a/common_features.mk b/common_features.mk index 9c6fc9cdf8..33a8da23d7 100644 --- a/common_features.mk +++ b/common_features.mk @@ -230,9 +230,12 @@ ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162)) # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines OPT_DEFS += -DLIB8_ATTINY endif - SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c - SRC += $(QUANTUM_DIR)/led_matrix.c - SRC += $(QUANTUM_DIR)/led_matrix_drivers.c + COMMON_VPATH += $(QUANTUM_DIR)/led_matrix + COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations + COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners + SRC += process_backlight.c + SRC += led_matrix.c + SRC += led_matrix_drivers.c CIE1931_CURVE := yes ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731) @@ -255,9 +258,12 @@ ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162)) # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines OPT_DEFS += -DLIB8_ATTINY endif - SRC += $(QUANTUM_DIR)/color.c - SRC += $(QUANTUM_DIR)/rgb_matrix.c - SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c + COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix + COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations + COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners + SRC += color.c + SRC += rgb_matrix.c + SRC += rgb_matrix_drivers.c CIE1931_CURVE := yes RGB_KEYCODES_ENABLE := yes diff --git a/quantum/led_matrix_animations/alpha_mods_anim.h b/quantum/led_matrix/animations/alpha_mods_anim.h similarity index 93% rename from quantum/led_matrix_animations/alpha_mods_anim.h rename to quantum/led_matrix/animations/alpha_mods_anim.h index 6f69f6892b..a4638fde69 100644 --- a/quantum/led_matrix_animations/alpha_mods_anim.h +++ b/quantum/led_matrix/animations/alpha_mods_anim.h @@ -21,4 +21,4 @@ bool ALPHAS_MODS(effect_params_t* params) { } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_ALPHAS_MODS +#endif // DISABLE_LED_MATRIX_ALPHAS_MODS diff --git a/quantum/led_matrix_animations/band_anim.h b/quantum/led_matrix/animations/band_anim.h similarity index 91% rename from quantum/led_matrix_animations/band_anim.h rename to quantum/led_matrix/animations/band_anim.h index 523dba1b78..f9cb85dc4f 100644 --- a/quantum/led_matrix_animations/band_anim.h +++ b/quantum/led_matrix/animations/band_anim.h @@ -10,4 +10,4 @@ static uint8_t BAND_math(uint8_t val, uint8_t i, uint8_t time) { bool BAND(effect_params_t* params) { return effect_runner_i(params, &BAND_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_BAND +#endif // DISABLE_LED_MATRIX_BAND diff --git a/quantum/led_matrix_animations/band_pinwheel_anim.h b/quantum/led_matrix/animations/band_pinwheel_anim.h similarity index 89% rename from quantum/led_matrix_animations/band_pinwheel_anim.h rename to quantum/led_matrix/animations/band_pinwheel_anim.h index fb3b835cad..d3144bffbf 100644 --- a/quantum/led_matrix_animations/band_pinwheel_anim.h +++ b/quantum/led_matrix/animations/band_pinwheel_anim.h @@ -7,4 +7,4 @@ static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t t bool BAND_PINWHEEL(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_BAND_PINWHEEL +#endif // DISABLE_LED_MATRIX_BAND_PINWHEEL diff --git a/quantum/led_matrix_animations/band_spiral_anim.h b/quantum/led_matrix/animations/band_spiral_anim.h similarity index 90% rename from quantum/led_matrix_animations/band_spiral_anim.h rename to quantum/led_matrix/animations/band_spiral_anim.h index fca22aad9c..defbe69676 100644 --- a/quantum/led_matrix_animations/band_spiral_anim.h +++ b/quantum/led_matrix/animations/band_spiral_anim.h @@ -7,4 +7,4 @@ static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dis bool BAND_SPIRAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_BAND_SPIRAL +#endif // DISABLE_LED_MATRIX_BAND_SPIRAL diff --git a/quantum/led_matrix_animations/breathing_anim.h b/quantum/led_matrix/animations/breathing_anim.h similarity index 93% rename from quantum/led_matrix_animations/breathing_anim.h rename to quantum/led_matrix/animations/breathing_anim.h index 00310e3f65..4f49f50690 100644 --- a/quantum/led_matrix_animations/breathing_anim.h +++ b/quantum/led_matrix/animations/breathing_anim.h @@ -16,4 +16,4 @@ bool BREATHING(effect_params_t* params) { } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_BREATHING +#endif // DISABLE_LED_MATRIX_BREATHING diff --git a/quantum/led_matrix_animations/cycle_left_right_anim.h b/quantum/led_matrix/animations/cycle_left_right_anim.h similarity index 88% rename from quantum/led_matrix_animations/cycle_left_right_anim.h rename to quantum/led_matrix/animations/cycle_left_right_anim.h index 51e81d57ca..c426d02fd5 100644 --- a/quantum/led_matrix_animations/cycle_left_right_anim.h +++ b/quantum/led_matrix/animations/cycle_left_right_anim.h @@ -7,4 +7,4 @@ static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { ret bool CYCLE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT +#endif // DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT diff --git a/quantum/led_matrix_animations/cycle_out_in_anim.h b/quantum/led_matrix/animations/cycle_out_in_anim.h similarity index 89% rename from quantum/led_matrix_animations/cycle_out_in_anim.h rename to quantum/led_matrix/animations/cycle_out_in_anim.h index f62061552c..55527556fd 100644 --- a/quantum/led_matrix_animations/cycle_out_in_anim.h +++ b/quantum/led_matrix/animations/cycle_out_in_anim.h @@ -7,4 +7,4 @@ static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t di bool CYCLE_OUT_IN(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_CYCLE_OUT_IN +#endif // DISABLE_LED_MATRIX_CYCLE_OUT_IN diff --git a/quantum/led_matrix_animations/cycle_up_down_anim.h b/quantum/led_matrix/animations/cycle_up_down_anim.h similarity index 89% rename from quantum/led_matrix_animations/cycle_up_down_anim.h rename to quantum/led_matrix/animations/cycle_up_down_anim.h index bd1d125672..d97de0d1ec 100644 --- a/quantum/led_matrix_animations/cycle_up_down_anim.h +++ b/quantum/led_matrix/animations/cycle_up_down_anim.h @@ -7,4 +7,4 @@ static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return bool CYCLE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &CYCLE_UP_DOWN_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_CYCLE_UP_DOWN +#endif // DISABLE_LED_MATRIX_CYCLE_UP_DOWN diff --git a/quantum/led_matrix_animations/dual_beacon_anim.h b/quantum/led_matrix/animations/dual_beacon_anim.h similarity index 91% rename from quantum/led_matrix_animations/dual_beacon_anim.h rename to quantum/led_matrix/animations/dual_beacon_anim.h index 9b8a7877c9..e1bc5ae464 100644 --- a/quantum/led_matrix_animations/dual_beacon_anim.h +++ b/quantum/led_matrix/animations/dual_beacon_anim.h @@ -7,4 +7,4 @@ static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, bool DUAL_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &DUAL_BEACON_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_DUAL_BEACON +#endif // DISABLE_LED_MATRIX_DUAL_BEACON diff --git a/quantum/led_matrix/animations/led_matrix_effects.inc b/quantum/led_matrix/animations/led_matrix_effects.inc new file mode 100644 index 0000000000..ad1f46b242 --- /dev/null +++ b/quantum/led_matrix/animations/led_matrix_effects.inc @@ -0,0 +1,18 @@ +// Add your new core led matrix effect here, order determines enum order +#include "solid_anim.h" +#include "alpha_mods_anim.h" +#include "breathing_anim.h" +#include "band_anim.h" +#include "band_pinwheel_anim.h" +#include "band_spiral_anim.h" +#include "cycle_left_right_anim.h" +#include "cycle_up_down_anim.h" +#include "cycle_out_in_anim.h" +#include "dual_beacon_anim.h" +#include "solid_reactive_simple_anim.h" +#include "solid_reactive_wide.h" +#include "solid_reactive_cross.h" +#include "solid_reactive_nexus.h" +#include "solid_splash_anim.h" +#include "wave_left_right_anim.h" +#include "wave_up_down_anim.h" diff --git a/quantum/led_matrix_runners/effect_runner_dx_dy.h b/quantum/led_matrix/animations/runners/effect_runner_dx_dy.h similarity index 100% rename from quantum/led_matrix_runners/effect_runner_dx_dy.h rename to quantum/led_matrix/animations/runners/effect_runner_dx_dy.h diff --git a/quantum/led_matrix_runners/effect_runner_dx_dy_dist.h b/quantum/led_matrix/animations/runners/effect_runner_dx_dy_dist.h similarity index 100% rename from quantum/led_matrix_runners/effect_runner_dx_dy_dist.h rename to quantum/led_matrix/animations/runners/effect_runner_dx_dy_dist.h diff --git a/quantum/led_matrix_runners/effect_runner_i.h b/quantum/led_matrix/animations/runners/effect_runner_i.h similarity index 100% rename from quantum/led_matrix_runners/effect_runner_i.h rename to quantum/led_matrix/animations/runners/effect_runner_i.h diff --git a/quantum/led_matrix_runners/effect_runner_reactive.h b/quantum/led_matrix/animations/runners/effect_runner_reactive.h similarity index 100% rename from quantum/led_matrix_runners/effect_runner_reactive.h rename to quantum/led_matrix/animations/runners/effect_runner_reactive.h diff --git a/quantum/led_matrix_runners/effect_runner_reactive_splash.h b/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h similarity index 100% rename from quantum/led_matrix_runners/effect_runner_reactive_splash.h rename to quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h diff --git a/quantum/led_matrix_runners/effect_runner_sin_cos_i.h b/quantum/led_matrix/animations/runners/effect_runner_sin_cos_i.h similarity index 100% rename from quantum/led_matrix_runners/effect_runner_sin_cos_i.h rename to quantum/led_matrix/animations/runners/effect_runner_sin_cos_i.h diff --git a/quantum/led_matrix/animations/runners/led_matrix_runners.inc b/quantum/led_matrix/animations/runners/led_matrix_runners.inc new file mode 100644 index 0000000000..c09022bb0f --- /dev/null +++ b/quantum/led_matrix/animations/runners/led_matrix_runners.inc @@ -0,0 +1,6 @@ +#include "effect_runner_dx_dy_dist.h" +#include "effect_runner_dx_dy.h" +#include "effect_runner_i.h" +#include "effect_runner_sin_cos_i.h" +#include "effect_runner_reactive.h" +#include "effect_runner_reactive_splash.h" diff --git a/quantum/led_matrix_animations/solid_anim.h b/quantum/led_matrix/animations/solid_anim.h similarity index 100% rename from quantum/led_matrix_animations/solid_anim.h rename to quantum/led_matrix/animations/solid_anim.h diff --git a/quantum/led_matrix_animations/solid_reactive_cross.h b/quantum/led_matrix/animations/solid_reactive_cross.h similarity index 88% rename from quantum/led_matrix_animations/solid_reactive_cross.h rename to quantum/led_matrix/animations/solid_reactive_cross.h index f402d99b37..94425c959f 100644 --- a/quantum/led_matrix_animations/solid_reactive_cross.h +++ b/quantum/led_matrix/animations/solid_reactive_cross.h @@ -31,5 +31,5 @@ bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_r # endif # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -# endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS) -#endif // LED_MATRIX_KEYREACTIVE_ENABLED +# endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS) +#endif // LED_MATRIX_KEYREACTIVE_ENABLED diff --git a/quantum/led_matrix_animations/solid_reactive_nexus.h b/quantum/led_matrix/animations/solid_reactive_nexus.h similarity index 87% rename from quantum/led_matrix_animations/solid_reactive_nexus.h rename to quantum/led_matrix/animations/solid_reactive_nexus.h index 4d0d252263..504b1104f1 100644 --- a/quantum/led_matrix_animations/solid_reactive_nexus.h +++ b/quantum/led_matrix/animations/solid_reactive_nexus.h @@ -28,5 +28,5 @@ bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_r # endif # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -# endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS) -#endif // LED_MATRIX_KEYREACTIVE_ENABLED +# endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS) +#endif // LED_MATRIX_KEYREACTIVE_ENABLED diff --git a/quantum/led_matrix_animations/solid_reactive_simple_anim.h b/quantum/led_matrix/animations/solid_reactive_simple_anim.h similarity index 80% rename from quantum/led_matrix_animations/solid_reactive_simple_anim.h rename to quantum/led_matrix/animations/solid_reactive_simple_anim.h index 30e2527f60..4752a84162 100644 --- a/quantum/led_matrix_animations/solid_reactive_simple_anim.h +++ b/quantum/led_matrix/animations/solid_reactive_simple_anim.h @@ -8,5 +8,5 @@ static uint8_t SOLID_REACTIVE_SIMPLE_math(uint8_t val, uint16_t offset) { return bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -# endif // DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE -#endif // LED_MATRIX_KEYREACTIVE_ENABLED +# endif // DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE +#endif // LED_MATRIX_KEYREACTIVE_ENABLED diff --git a/quantum/led_matrix_animations/solid_reactive_wide.h b/quantum/led_matrix/animations/solid_reactive_wide.h similarity index 86% rename from quantum/led_matrix_animations/solid_reactive_wide.h rename to quantum/led_matrix/animations/solid_reactive_wide.h index 34a230c259..922e32fe5f 100644 --- a/quantum/led_matrix_animations/solid_reactive_wide.h +++ b/quantum/led_matrix/animations/solid_reactive_wide.h @@ -26,5 +26,5 @@ bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_re # endif # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -# endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) -#endif // LED_MATRIX_KEYREACTIVE_ENABLED +# endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) +#endif // LED_MATRIX_KEYREACTIVE_ENABLED diff --git a/quantum/led_matrix_animations/solid_splash_anim.h b/quantum/led_matrix/animations/solid_splash_anim.h similarity index 87% rename from quantum/led_matrix_animations/solid_splash_anim.h rename to quantum/led_matrix/animations/solid_splash_anim.h index 4f6ba3d343..d95889b813 100644 --- a/quantum/led_matrix_animations/solid_splash_anim.h +++ b/quantum/led_matrix/animations/solid_splash_anim.h @@ -26,5 +26,5 @@ bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_ # endif # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -# endif // !defined(DISABLE_LED_MATRIX_SPLASH) && !defined(DISABLE_LED_MATRIX_MULTISPLASH) -#endif // LED_MATRIX_KEYREACTIVE_ENABLED +# endif // !defined(DISABLE_LED_MATRIX_SPLASH) && !defined(DISABLE_LED_MATRIX_MULTISPLASH) +#endif // LED_MATRIX_KEYREACTIVE_ENABLED diff --git a/quantum/led_matrix_animations/wave_left_right_anim.h b/quantum/led_matrix/animations/wave_left_right_anim.h similarity index 89% rename from quantum/led_matrix_animations/wave_left_right_anim.h rename to quantum/led_matrix/animations/wave_left_right_anim.h index 736f22ddc5..8579f1b45f 100644 --- a/quantum/led_matrix_animations/wave_left_right_anim.h +++ b/quantum/led_matrix/animations/wave_left_right_anim.h @@ -7,4 +7,4 @@ static uint8_t WAVE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { retu bool WAVE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &WAVE_LEFT_RIGHT_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT +#endif // DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT diff --git a/quantum/led_matrix_animations/wave_up_down_anim.h b/quantum/led_matrix/animations/wave_up_down_anim.h similarity index 89% rename from quantum/led_matrix_animations/wave_up_down_anim.h rename to quantum/led_matrix/animations/wave_up_down_anim.h index 3cab0597d4..635c608414 100644 --- a/quantum/led_matrix_animations/wave_up_down_anim.h +++ b/quantum/led_matrix/animations/wave_up_down_anim.h @@ -7,4 +7,4 @@ static uint8_t WAVE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return bool WAVE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &WAVE_UP_DOWN_math); } # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -#endif // DISABLE_LED_MATRIX_WAVE_UP_DOWN +#endif // DISABLE_LED_MATRIX_WAVE_UP_DOWN diff --git a/quantum/led_matrix.c b/quantum/led_matrix/led_matrix.c similarity index 97% rename from quantum/led_matrix.c rename to quantum/led_matrix/led_matrix.c index 9b6151604f..32788866c5 100644 --- a/quantum/led_matrix.c +++ b/quantum/led_matrix/led_matrix.c @@ -42,19 +42,14 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER; // clang-format on // Generic effect runners -#include "led_matrix_runners/effect_runner_dx_dy_dist.h" -#include "led_matrix_runners/effect_runner_dx_dy.h" -#include "led_matrix_runners/effect_runner_i.h" -#include "led_matrix_runners/effect_runner_sin_cos_i.h" -#include "led_matrix_runners/effect_runner_reactive.h" -#include "led_matrix_runners/effect_runner_reactive_splash.h" +#include "led_matrix_runners.inc" // ------------------------------------------ // -----Begin led effect includes macros----- #define LED_MATRIX_EFFECT(name) #define LED_MATRIX_CUSTOM_EFFECT_IMPLS -#include "led_matrix_animations/led_matrix_effects.inc" +#include "led_matrix_effects.inc" #ifdef LED_MATRIX_CUSTOM_KB # include "led_matrix_kb.inc" #endif @@ -325,7 +320,7 @@ static void led_task_render(uint8_t effect) { case LED_MATRIX_##name: \ rendering = name(&led_effect_params); \ break; -#include "led_matrix_animations/led_matrix_effects.inc" +#include "led_matrix_effects.inc" #undef LED_MATRIX_EFFECT #if defined(LED_MATRIX_CUSTOM_KB) || defined(LED_MATRIX_CUSTOM_USER) diff --git a/quantum/led_matrix.h b/quantum/led_matrix/led_matrix.h similarity index 99% rename from quantum/led_matrix.h rename to quantum/led_matrix/led_matrix.h index 0984de73b3..6f85854fbe 100644 --- a/quantum/led_matrix.h +++ b/quantum/led_matrix/led_matrix.h @@ -56,7 +56,7 @@ enum led_matrix_effects { // -------------------------------------- // -----Begin led effect enum macros----- #define LED_MATRIX_EFFECT(name, ...) LED_MATRIX_##name, -#include "led_matrix_animations/led_matrix_effects.inc" +#include "led_matrix_effects.inc" #undef LED_MATRIX_EFFECT #if defined(LED_MATRIX_CUSTOM_KB) || defined(LED_MATRIX_CUSTOM_USER) diff --git a/quantum/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c similarity index 100% rename from quantum/led_matrix_drivers.c rename to quantum/led_matrix/led_matrix_drivers.c diff --git a/quantum/led_matrix_types.h b/quantum/led_matrix/led_matrix_types.h similarity index 100% rename from quantum/led_matrix_types.h rename to quantum/led_matrix/led_matrix_types.h diff --git a/quantum/led_matrix_animations/led_matrix_effects.inc b/quantum/led_matrix_animations/led_matrix_effects.inc deleted file mode 100644 index 67237c5683..0000000000 --- a/quantum/led_matrix_animations/led_matrix_effects.inc +++ /dev/null @@ -1,18 +0,0 @@ -// Add your new core led matrix effect here, order determins enum order, requires "led_matrix_animations/ directory -#include "led_matrix_animations/solid_anim.h" -#include "led_matrix_animations/alpha_mods_anim.h" -#include "led_matrix_animations/breathing_anim.h" -#include "led_matrix_animations/band_anim.h" -#include "led_matrix_animations/band_pinwheel_anim.h" -#include "led_matrix_animations/band_spiral_anim.h" -#include "led_matrix_animations/cycle_left_right_anim.h" -#include "led_matrix_animations/cycle_up_down_anim.h" -#include "led_matrix_animations/cycle_out_in_anim.h" -#include "led_matrix_animations/dual_beacon_anim.h" -#include "led_matrix_animations/solid_reactive_simple_anim.h" -#include "led_matrix_animations/solid_reactive_wide.h" -#include "led_matrix_animations/solid_reactive_cross.h" -#include "led_matrix_animations/solid_reactive_nexus.h" -#include "led_matrix_animations/solid_splash_anim.h" -#include "led_matrix_animations/wave_left_right_anim.h" -#include "led_matrix_animations/wave_up_down_anim.h" diff --git a/quantum/rgb_matrix_animations/alpha_mods_anim.h b/quantum/rgb_matrix/animations/alpha_mods_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/alpha_mods_anim.h rename to quantum/rgb_matrix/animations/alpha_mods_anim.h diff --git a/quantum/rgb_matrix_animations/breathing_anim.h b/quantum/rgb_matrix/animations/breathing_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/breathing_anim.h rename to quantum/rgb_matrix/animations/breathing_anim.h diff --git a/quantum/rgb_matrix_animations/colorband_pinwheel_sat_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/colorband_pinwheel_sat_anim.h rename to quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h diff --git a/quantum/rgb_matrix_animations/colorband_pinwheel_val_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/colorband_pinwheel_val_anim.h rename to quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h diff --git a/quantum/rgb_matrix_animations/colorband_sat_anim.h b/quantum/rgb_matrix/animations/colorband_sat_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/colorband_sat_anim.h rename to quantum/rgb_matrix/animations/colorband_sat_anim.h diff --git a/quantum/rgb_matrix_animations/colorband_spiral_sat_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/colorband_spiral_sat_anim.h rename to quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h diff --git a/quantum/rgb_matrix_animations/colorband_spiral_val_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/colorband_spiral_val_anim.h rename to quantum/rgb_matrix/animations/colorband_spiral_val_anim.h diff --git a/quantum/rgb_matrix_animations/colorband_val_anim.h b/quantum/rgb_matrix/animations/colorband_val_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/colorband_val_anim.h rename to quantum/rgb_matrix/animations/colorband_val_anim.h diff --git a/quantum/rgb_matrix_animations/cycle_all_anim.h b/quantum/rgb_matrix/animations/cycle_all_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/cycle_all_anim.h rename to quantum/rgb_matrix/animations/cycle_all_anim.h diff --git a/quantum/rgb_matrix_animations/cycle_left_right_anim.h b/quantum/rgb_matrix/animations/cycle_left_right_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/cycle_left_right_anim.h rename to quantum/rgb_matrix/animations/cycle_left_right_anim.h diff --git a/quantum/rgb_matrix_animations/cycle_out_in_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/cycle_out_in_anim.h rename to quantum/rgb_matrix/animations/cycle_out_in_anim.h diff --git a/quantum/rgb_matrix_animations/cycle_out_in_dual_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/cycle_out_in_dual_anim.h rename to quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h diff --git a/quantum/rgb_matrix_animations/cycle_pinwheel_anim.h b/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/cycle_pinwheel_anim.h rename to quantum/rgb_matrix/animations/cycle_pinwheel_anim.h diff --git a/quantum/rgb_matrix_animations/cycle_spiral_anim.h b/quantum/rgb_matrix/animations/cycle_spiral_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/cycle_spiral_anim.h rename to quantum/rgb_matrix/animations/cycle_spiral_anim.h diff --git a/quantum/rgb_matrix_animations/cycle_up_down_anim.h b/quantum/rgb_matrix/animations/cycle_up_down_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/cycle_up_down_anim.h rename to quantum/rgb_matrix/animations/cycle_up_down_anim.h diff --git a/quantum/rgb_matrix_animations/digital_rain_anim.h b/quantum/rgb_matrix/animations/digital_rain_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/digital_rain_anim.h rename to quantum/rgb_matrix/animations/digital_rain_anim.h diff --git a/quantum/rgb_matrix_animations/dual_beacon_anim.h b/quantum/rgb_matrix/animations/dual_beacon_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/dual_beacon_anim.h rename to quantum/rgb_matrix/animations/dual_beacon_anim.h diff --git a/quantum/rgb_matrix_animations/gradient_left_right_anim.h b/quantum/rgb_matrix/animations/gradient_left_right_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/gradient_left_right_anim.h rename to quantum/rgb_matrix/animations/gradient_left_right_anim.h diff --git a/quantum/rgb_matrix_animations/gradient_up_down_anim.h b/quantum/rgb_matrix/animations/gradient_up_down_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/gradient_up_down_anim.h rename to quantum/rgb_matrix/animations/gradient_up_down_anim.h diff --git a/quantum/rgb_matrix_animations/hue_breathing_anim.h b/quantum/rgb_matrix/animations/hue_breathing_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/hue_breathing_anim.h rename to quantum/rgb_matrix/animations/hue_breathing_anim.h diff --git a/quantum/rgb_matrix_animations/hue_pendulum_anim.h b/quantum/rgb_matrix/animations/hue_pendulum_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/hue_pendulum_anim.h rename to quantum/rgb_matrix/animations/hue_pendulum_anim.h diff --git a/quantum/rgb_matrix_animations/hue_wave_anim.h b/quantum/rgb_matrix/animations/hue_wave_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/hue_wave_anim.h rename to quantum/rgb_matrix/animations/hue_wave_anim.h diff --git a/quantum/rgb_matrix_animations/jellybean_raindrops_anim.h b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/jellybean_raindrops_anim.h rename to quantum/rgb_matrix/animations/jellybean_raindrops_anim.h diff --git a/quantum/rgb_matrix_animations/rainbow_beacon_anim.h b/quantum/rgb_matrix/animations/rainbow_beacon_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/rainbow_beacon_anim.h rename to quantum/rgb_matrix/animations/rainbow_beacon_anim.h diff --git a/quantum/rgb_matrix_animations/rainbow_moving_chevron_anim.h b/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/rainbow_moving_chevron_anim.h rename to quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h diff --git a/quantum/rgb_matrix_animations/rainbow_pinwheels_anim.h b/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/rainbow_pinwheels_anim.h rename to quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h diff --git a/quantum/rgb_matrix_animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/raindrops_anim.h rename to quantum/rgb_matrix/animations/raindrops_anim.h diff --git a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc new file mode 100644 index 0000000000..302ad79c04 --- /dev/null +++ b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc @@ -0,0 +1,37 @@ +// Add your new core rgb matrix effect here, order determines enum order +#include "solid_color_anim.h" +#include "alpha_mods_anim.h" +#include "gradient_up_down_anim.h" +#include "gradient_left_right_anim.h" +#include "breathing_anim.h" +#include "colorband_sat_anim.h" +#include "colorband_val_anim.h" +#include "colorband_pinwheel_sat_anim.h" +#include "colorband_pinwheel_val_anim.h" +#include "colorband_spiral_sat_anim.h" +#include "colorband_spiral_val_anim.h" +#include "cycle_all_anim.h" +#include "cycle_left_right_anim.h" +#include "cycle_up_down_anim.h" +#include "rainbow_moving_chevron_anim.h" +#include "cycle_out_in_anim.h" +#include "cycle_out_in_dual_anim.h" +#include "cycle_pinwheel_anim.h" +#include "cycle_spiral_anim.h" +#include "dual_beacon_anim.h" +#include "rainbow_beacon_anim.h" +#include "rainbow_pinwheels_anim.h" +#include "raindrops_anim.h" +#include "jellybean_raindrops_anim.h" +#include "hue_breathing_anim.h" +#include "hue_pendulum_anim.h" +#include "hue_wave_anim.h" +#include "typing_heatmap_anim.h" +#include "digital_rain_anim.h" +#include "solid_reactive_simple_anim.h" +#include "solid_reactive_anim.h" +#include "solid_reactive_wide.h" +#include "solid_reactive_cross.h" +#include "solid_reactive_nexus.h" +#include "splash_anim.h" +#include "solid_splash_anim.h" diff --git a/quantum/rgb_matrix_runners/effect_runner_dx_dy.h b/quantum/rgb_matrix/animations/runners/effect_runner_dx_dy.h similarity index 100% rename from quantum/rgb_matrix_runners/effect_runner_dx_dy.h rename to quantum/rgb_matrix/animations/runners/effect_runner_dx_dy.h diff --git a/quantum/rgb_matrix_runners/effect_runner_dx_dy_dist.h b/quantum/rgb_matrix/animations/runners/effect_runner_dx_dy_dist.h similarity index 100% rename from quantum/rgb_matrix_runners/effect_runner_dx_dy_dist.h rename to quantum/rgb_matrix/animations/runners/effect_runner_dx_dy_dist.h diff --git a/quantum/rgb_matrix_runners/effect_runner_i.h b/quantum/rgb_matrix/animations/runners/effect_runner_i.h similarity index 100% rename from quantum/rgb_matrix_runners/effect_runner_i.h rename to quantum/rgb_matrix/animations/runners/effect_runner_i.h diff --git a/quantum/rgb_matrix_runners/effect_runner_reactive.h b/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h similarity index 100% rename from quantum/rgb_matrix_runners/effect_runner_reactive.h rename to quantum/rgb_matrix/animations/runners/effect_runner_reactive.h diff --git a/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h b/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h similarity index 100% rename from quantum/rgb_matrix_runners/effect_runner_reactive_splash.h rename to quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h diff --git a/quantum/rgb_matrix_runners/effect_runner_sin_cos_i.h b/quantum/rgb_matrix/animations/runners/effect_runner_sin_cos_i.h similarity index 100% rename from quantum/rgb_matrix_runners/effect_runner_sin_cos_i.h rename to quantum/rgb_matrix/animations/runners/effect_runner_sin_cos_i.h diff --git a/quantum/rgb_matrix/animations/runners/rgb_matrix_runners.inc b/quantum/rgb_matrix/animations/runners/rgb_matrix_runners.inc new file mode 100644 index 0000000000..c09022bb0f --- /dev/null +++ b/quantum/rgb_matrix/animations/runners/rgb_matrix_runners.inc @@ -0,0 +1,6 @@ +#include "effect_runner_dx_dy_dist.h" +#include "effect_runner_dx_dy.h" +#include "effect_runner_i.h" +#include "effect_runner_sin_cos_i.h" +#include "effect_runner_reactive.h" +#include "effect_runner_reactive_splash.h" diff --git a/quantum/rgb_matrix_animations/solid_color_anim.h b/quantum/rgb_matrix/animations/solid_color_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/solid_color_anim.h rename to quantum/rgb_matrix/animations/solid_color_anim.h diff --git a/quantum/rgb_matrix_animations/solid_reactive_anim.h b/quantum/rgb_matrix/animations/solid_reactive_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/solid_reactive_anim.h rename to quantum/rgb_matrix/animations/solid_reactive_anim.h diff --git a/quantum/rgb_matrix_animations/solid_reactive_cross.h b/quantum/rgb_matrix/animations/solid_reactive_cross.h similarity index 100% rename from quantum/rgb_matrix_animations/solid_reactive_cross.h rename to quantum/rgb_matrix/animations/solid_reactive_cross.h diff --git a/quantum/rgb_matrix_animations/solid_reactive_nexus.h b/quantum/rgb_matrix/animations/solid_reactive_nexus.h similarity index 100% rename from quantum/rgb_matrix_animations/solid_reactive_nexus.h rename to quantum/rgb_matrix/animations/solid_reactive_nexus.h diff --git a/quantum/rgb_matrix_animations/solid_reactive_simple_anim.h b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/solid_reactive_simple_anim.h rename to quantum/rgb_matrix/animations/solid_reactive_simple_anim.h diff --git a/quantum/rgb_matrix_animations/solid_reactive_wide.h b/quantum/rgb_matrix/animations/solid_reactive_wide.h similarity index 100% rename from quantum/rgb_matrix_animations/solid_reactive_wide.h rename to quantum/rgb_matrix/animations/solid_reactive_wide.h diff --git a/quantum/rgb_matrix_animations/solid_splash_anim.h b/quantum/rgb_matrix/animations/solid_splash_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/solid_splash_anim.h rename to quantum/rgb_matrix/animations/solid_splash_anim.h diff --git a/quantum/rgb_matrix_animations/splash_anim.h b/quantum/rgb_matrix/animations/splash_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/splash_anim.h rename to quantum/rgb_matrix/animations/splash_anim.h diff --git a/quantum/rgb_matrix_animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h similarity index 100% rename from quantum/rgb_matrix_animations/typing_heatmap_anim.h rename to quantum/rgb_matrix/animations/typing_heatmap_anim.h diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c similarity index 98% rename from quantum/rgb_matrix.c rename to quantum/rgb_matrix/rgb_matrix.c index 09803c72af..789cd28605 100644 --- a/quantum/rgb_matrix.c +++ b/quantum/rgb_matrix/rgb_matrix.c @@ -42,19 +42,14 @@ const led_point_t k_rgb_matrix_center = RGB_MATRIX_CENTER; __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); } // Generic effect runners -#include "rgb_matrix_runners/effect_runner_dx_dy_dist.h" -#include "rgb_matrix_runners/effect_runner_dx_dy.h" -#include "rgb_matrix_runners/effect_runner_i.h" -#include "rgb_matrix_runners/effect_runner_sin_cos_i.h" -#include "rgb_matrix_runners/effect_runner_reactive.h" -#include "rgb_matrix_runners/effect_runner_reactive_splash.h" +#include "rgb_matrix_runners.inc" // ------------------------------------------ // -----Begin rgb effect includes macros----- #define RGB_MATRIX_EFFECT(name) #define RGB_MATRIX_CUSTOM_EFFECT_IMPLS -#include "rgb_matrix_animations/rgb_matrix_effects.inc" +#include "rgb_matrix_effects.inc" #ifdef RGB_MATRIX_CUSTOM_KB # include "rgb_matrix_kb.inc" #endif @@ -360,7 +355,7 @@ static void rgb_task_render(uint8_t effect) { case RGB_MATRIX_##name: \ rendering = name(&rgb_effect_params); \ break; -#include "rgb_matrix_animations/rgb_matrix_effects.inc" +#include "rgb_matrix_effects.inc" #undef RGB_MATRIX_EFFECT #if defined(RGB_MATRIX_CUSTOM_KB) || defined(RGB_MATRIX_CUSTOM_USER) diff --git a/quantum/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h similarity index 99% rename from quantum/rgb_matrix.h rename to quantum/rgb_matrix/rgb_matrix.h index 741a2fe446..28f07c84d6 100644 --- a/quantum/rgb_matrix.h +++ b/quantum/rgb_matrix/rgb_matrix.h @@ -72,7 +72,7 @@ enum rgb_matrix_effects { // -------------------------------------- // -----Begin rgb effect enum macros----- #define RGB_MATRIX_EFFECT(name, ...) RGB_MATRIX_##name, -#include "rgb_matrix_animations/rgb_matrix_effects.inc" +#include "rgb_matrix_effects.inc" #undef RGB_MATRIX_EFFECT #if defined(RGB_MATRIX_CUSTOM_KB) || defined(RGB_MATRIX_CUSTOM_USER) diff --git a/quantum/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c similarity index 100% rename from quantum/rgb_matrix_drivers.c rename to quantum/rgb_matrix/rgb_matrix_drivers.c diff --git a/quantum/rgb_matrix_types.h b/quantum/rgb_matrix/rgb_matrix_types.h similarity index 100% rename from quantum/rgb_matrix_types.h rename to quantum/rgb_matrix/rgb_matrix_types.h diff --git a/quantum/rgb_matrix_animations/rgb_matrix_effects.inc b/quantum/rgb_matrix_animations/rgb_matrix_effects.inc deleted file mode 100644 index 053d441506..0000000000 --- a/quantum/rgb_matrix_animations/rgb_matrix_effects.inc +++ /dev/null @@ -1,37 +0,0 @@ -// Add your new core rgb matrix effect here, order determins enum order, requires "rgb_matrix_animations/ directory -#include "rgb_matrix_animations/solid_color_anim.h" -#include "rgb_matrix_animations/alpha_mods_anim.h" -#include "rgb_matrix_animations/gradient_up_down_anim.h" -#include "rgb_matrix_animations/gradient_left_right_anim.h" -#include "rgb_matrix_animations/breathing_anim.h" -#include "rgb_matrix_animations/colorband_sat_anim.h" -#include "rgb_matrix_animations/colorband_val_anim.h" -#include "rgb_matrix_animations/colorband_pinwheel_sat_anim.h" -#include "rgb_matrix_animations/colorband_pinwheel_val_anim.h" -#include "rgb_matrix_animations/colorband_spiral_sat_anim.h" -#include "rgb_matrix_animations/colorband_spiral_val_anim.h" -#include "rgb_matrix_animations/cycle_all_anim.h" -#include "rgb_matrix_animations/cycle_left_right_anim.h" -#include "rgb_matrix_animations/cycle_up_down_anim.h" -#include "rgb_matrix_animations/rainbow_moving_chevron_anim.h" -#include "rgb_matrix_animations/cycle_out_in_anim.h" -#include "rgb_matrix_animations/cycle_out_in_dual_anim.h" -#include "rgb_matrix_animations/cycle_pinwheel_anim.h" -#include "rgb_matrix_animations/cycle_spiral_anim.h" -#include "rgb_matrix_animations/dual_beacon_anim.h" -#include "rgb_matrix_animations/rainbow_beacon_anim.h" -#include "rgb_matrix_animations/rainbow_pinwheels_anim.h" -#include "rgb_matrix_animations/raindrops_anim.h" -#include "rgb_matrix_animations/jellybean_raindrops_anim.h" -#include "rgb_matrix_animations/hue_breathing_anim.h" -#include "rgb_matrix_animations/hue_pendulum_anim.h" -#include "rgb_matrix_animations/hue_wave_anim.h" -#include "rgb_matrix_animations/typing_heatmap_anim.h" -#include "rgb_matrix_animations/digital_rain_anim.h" -#include "rgb_matrix_animations/solid_reactive_simple_anim.h" -#include "rgb_matrix_animations/solid_reactive_anim.h" -#include "rgb_matrix_animations/solid_reactive_wide.h" -#include "rgb_matrix_animations/solid_reactive_cross.h" -#include "rgb_matrix_animations/solid_reactive_nexus.h" -#include "rgb_matrix_animations/splash_anim.h" -#include "rgb_matrix_animations/solid_splash_anim.h"