~ruther/qmk_firmware

38d979189b183fdc4111fe8290e6e6b7f2cd9d24 — QMK Bot 4 years ago c742d0b + a913db6
Merge remote-tracking branch 'origin/master' into develop
M quantum/rgb_matrix/animations/runners/effect_runner_i.h => quantum/rgb_matrix/animations/runners/effect_runner_i.h +1 -1
@@ 5,7 5,7 @@ typedef HSV (*i_f)(HSV hsv, uint8_t i, uint8_t time);
bool effect_runner_i(effect_params_t* params, i_f effect_func) {
    RGB_MATRIX_USE_LIMITS(led_min, led_max);

    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
    for (uint8_t i = led_min; i < led_max; i++) {
        RGB_MATRIX_TEST_LED_FLAGS();
        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));

M quantum/rgb_matrix/animations/runners/effect_runner_reactive.h => quantum/rgb_matrix/animations/runners/effect_runner_reactive.h +2 -2
@@ 7,7 7,7 @@ typedef HSV (*reactive_f)(HSV hsv, uint16_t offset);
bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
    RGB_MATRIX_USE_LIMITS(led_min, led_max);

    uint16_t max_tick = 65535 / rgb_matrix_config.speed;
    uint16_t max_tick = 65535 / qadd8(rgb_matrix_config.speed, 1);
    for (uint8_t i = led_min; i < led_max; i++) {
        RGB_MATRIX_TEST_LED_FLAGS();
        uint16_t tick = max_tick;


@@ 19,7 19,7 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
            }
        }

        uint16_t offset = scale16by8(tick, rgb_matrix_config.speed);
        uint16_t offset = scale16by8(tick, qadd8(rgb_matrix_config.speed, 1));
        RGB      rgb    = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, offset));
        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
    }

M quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h => quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h +1 -1
@@ 16,7 16,7 @@ bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, react
            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], rgb_matrix_config.speed);
            uint16_t tick = scale16by8(g_last_hit_tracker.tick[j], qadd8(rgb_matrix_config.speed, 1));
            hsv           = effect_func(hsv, dx, dy, dist, tick);
        }
        hsv.v   = scale8(hsv.v, rgb_matrix_config.hsv.v);