t9/qmk-firmware
Watch
1
0
Fork
You've already forked qmk-firmware
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move LED/RGB Matrix code into their own directories (#13257)

Browse source
This commit is contained in:
Ryan 2021-06-22 18:26:23 +10:00 • committed by GitHub
commit d61e5c0027
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 108 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common_features.mk
View file

@ -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

24
quantum/led_matrix/animations/alpha_mods_anim.h Normal file
View file

@ -0,0 +1,24 @@
#ifndef DISABLE_LED_MATRIX_ALPHAS_MODS
LED_MATRIX_EFFECT(ALPHAS_MODS)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
// alphas = val1, mods = val2
bool ALPHAS_MODS(effect_params_t* params) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t val1 = led_matrix_eeconfig.val;
uint8_t val2 = val1 + led_matrix_eeconfig.speed;
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
led_matrix_set_value(i, val2);
} else {
led_matrix_set_value(i, val1);
}
}
return led_max < DRIVER_LED_TOTAL;
}
# endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // DISABLE_LED_MATRIX_ALPHAS_MODS

13
quantum/led_matrix/animations/band_anim.h Normal file
View file

@ -0,0 +1,13 @@
#ifndef DISABLE_LED_MATRIX_BAND
LED_MATRIX_EFFECT(BAND)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t BAND_math(uint8_t val, uint8_t i, uint8_t time) {
int16_t v = val - abs(scale8(g_led_config.point[i].x, 228) + 28 - time) * 8;
return scale8(v < 0 ? 0 : v, val);
}
bool BAND(effect_params_t* params) { return effect_runner_i(params, &BAND_math); }
# endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // DISABLE_LED_MATRIX_BAND

10
quantum/led_matrix/animations/band_pinwheel_anim.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef DISABLE_LED_MATRIX_BAND_PINWHEEL
LED_MATRIX_EFFECT(BAND_PINWHEEL)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t time) { return scale8(val - time - atan2_8(dy, dx) * 3, val); }
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

10
quantum/led_matrix/animations/band_spiral_anim.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef DISABLE_LED_MATRIX_BAND_SPIRAL
LED_MATRIX_EFFECT(BAND_SPIRAL)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(val + dist - time - atan2_8(dy, dx), val); }
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

19
quantum/led_matrix/animations/breathing_anim.h Normal file
View file

@ -0,0 +1,19 @@
#ifndef DISABLE_LED_MATRIX_BREATHING
LED_MATRIX_EFFECT(BREATHING)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
bool BREATHING(effect_params_t* params) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t val = led_matrix_eeconfig.val;
uint16_t time = scale16by8(g_led_timer, led_matrix_eeconfig.speed / 8);
val = scale8(abs8(sin8(time) - 128) * 2, val);
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
led_matrix_set_value(i, val);
}
return led_max < DRIVER_LED_TOTAL;
}
# endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // DISABLE_LED_MATRIX_BREATHING

10
quantum/led_matrix/animations/cycle_left_right_anim.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
LED_MATRIX_EFFECT(CYCLE_LEFT_RIGHT)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].x - time, val); }
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

10
quantum/led_matrix/animations/cycle_out_in_anim.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef DISABLE_LED_MATRIX_CYCLE_OUT_IN
LED_MATRIX_EFFECT(CYCLE_OUT_IN)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(3 * dist / 2 + time, val); }
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

10
quantum/led_matrix/animations/cycle_up_down_anim.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef DISABLE_LED_MATRIX_CYCLE_UP_DOWN
LED_MATRIX_EFFECT(CYCLE_UP_DOWN)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].y - time, val); }
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

10
quantum/led_matrix/animations/dual_beacon_anim.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef DISABLE_LED_MATRIX_DUAL_BEACON
LED_MATRIX_EFFECT(DUAL_BEACON)
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time) { return scale8(((g_led_config.point[i].y - k_led_matrix_center.y) * cos + (g_led_config.point[i].x - k_led_matrix_center.x) * sin) / 128, val); }
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

18
quantum/led_matrix/animations/led_matrix_effects.inc Normal file
View file

@ -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"

16
quantum/led_matrix/animations/runners/effect_runner_dx_dy.h Normal file
View file

@ -0,0 +1,16 @@
#pragma once
typedef uint8_t (*dx_dy_f)(uint8_t val, int16_t dx, int16_t dy, uint8_t time);
bool effect_runner_dx_dy(effect_params_t* params, dx_dy_f effect_func) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t time = scale16by8(g_led_timer, led_matrix_eeconfig.speed / 2);
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
int16_t dx = g_led_config.point[i].x - k_led_matrix_center.x;
int16_t dy = g_led_config.point[i].y - k_led_matrix_center.y;
led_matrix_set_value(i, effect_func(led_matrix_eeconfig.val, dx, dy, time));
}
return led_max < DRIVER_LED_TOTAL;
}

17
quantum/led_matrix/animations/runners/effect_runner_dx_dy_dist.h Normal file
View file

@ -0,0 +1,17 @@
#pragma once
typedef uint8_t (*dx_dy_dist_f)(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time);
bool effect_runner_dx_dy_dist(effect_params_t* params, dx_dy_dist_f effect_func) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t time = scale16by8(g_led_timer, led_matrix_eeconfig.speed / 2);
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
int16_t dx = g_led_config.point[i].x - k_led_matrix_center.x;
int16_t dy = g_led_config.point[i].y - k_led_matrix_center.y;
uint8_t dist = sqrt16(dx * dx + dy * dy);
led_matrix_set_value(i, effect_func(led_matrix_eeconfig.val, dx, dy, dist, time));
}
return led_max < DRIVER_LED_TOTAL;
}

14
quantum/led_matrix/animations/runners/effect_runner_i.h Normal file
View file

@ -0,0 +1,14 @@
#pragma once
typedef uint8_t (*i_f)(uint8_t val, uint8_t i, uint8_t time);
bool effect_runner_i(effect_params_t* params, i_f effect_func) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t time = scale16by8(g_led_timer, led_matrix_eeconfig.speed / 4);
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
led_matrix_set_value(i, effect_func(led_matrix_eeconfig.val, i, time));
}
return led_max < DRIVER_LED_TOTAL;
}

28
quantum/led_matrix/animations/runners/effect_runner_reactive.h Normal file
View file

@ -0,0 +1,28 @@
#pragma once
#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
typedef uint8_t (*reactive_f)(uint8_t val, uint16_t offset);
bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint16_t max_tick = 65535 / led_matrix_eeconfig.speed;
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
uint16_t tick = max_tick;
// Reverse search to find most recent key hit
for (int8_t j = g_last_hit_tracker.count - 1; j >= 0; j--) {
if (g_last_hit_tracker.index[j] == i && g_last_hit_tracker.tick[j] < tick) {
tick = g_last_hit_tracker.tick[j];
break;
}
}
uint16_t offset = scale16by8(tick, led_matrix_eeconfig.speed);
led_matrix_set_value(i, effect_func(led_matrix_eeconfig.val, offset));
}
return led_max < DRIVER_LED_TOTAL;
}
#endif // LED_MATRIX_KEYREACTIVE_ENABLED

26
quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h Normal file
View file

@ -0,0 +1,26 @@
#pragma once
#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
typedef uint8_t (*reactive_splash_f)(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick);
bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, reactive_splash_f effect_func) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t count = g_last_hit_tracker.count;
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
uint8_t val = 0;
for (uint8_t j = start; j < count; j++) {
int16_t dx = g_led_config.point[i].x - g_last_hit_tracker.x[j];
int16_t dy = g_led_config.point[i].y - g_last_hit_tracker.y[j];
uint8_t dist = sqrt16(dx * dx + dy * dy);
uint16_t tick = scale16by8(g_last_hit_tracker.tick[j], led_matrix_eeconfig.speed);
val = effect_func(val, dx, dy, dist, tick);
}
led_matrix_set_value(i, scale8(val, led_matrix_eeconfig.val));
}
return led_max < DRIVER_LED_TOTAL;
}
#endif // LED_MATRIX_KEYREACTIVE_ENABLED

16
quantum/led_matrix/animations/runners/effect_runner_sin_cos_i.h Normal file
View file

@ -0,0 +1,16 @@
#pragma once
typedef uint8_t (*sin_cos_i_f)(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time);
bool effect_runner_sin_cos_i(effect_params_t* params, sin_cos_i_f effect_func) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint16_t time = scale16by8(g_led_timer, led_matrix_eeconfig.speed / 4);
int8_t cos_value = cos8(time) - 128;
int8_t sin_value = sin8(time) - 128;
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
led_matrix_set_value(i, effect_func(led_matrix_eeconfig.val, cos_value, sin_value, i, time));
}
return led_max < DRIVER_LED_TOTAL;
}

6
quantum/led_matrix/animations/runners/led_matrix_runners.inc Normal file
View file

@ -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"

15
quantum/led_matrix/animations/solid_anim.h Normal file
View file

@ -0,0 +1,15 @@
LED_MATRIX_EFFECT(SOLID)
#ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
bool SOLID(effect_params_t* params) {
LED_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t val = led_matrix_eeconfig.val;
for (uint8_t i = led_min; i < led_max; i++) {
LED_MATRIX_TEST_LED_FLAGS();
led_matrix_set_value(i, val);
}
return led_max < DRIVER_LED_TOTAL;
}
#endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS

35
quantum/led_matrix/animations/solid_reactive_cross.h Normal file
View file

@ -0,0 +1,35 @@
#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
# if !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS)
# ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
LED_MATRIX_EFFECT(SOLID_REACTIVE_CROSS)
# endif
# ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
LED_MATRIX_EFFECT(SOLID_REACTIVE_MULTICROSS)
# endif
# ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
static uint8_t SOLID_REACTIVE_CROSS_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) {
uint16_t effect = tick + dist;
dx = dx < 0 ? dx * -1 : dx;
dy = dy < 0 ? dy * -1 : dy;
dx = dx * 16 > 255 ? 255 : dx * 16;
dy = dy * 16 > 255 ? 255 : dy * 16;
effect += dx > dy ? dy : dx;
if (effect > 255) effect = 255;
return qadd8(val, 255 - effect);
}
# ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); }
# endif
# ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); }
# 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

Some files were not shown because too many files have changed in this diff Show more