diff options
Diffstat (limited to 'users')
-rw-r--r-- | users/bcat/rules.mk | 2 | ||||
-rw-r--r-- | users/curry/config.h | 72 | ||||
-rw-r--r-- | users/curry/oled.c | 3 | ||||
-rw-r--r-- | users/drashna/config.h | 143 | ||||
-rw-r--r-- | users/drashna/oled_stuff.c | 5 | ||||
-rw-r--r-- | users/dshields/config.h | 82 | ||||
-rw-r--r-- | users/ninjonas/oled.c | 3 | ||||
-rw-r--r-- | users/nstickney/rules.mk | 3 | ||||
-rw-r--r-- | users/riblee/riblee.c | 7 | ||||
-rw-r--r-- | users/ridingqwerty/rules.mk | 2 | ||||
-rw-r--r-- | users/snowe/oled_setup.c | 3 | ||||
-rw-r--r-- | users/spidey3/rules.mk | 2 | ||||
-rw-r--r-- | users/talljoe/rules.mk | 2 | ||||
-rw-r--r-- | users/talljoe/visualizer.c | 21 | ||||
-rw-r--r-- | users/tominabox1/config.h | 54 | ||||
-rw-r--r-- | users/tominabox1/rules.mk | 2 | ||||
-rw-r--r-- | users/tominabox1/tominabox1.c | 3 | ||||
-rw-r--r-- | users/wanleg/rules.mk | 4 | ||||
-rw-r--r-- | users/xulkal/config.h | 10 | ||||
-rw-r--r-- | users/xulkal/custom_oled.c | 3 | ||||
-rw-r--r-- | users/yanfali/rules.mk | 2 |
21 files changed, 231 insertions, 197 deletions
diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk index 651ee96fe..12c9a89bf 100644 --- a/users/bcat/rules.mk +++ b/users/bcat/rules.mk | |||
@@ -1,7 +1,7 @@ | |||
1 | SRC += bcat.c | 1 | SRC += bcat.c |
2 | 2 | ||
3 | # Enable Bootmagic Lite to consistently reset to bootloader and clear EEPROM. | 3 | # Enable Bootmagic Lite to consistently reset to bootloader and clear EEPROM. |
4 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 4 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
5 | 5 | ||
6 | # Enable media keys on all keyboards. | 6 | # Enable media keys on all keyboards. |
7 | EXTRAKEY_ENABLE = yes | 7 | EXTRAKEY_ENABLE = yes |
diff --git a/users/curry/config.h b/users/curry/config.h index e3c0a103e..31baea625 100644 --- a/users/curry/config.h +++ b/users/curry/config.h | |||
@@ -19,42 +19,42 @@ | |||
19 | # define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 19 | # define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
20 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 20 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
21 | 21 | ||
22 | # define DISABLE_RGB_MATRIX_ALPHAS_MODS | 22 | # undef ENABLE_RGB_MATRIX_ALPHAS_MODS |
23 | # define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 23 | # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
24 | # define DISABLE_RGB_MATRIX_BREATHING | 24 | # undef ENABLE_RGB_MATRIX_BREATHING |
25 | # define DISABLE_RGB_MATRIX_BAND_SAT | 25 | # undef ENABLE_RGB_MATRIX_BAND_SAT |
26 | # define DISABLE_RGB_MATRIX_BAND_VAL | 26 | # undef ENABLE_RGB_MATRIX_BAND_VAL |
27 | # define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 27 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
28 | # define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | 28 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL |
29 | # define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 29 | # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
30 | # define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL | 30 | # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL |
31 | # define DISABLE_RGB_MATRIX_CYCLE_ALL | 31 | # undef ENABLE_RGB_MATRIX_CYCLE_ALL |
32 | # define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | 32 | # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT |
33 | # define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN | 33 | # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN |
34 | # define DISABLE_RGB_MATRIX_CYCLE_OUT_IN | 34 | # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN |
35 | // # define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | 35 | // # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL |
36 | # define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 36 | # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
37 | # define DISABLE_RGB_MATRIX_DUAL_BEACON | 37 | # undef ENABLE_RGB_MATRIX_DUAL_BEACON |
38 | # define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL | 38 | # undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL |
39 | # define DISABLE_RGB_MATRIX_CYCLE_SPIRAL | 39 | # undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL |
40 | # define DISABLE_RGB_MATRIX_RAINBOW_BEACON | 40 | # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON |
41 | # define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS | 41 | # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS |
42 | # define DISABLE_RGB_MATRIX_RAINDROPS | 42 | # undef ENABLE_RGB_MATRIX_RAINDROPS |
43 | # define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | 43 | # undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS |
44 | // # define DISABLE_RGB_MATRIX_TYPING_HEATMAP | 44 | // # undef ENABLE_RGB_MATRIX_TYPING_HEATMAP |
45 | # define DISABLE_RGB_MATRIX_DIGITAL_RAIN | 45 | # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN |
46 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE | 46 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE |
47 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | 47 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE |
48 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | 48 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE |
49 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | 49 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE |
50 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 50 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
51 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 51 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
52 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | 52 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS |
53 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | 53 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS |
54 | # define DISABLE_RGB_MATRIX_SPLASH | 54 | # undef ENABLE_RGB_MATRIX_SPLASH |
55 | # define DISABLE_RGB_MATRIX_MULTISPLASH | 55 | # undef ENABLE_RGB_MATRIX_MULTISPLASH |
56 | # define DISABLE_RGB_MATRIX_SOLID_SPLASH | 56 | # undef ENABLE_RGB_MATRIX_SOLID_SPLASH |
57 | # define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | 57 | # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
58 | #endif // RGB_MATRIX_ENABLE | 58 | #endif // RGB_MATRIX_ENABLE |
59 | 59 | ||
60 | #if !defined(ONESHOT_TAP_TOGGLE) | 60 | #if !defined(ONESHOT_TAP_TOGGLE) |
diff --git a/users/curry/oled.c b/users/curry/oled.c index fc87a46e5..27f6072ff 100644 --- a/users/curry/oled.c +++ b/users/curry/oled.c | |||
@@ -137,7 +137,7 @@ void render_status_secondary(void) { | |||
137 | render_keylogger_status(); | 137 | render_keylogger_status(); |
138 | } | 138 | } |
139 | 139 | ||
140 | void oled_task_user(void) { | 140 | bool oled_task_user(void) { |
141 | if (timer_elapsed32(oled_timer) > 30000) { | 141 | if (timer_elapsed32(oled_timer) > 30000) { |
142 | oled_off(); | 142 | oled_off(); |
143 | return; | 143 | return; |
@@ -152,6 +152,7 @@ void oled_task_user(void) { | |||
152 | } else { | 152 | } else { |
153 | render_status_secondary(); | 153 | render_status_secondary(); |
154 | } | 154 | } |
155 | return false; | ||
155 | } | 156 | } |
156 | 157 | ||
157 | bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | 158 | bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { |
diff --git a/users/drashna/config.h b/users/drashna/config.h index a7c99ed0d..ebb8d7b7a 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h | |||
@@ -83,54 +83,103 @@ | |||
83 | // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 83 | // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
84 | // # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended | 84 | // # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
85 | 85 | ||
86 | # if defined(__AVR__) && !defined(__AVR_AT90USB1286__) && !defined(KEYBOARD_launchpad) | 86 | # undef ENABLE_RGB_MATRIX_ALPHAS_MODS |
87 | # define DISABLE_RGB_MATRIX_ALPHAS_MODS | 87 | # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
88 | # define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 88 | # undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT |
89 | # define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | 89 | # undef ENABLE_RGB_MATRIX_BREATHING |
90 | # define DISABLE_RGB_MATRIX_BREATHING | 90 | # undef ENABLE_RGB_MATRIX_BAND_SAT |
91 | # define DISABLE_RGB_MATRIX_BAND_SAT | 91 | # undef ENABLE_RGB_MATRIX_BAND_VAL |
92 | # define DISABLE_RGB_MATRIX_BAND_VAL | 92 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
93 | # define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 93 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL |
94 | # define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | 94 | # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
95 | # define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 95 | # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL |
96 | # define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL | 96 | # undef ENABLE_RGB_MATRIX_CYCLE_ALL |
97 | # define DISABLE_RGB_MATRIX_CYCLE_ALL | 97 | # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT |
98 | # define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | 98 | # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN |
99 | # define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN | 99 | # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
100 | # if defined(SPLIT_KEYBOARD) || defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_moonlander) | 100 | # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN |
101 | # define DISABLE_RGB_MATRIX_CYCLE_OUT_IN | 101 | # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL |
102 | // # define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | 102 | # undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL |
103 | # endif | 103 | # undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL |
104 | # define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 104 | # undef ENABLE_RGB_MATRIX_DUAL_BEACON |
105 | # define DISABLE_RGB_MATRIX_DUAL_BEACON | 105 | # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON |
106 | # define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL | 106 | # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS |
107 | # define DISABLE_RGB_MATRIX_CYCLE_SPIRAL | 107 | # undef ENABLE_RGB_MATRIX_RAINDROPS |
108 | # define DISABLE_RGB_MATRIX_RAINBOW_BEACON | 108 | # undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS |
109 | # define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS | 109 | # undef ENABLE_RGB_MATRIX_HUE_BREATHING |
110 | # define DISABLE_RGB_MATRIX_RAINDROPS | 110 | # undef ENABLE_RGB_MATRIX_HUE_PENDULUM |
111 | # define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | 111 | # undef ENABLE_RGB_MATRIX_HUE_WAVE |
112 | # define DISABLE_RGB_MATRIX_HUE_BREATHING | 112 | # undef ENABLE_RGB_MATRIX_PIXEL_RAIN |
113 | # define DISABLE_RGB_MATRIX_HUE_PENDULUM | 113 | # undef ENABLE_RGB_MATRIX_PIXEL_FLOW |
114 | # define DISABLE_RGB_MATRIX_HUE_WAVE | 114 | # undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL |
115 | # define DISABLE_RGB_MATRIX_PIXEL_RAIN | 115 | // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined |
116 | # define DISABLE_RGB_MATRIX_PIXEL_FLOW | 116 | # undef ENABLE_RGB_MATRIX_TYPING_HEATMAP |
117 | # define DISABLE_RGB_MATRIX_PIXEL_FRACTAL | 117 | # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN |
118 | // # define DISABLE_RGB_MATRIX_TYPING_HEATMAP | 118 | // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined |
119 | # define DISABLE_RGB_MATRIX_DIGITAL_RAIN | 119 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE |
120 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE | 120 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE |
121 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | 121 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE |
122 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | 122 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE |
123 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | 123 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
124 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 124 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
125 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 125 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS |
126 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | 126 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS |
127 | # define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | 127 | # undef ENABLE_RGB_MATRIX_SPLASH |
128 | # define DISABLE_RGB_MATRIX_SPLASH | 128 | # undef ENABLE_RGB_MATRIX_MULTISPLASH |
129 | # define DISABLE_RGB_MATRIX_MULTISPLASH | 129 | # undef ENABLE_RGB_MATRIX_SOLID_SPLASH |
130 | # define DISABLE_RGB_MATRIX_SOLID_SPLASH | 130 | # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
131 | # define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | 131 | |
132 | # define ENABLE_RGB_MATRIX_TYPING_HEATMAP | ||
133 | # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | ||
134 | # if !defined(SPLIT_KEYBOARD) && !defined(KEYBOARD_ergodox_ez) && !defined(KEYBOARD_moonlander) | ||
135 | # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN | ||
136 | # endif | ||
137 | # if defined(__arm__) || defined(__AVR_AT90USB1286__) || defined(KEYBOARD_launchpad) | ||
138 | // RGB Matrix Animation modes. Explicitly enabled | ||
139 | // For full list of effects, see: | ||
140 | // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects | ||
141 | # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN | ||
142 | # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | ||
143 | # define ENABLE_RGB_MATRIX_BREATHING | ||
144 | # define ENABLE_RGB_MATRIX_BAND_SAT | ||
145 | # define ENABLE_RGB_MATRIX_BAND_VAL | ||
146 | # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | ||
147 | # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | ||
148 | # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT | ||
149 | # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL | ||
150 | # define ENABLE_RGB_MATRIX_CYCLE_ALL | ||
151 | # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | ||
152 | # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN | ||
153 | # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | ||
154 | # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN | ||
155 | # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL | ||
156 | # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL | ||
157 | # define ENABLE_RGB_MATRIX_DUAL_BEACON | ||
158 | # define ENABLE_RGB_MATRIX_RAINBOW_BEACON | ||
159 | # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS | ||
160 | # define ENABLE_RGB_MATRIX_RAINDROPS | ||
161 | # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | ||
162 | # define ENABLE_RGB_MATRIX_HUE_BREATHING | ||
163 | # define ENABLE_RGB_MATRIX_HUE_PENDULUM | ||
164 | # define ENABLE_RGB_MATRIX_HUE_WAVE | ||
165 | # define ENABLE_RGB_MATRIX_PIXEL_RAIN | ||
166 | # define ENABLE_RGB_MATRIX_PIXEL_FLOW | ||
167 | # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL | ||
168 | # define ENABLE_RGB_MATRIX_DIGITAL_RAIN | ||
169 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||
170 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE | ||
171 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | ||
172 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | ||
173 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | ||
174 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | ||
175 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | ||
176 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | ||
177 | # define ENABLE_RGB_MATRIX_SPLASH | ||
178 | # define ENABLE_RGB_MATRIX_MULTISPLASH | ||
179 | # define ENABLE_RGB_MATRIX_SOLID_SPLASH | ||
180 | # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||
132 | # endif // AVR | 181 | # endif // AVR |
133 | #endif // RGB_MATRIX_ENABLE | 182 | #endif // RGB_MATRIX_ENABLE |
134 | 183 | ||
135 | #ifdef OLED_ENABLE | 184 | #ifdef OLED_ENABLE |
136 | # ifdef SPLIT_KEYBOARD | 185 | # ifdef SPLIT_KEYBOARD |
diff --git a/users/drashna/oled_stuff.c b/users/drashna/oled_stuff.c index 6413f5e1c..396e5e05b 100644 --- a/users/drashna/oled_stuff.c +++ b/users/drashna/oled_stuff.c | |||
@@ -421,13 +421,13 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { | |||
421 | return oled_init_keymap(rotation); | 421 | return oled_init_keymap(rotation); |
422 | } | 422 | } |
423 | 423 | ||
424 | void oled_task_user(void) { | 424 | bool oled_task_user(void) { |
425 | update_log(); | 425 | update_log(); |
426 | 426 | ||
427 | if (is_keyboard_master()) { | 427 | if (is_keyboard_master()) { |
428 | if (timer_elapsed32(oled_timer) > 30000) { | 428 | if (timer_elapsed32(oled_timer) > 30000) { |
429 | oled_off(); | 429 | oled_off(); |
430 | return; | 430 | return false; |
431 | } else { | 431 | } else { |
432 | oled_on(); | 432 | oled_on(); |
433 | } | 433 | } |
@@ -442,4 +442,5 @@ void oled_task_user(void) { | |||
442 | } else { | 442 | } else { |
443 | render_keylock_status(host_keyboard_leds()); | 443 | render_keylock_status(host_keyboard_leds()); |
444 | } | 444 | } |
445 | return false; | ||
445 | } | 446 | } |
diff --git a/users/dshields/config.h b/users/dshields/config.h index aa1081476..9a722b89e 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h | |||
@@ -14,44 +14,44 @@ | |||
14 | #define MOUSEKEY_MAX_SPEED 7 | 14 | #define MOUSEKEY_MAX_SPEED 7 |
15 | #define MOUSEKEY_WHEEL_DELAY 0 | 15 | #define MOUSEKEY_WHEEL_DELAY 0 |
16 | 16 | ||
17 | #define DISABLE_RGB_MATRIX_ALPHAS_MODS | 17 | #undef ENABLE_RGB_MATRIX_ALPHAS_MODS |
18 | #define DISABLE_RGB_MATRIX_BREATHING | 18 | #undef ENABLE_RGB_MATRIX_BREATHING |
19 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 19 | #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
20 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | 20 | #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL |
21 | #define DISABLE_RGB_MATRIX_BAND_SAT | 21 | #undef ENABLE_RGB_MATRIX_BAND_SAT |
22 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 22 | #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
23 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL | 23 | #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL |
24 | #define DISABLE_RGB_MATRIX_BAND_VAL | 24 | #undef ENABLE_RGB_MATRIX_BAND_VAL |
25 | #define DISABLE_RGB_MATRIX_CYCLE_ALL | 25 | #undef ENABLE_RGB_MATRIX_CYCLE_ALL |
26 | #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | 26 | #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT |
27 | #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN | 27 | #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN |
28 | #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | 28 | #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL |
29 | #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL | 29 | #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL |
30 | #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL | 30 | #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL |
31 | #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN | 31 | #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN |
32 | #define DISABLE_RGB_MATRIX_DUAL_BEACON | 32 | #undef ENABLE_RGB_MATRIX_DUAL_BEACON |
33 | #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | 33 | #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS |
34 | #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 34 | #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
35 | #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS | 35 | #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS |
36 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE | 36 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE |
37 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 37 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
38 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 38 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
39 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 39 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
40 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 40 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
41 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | 41 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS |
42 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | 42 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS |
43 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | 43 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS |
44 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | 44 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS |
45 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | 45 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE |
46 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | 46 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE |
47 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | 47 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE |
48 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | 48 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE |
49 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | 49 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE |
50 | #define DISABLE_RGB_MATRIX_SOLID_SPLASH | 50 | #undef ENABLE_RGB_MATRIX_SOLID_SPLASH |
51 | #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | 51 | #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
52 | #define DISABLE_RGB_MATRIX_SOLID_SPLASH | 52 | #undef ENABLE_RGB_MATRIX_SOLID_SPLASH |
53 | #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | 53 | #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
54 | #define DISABLE_RGB_MATRIX_SPLASH | 54 | #undef ENABLE_RGB_MATRIX_SPLASH |
55 | #define DISABLE_RGB_MATRIX_MULTISPLASH | 55 | #undef ENABLE_RGB_MATRIX_MULTISPLASH |
56 | #define DISABLE_RGB_MATRIX_SPLASH | 56 | #undef ENABLE_RGB_MATRIX_SPLASH |
57 | #define DISABLE_RGB_MATRIX_MULTISPLASH | 57 | #undef ENABLE_RGB_MATRIX_MULTISPLASH |
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c index 1d88c3057..55eaf88cc 100644 --- a/users/ninjonas/oled.c +++ b/users/ninjonas/oled.c | |||
@@ -90,7 +90,7 @@ static void render_logo(void) { | |||
90 | oled_write_P(qmk_logo, false); | 90 | oled_write_P(qmk_logo, false); |
91 | } | 91 | } |
92 | 92 | ||
93 | void oled_task_user(void) { | 93 | bool oled_task_user(void) { |
94 | if (timer_elapsed32(oled_timer) > 15000) { | 94 | if (timer_elapsed32(oled_timer) > 15000) { |
95 | oled_off(); | 95 | oled_off(); |
96 | return; | 96 | return; |
@@ -106,6 +106,7 @@ void oled_task_user(void) { | |||
106 | oled_write_P(PSTR("\n"), false); | 106 | oled_write_P(PSTR("\n"), false); |
107 | oled_scroll_left(); | 107 | oled_scroll_left(); |
108 | } | 108 | } |
109 | return false; | ||
109 | } | 110 | } |
110 | 111 | ||
111 | #endif | 112 | #endif |
diff --git a/users/nstickney/rules.mk b/users/nstickney/rules.mk index 0f189e8a4..cad245cc2 100644 --- a/users/nstickney/rules.mk +++ b/users/nstickney/rules.mk | |||
@@ -25,9 +25,8 @@ UCIS_ENABLE = no | |||
25 | LTO_ENABLE = yes | 25 | LTO_ENABLE = yes |
26 | 26 | ||
27 | # https://beta.docs.qmk.fm/developing-qmk/qmk-reference/getting_started_make_guide#rules-mk-options | 27 | # https://beta.docs.qmk.fm/developing-qmk/qmk-reference/getting_started_make_guide#rules-mk-options |
28 | API_SYSEX_ENABLE = no | ||
29 | AUDIO_ENABLE = no | 28 | AUDIO_ENABLE = no |
30 | BOOTMAGIC_ENABLE = no | 29 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
31 | COMMAND_ENABLE = no | 30 | COMMAND_ENABLE = no |
32 | CONSOLE_ENABLE = no | 31 | CONSOLE_ENABLE = no |
33 | MOUSEKEY_ENABLE = no | 32 | MOUSEKEY_ENABLE = no |
diff --git a/users/riblee/riblee.c b/users/riblee/riblee.c index 04e37b242..307c69720 100644 --- a/users/riblee/riblee.c +++ b/users/riblee/riblee.c | |||
@@ -245,10 +245,9 @@ static void render_info(void) { | |||
245 | } | 245 | } |
246 | 246 | ||
247 | // Print string received via HID RAW | 247 | // Print string received via HID RAW |
248 | oled_write_ln(receive_buffer, false); | 248 | oled_write_ln(receive_buffer, false);} |
249 | } | ||
250 | 249 | ||
251 | void oled_task_user(void) { | 250 | bool oled_task_user(void) { |
252 | static bool finished_timer = false; | 251 | static bool finished_timer = false; |
253 | if (!finished_timer && (timer_elapsed(startup_timer) < 1000)) { | 252 | if (!finished_timer && (timer_elapsed(startup_timer) < 1000)) { |
254 | render_logo(); | 253 | render_logo(); |
@@ -259,6 +258,8 @@ void oled_task_user(void) { | |||
259 | } | 258 | } |
260 | render_info(); | 259 | render_info(); |
261 | } | 260 | } |
261 | return false; | ||
262 | |||
262 | } | 263 | } |
263 | 264 | ||
264 | #ifdef RAW_ENABLE | 265 | #ifdef RAW_ENABLE |
diff --git a/users/ridingqwerty/rules.mk b/users/ridingqwerty/rules.mk index 93b88068e..cc53f3f53 100644 --- a/users/ridingqwerty/rules.mk +++ b/users/ridingqwerty/rules.mk | |||
@@ -1,7 +1,7 @@ | |||
1 | SRC += ridingqwerty.c \ | 1 | SRC += ridingqwerty.c \ |
2 | process_records.c | 2 | process_records.c |
3 | 3 | ||
4 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 4 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
5 | CONSOLE_ENABLE = no | 5 | CONSOLE_ENABLE = no |
6 | COMMAND_ENABLE = no | 6 | COMMAND_ENABLE = no |
7 | UNICODE_ENABLE = no # "yes" in Atreus default keymap, blocking UNICODEMAP_ENABLE | 7 | UNICODE_ENABLE = no # "yes" in Atreus default keymap, blocking UNICODEMAP_ENABLE |
diff --git a/users/snowe/oled_setup.c b/users/snowe/oled_setup.c index 3d21ea9f0..dfc4b085e 100644 --- a/users/snowe/oled_setup.c +++ b/users/snowe/oled_setup.c | |||
@@ -121,7 +121,7 @@ void render_bootmagic_status(void) { | |||
121 | oled_write_ln(wpm, false); | 121 | oled_write_ln(wpm, false); |
122 | } | 122 | } |
123 | 123 | ||
124 | void oled_task_user(void) { | 124 | bool oled_task_user(void) { |
125 | if (is_master) { | 125 | if (is_master) { |
126 | oled_render_layer_state(); | 126 | oled_render_layer_state(); |
127 | oled_render_keylog(); | 127 | oled_render_keylog(); |
@@ -136,6 +136,7 @@ void oled_task_user(void) { | |||
136 | render_stars(); | 136 | render_stars(); |
137 | # endif | 137 | # endif |
138 | } | 138 | } |
139 | return false; | ||
139 | } | 140 | } |
140 | 141 | ||
141 | #endif // OLED_ENABLE | 142 | #endif // OLED_ENABLE |
diff --git a/users/spidey3/rules.mk b/users/spidey3/rules.mk index 69327038b..de8ed113e 100644 --- a/users/spidey3/rules.mk +++ b/users/spidey3/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 1 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
2 | CONSOLE_ENABLE = yes # Console for debug | 2 | CONSOLE_ENABLE = yes # Console for debug |
3 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 3 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
4 | LTO_ENABLE = yes | 4 | LTO_ENABLE = yes |
diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk index 632e725b7..9338568b9 100644 --- a/users/talljoe/rules.mk +++ b/users/talljoe/rules.mk | |||
@@ -13,4 +13,4 @@ TAP_DANCE_ENABLE=yes | |||
13 | CONSOLE_ENABLE=no | 13 | CONSOLE_ENABLE=no |
14 | COMMAND_ENABLE=no | 14 | COMMAND_ENABLE=no |
15 | DYNAMIC_KEYMAP_ENABLE=no | 15 | DYNAMIC_KEYMAP_ENABLE=no |
16 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 16 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
diff --git a/users/talljoe/visualizer.c b/users/talljoe/visualizer.c deleted file mode 100644 index c17b56706..000000000 --- a/users/talljoe/visualizer.c +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* Copyright 2020 Joseph Wasson | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #include "talljoe.h" | ||
18 | |||
19 | static void get_visualizer_layer_and_color(visualizer_state_t* state) { | ||
20 | state->status_text = layer_names[biton32(state->status.layer)]; | ||
21 | } | ||
diff --git a/users/tominabox1/config.h b/users/tominabox1/config.h index 004f58ab5..4a2433eb0 100644 --- a/users/tominabox1/config.h +++ b/users/tominabox1/config.h | |||
@@ -41,33 +41,33 @@ | |||
41 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT | 41 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT |
42 | /* Disable the animations you don't want/need. You will need to disable a good number of these | 42 | /* Disable the animations you don't want/need. You will need to disable a good number of these |
43 | because they take up a lot of space. Disable until you can successfully compile your firmware. */ | 43 | because they take up a lot of space. Disable until you can successfully compile your firmware. */ |
44 | // #define DISABLE_RGB_MATRIX_ALPHAS_MODS | 44 | // #undef ENABLE_RGB_MATRIX_ALPHAS_MODS |
45 | // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 45 | // #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
46 | #define DISABLE_RGB_MATRIX_BREATHING | 46 | # undef ENABLE_RGB_MATRIX_BREATHING |
47 | // #define DISABLE_RGB_MATRIX_CYCLE_ALL | 47 | // #undef ENABLE_RGB_MATRIX_CYCLE_ALL |
48 | // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | 48 | // #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT |
49 | // #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN | 49 | // #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN |
50 | // #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN | 50 | // #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN |
51 | // #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | 51 | // #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL |
52 | #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 52 | # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
53 | #define DISABLE_RGB_MATRIX_DUAL_BEACON | 53 | # undef ENABLE_RGB_MATRIX_DUAL_BEACON |
54 | #define DISABLE_RGB_MATRIX_RAINBOW_BEACON | 54 | # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON |
55 | #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS | 55 | # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS |
56 | // #define DISABLE_RGB_MATRIX_RAINDROPS | 56 | // #undef ENABLE_RGB_MATRIX_RAINDROPS |
57 | #define DISABLE_RGB_MATRIX_JELLYBEN_RAINDROPS | 57 | # undef ENABLE_RGB_MATRIX_JELLYBEN_RAINDROPS |
58 | // # define DISABLE_RGB_MATRIX_TYPING_HEATMAP | 58 | // # undef ENABLE_RGB_MATRIX_TYPING_HEATMAP |
59 | #define DISABLE_RGB_MATRIX_DIGITAL_RAIN | 59 | # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN |
60 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE | 60 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE |
61 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | 61 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE |
62 | // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | 62 | // #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE |
63 | // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 63 | // #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
64 | // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 64 | // #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
65 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | 65 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS |
66 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | 66 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS |
67 | #define DISABLE_RGB_MATRIX_SPLASH | 67 | # undef ENABLE_RGB_MATRIX_SPLASH |
68 | #define DISABLE_RGB_MATRIX_MULTISPLASH | 68 | # undef ENABLE_RGB_MATRIX_MULTISPLASH |
69 | #define DISABLE_RGB_MATRIX_SOLID_SPLASH | 69 | # undef ENABLE_RGB_MATRIX_SOLID_SPLASH |
70 | #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | 70 | # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
71 | #endif //RGB_MATRIX_ENABLE | 71 | #endif //RGB_MATRIX_ENABLE |
72 | 72 | ||
73 | // Hex size reduction options | 73 | // Hex size reduction options |
diff --git a/users/tominabox1/rules.mk b/users/tominabox1/rules.mk index 160dcce7b..1df563464 100644 --- a/users/tominabox1/rules.mk +++ b/users/tominabox1/rules.mk | |||
@@ -5,7 +5,7 @@ | |||
5 | CONSOLE_ENABLE = no | 5 | CONSOLE_ENABLE = no |
6 | TAP_DANCE_ENABLE = yes | 6 | TAP_DANCE_ENABLE = yes |
7 | NKRO_ENABLE = yes | 7 | NKRO_ENABLE = yes |
8 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 8 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
9 | 9 | ||
10 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) | 10 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) |
11 | RGB_MATRIX_ENABLE = yes | 11 | RGB_MATRIX_ENABLE = yes |
diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c index e48959be9..7322ead0d 100644 --- a/users/tominabox1/tominabox1.c +++ b/users/tominabox1/tominabox1.c | |||
@@ -262,7 +262,7 @@ void render_status_main(void) { | |||
262 | __attribute__ ((weak)) | 262 | __attribute__ ((weak)) |
263 | void oled_task_keymap(void) {} | 263 | void oled_task_keymap(void) {} |
264 | 264 | ||
265 | void oled_task_user(void) { | 265 | bool oled_task_user(void) { |
266 | 266 | ||
267 | if (timer_elapsed(oled_timer) > 20000) { | 267 | if (timer_elapsed(oled_timer) > 20000) { |
268 | oled_off(); | 268 | oled_off(); |
@@ -275,6 +275,7 @@ void oled_task_user(void) { | |||
275 | oled_scroll_left(); | 275 | oled_scroll_left(); |
276 | } | 276 | } |
277 | oled_task_keymap(); | 277 | oled_task_keymap(); |
278 | return false; | ||
278 | } | 279 | } |
279 | 280 | ||
280 | #endif // OLED_Driver | 281 | #endif // OLED_Driver |
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk index eb66a49e6..410803512 100644 --- a/users/wanleg/rules.mk +++ b/users/wanleg/rules.mk | |||
@@ -21,8 +21,8 @@ ifeq ($(strip $(BT)), yes) | |||
21 | #opt_defs for alternate pin usage | 21 | #opt_defs for alternate pin usage |
22 | OPT_DEFS += -DBLUEFRUIT | 22 | OPT_DEFS += -DBLUEFRUIT |
23 | #Adafruit Bluefruit controller settings | 23 | #Adafruit Bluefruit controller settings |
24 | BLUETOOTH = AdafruitBLE | ||
25 | BLUETOOTH_ENABLE = yes | 24 | BLUETOOTH_ENABLE = yes |
25 | BLUETOOTH_DRIVER = AdafruitBLE | ||
26 | F_CPU = 8000000 | 26 | F_CPU = 8000000 |
27 | CONSOLE_ENABLE = no # Console for debug(+400) | 27 | CONSOLE_ENABLE = no # Console for debug(+400) |
28 | COMMAND_ENABLE = no # Commands for debug and configuration | 28 | COMMAND_ENABLE = no # Commands for debug and configuration |
@@ -42,4 +42,4 @@ endif | |||
42 | #example usage: make gherkin:wanleg flip=yes | 42 | #example usage: make gherkin:wanleg flip=yes |
43 | ifeq ($(strip $(flip)), yes) | 43 | ifeq ($(strip $(flip)), yes) |
44 | OPT_DEFS += -DFLIP | 44 | OPT_DEFS += -DFLIP |
45 | endif \ No newline at end of file | 45 | endif |
diff --git a/users/xulkal/config.h b/users/xulkal/config.h index e000b97ac..88e3efbe7 100644 --- a/users/xulkal/config.h +++ b/users/xulkal/config.h | |||
@@ -24,11 +24,11 @@ | |||
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | // No need for the single versions when multi performance isn't a problem =D | 26 | // No need for the single versions when multi performance isn't a problem =D |
27 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | 27 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE |
28 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 28 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
29 | #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | 29 | #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS |
30 | #define DISABLE_RGB_MATRIX_SPLASH | 30 | #undef ENABLE_RGB_MATRIX_SPLASH |
31 | #define DISABLE_RGB_MATRIX_SOLID_SPLASH | 31 | #undef ENABLE_RGB_MATRIX_SOLID_SPLASH |
32 | 32 | ||
33 | // 20m timeout (20m * 60s * 1000mil) | 33 | // 20m timeout (20m * 60s * 1000mil) |
34 | #define RGB_DISABLE_TIMEOUT 1200000 | 34 | #define RGB_DISABLE_TIMEOUT 1200000 |
diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c index 4ed2b9a0b..7fe804092 100644 --- a/users/xulkal/custom_oled.c +++ b/users/xulkal/custom_oled.c | |||
@@ -176,7 +176,7 @@ static void render_status(void) | |||
176 | 176 | ||
177 | #endif // OLED_90ROTATION | 177 | #endif // OLED_90ROTATION |
178 | 178 | ||
179 | void oled_task_user(void) | 179 | bool oled_task_user(void) |
180 | { | 180 | { |
181 | if (is_keyboard_master()) | 181 | if (is_keyboard_master()) |
182 | render_status(); | 182 | render_status(); |
@@ -185,4 +185,5 @@ void oled_task_user(void) | |||
185 | render_logo(); | 185 | render_logo(); |
186 | oled_scroll_left(); | 186 | oled_scroll_left(); |
187 | } | 187 | } |
188 | return false; | ||
188 | } | 189 | } |
diff --git a/users/yanfali/rules.mk b/users/yanfali/rules.mk index 631dda4fb..6c0c48c76 100644 --- a/users/yanfali/rules.mk +++ b/users/yanfali/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 1 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
2 | DYNAMIC_KEYMAP_ENABLE = no | 2 | DYNAMIC_KEYMAP_ENABLE = no |
3 | LTO_ENABLE = yes | 3 | LTO_ENABLE = yes |
4 | AUDIO_ENABLE = no | 4 | AUDIO_ENABLE = no |