aboutsummaryrefslogtreecommitdiff
path: root/keyboards/crkbd
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-11-01 15:42:50 -0700
committerGitHub <noreply@github.com>2021-11-02 09:42:50 +1100
commit9d235d4fc5c34f372b0c393f41686b5ef4f8dc13 (patch)
treec155fae4cd6043c3c32aa185eb05c5d1a4a5700e /keyboards/crkbd
parentf775da96b17ceec66bac279434325b4da5cb9467 (diff)
downloadqmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.tar.gz
qmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.zip
[Core] Change OLED task function to be boolean (#14864)
* [Core] Add kb level callbacks to OLED driver * Update keyboards and keymaps * Update docs * Update userspace configs * Add fix for my keymap ... * update lefty
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/keymaps/armand1m/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/blipson/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/default/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/devdev/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/dsanchezseco/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/edvorakjp/oled.c3
-rw-r--r--keyboards/crkbd/keymaps/gotham/oled.c3
-rw-r--r--keyboards/crkbd/keymaps/kidbrazil/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/mcrown/oled.c3
-rw-r--r--keyboards/crkbd/keymaps/oled_sample/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/oo/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/rarick/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/rjhilgefort/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/rpbaptist/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/soundmonster/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/sulrich/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/vayashiko/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/via/keymap.c3
-rw-r--r--keyboards/crkbd/keymaps/xyverz/keymap.c3
19 files changed, 38 insertions, 20 deletions
diff --git a/keyboards/crkbd/keymaps/armand1m/keymap.c b/keyboards/crkbd/keymaps/armand1m/keymap.c
index a37862fad..3caee1c82 100644
--- a/keyboards/crkbd/keymaps/armand1m/keymap.c
+++ b/keyboards/crkbd/keymaps/armand1m/keymap.c
@@ -130,7 +130,8 @@ void oled_render_amsterdam_flag(void) {
130 oled_write_raw_P(amsterdam_flag, sizeof(amsterdam_flag)); 130 oled_write_raw_P(amsterdam_flag, sizeof(amsterdam_flag));
131} 131}
132 132
133void oled_task_user(void) { 133bool oled_task_user(void) {
134 oled_render_amsterdam_flag(); 134 oled_render_amsterdam_flag();
135 return false;
135} 136}
136#endif // OLED_ENABLE 137#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/blipson/keymap.c b/keyboards/crkbd/keymaps/blipson/keymap.c
index 23491e11a..ad7664c29 100644
--- a/keyboards/crkbd/keymaps/blipson/keymap.c
+++ b/keyboards/crkbd/keymaps/blipson/keymap.c
@@ -128,12 +128,13 @@ void oled_render_logo(void) {
128 oled_write_P(crkbd_logo, false); 128 oled_write_P(crkbd_logo, false);
129} 129}
130 130
131void oled_task_user(void) { 131bool oled_task_user(void) {
132 if (is_keyboard_master()) { 132 if (is_keyboard_master()) {
133 oled_render_layer_state(); 133 oled_render_layer_state();
134 } else { 134 } else {
135 oled_render_logo(); 135 oled_render_logo();
136 } 136 }
137 return false;
137} 138}
138 139
139#endif // OLED_ENABLE 140#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c
index 88d40ee40..e06cfa346 100644
--- a/keyboards/crkbd/keymaps/default/keymap.c
+++ b/keyboards/crkbd/keymaps/default/keymap.c
@@ -157,13 +157,14 @@ void oled_render_logo(void) {
157 oled_write_P(crkbd_logo, false); 157 oled_write_P(crkbd_logo, false);
158} 158}
159 159
160void oled_task_user(void) { 160bool oled_task_user(void) {
161 if (is_keyboard_master()) { 161 if (is_keyboard_master()) {
162 oled_render_layer_state(); 162 oled_render_layer_state();
163 oled_render_keylog(); 163 oled_render_keylog();
164 } else { 164 } else {
165 oled_render_logo(); 165 oled_render_logo();
166 } 166 }
167 return false;
167} 168}
168 169
169bool process_record_user(uint16_t keycode, keyrecord_t *record) { 170bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/devdev/keymap.c b/keyboards/crkbd/keymaps/devdev/keymap.c
index aa4d39a25..a50629574 100644
--- a/keyboards/crkbd/keymaps/devdev/keymap.c
+++ b/keyboards/crkbd/keymaps/devdev/keymap.c
@@ -392,13 +392,14 @@ void oled_render_logo(void) {
392 oled_write_P(crkbd_logo, false); 392 oled_write_P(crkbd_logo, false);
393} 393}
394 394
395void oled_task_user(void) { 395bool oled_task_user(void) {
396 if (is_master) { 396 if (is_master) {
397 oled_render_layer_state(); 397 oled_render_layer_state();
398 oled_render_keylog(); 398 oled_render_keylog();
399 } else { 399 } else {
400 oled_render_logo(); 400 oled_render_logo();
401 } 401 }
402 return false;
402} 403}
403 404
404bool process_record_user(uint16_t keycode, keyrecord_t *record) { 405bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
index 11690b029..6ef428a11 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
@@ -83,7 +83,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
83} 83}
84 84
85const char *read_logo(void); 85const char *read_logo(void);
86void oled_task_user(void){ 86bool oled_task_user(void){
87 switch (biton32(layer_state)){ 87 switch (biton32(layer_state)){
88 case _DVORAK: 88 case _DVORAK:
89 oled_write_ln_P(PSTR("DVRK"), false); 89 oled_write_ln_P(PSTR("DVRK"), false);
@@ -102,5 +102,6 @@ void oled_task_user(void){
102 } 102 }
103 //now print logo 103 //now print logo
104 oled_write(read_logo(), false); 104 oled_write(read_logo(), false);
105 return false;
105} 106}
106#endif 107#endif
diff --git a/keyboards/crkbd/keymaps/edvorakjp/oled.c b/keyboards/crkbd/keymaps/edvorakjp/oled.c
index 3a3748c69..e5ff02956 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/oled.c
+++ b/keyboards/crkbd/keymaps/edvorakjp/oled.c
@@ -43,7 +43,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
43 return is_keyboard_left() ? rotation : rotation ^ OLED_ROTATION_180; 43 return is_keyboard_left() ? rotation : rotation ^ OLED_ROTATION_180;
44} 44}
45 45
46void oled_task_user(void) { 46bool oled_task_user(void) {
47 if (is_keyboard_left()) { 47 if (is_keyboard_left()) {
48 render_mode_icon(!get_enable_kc_lang()); 48 render_mode_icon(!get_enable_kc_lang());
49 render_layer_state(); 49 render_layer_state();
@@ -51,5 +51,6 @@ void oled_task_user(void) {
51 } else { 51 } else {
52 render_logo(); 52 render_logo();
53 } 53 }
54 return false;
54} 55}
55#endif // OLED_ENABLE 56#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/gotham/oled.c b/keyboards/crkbd/keymaps/gotham/oled.c
index 4d2c10b60..baacc86b1 100644
--- a/keyboards/crkbd/keymaps/gotham/oled.c
+++ b/keyboards/crkbd/keymaps/gotham/oled.c
@@ -246,7 +246,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
246 return OLED_ROTATION_270; 246 return OLED_ROTATION_270;
247} 247}
248 248
249void oled_task_user(void) { 249bool oled_task_user(void) {
250 if (timer_elapsed(oled_timer) > 10000) { 250 if (timer_elapsed(oled_timer) > 10000) {
251 oled_off(); 251 oled_off();
252 return; 252 return;
@@ -262,4 +262,5 @@ void oled_task_user(void) {
262 } else { 262 } else {
263 render_status_secondary(); 263 render_status_secondary();
264 } 264 }
265 return false;
265} 266}
diff --git a/keyboards/crkbd/keymaps/kidbrazil/keymap.c b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
index 7cb08f40d..219db2243 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/keymap.c
+++ b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
@@ -172,7 +172,7 @@ void render_slave_oled(void) {
172} 172}
173 173
174// {OLED Task} -----------------------------------------------// 174// {OLED Task} -----------------------------------------------//
175void oled_task_user(void) { 175bool oled_task_user(void) {
176 // First time out switches to logo as first indication of iddle. 176 // First time out switches to logo as first indication of iddle.
177 if (timer_elapsed32(oled_timer) > 100000 && timer_elapsed32(oled_timer) < 479999) { 177 if (timer_elapsed32(oled_timer) > 100000 && timer_elapsed32(oled_timer) < 479999) {
178 // Render logo on both halves before full timeout 178 // Render logo on both halves before full timeout
@@ -209,5 +209,6 @@ void oled_task_user(void) {
209 } 209 }
210 } 210 }
211 } 211 }
212 return false;
212} 213}
213#endif 214#endif
diff --git a/keyboards/crkbd/keymaps/mcrown/oled.c b/keyboards/crkbd/keymaps/mcrown/oled.c
index b728a5806..9623b921a 100644
--- a/keyboards/crkbd/keymaps/mcrown/oled.c
+++ b/keyboards/crkbd/keymaps/mcrown/oled.c
@@ -308,7 +308,7 @@ static void render_logo(void){
308 * @param void. 308 * @param void.
309 * @return void. 309 * @return void.
310 */ 310 */
311void oled_task_user(void){ 311bool oled_task_user(void){
312 if (timer_elapsed32(standby_oled_timer) > 15000){ 312 if (timer_elapsed32(standby_oled_timer) > 15000){
313 oled_off(); 313 oled_off();
314 }else{ 314 }else{
@@ -321,6 +321,7 @@ void oled_task_user(void){
321 oled_scroll_left(); 321 oled_scroll_left();
322 } 322 }
323 } 323 }
324 return false;
324} 325}
325 326
326/** @brief process the current key and add it to the keylog string. 327/** @brief process the current key and add it to the keylog string.
diff --git a/keyboards/crkbd/keymaps/oled_sample/keymap.c b/keyboards/crkbd/keymaps/oled_sample/keymap.c
index 14b453585..9daae9607 100644
--- a/keyboards/crkbd/keymaps/oled_sample/keymap.c
+++ b/keyboards/crkbd/keymaps/oled_sample/keymap.c
@@ -190,13 +190,14 @@ void render_status_main(void) {
190 render_keylogger_status(); 190 render_keylogger_status();
191} 191}
192 192
193void oled_task_user(void) { 193bool oled_task_user(void) {
194 update_log(); 194 update_log();
195 if (is_keyboard_master()) { 195 if (is_keyboard_master()) {
196 render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) 196 render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
197 } else { 197 } else {
198 render_crkbd_logo(); 198 render_crkbd_logo();
199 } 199 }
200 return false;
200} 201}
201 202
202bool process_record_user(uint16_t keycode, keyrecord_t *record) { 203bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/oo/keymap.c b/keyboards/crkbd/keymaps/oo/keymap.c
index c0416d972..bcc296c8b 100644
--- a/keyboards/crkbd/keymaps/oo/keymap.c
+++ b/keyboards/crkbd/keymaps/oo/keymap.c
@@ -148,13 +148,14 @@ void oled_render_logo(void) {
148 oled_write_P(crkbd_logo, false); 148 oled_write_P(crkbd_logo, false);
149} 149}
150 150
151void oled_task_user(void) { 151bool oled_task_user(void) {
152 if (is_keyboard_master()) { 152 if (is_keyboard_master()) {
153 oled_render_layer_state(); 153 oled_render_layer_state();
154 oled_render_keylog(); 154 oled_render_keylog();
155 } else { 155 } else {
156 oled_render_logo(); 156 oled_render_logo();
157 } 157 }
158 return false;
158} 159}
159 160
160bool process_record_user(uint16_t keycode, keyrecord_t *record) { 161bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/rarick/keymap.c b/keyboards/crkbd/keymaps/rarick/keymap.c
index b11bac1e7..adf955542 100644
--- a/keyboards/crkbd/keymaps/rarick/keymap.c
+++ b/keyboards/crkbd/keymaps/rarick/keymap.c
@@ -158,13 +158,14 @@ void oled_render_logo(void) {
158 oled_write_P(crkbd_logo, false); 158 oled_write_P(crkbd_logo, false);
159} 159}
160 160
161void oled_task_user(void) { 161bool oled_task_user(void) {
162 if (is_keyboard_master()) { 162 if (is_keyboard_master()) {
163 oled_render_layer_state(); 163 oled_render_layer_state();
164 oled_render_keylog(); 164 oled_render_keylog();
165 } else { 165 } else {
166 oled_render_logo(); 166 oled_render_logo();
167 } 167 }
168 return false;
168} 169}
169 170
170bool process_record_user(uint16_t keycode, keyrecord_t *record) { 171bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
index 7ca234a0e..a753b2b87 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
+++ b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
@@ -204,13 +204,14 @@ void oled_render_logo(void) {
204 oled_write_P(crkbd_logo, false); 204 oled_write_P(crkbd_logo, false);
205} 205}
206 206
207void oled_task_user(void) { 207bool oled_task_user(void) {
208 if (is_keyboard_master()) { 208 if (is_keyboard_master()) {
209 oled_render_layer_state(); 209 oled_render_layer_state();
210 oled_render_keylog(); 210 oled_render_keylog();
211 } else { 211 } else {
212 oled_render_logo(); 212 oled_render_logo();
213 } 213 }
214 return false;
214} 215}
215 216
216bool process_record_user(uint16_t keycode, keyrecord_t *record) { 217bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index d632e255d..a098c73d2 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -290,7 +290,7 @@ void render_status(void) {
290# endif 290# endif
291} 291}
292 292
293void oled_task_user(void) { 293bool oled_task_user(void) {
294 if (timer_elapsed32(oled_timer) > OLED_TIMEOUT) { 294 if (timer_elapsed32(oled_timer) > OLED_TIMEOUT) {
295 oled_off(); 295 oled_off();
296 return; 296 return;
@@ -310,6 +310,7 @@ void oled_task_user(void) {
310 } 310 }
311 #endif 311 #endif
312 } 312 }
313 return false;
313} 314}
314#endif 315#endif
315 316
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 67cfa78f9..98afe3685 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -300,7 +300,7 @@ void suspend_power_down_user() {
300 oled_off(); 300 oled_off();
301} 301}
302 302
303void oled_task_user(void) { 303bool oled_task_user(void) {
304 if (timer_elapsed32(oled_timer) > 30000) { 304 if (timer_elapsed32(oled_timer) > 30000) {
305 oled_off(); 305 oled_off();
306 return; 306 return;
@@ -314,6 +314,7 @@ void oled_task_user(void) {
314 } else { 314 } else {
315 render_status_secondary(); 315 render_status_secondary();
316 } 316 }
317 return false;
317} 318}
318 319
319#endif 320#endif
diff --git a/keyboards/crkbd/keymaps/sulrich/keymap.c b/keyboards/crkbd/keymaps/sulrich/keymap.c
index f1cd60c52..84668b53c 100644
--- a/keyboards/crkbd/keymaps/sulrich/keymap.c
+++ b/keyboards/crkbd/keymaps/sulrich/keymap.c
@@ -137,13 +137,14 @@ void oled_render_logo(void) {
137 oled_write_P(crkbd_logo, false); 137 oled_write_P(crkbd_logo, false);
138} 138}
139 139
140void oled_task_user(void) { 140bool oled_task_user(void) {
141 if (is_keyboard_master()) { 141 if (is_keyboard_master()) {
142 oled_render_layer_state(); 142 oled_render_layer_state();
143 oled_render_keylog(); 143 oled_render_keylog();
144 } else { 144 } else {
145 oled_render_logo(); 145 oled_render_logo();
146 } 146 }
147 return false;
147} 148}
148 149
149bool process_record_user(uint16_t keycode, keyrecord_t *record) { 150bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -153,4 +154,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
153 return true; 154 return true;
154} 155}
155#endif // OLED_ENABLE 156#endif // OLED_ENABLE
156
diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c
index a1a8f7e9f..ecb629f30 100644
--- a/keyboards/crkbd/keymaps/vayashiko/keymap.c
+++ b/keyboards/crkbd/keymaps/vayashiko/keymap.c
@@ -164,13 +164,14 @@ void oled_render_logo(void) {
164 oled_write_P(crkbd_logo, false); 164 oled_write_P(crkbd_logo, false);
165} 165}
166 166
167void oled_task_user(void) { 167bool oled_task_user(void) {
168 if (is_master) { 168 if (is_master) {
169 oled_render_layer_state(); 169 oled_render_layer_state();
170 oled_render_keylog(); 170 oled_render_keylog();
171 } else { 171 } else {
172 oled_render_logo(); 172 oled_render_logo();
173 } 173 }
174 return false;
174} 175}
175 176
176bool process_record_user(uint16_t keycode, keyrecord_t *record) { 177bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/via/keymap.c b/keyboards/crkbd/keymaps/via/keymap.c
index cbaeb93f6..12c86f6bb 100644
--- a/keyboards/crkbd/keymaps/via/keymap.c
+++ b/keyboards/crkbd/keymaps/via/keymap.c
@@ -158,13 +158,14 @@ void oled_render_logo(void) {
158 oled_write_P(crkbd_logo, false); 158 oled_write_P(crkbd_logo, false);
159} 159}
160 160
161void oled_task_user(void) { 161bool oled_task_user(void) {
162 if (is_keyboard_master()) { 162 if (is_keyboard_master()) {
163 oled_render_layer_state(); 163 oled_render_layer_state();
164 oled_render_keylog(); 164 oled_render_keylog();
165 } else { 165 } else {
166 oled_render_logo(); 166 oled_render_logo();
167 } 167 }
168 return false;
168} 169}
169 170
170bool process_record_user(uint16_t keycode, keyrecord_t *record) { 171bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/crkbd/keymaps/xyverz/keymap.c b/keyboards/crkbd/keymaps/xyverz/keymap.c
index d99d9d6ba..0b7fc0a0a 100644
--- a/keyboards/crkbd/keymaps/xyverz/keymap.c
+++ b/keyboards/crkbd/keymaps/xyverz/keymap.c
@@ -187,13 +187,14 @@ void oled_render_logo(void) {
187 oled_write_P(crkbd_logo, false); 187 oled_write_P(crkbd_logo, false);
188} 188}
189 189
190void oled_task_user(void) { 190bool oled_task_user(void) {
191 if (is_keyboard_master()) { 191 if (is_keyboard_master()) {
192 oled_render_layer_state(); 192 oled_render_layer_state();
193 oled_render_keylog(); 193 oled_render_keylog();
194 } else { 194 } else {
195 oled_render_logo(); 195 oled_render_logo();
196 } 196 }
197 return false;
197} 198}
198 199
199bool process_record_user(uint16_t keycode, keyrecord_t *record) { 200bool process_record_user(uint16_t keycode, keyrecord_t *record) {