diff options
| author | William Chang <william@factual.com> | 2019-05-09 21:16:15 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-05-09 21:16:15 -0700 |
| commit | 9ce186860e78d5afe350636cb7445e18c2577f33 (patch) | |
| tree | b7f5dded777a950e63c4dd967260744336bfaa6b /quantum/rgb_matrix_animations/splash_anim.h | |
| parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
| parent | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (diff) | |
Merge branch 'qmk-master'
Diffstat (limited to 'quantum/rgb_matrix_animations/splash_anim.h')
| -rw-r--r-- | quantum/rgb_matrix_animations/splash_anim.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/rgb_matrix_animations/splash_anim.h b/quantum/rgb_matrix_animations/splash_anim.h index 829d30eef5..fbe7761117 100644 --- a/quantum/rgb_matrix_animations/splash_anim.h +++ b/quantum/rgb_matrix_animations/splash_anim.h @@ -2,7 +2,7 @@ #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED #if !defined(DISABLE_RGB_MATRIX_SPLASH) || !defined(DISABLE_RGB_MATRIX_MULTISPLASH) -extern const rgb_led g_rgb_leds[DRIVER_LED_TOTAL]; +extern led_config_t g_led_config; extern rgb_config_t rgb_matrix_config; extern last_hit_t g_last_hit_tracker; @@ -12,12 +12,12 @@ static bool rgb_matrix_multisplash_range(uint8_t start, effect_params_t* params) HSV hsv = { 0, rgb_matrix_config.sat, 0 }; uint8_t count = g_last_hit_tracker.count; for (uint8_t i = led_min; i < led_max; i++) { + RGB_MATRIX_TEST_LED_FLAGS(); hsv.h = rgb_matrix_config.hue; hsv.v = 0; - point_t point = g_rgb_leds[i].point; for (uint8_t j = start; j < count; j++) { - int16_t dx = point.x - g_last_hit_tracker.x[j]; - int16_t dy = point.y - g_last_hit_tracker.y[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 effect = scale16by8(g_last_hit_tracker.tick[j], rgb_matrix_config.speed) - dist; if (effect > 255) |