gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 04:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2025-01-02 07:11:42 +00:00
commit e692d3a943
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/chibios/timer.c
View File

@ -99,7 +99,7 @@ uint16_t timer_read(void) {
} }
uint32_t timer_read32(void) { uint32_t timer_read32(void) {
chSysLock(); syssts_t sts = chSysGetStatusAndLockX();
uint32_t ticks = get_system_time_ticks() - ticks_offset; uint32_t ticks = get_system_time_ticks() - ticks_offset;
if (ticks < last_ticks) { if (ticks < last_ticks) {
// The 32-bit tick counter overflowed and wrapped around. We cannot just extend the counter to 64 bits here, // The 32-bit tick counter overflowed and wrapped around. We cannot just extend the counter to 64 bits here,
@ -114,7 +114,7 @@ uint32_t timer_read32(void) {
} }
last_ticks = ticks; last_ticks = ticks;
uint32_t ms_offset_copy = ms_offset; // read while still holding the lock to ensure a consistent value uint32_t ms_offset_copy = ms_offset; // read while still holding the lock to ensure a consistent value
chSysUnlock(); chSysRestoreStatusX(sts);
return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy; return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy;
} }

29
quantum/rgb_matrix/animations/raindrops_anim.h
View File

@ -2,35 +2,42 @@
RGB_MATRIX_EFFECT(RAINDROPS) RGB_MATRIX_EFFECT(RAINDROPS)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
static void raindrops_set_color(int i, effect_params_t* params) { static void raindrops_set_color(uint8_t i, effect_params_t* params) {
if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return; if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
hsv_t hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v}; hsv_t hsv = rgb_matrix_config.hsv;
// Take the shortest path between hues // Take the shortest path between hues
int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4; int16_t deltaH = ((hsv.h + 180) % 360 - hsv.h) / 4;
if (deltaH > 127) { if (deltaH > 127) {
deltaH -= 256; deltaH -= 256;
} else if (deltaH < -127) { } else if (deltaH < -127) {
deltaH += 256; deltaH += 256;
} }
hsv.h = rgb_matrix_config.hsv.h + (deltaH * (random8() & 0x03)); hsv.h += (deltaH * random8_max(3));
rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv); rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
} }
bool RAINDROPS(effect_params_t* params) { bool RAINDROPS(effect_params_t* params) {
static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
// Periodic trigger for LED change
if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0)) {
index = random8_max(RGB_MATRIX_LED_COUNT);
}
RGB_MATRIX_USE_LIMITS(led_min, led_max); RGB_MATRIX_USE_LIMITS(led_min, led_max);
if (!params->init) { if (params->init) {
// Change one LED every tick, make sure speed is not 0 for (uint8_t i = led_min; i < led_max; i++) {
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
raindrops_set_color(random8_max(RGB_MATRIX_LED_COUNT), params);
}
} else {
for (int i = led_min; i < led_max; i++) {
raindrops_set_color(i, params); raindrops_set_color(i, params);
} }
} }
// Change LED once and set index out of range till next trigger
else if (led_min <= index && index < led_max) {
raindrops_set_color(index, params);
index = RGB_MATRIX_LED_COUNT + 1;
}
return rgb_matrix_check_finished_leds(led_max); return rgb_matrix_check_finished_leds(led_max);
} }