diff options
author | QMK Bot <hello@qmk.fm> | 2021-11-17 12:42:00 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-17 20:42:00 +0000 |
commit | 25b087925c8ea88816c4049b7bcbd9dd850f2cef (patch) | |
tree | 96e7a370212e7b8c8935d6617c8d9c555042f9ca /quantum | |
parent | 45f4f446fb8473008252756e45023fc11bfe1472 (diff) | |
download | qmk_firmware-25b087925c8ea88816c4049b7bcbd9dd850f2cef.tar.gz qmk_firmware-25b087925c8ea88816c4049b7bcbd9dd850f2cef.zip |
Format code according to conventions (#15195)
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/process_keycode/process_auto_shift.c | 10 | ||||
-rw-r--r-- | quantum/rgb_matrix/animations/pixel_rain_anim.h | 18 |
2 files changed, 16 insertions, 12 deletions
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c index 02af5174f..4d928edb5 100644 --- a/quantum/process_keycode/process_auto_shift.c +++ b/quantum/process_keycode/process_auto_shift.c | |||
@@ -21,11 +21,11 @@ | |||
21 | 21 | ||
22 | # include "process_auto_shift.h" | 22 | # include "process_auto_shift.h" |
23 | 23 | ||
24 | #ifndef AUTO_SHIFT_DISABLED_AT_STARTUP | 24 | # ifndef AUTO_SHIFT_DISABLED_AT_STARTUP |
25 | # define AUTO_SHIFT_STARTUP_STATE true /* enabled */ | 25 | # define AUTO_SHIFT_STARTUP_STATE true /* enabled */ |
26 | #else | 26 | # else |
27 | # define AUTO_SHIFT_STARTUP_STATE false /* disabled */ | 27 | # define AUTO_SHIFT_STARTUP_STATE false /* disabled */ |
28 | #endif | 28 | # endif |
29 | 29 | ||
30 | static uint16_t autoshift_time = 0; | 30 | static uint16_t autoshift_time = 0; |
31 | static uint16_t autoshift_timeout = AUTO_SHIFT_TIMEOUT; | 31 | static uint16_t autoshift_timeout = AUTO_SHIFT_TIMEOUT; |
diff --git a/quantum/rgb_matrix/animations/pixel_rain_anim.h b/quantum/rgb_matrix/animations/pixel_rain_anim.h index 0209d3303..001649aa6 100644 --- a/quantum/rgb_matrix/animations/pixel_rain_anim.h +++ b/quantum/rgb_matrix/animations/pixel_rain_anim.h | |||
@@ -16,18 +16,22 @@ | |||
16 | 16 | ||
17 | #ifdef ENABLE_RGB_MATRIX_PIXEL_RAIN | 17 | #ifdef ENABLE_RGB_MATRIX_PIXEL_RAIN |
18 | RGB_MATRIX_EFFECT(PIXEL_RAIN) | 18 | RGB_MATRIX_EFFECT(PIXEL_RAIN) |
19 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 19 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
20 | 20 | ||
21 | static bool PIXEL_RAIN(effect_params_t* params) { | 21 | static bool PIXEL_RAIN(effect_params_t* params) { |
22 | static uint32_t wait_timer = 0; | 22 | static uint32_t wait_timer = 0; |
23 | if (wait_timer > g_rgb_timer) { return false; } | 23 | if (wait_timer > g_rgb_timer) { |
24 | return false; | ||
25 | } | ||
24 | 26 | ||
25 | inline uint32_t interval(void) { return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); } | 27 | inline uint32_t interval(void) { return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); } |
26 | 28 | ||
27 | bool rain_pixel(uint8_t i, effect_params_t* params, bool off) { | 29 | bool rain_pixel(uint8_t i, effect_params_t * params, bool off) { |
28 | if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) { return true; } | 30 | if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) { |
31 | return true; | ||
32 | } | ||
29 | if (off) { | 33 | if (off) { |
30 | rgb_matrix_set_color(i, 0,0,0); | 34 | rgb_matrix_set_color(i, 0, 0, 0); |
31 | } else { | 35 | } else { |
32 | HSV hsv = {random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v}; | 36 | HSV hsv = {random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v}; |
33 | RGB rgb = rgb_matrix_hsv_to_rgb(hsv); | 37 | RGB rgb = rgb_matrix_hsv_to_rgb(hsv); |
@@ -40,5 +44,5 @@ static bool PIXEL_RAIN(effect_params_t* params) { | |||
40 | return rain_pixel(mod8(random8(), DRIVER_LED_TOTAL), params, random8() & 2); | 44 | return rain_pixel(mod8(random8(), DRIVER_LED_TOTAL), params, random8() & 2); |
41 | } | 45 | } |
42 | 46 | ||
43 | # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 47 | # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
44 | #endif // ENABLE_RGB_MATRIX_PIXEL_RAIN | 48 | #endif // ENABLE_RGB_MATRIX_PIXEL_RAIN |