Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
82a670135f
3 changed files with 44 additions and 84 deletions
|
@ -1,45 +1,3 @@
|
||||||
// Copyright 2022 Alexander Lozyuk (@keyzog)
|
// Copyright 2022 Alexander Lozyuk (@keyzog)
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
|
||||||
#define RGBLIGHT_EFFECT_CHRISTMAS
|
|
||||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
|
||||||
#define RGBLIGHT_SAT_STEP 16
|
|
||||||
#define RGBLIGHT_VAL_STEP 16
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
|
||||||
#define RGB_MATRIX_HUE_STEP 8
|
|
||||||
#define RGB_MATRIX_SAT_STEP 16
|
|
||||||
#define RGB_MATRIX_VAL_STEP 16
|
|
||||||
#define RGB_MATRIX_SPD_STEP 10
|
|
||||||
// EFFECTS
|
|
||||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
|
|
||||||
#define ENABLE_RGB_MATRIX_BREATHING
|
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
|
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_ALL
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
|
||||||
#define ENABLE_RGB_MATRIX_HUE_BREATHING
|
|
||||||
#define ENABLE_RGB_MATRIX_HUE_WAVE
|
|
||||||
// KEYPRESSES EFFECTS
|
|
||||||
#define RGB_MATRIX_KEYPRESSES
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
|
||||||
#define ENABLE_RGB_MATRIX_MULTISPLASH
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,45 +1,3 @@
|
||||||
// Copyright 2022 Alexander Lozyuk (@keyzog)
|
// Copyright 2022 Alexander Lozyuk (@keyzog)
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
|
||||||
#define RGBLIGHT_EFFECT_CHRISTMAS
|
|
||||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
|
||||||
#define RGBLIGHT_SAT_STEP 16
|
|
||||||
#define RGBLIGHT_VAL_STEP 16
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
|
||||||
#define RGB_MATRIX_HUE_STEP 8
|
|
||||||
#define RGB_MATRIX_SAT_STEP 16
|
|
||||||
#define RGB_MATRIX_VAL_STEP 16
|
|
||||||
#define RGB_MATRIX_SPD_STEP 10
|
|
||||||
// EFFECTS
|
|
||||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
|
|
||||||
#define ENABLE_RGB_MATRIX_BREATHING
|
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
|
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_ALL
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
|
||||||
#define ENABLE_RGB_MATRIX_HUE_BREATHING
|
|
||||||
#define ENABLE_RGB_MATRIX_HUE_WAVE
|
|
||||||
// KEYPRESSES EFFECTS
|
|
||||||
#define RGB_MATRIX_KEYPRESSES
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
|
||||||
#define ENABLE_RGB_MATRIX_MULTISPLASH
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
/* Select hand configuration */
|
/* Select hand configuration */
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
|
|
||||||
|
|
||||||
#define RGB_DI_PIN D4
|
#define RGB_DI_PIN D4
|
||||||
#define RGBLED_NUM 88
|
#define RGBLED_NUM 88
|
||||||
#define RGBLED_SPLIT { 44, 44 }
|
#define RGBLED_SPLIT { 44, 44 }
|
||||||
|
@ -46,6 +47,49 @@
|
||||||
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
||||||
#define SPLIT_TRANSPORT_MIRROR
|
#define SPLIT_TRANSPORT_MIRROR
|
||||||
|
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
#define RGBLIGHT_HUE_STEP 8
|
||||||
|
#define RGBLIGHT_SAT_STEP 16
|
||||||
|
#define RGBLIGHT_VAL_STEP 16
|
||||||
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
|
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||||
|
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||||
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
|
#define RGB_MATRIX_HUE_STEP 8
|
||||||
|
#define RGB_MATRIX_SAT_STEP 16
|
||||||
|
#define RGB_MATRIX_VAL_STEP 16
|
||||||
|
#define RGB_MATRIX_SPD_STEP 10
|
||||||
|
// EFFECTS
|
||||||
|
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||||
|
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
||||||
|
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
|
||||||
|
#define ENABLE_RGB_MATRIX_BREATHING
|
||||||
|
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
|
||||||
|
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
|
||||||
|
#define ENABLE_RGB_MATRIX_CYCLE_ALL
|
||||||
|
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||||
|
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
|
||||||
|
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
||||||
|
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
||||||
|
#define ENABLE_RGB_MATRIX_HUE_BREATHING
|
||||||
|
#define ENABLE_RGB_MATRIX_HUE_WAVE
|
||||||
|
// KEYPRESSES EFFECTS
|
||||||
|
#define RGB_MATRIX_KEYPRESSES
|
||||||
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
||||||
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
||||||
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
||||||
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
||||||
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
||||||
|
#define ENABLE_RGB_MATRIX_MULTISPLASH
|
||||||
|
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
/* Locking resynchronize hack */
|
/* Locking resynchronize hack */
|
||||||
|
|
Loading…
Reference in a new issue