summaryrefslogtreecommitdiff
path: root/keyboards/crkbd/keymaps
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/keymaps
parentf775da96b17ceec66bac279434325b4da5cb9467 (diff)
[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/keymaps')
-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 a37862fad3..3caee1c827 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) {
oled_write_raw_P(amsterdam_flag, sizeof(amsterdam_flag));
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
oled_render_amsterdam_flag();
+ return false;
}
#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/blipson/keymap.c b/keyboards/crkbd/keymaps/blipson/keymap.c
index 23491e11a6..ad7664c295 100644
--- a/keyboards/crkbd/keymaps/blipson/keymap.c
+++ b/keyboards/crkbd/keymaps/blipson/keymap.c
@@ -128,12 +128,13 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
} else {
oled_render_logo();
}
+ return false;
}
#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c
index 88d40ee407..e06cfa3465 100644
--- a/keyboards/crkbd/keymaps/default/keymap.c
+++ b/keyboards/crkbd/keymaps/default/keymap.c
@@ -157,13 +157,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool 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 aa4d39a253..a506295749 100644
--- a/keyboards/crkbd/keymaps/devdev/keymap.c
+++ b/keyboards/crkbd/keymaps/devdev/keymap.c
@@ -392,13 +392,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_master) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool 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 11690b0294..6ef428a11f 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) {
}
const char *read_logo(void);
-void oled_task_user(void){
+bool oled_task_user(void){
switch (biton32(layer_state)){
case _DVORAK:
oled_write_ln_P(PSTR("DVRK"), false);
@@ -102,5 +102,6 @@ void oled_task_user(void){
}
//now print logo
oled_write(read_logo(), false);
+ return false;
}
#endif
diff --git a/keyboards/crkbd/keymaps/edvorakjp/oled.c b/keyboards/crkbd/keymaps/edvorakjp/oled.c
index 3a3748c691..e5ff029565 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) {
return is_keyboard_left() ? rotation : rotation ^ OLED_ROTATION_180;
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_left()) {
render_mode_icon(!get_enable_kc_lang());
render_layer_state();
@@ -51,5 +51,6 @@ void oled_task_user(void) {
} else {
render_logo();
}
+ return false;
}
#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/gotham/oled.c b/keyboards/crkbd/keymaps/gotham/oled.c
index 4d2c10b60a..baacc86b18 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) {
return OLED_ROTATION_270;
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (timer_elapsed(oled_timer) > 10000) {
oled_off();
return;
@@ -262,4 +262,5 @@ void oled_task_user(void) {
} else {
render_status_secondary();
}
+ return false;
}
diff --git a/keyboards/crkbd/keymaps/kidbrazil/keymap.c b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
index 7cb08f40d5..219db22433 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/keymap.c
+++ b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
@@ -172,7 +172,7 @@ void render_slave_oled(void) {
}
// {OLED Task} -----------------------------------------------//
-void oled_task_user(void) {
+bool oled_task_user(void) {
// First time out switches to logo as first indication of iddle.
if (timer_elapsed32(oled_timer) > 100000 && timer_elapsed32(oled_timer) < 479999) {
// Render logo on both halves before full timeout
@@ -209,5 +209,6 @@ void oled_task_user(void) {
}
}
}
+ return false;
}
#endif
diff --git a/keyboards/crkbd/keymaps/mcrown/oled.c b/keyboards/crkbd/keymaps/mcrown/oled.c
index b728a5806e..9623b921a7 100644
--- a/keyboards/crkbd/keymaps/mcrown/oled.c
+++ b/keyboards/crkbd/keymaps/mcrown/oled.c
@@ -308,7 +308,7 @@ static void render_logo(void){
* @param void.
* @return void.
*/
-void oled_task_user(void){
+bool oled_task_user(void){
if (timer_elapsed32(standby_oled_timer) > 15000){
oled_off();
}else{
@@ -321,6 +321,7 @@ void oled_task_user(void){
oled_scroll_left();
}
}
+ return false;
}
/** @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 14b4535855..9daae9607d 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) {
render_keylogger_status();
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
update_log();
if (is_keyboard_master()) {
render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_crkbd_logo();
}
+ return false;
}
bool 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 c0416d9726..bcc296c8b6 100644
--- a/keyboards/crkbd/keymaps/oo/keymap.c
+++ b/keyboards/crkbd/keymaps/oo/keymap.c
@@ -148,13 +148,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool 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 b11bac1e72..adf9555421 100644
--- a/keyboards/crkbd/keymaps/rarick/keymap.c
+++ b/keyboards/crkbd/keymaps/rarick/keymap.c
@@ -158,13 +158,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool 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 7ca234a0ee..a753b2b872 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
+++ b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
@@ -204,13 +204,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool 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 d632e255d5..a098c73d2c 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -290,7 +290,7 @@ void render_status(void) {
# endif
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (timer_elapsed32(oled_timer) > OLED_TIMEOUT) {
oled_off();
return;
@@ -310,6 +310,7 @@ void oled_task_user(void) {
}
#endif
}
+ return false;
}
#endif
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 67cfa78f92..98afe3685f 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -300,7 +300,7 @@ void suspend_power_down_user() {
oled_off();
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (timer_elapsed32(oled_timer) > 30000) {
oled_off();
return;
@@ -314,6 +314,7 @@ void oled_task_user(void) {
} else {
render_status_secondary();
}
+ return false;
}
#endif
diff --git a/keyboards/crkbd/keymaps/sulrich/keymap.c b/keyboards/crkbd/keymaps/sulrich/keymap.c
index f1cd60c526..84668b53c8 100644
--- a/keyboards/crkbd/keymaps/sulrich/keymap.c
+++ b/keyboards/crkbd/keymaps/sulrich/keymap.c
@@ -137,13 +137,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -153,4 +154,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
#endif // OLED_ENABLE
-
diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c
index a1a8f7e9f5..ecb629f30d 100644
--- a/keyboards/crkbd/keymaps/vayashiko/keymap.c
+++ b/keyboards/crkbd/keymaps/vayashiko/keymap.c
@@ -164,13 +164,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_master) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool 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 cbaeb93f6d..12c86f6bbc 100644
--- a/keyboards/crkbd/keymaps/via/keymap.c
+++ b/keyboards/crkbd/keymaps/via/keymap.c
@@ -158,13 +158,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool 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 d99d9d6baf..0b7fc0a0ac 100644
--- a/keyboards/crkbd/keymaps/xyverz/keymap.c
+++ b/keyboards/crkbd/keymaps/xyverz/keymap.c
@@ -187,13 +187,14 @@ void oled_render_logo(void) {
oled_write_P(crkbd_logo, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_render_layer_state();
oled_render_keylog();
} else {
oled_render_logo();
}
+ return false;
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {