g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #16705 : digital rain follows val (#16716) 

Co-authored-by: Drashna Jaelre <drashna@live.com>
master
KoenGoe 2022-04-19 13:02:21 +02:00 committed by GitHub
parent 2a4db15f62
commit 671b62efab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
quantum/rgb_matrix/animations/digital_rain_anim.h
View File

@ -10,11 +10,13 @@ RGB_MATRIX_EFFECT(DIGITAL_RAIN)
bool DIGITAL_RAIN(effect_params_t* params) { bool DIGITAL_RAIN(effect_params_t* params) {
// algorithm ported from https://github.com/tremby/Kaleidoscope-LEDEffect-DigitalRain // algorithm ported from https://github.com/tremby/Kaleidoscope-LEDEffect-DigitalRain
const uint8_t drop_ticks = 28; const uint8_t drop_ticks = 28;
const uint8_t pure_green_intensity = 0xd0; const uint8_t pure_green_intensity = (((uint16_t)rgb_matrix_config.hsv.v) * 3) >> 2;
const uint8_t max_brightness_boost = 0xc0; const uint8_t max_brightness_boost = (((uint16_t)rgb_matrix_config.hsv.v) * 3) >> 2;
const uint8_t max_intensity = 0xff; const uint8_t max_intensity = rgb_matrix_config.hsv.v;
const uint8_t decay_ticks = 0xff / max_intensity;
static uint8_t drop = 0; static uint8_t drop = 0;
static uint8_t decay = 0;
if (params->init) { if (params->init) {
rgb_matrix_set_color_all(0, 0, 0); rgb_matrix_set_color_all(0, 0, 0);
@ -22,6 +24,7 @@ bool DIGITAL_RAIN(effect_params_t* params) {
drop = 0; drop = 0;
} }
decay++;
for (uint8_t col = 0; col < MATRIX_COLS; col++) { for (uint8_t col = 0; col < MATRIX_COLS; col++) {
for (uint8_t row = 0; row < MATRIX_ROWS; row++) { for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
if (row == 0 && drop == 0 && rand() < RAND_MAX / RGB_DIGITAL_RAIN_DROPS) { if (row == 0 && drop == 0 && rand() < RAND_MAX / RGB_DIGITAL_RAIN_DROPS) {
@ -30,7 +33,9 @@ bool DIGITAL_RAIN(effect_params_t* params) {
g_rgb_frame_buffer[row][col] = max_intensity; g_rgb_frame_buffer[row][col] = max_intensity;
} else if (g_rgb_frame_buffer[row][col] > 0 && g_rgb_frame_buffer[row][col] < max_intensity) { } else if (g_rgb_frame_buffer[row][col] > 0 && g_rgb_frame_buffer[row][col] < max_intensity) {
// neither fully bright nor dark, decay it // neither fully bright nor dark, decay it
g_rgb_frame_buffer[row][col]--; if (decay == decay_ticks) {
g_rgb_frame_buffer[row][col]--;
}
} }
// set the pixel colour // set the pixel colour
uint8_t led[LED_HITS_TO_REMEMBER]; uint8_t led[LED_HITS_TO_REMEMBER];
@ -48,6 +53,9 @@ bool DIGITAL_RAIN(effect_params_t* params) {
} }
} }
} }
if (decay == decay_ticks) {
decay = 0;
}
if (++drop > drop_ticks) { if (++drop > drop_ticks) {
// reset drop timer // reset drop timer
@ -59,9 +67,9 @@ bool DIGITAL_RAIN(effect_params_t* params) {
g_rgb_frame_buffer[row][col]--; g_rgb_frame_buffer[row][col]--;
} }
// check if the pixel above is bright // check if the pixel above is bright
if (g_rgb_frame_buffer[row - 1][col] == max_intensity) { if (g_rgb_frame_buffer[row - 1][col] >= max_intensity) { // Note: can be larger than max_intensity if val was recently decreased
// allow old bright pixel to decay // allow old bright pixel to decay
g_rgb_frame_buffer[row - 1][col]--; g_rgb_frame_buffer[row - 1][col] = max_intensity - 1;
// make this pixel bright // make this pixel bright
g_rgb_frame_buffer[row][col] = max_intensity; g_rgb_frame_buffer[row][col] = max_intensity;
} }