diff options
Diffstat (limited to 'users/drashna/rgb_matrix_stuff.c')
| -rw-r--r-- | users/drashna/rgb_matrix_stuff.c | 54 | 
1 files changed, 20 insertions, 34 deletions
| diff --git a/users/drashna/rgb_matrix_stuff.c b/users/drashna/rgb_matrix_stuff.c index 9e9e1e4279..9fbe6214bf 100644 --- a/users/drashna/rgb_matrix_stuff.c +++ b/users/drashna/rgb_matrix_stuff.c @@ -28,33 +28,27 @@ static uint32_t hypno_timer;  void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type, uint8_t led_min, uint8_t led_max) {      HSV hsv = {hue, sat, val}; -    if (hsv.v > rgb_matrix_get_val()) { -        hsv.v = rgb_matrix_get_val(); -    } +    if (hsv.v > rgb_matrix_get_val()) { hsv.v = rgb_matrix_get_val(); }      switch (mode) { -        case 1:  // breathing -        { -            uint16_t time = scale16by8(g_rgb_timer, speed / 8); -            hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v); -            RGB rgb       = hsv_to_rgb(hsv); -            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { -                if (HAS_FLAGS(g_led_config.flags[i], led_type)) { -                    RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b); +        case 1: // breathing +            { +                uint16_t time = scale16by8(g_rgb_timer, speed / 8); +                hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v); +                RGB rgb       = hsv_to_rgb(hsv); +                for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { +                    if (HAS_FLAGS(g_led_config.flags[i], led_type)) { RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b); }                  } +                break;              } -            break; -        } -        default:  // Solid Color -        { -            RGB rgb = hsv_to_rgb(hsv); -            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { -                if (HAS_FLAGS(g_led_config.flags[i], led_type)) { -                    RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b); +        default: // Solid Color +            { +                RGB rgb = hsv_to_rgb(hsv); +                for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { +                    if (HAS_FLAGS(g_led_config.flags[i], led_type)) { RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b); }                  } +                break;              } -            break; -        }      }  } @@ -62,38 +56,30 @@ __attribute__((weak)) void rgb_matrix_indicator_keymap(void) {}  void matrix_scan_rgb_matrix(void) {  #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) -    if (userspace_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == RGB_MATRIX_TYPING_HEATMAP && sync_timer_elapsed32(hypno_timer) > 15000) { -        rgb_matrix_mode_noeeprom(RGB_MATRIX_REST_MODE); -    } +    if (userspace_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == RGB_MATRIX_TYPING_HEATMAP && sync_timer_elapsed32(hypno_timer) > 15000) { rgb_matrix_mode_noeeprom(RGB_MATRIX_REST_MODE); }  #endif      rgb_matrix_indicator_keymap();  }  void keyboard_post_init_rgb_matrix(void) {  #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) -    if (userspace_config.rgb_matrix_idle_anim) { -        rgb_matrix_mode_noeeprom(RGB_MATRIX_REST_MODE); -    } +    if (userspace_config.rgb_matrix_idle_anim) { rgb_matrix_mode_noeeprom(RGB_MATRIX_REST_MODE); }  #endif  }  bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record) {  #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)      hypno_timer = sync_timer_read32(); -    if (userspace_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == RGB_MATRIX_REST_MODE) { -        rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP); -    } +    if (userspace_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == RGB_MATRIX_REST_MODE) { rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP); }  #endif      switch (keycode) { -        case RGB_IDL:  // This allows me to use underglow as layer indication, or as normal +        case RGB_IDL: // This allows me to use underglow as layer indication, or as normal  #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)              if (record->event.pressed) {                  userspace_config.rgb_matrix_idle_anim ^= 1;                  dprintf("RGB Matrix Idle Animation [EEPROM]: %u\n", userspace_config.rgb_matrix_idle_anim);                  eeconfig_update_user(userspace_config.raw); -                if (userspace_config.rgb_matrix_idle_anim) { -                    rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP); -                } +                if (userspace_config.rgb_matrix_idle_anim) { rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP); }              }  #endif              break; | 
