diff options
author | Drashna Jaelre <drashna@live.com> | 2021-11-15 10:41:04 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-15 10:41:04 -0800 |
commit | 160b0558f55f1357e1a48175c949e98d32630e6b (patch) | |
tree | 459e163bfda5c90a615dada0d282891795cb7d42 /keyboards/gmmk | |
parent | c9fd69871165eb889be5421df518d8e35b2be027 (diff) | |
download | qmk_firmware-160b0558f55f1357e1a48175c949e98d32630e6b.tar.gz qmk_firmware-160b0558f55f1357e1a48175c949e98d32630e6b.zip |
Require explicit enabling of RGB Matrix modes (#15018)
Diffstat (limited to 'keyboards/gmmk')
-rw-r--r-- | keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h | 82 | ||||
-rw-r--r-- | keyboards/gmmk/pro/config.h | 49 |
2 files changed, 90 insertions, 41 deletions
diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index 2566fc6f9..78ff96f8b 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h | |||
@@ -31,45 +31,45 @@ | |||
31 | #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes | 31 | #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes |
32 | 32 | ||
33 | // Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft | 33 | // Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft |
34 | // #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. | 34 | // #undef ENABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. |
35 | // #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. | 35 | // #undef ENABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. |
36 | // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! | 36 | // #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! |
37 | #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). | 37 | # undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). |
38 | // #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) | 38 | // #undef ENABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) |
39 | // #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) | 39 | // #undef ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) |
40 | // #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) | 40 | // #undef ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) |
41 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) | 41 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) |
42 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above | 42 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above |
43 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above | 43 | # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above |
44 | // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) | 44 | // #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) |
45 | #define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow | 45 | # undef ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow |
46 | // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right | 46 | // #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right |
47 | #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom | 47 | # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom |
48 | #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. | 48 | # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. |
49 | #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. | 49 | # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. |
50 | #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right | 50 | # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right |
51 | // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. | 51 | // #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. |
52 | #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard | 52 | # undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard |
53 | #define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards | 53 | # undef ENABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards |
54 | #define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. | 54 | # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. |
55 | #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) | 55 | # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) |
56 | #define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. | 56 | # undef ENABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. |
57 | // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. | 57 | // #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. |
58 | #define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back | 58 | # undef ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back |
59 | #define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left | 59 | # undef ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left |
60 | #define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right | 60 | # undef ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right |
61 | // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! | 61 | // #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! |
62 | // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! | 62 | // #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! |
63 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo | 63 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo |
64 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue | 64 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue |
65 | // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) | 65 | // #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) |
66 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. | 66 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. |
67 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. | 67 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. |
68 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) | 68 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) |
69 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades | 69 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades |
70 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades | 70 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades |
71 | #define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. | 71 | # undef ENABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. |
72 | #define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. | 72 | # undef ENABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. |
73 | #define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). | 73 | # undef ENABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). |
74 | #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). | 74 | # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). |
75 | #endif | 75 | #endif |
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index 693b86539..bb2cca192 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h | |||
@@ -65,6 +65,55 @@ | |||
65 | 65 | ||
66 | #define DRIVER_COUNT 2 | 66 | #define DRIVER_COUNT 2 |
67 | 67 | ||
68 | // RGB Matrix Animation modes. Explicitly enabled | ||
69 | // For full list of effects, see: | ||
70 | // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects | ||
71 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS | ||
72 | #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN | ||
73 | #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | ||
74 | #define ENABLE_RGB_MATRIX_BREATHING | ||
75 | #define ENABLE_RGB_MATRIX_BAND_SAT | ||
76 | #define ENABLE_RGB_MATRIX_BAND_VAL | ||
77 | #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | ||
78 | #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | ||
79 | #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT | ||
80 | #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL | ||
81 | #define ENABLE_RGB_MATRIX_CYCLE_ALL | ||
82 | #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | ||
83 | #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN | ||
84 | #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | ||
85 | #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN | ||
86 | #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | ||
87 | #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL | ||
88 | #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL | ||
89 | #define ENABLE_RGB_MATRIX_DUAL_BEACON | ||
90 | #define ENABLE_RGB_MATRIX_RAINBOW_BEACON | ||
91 | #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS | ||
92 | #define ENABLE_RGB_MATRIX_RAINDROPS | ||
93 | #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | ||
94 | #define ENABLE_RGB_MATRIX_HUE_BREATHING | ||
95 | #define ENABLE_RGB_MATRIX_HUE_PENDULUM | ||
96 | #define ENABLE_RGB_MATRIX_HUE_WAVE | ||
97 | #define ENABLE_RGB_MATRIX_PIXEL_RAIN | ||
98 | #define ENABLE_RGB_MATRIX_PIXEL_FLOW | ||
99 | #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL | ||
100 | // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined | ||
101 | #define ENABLE_RGB_MATRIX_TYPING_HEATMAP | ||
102 | #define ENABLE_RGB_MATRIX_DIGITAL_RAIN | ||
103 | // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined | ||
104 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||
105 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE | ||
106 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | ||
107 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | ||
108 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | ||
109 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | ||
110 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | ||
111 | #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | ||
112 | #define ENABLE_RGB_MATRIX_SPLASH | ||
113 | #define ENABLE_RGB_MATRIX_MULTISPLASH | ||
114 | #define ENABLE_RGB_MATRIX_SOLID_SPLASH | ||
115 | #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||
116 | |||
68 | /* 1000Hz USB polling - it's the default on stock firmware */ | 117 | /* 1000Hz USB polling - it's the default on stock firmware */ |
69 | #define USB_POLLING_INTERVAL_MS 1 | 118 | #define USB_POLLING_INTERVAL_MS 1 |
70 | 119 | ||