_/qmk_firmware
1
0
Fork 0
Code Releases Activity

format code according to conventions [skip ci]

Browse source
This commit is contained in:
QMK Bot 2020-05-09 09:31:49 +00:00
parent 2fe7e221ec
commit e7860d673b
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
quantum/rgblight.c
View file

@ -1201,33 +1201,32 @@ void rgblight_effect_alternating(animation_status_t *anim) {
__attribute__((weak)) const uint8_t RGBLED_TWINKLE_INTERVALS[] PROGMEM = {50, 25, 10}; __attribute__((weak)) const uint8_t RGBLED_TWINKLE_INTERVALS[] PROGMEM = {50, 25, 10};
typedef struct PACKED { typedef struct PACKED {
HSV hsv; HSV hsv;
uint8_t life; uint8_t life;
bool up; bool up;
} TwinkleState; } TwinkleState;
static TwinkleState led_twinkle_state[RGBLED_NUM]; static TwinkleState led_twinkle_state[RGBLED_NUM];
void rgblight_effect_twinkle(animation_status_t *anim) { void rgblight_effect_twinkle(animation_status_t *anim) {
bool random_color = anim->delta / 3; bool random_color = anim->delta / 3;
bool restart = anim->pos == 0; bool restart = anim->pos == 0;
anim->pos = 1; anim->pos = 1;
for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) { for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) {
TwinkleState *t = &(led_twinkle_state[i]); TwinkleState *t = &(led_twinkle_state[i]);
HSV *c = &(t->hsv); HSV * c = &(t->hsv);
if (restart) { if (restart) {
// Restart // Restart
t->life = 0; t->life = 0;
t->hsv.v = 0; t->hsv.v = 0;
} else if (t->life) { } else if (t->life) {
// This LED is already on, either brightening or dimming // This LED is already on, either brightening or dimming
t->life--; t->life--;
uint8_t on = t->up ? RGBLIGHT_EFFECT_TWINKLE_LIFE - t->life : t->life; uint8_t on = t->up ? RGBLIGHT_EFFECT_TWINKLE_LIFE - t->life : t->life;
c->v = (uint16_t) rgblight_config.val * on / RGBLIGHT_EFFECT_TWINKLE_LIFE; c->v = (uint16_t)rgblight_config.val * on / RGBLIGHT_EFFECT_TWINKLE_LIFE;
if (t->life == 0 && t->up) { if (t->life == 0 && t->up) {
t->up = false; t->up = false;
t->life = RGBLIGHT_EFFECT_TWINKLE_LIFE; t->life = RGBLIGHT_EFFECT_TWINKLE_LIFE;
} }
if (!random_color) { if (!random_color) {
@ -1236,11 +1235,11 @@ void rgblight_effect_twinkle(animation_status_t *anim) {
} }
} else if (rand() < RAND_MAX * RGBLIGHT_EFFECT_TWINKLE_PROBABILITY) { } else if (rand() < RAND_MAX * RGBLIGHT_EFFECT_TWINKLE_PROBABILITY) {
// This LED is off, but was randomly selected to start brightening // This LED is off, but was randomly selected to start brightening
c->h = random_color ? rand() % 0xFF : rgblight_config.hue; c->h = random_color ? rand() % 0xFF : rgblight_config.hue;
c->s = random_color ? (rand() % (rgblight_config.sat / 2)) + (rgblight_config.sat / 2) : rgblight_config.sat; c->s = random_color ? (rand() % (rgblight_config.sat / 2)) + (rgblight_config.sat / 2) : rgblight_config.sat;
c->v = 0; c->v = 0;
t->life = RGBLIGHT_EFFECT_TWINKLE_LIFE; t->life = RGBLIGHT_EFFECT_TWINKLE_LIFE;
t->up = true; t->up = true;
} else { } else {
// This LED is off, and was NOT selected to start brightening // This LED is off, and was NOT selected to start brightening
} }

2
quantum/rgblight.h
View file

@ -154,7 +154,7 @@ enum RGBLIGHT_EFFECT_MODE {
# endif # endif
# ifndef RGBLIGHT_EFFECT_TWINKLE_PROBABILITY # ifndef RGBLIGHT_EFFECT_TWINKLE_PROBABILITY
# define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1/127 # define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1 / 127
# endif # endif
# ifndef RGBLIGHT_HUE_STEP # ifndef RGBLIGHT_HUE_STEP