Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
e014d9897d
|
@ -41,22 +41,69 @@
|
||||||
#define NO_ACTION_FUNCTION
|
#define NO_ACTION_FUNCTION
|
||||||
#define USB_SUSPEND_WAKEUP_DELAY 5000
|
#define USB_SUSPEND_WAKEUP_DELAY 5000
|
||||||
|
|
||||||
|
|
||||||
#define RGB_DI_PIN C7
|
#define RGB_DI_PIN C7
|
||||||
#define RGBLED_NUM 68
|
#define RGBLED_NUM 68
|
||||||
#define DRIVER_LED_TOTAL RGBLED_NUM
|
#define DRIVER_LED_TOTAL RGBLED_NUM
|
||||||
#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
|
||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
||||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
|
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
|
||||||
#define RGB_MATRIX_HUE_STEP 8
|
# define RGB_MATRIX_HUE_STEP 8
|
||||||
#define RGB_MATRIX_SAT_STEP 8
|
# define RGB_MATRIX_SAT_STEP 8
|
||||||
#define RGB_MATRIX_VAL_STEP 8
|
# define RGB_MATRIX_VAL_STEP 8
|
||||||
#define RGB_MATRIX_SPD_STEP 10
|
# define RGB_MATRIX_SPD_STEP 10
|
||||||
|
// RGB Matrix Animation modes. Explicitly enabled
|
||||||
|
// For full list of effects, see:
|
||||||
|
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-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_SAT
|
||||||
|
# define ENABLE_RGB_MATRIX_BAND_VAL
|
||||||
|
// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
|
||||||
|
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
|
||||||
|
// #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_RAINBOW_MOVING_CHEVRON
|
||||||
|
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
||||||
|
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
||||||
|
# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
|
||||||
|
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
||||||
|
# define ENABLE_RGB_MATRIX_DUAL_BEACON
|
||||||
|
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
|
||||||
|
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
|
||||||
|
# define ENABLE_RGB_MATRIX_RAINDROPS
|
||||||
|
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
|
||||||
|
# define ENABLE_RGB_MATRIX_HUE_BREATHING
|
||||||
|
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
||||||
|
# define ENABLE_RGB_MATRIX_HUE_WAVE
|
||||||
|
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
||||||
|
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
||||||
|
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
||||||
|
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
||||||
|
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
||||||
|
// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
||||||
|
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
||||||
|
// #define ENABLE_RGB_MATRIX_SPLASH
|
||||||
|
// #define ENABLE_RGB_MATRIX_MULTISPLASH
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
|
||||||
|
// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
|
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
|
||||||
|
|
|
@ -7,17 +7,17 @@ BOOTLOADER = caterina
|
||||||
# Build Options
|
# Build Options
|
||||||
# change yes to no to disable
|
# change yes to no to disable
|
||||||
#
|
#
|
||||||
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
|
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
||||||
MOUSEKEY_ENABLE = yes # Mouse keys
|
MOUSEKEY_ENABLE = yes # Mouse keys
|
||||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||||
CONSOLE_ENABLE = no # Console for debug
|
CONSOLE_ENABLE = no # Console for debug
|
||||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
|
||||||
NKRO_ENABLE = no # Enable N-Key Rollover
|
NKRO_ENABLE = no # Enable N-Key Rollover
|
||||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
UNICODE_ENABLE = yes # Unicode
|
UNICODE_ENABLE = yes # Unicode
|
||||||
|
LTO_ENABLE = yes
|
||||||
|
|
||||||
SPLIT_KEYBOARD = yes
|
SPLIT_KEYBOARD = yes
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue