diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/rgb_matrix.c | 6 | ||||
| -rw-r--r-- | quantum/rgb_matrix_animations/cycle_out_in_anim.h | 4 | ||||
| -rw-r--r-- | quantum/rgb_matrix_animations/cycle_out_in_dual_anim.h | 4 | ||||
| -rw-r--r-- | quantum/rgb_matrix_animations/dual_beacon_anim.h | 2 | ||||
| -rw-r--r-- | quantum/rgb_matrix_animations/rainbow_beacon_anim.h | 2 | ||||
| -rw-r--r-- | quantum/rgb_matrix_animations/rainbow_pinwheels_anim.h | 2 |
6 files changed, 13 insertions, 7 deletions
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c index 9b9932df5..a6a9549af 100644 --- a/quantum/rgb_matrix.c +++ b/quantum/rgb_matrix.c | |||
| @@ -26,6 +26,12 @@ | |||
| 26 | 26 | ||
| 27 | #include "lib/lib8tion/lib8tion.h" | 27 | #include "lib/lib8tion/lib8tion.h" |
| 28 | 28 | ||
| 29 | #ifndef RGB_MATRIX_CENTER | ||
| 30 | const point_t k_rgb_matrix_center = { 112, 32 }; | ||
| 31 | #else | ||
| 32 | const point_t k_rgb_matrix_center = RGB_MATRIX_CENTER; | ||
| 33 | #endif | ||
| 34 | |||
| 29 | // ------------------------------------------ | 35 | // ------------------------------------------ |
| 30 | // -----Begin rgb effect includes macros----- | 36 | // -----Begin rgb effect includes macros----- |
| 31 | #define RGB_MATRIX_EFFECT(name) | 37 | #define RGB_MATRIX_EFFECT(name) |
diff --git a/quantum/rgb_matrix_animations/cycle_out_in_anim.h b/quantum/rgb_matrix_animations/cycle_out_in_anim.h index dc9d09fd3..29209e4d7 100644 --- a/quantum/rgb_matrix_animations/cycle_out_in_anim.h +++ b/quantum/rgb_matrix_animations/cycle_out_in_anim.h | |||
| @@ -9,8 +9,8 @@ bool CYCLE_OUT_IN(effect_params_t* params) { | |||
| 9 | uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4); | 9 | uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4); |
| 10 | for (uint8_t i = led_min; i < led_max; i++) { | 10 | for (uint8_t i = led_min; i < led_max; i++) { |
| 11 | RGB_MATRIX_TEST_LED_FLAGS(); | 11 | RGB_MATRIX_TEST_LED_FLAGS(); |
| 12 | int16_t dx = g_led_config.point[i].x - 112; | 12 | int16_t dx = g_led_config.point[i].x - k_rgb_matrix_center.x; |
| 13 | int16_t dy = g_led_config.point[i].y - 32; | 13 | int16_t dy = g_led_config.point[i].y - k_rgb_matrix_center.y; |
| 14 | uint8_t dist = sqrt16(dx * dx + dy * dy); | 14 | uint8_t dist = sqrt16(dx * dx + dy * dy); |
| 15 | hsv.h = 3 * dist / 2 + time; | 15 | hsv.h = 3 * dist / 2 + time; |
| 16 | RGB rgb = hsv_to_rgb(hsv); | 16 | RGB rgb = hsv_to_rgb(hsv); |
diff --git a/quantum/rgb_matrix_animations/cycle_out_in_dual_anim.h b/quantum/rgb_matrix_animations/cycle_out_in_dual_anim.h index 941e6b9a8..b2f79ceea 100644 --- a/quantum/rgb_matrix_animations/cycle_out_in_dual_anim.h +++ b/quantum/rgb_matrix_animations/cycle_out_in_dual_anim.h | |||
| @@ -9,8 +9,8 @@ bool CYCLE_OUT_IN_DUAL(effect_params_t* params) { | |||
| 9 | uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4); | 9 | uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4); |
| 10 | for (uint8_t i = led_min; i < led_max; i++) { | 10 | for (uint8_t i = led_min; i < led_max; i++) { |
| 11 | RGB_MATRIX_TEST_LED_FLAGS(); | 11 | RGB_MATRIX_TEST_LED_FLAGS(); |
| 12 | int16_t dx = 56 - abs8(g_led_config.point[i].x - 112); | 12 | int16_t dx = (k_rgb_matrix_center.x / 2) - abs8(g_led_config.point[i].x - k_rgb_matrix_center.x); |
| 13 | int16_t dy = g_led_config.point[i].y - 32; | 13 | int16_t dy = g_led_config.point[i].y - k_rgb_matrix_center.y; |
| 14 | uint8_t dist = sqrt16(dx * dx + dy * dy); | 14 | uint8_t dist = sqrt16(dx * dx + dy * dy); |
| 15 | hsv.h = 3 * dist + time; | 15 | hsv.h = 3 * dist + time; |
| 16 | RGB rgb = hsv_to_rgb(hsv); | 16 | RGB rgb = hsv_to_rgb(hsv); |
diff --git a/quantum/rgb_matrix_animations/dual_beacon_anim.h b/quantum/rgb_matrix_animations/dual_beacon_anim.h index f853f71ec..59c91046d 100644 --- a/quantum/rgb_matrix_animations/dual_beacon_anim.h +++ b/quantum/rgb_matrix_animations/dual_beacon_anim.h | |||
| @@ -11,7 +11,7 @@ bool DUAL_BEACON(effect_params_t* params) { | |||
| 11 | int8_t sin_value = sin8(time) - 128; | 11 | int8_t sin_value = sin8(time) - 128; |
| 12 | for (uint8_t i = led_min; i < led_max; i++) { | 12 | for (uint8_t i = led_min; i < led_max; i++) { |
| 13 | RGB_MATRIX_TEST_LED_FLAGS(); | 13 | RGB_MATRIX_TEST_LED_FLAGS(); |
| 14 | hsv.h = ((g_led_config.point[i].y - 32) * cos_value + (g_led_config.point[i].x - 112) * sin_value) / 128 + rgb_matrix_config.hue; | 14 | hsv.h = ((g_led_config.point[i].y - k_rgb_matrix_center.y) * cos_value + (g_led_config.point[i].x - k_rgb_matrix_center.x) * sin_value) / 128 + rgb_matrix_config.hue; |
| 15 | RGB rgb = hsv_to_rgb(hsv); | 15 | RGB rgb = hsv_to_rgb(hsv); |
| 16 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); | 16 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); |
| 17 | } | 17 | } |
diff --git a/quantum/rgb_matrix_animations/rainbow_beacon_anim.h b/quantum/rgb_matrix_animations/rainbow_beacon_anim.h index a0e0f814c..564e3c480 100644 --- a/quantum/rgb_matrix_animations/rainbow_beacon_anim.h +++ b/quantum/rgb_matrix_animations/rainbow_beacon_anim.h | |||
| @@ -11,7 +11,7 @@ bool RAINBOW_BEACON(effect_params_t* params) { | |||
| 11 | int16_t sin_value = 2 * (sin8(time) - 128); | 11 | int16_t sin_value = 2 * (sin8(time) - 128); |
| 12 | for (uint8_t i = led_min; i < led_max; i++) { | 12 | for (uint8_t i = led_min; i < led_max; i++) { |
| 13 | RGB_MATRIX_TEST_LED_FLAGS(); | 13 | RGB_MATRIX_TEST_LED_FLAGS(); |
| 14 | hsv.h = ((g_led_config.point[i].y - 32) * cos_value + (g_led_config.point[i].x - 112) * sin_value) / 128 + rgb_matrix_config.hue; | 14 | hsv.h = ((g_led_config.point[i].y - k_rgb_matrix_center.y) * cos_value + (g_led_config.point[i].x - k_rgb_matrix_center.x) * sin_value) / 128 + rgb_matrix_config.hue; |
| 15 | RGB rgb = hsv_to_rgb(hsv); | 15 | RGB rgb = hsv_to_rgb(hsv); |
| 16 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); | 16 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); |
| 17 | } | 17 | } |
diff --git a/quantum/rgb_matrix_animations/rainbow_pinwheels_anim.h b/quantum/rgb_matrix_animations/rainbow_pinwheels_anim.h index 275aaa48d..7d189b927 100644 --- a/quantum/rgb_matrix_animations/rainbow_pinwheels_anim.h +++ b/quantum/rgb_matrix_animations/rainbow_pinwheels_anim.h | |||
| @@ -11,7 +11,7 @@ bool PINWHEELS(effect_params_t* params) { | |||
| 11 | int16_t sin_value = 3 * (sin8(time) - 128); | 11 | int16_t sin_value = 3 * (sin8(time) - 128); |
| 12 | for (uint8_t i = led_min; i < led_max; i++) { | 12 | for (uint8_t i = led_min; i < led_max; i++) { |
| 13 | RGB_MATRIX_TEST_LED_FLAGS(); | 13 | RGB_MATRIX_TEST_LED_FLAGS(); |
| 14 | hsv.h = ((g_led_config.point[i].y - 32) * cos_value + (56 - abs8(g_led_config.point[i].x - 112)) * sin_value) / 128 + rgb_matrix_config.hue; | 14 | hsv.h = ((g_led_config.point[i].y - k_rgb_matrix_center.y) * cos_value + (56 - abs8(g_led_config.point[i].x - k_rgb_matrix_center.x)) * sin_value) / 128 + rgb_matrix_config.hue; |
| 15 | RGB rgb = hsv_to_rgb(hsv); | 15 | RGB rgb = hsv_to_rgb(hsv); |
| 16 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); | 16 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); |
| 17 | } | 17 | } |
