gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +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:10:45 +00:00
commit b6003c1079
5 changed files with 69 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platforms/chibios/drivers/audio_pwm_hardware.c
View File

@ -41,18 +41,19 @@ static float channel_1_frequency = 0.0f;
void channel_1_set_frequency(float freq) { void channel_1_set_frequency(float freq) {
channel_1_frequency = freq; channel_1_frequency = freq;
pwmcnt_t period;
pwmcnt_t width;
if (freq <= 0.0) { if (freq <= 0.0) {
// a pause/rest has freq=0 period = 2;
return; width = 0;
} else {
period = (pwmCFG.frequency / freq);
width = (pwmcnt_t)(((period) * (pwmcnt_t)((100 - note_timbre) * 100)) / (pwmcnt_t)(10000));
} }
pwmcnt_t period = (pwmCFG.frequency / freq);
chSysLockFromISR(); chSysLockFromISR();
pwmChangePeriodI(&AUDIO_PWM_DRIVER, period); pwmChangePeriodI(&AUDIO_PWM_DRIVER, period);
pwmEnableChannelI(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1, pwmEnableChannelI(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1, width);
// adjust the duty-cycle so that the output is for 'note_timbre' duration HIGH
PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
chSysUnlockFromISR(); chSysUnlockFromISR();
} }
@ -67,6 +68,9 @@ void channel_1_start(void) {
void channel_1_stop(void) { void channel_1_stop(void) {
pwmStop(&AUDIO_PWM_DRIVER); pwmStop(&AUDIO_PWM_DRIVER);
pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
pwmEnableChannel(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1, 0);
pwmStop(&AUDIO_PWM_DRIVER);
} }
static virtual_timer_t audio_vt; static virtual_timer_t audio_vt;

5
quantum/audio/audio.c
View File

@ -258,11 +258,10 @@ void audio_stop_tone(float pitch) {
for (int i = AUDIO_TONE_STACKSIZE - 1; i >= 0; i--) { for (int i = AUDIO_TONE_STACKSIZE - 1; i >= 0; i--) {
found = (tones[i].pitch == pitch); found = (tones[i].pitch == pitch);
if (found) { if (found) {
tones[i] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
for (int j = i; (j < AUDIO_TONE_STACKSIZE - 1); j++) { for (int j = i; (j < AUDIO_TONE_STACKSIZE - 1); j++) {
tones[j] = tones[j + 1]; tones[j] = tones[j + 1];
tones[j + 1] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
} }
tones[AUDIO_TONE_STACKSIZE - 1] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
break; break;
} }
} }

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

@ -2,7 +2,9 @@
RGB_MATRIX_EFFECT(STARLIGHT) RGB_MATRIX_EFFECT(STARLIGHT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_color(uint8_t i, effect_params_t* params) { static void set_starlight_color(uint8_t i, effect_params_t* params) {
if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8); uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
hsv_t hsv = rgb_matrix_config.hsv; hsv_t hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v); hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
@ -11,21 +13,26 @@ void set_starlight_color(uint8_t i, effect_params_t* params) {
} }
bool STARLIGHT(effect_params_t* params) { bool STARLIGHT(effect_params_t* params) {
if (!params->init) { static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT); // Periodic trigger for LED change
set_starlight_color(rand_led, params); if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
} index = random8_max(RGB_MATRIX_LED_COUNT);
return false;
} }
RGB_MATRIX_USE_LIMITS(led_min, led_max); RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) { if (params->init) {
RGB_MATRIX_TEST_LED_FLAGS(); for (uint8_t i = led_min; i < led_max; i++) {
set_starlight_color(i, params); set_starlight_color(i, params);
}
}
// Change LED once and set index out of range till next trigger
else if (led_min <= index && index < led_max) {
set_starlight_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);
} }
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT #endif // ENABLE_RGB_MATRIX_STARLIGHT

31
quantum/rgb_matrix/animations/starlight_dual_hue_anim.h
View File

@ -2,31 +2,38 @@
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE) RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_dual_hue_color(uint8_t i, effect_params_t* params) { static void set_starlight_dual_hue_color(uint8_t i, effect_params_t* params) {
if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8); uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
hsv_t hsv = rgb_matrix_config.hsv; hsv_t hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v); hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.h = hsv.h + random8_max((30 + 1 - -30) + -30); hsv.h = hsv.h + random8_max(31);
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 STARLIGHT_DUAL_HUE(effect_params_t* params) { bool STARLIGHT_DUAL_HUE(effect_params_t* params) {
if (!params->init) { static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT); // Periodic trigger for LED change
set_starlight_dual_hue_color(rand_led, params); if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
} index = random8_max(RGB_MATRIX_LED_COUNT);
return false;
} }
RGB_MATRIX_USE_LIMITS(led_min, led_max); RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) { if (params->init) {
RGB_MATRIX_TEST_LED_FLAGS(); for (uint8_t i = led_min; i < led_max; i++) {
set_starlight_dual_hue_color(i, params); set_starlight_dual_hue_color(i, params);
}
}
// Change LED once and set index out of range till next trigger
else if (led_min <= index && index < led_max) {
set_starlight_dual_hue_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);
} }
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE #endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE

31
quantum/rgb_matrix/animations/starlight_dual_sat_anim.h
View File

@ -2,31 +2,38 @@
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT) RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_dual_sat_color(uint8_t i, effect_params_t* params) { static void set_starlight_dual_sat_color(uint8_t i, effect_params_t* params) {
if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8); uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
hsv_t hsv = rgb_matrix_config.hsv; hsv_t hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v); hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.s = hsv.s + random8_max((30 + 1 - -30) + -30); hsv.s = hsv.s + random8_max(31);
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 STARLIGHT_DUAL_SAT(effect_params_t* params) { bool STARLIGHT_DUAL_SAT(effect_params_t* params) {
if (!params->init) { static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT); // Periodic trigger for LED change
set_starlight_dual_sat_color(rand_led, params); if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
} index = random8_max(RGB_MATRIX_LED_COUNT);
return false;
} }
RGB_MATRIX_USE_LIMITS(led_min, led_max); RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) { if (params->init) {
RGB_MATRIX_TEST_LED_FLAGS(); for (uint8_t i = led_min; i < led_max; i++) {
set_starlight_dual_sat_color(i, params); set_starlight_dual_sat_color(i, params);
}
}
// Change LED once and set index out of range till next trigger
else if (led_min <= index && index < led_max) {
set_starlight_dual_sat_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);
} }
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT #endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT