qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-30 05:50:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zvecr
2023-11-26 20:56:29 +00:00
parent 90d19fdd49 1ed03f498f
commit 993e9c29e7
2903 changed files with 754 additions and 209185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quantum/quantum.c
+14 -7
View File
@@ -172,7 +172,7 @@ __attribute__((weak)) void post_process_record_kb(uint16_t keycode, keyrecord_t
__attribute__((weak)) void post_process_record_user(uint16_t keycode, keyrecord_t *record) {}
void shutdown_quantum(void) {
void shutdown_quantum(bool jump_to_bootloader) {
clear_keyboard();
#if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
process_midi_all_notes_off();
@@ -183,12 +183,12 @@ void shutdown_quantum(void) {
# endif
uint16_t timer_start = timer_read();
PLAY_SONG(goodbye_song);
shutdown_user();
shutdown_kb(jump_to_bootloader);
while (timer_elapsed(timer_start) < 250)
wait_ms(1);
stop_all_notes();
#else
shutdown_user();
shutdown_kb(jump_to_bootloader);
wait_ms(250);
#endif
#ifdef HAPTIC_ENABLE
@@ -197,12 +197,12 @@ void shutdown_quantum(void) {
}
void reset_keyboard(void) {
shutdown_quantum();
shutdown_quantum(true);
bootloader_jump();
}
void soft_reset_keyboard(void) {
shutdown_quantum();
shutdown_quantum(false);
mcu_reset();
}
@@ -491,9 +491,16 @@ void set_single_persistent_default_layer(uint8_t default_layer) {
// Override these functions in your keymap file to play different tunes on
// different events such as startup and bootloader jump
__attribute__((weak)) void startup_user(void) {}
__attribute__((weak)) bool shutdown_user(bool jump_to_bootloader) {
return true;
}
__attribute__((weak)) void shutdown_user(void) {}
__attribute__((weak)) bool shutdown_kb(bool jump_to_bootloader) {
if (!shutdown_user(jump_to_bootloader)) {
return false;
}
return true;
}
void suspend_power_down_quantum(void) {
suspend_power_down_kb();
quantum/quantum.h
+2 -2
View File
@@ -259,8 +259,8 @@ void post_process_record_user(uint16_t keycode, keyrecord_t *record);
void reset_keyboard(void);
void soft_reset_keyboard(void);
void startup_user(void);
void shutdown_user(void);
bool shutdown_kb(bool jump_to_bootloader);
bool shutdown_user(bool jump_to_bootloader);
void register_code16(uint16_t code);
void unregister_code16(uint16_t code);
quantum/rgb_matrix/animations/rgb_matrix_effects.inc
+4
View File
@@ -39,3 +39,7 @@
#include "solid_reactive_nexus.h"
#include "splash_anim.h"
#include "solid_splash_anim.h"
#include "starlight_anim.h"
#include "starlight_dual_sat_anim.h"
#include "starlight_dual_hue_anim.h"
#include "riverflow_anim.h"
quantum/rgb_matrix/animations/riverflow_anim.h
+22
View File
@@ -0,0 +1,22 @@
#ifdef ENABLE_RGB_MATRIX_RIVERFLOW
RGB_MATRIX_EFFECT(RIVERFLOW)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
// inspired by @PleasureTek's Massdrop Alt LED animation
bool RIVERFLOW(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) {
HSV hsv = rgb_matrix_config.hsv;
uint16_t time = scale16by8(g_rgb_timer + (i * 315), rgb_matrix_config.speed / 8);
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
RGB_MATRIX_TEST_LED_FLAGS();
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
return rgb_matrix_check_finished_leds(led_max);
}
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_RIVERFLOW
quantum/rgb_matrix/animations/starlight_anim.h
+30
View File
@@ -0,0 +1,30 @@
#ifdef ENABLE_RGB_MATRIX_STARLIGHT
RGB_MATRIX_EFFECT(STARLIGHT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_color(int i, effect_params_t* params) {
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
RGB rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
bool STARLIGHT(effect_params_t* params) {
if (!params->init) {
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
set_starlight_color(rand_led, params);
}
return false;
}
RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (int i = led_min; i < led_max; i++) {
set_starlight_color(i, params);
}
return rgb_matrix_check_finished_leds(led_max);
}
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT
quantum/rgb_matrix/animations/starlight_dual_hue_anim.h
+31
View File
@@ -0,0 +1,31 @@
#ifdef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_dual_hue_color(int i, effect_params_t* params) {
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.h = hsv.h + (rand() % (30 + 1 - -30) + -30);
RGB rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
bool STARLIGHT_DUAL_HUE(effect_params_t* params) {
if (!params->init) {
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
set_starlight_dual_hue_color(rand_led, params);
}
return false;
}
RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (int i = led_min; i < led_max; i++) {
set_starlight_dual_hue_color(i, params);
}
return rgb_matrix_check_finished_leds(led_max);
}
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
quantum/rgb_matrix/animations/starlight_dual_sat_anim.h
+31
View File
@@ -0,0 +1,31 @@
#ifdef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_dual_sat_color(int i, effect_params_t* params) {
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.s = hsv.s + (rand() % (30 + 1 - -30) + -30);
RGB rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
bool STARLIGHT_DUAL_SAT(effect_params_t* params) {
if (!params->init) {
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
set_starlight_dual_sat_color(rand_led, params);
}
return false;
}
RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (int i = led_min; i < led_max; i++) {
set_starlight_dual_sat_color(i, params);
}
return rgb_matrix_check_finished_leds(led_max);
}
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT