summaryrefslogtreecommitdiff
path: root/keyboards/mechwild/mercutio/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/mechwild/mercutio/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/mechwild/mercutio/keymaps')
-rw-r--r--keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c3
-rw-r--r--keyboards/mechwild/mercutio/keymaps/default/keymap.c3
-rwxr-xr-xkeyboards/mechwild/mercutio/keymaps/fancy/keymap.c3
-rwxr-xr-xkeyboards/mechwild/mercutio/keymaps/jonavin/keymap.c3
-rwxr-xr-xkeyboards/mechwild/mercutio/keymaps/via/keymap.c3
5 files changed, 10 insertions, 5 deletions
diff --git a/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c b/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c
index b094898768..6062b8c73d 100644
--- a/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c
@@ -187,12 +187,13 @@ static void render_anim(void) {
}
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
render_anim();
oled_set_cursor(0,4);
sprintf(wpm_str, "WPM: %03d", get_current_wpm());
oled_write(wpm_str, false);
+ return false;
}
#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/default/keymap.c b/keyboards/mechwild/mercutio/keymaps/default/keymap.c
index a08150505f..8f433292b5 100644
--- a/keyboards/mechwild/mercutio/keymaps/default/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/default/keymap.c
@@ -76,7 +76,8 @@ static void render_name(void) {
oled_write_P(mercutio_name, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
render_name();
+ return false;
}
#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c b/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c
index cb0a6173f3..96457be6d2 100755
--- a/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
oled_write_P(logo_4, false);
}
- void oled_task_user(void) {
+ bool oled_task_user(void) {
if ( IS_HOST_LED_OFF(USB_LED_NUM_LOCK) && IS_HOST_LED_OFF(USB_LED_CAPS_LOCK) && selected_layer == 0 && get_highest_layer(layer_state) == 0 ) {
render_name();
@@ -164,5 +164,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
oled_write_P(led_state.num_lock ? PSTR("NLCK ") : PSTR(" "), false);
oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false);
}
+ return false;
}
#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
index 22d26db3c2..869a9f73ab 100755
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
@@ -188,7 +188,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
oled_write_P(logo_4, false);
}
- void oled_task_user(void) {
+ bool oled_task_user(void) {
if ( IS_HOST_LED_OFF(USB_LED_NUM_LOCK) && IS_HOST_LED_OFF(USB_LED_CAPS_LOCK) && get_selected_layer() == 0 && get_highest_layer(layer_state) == 0 ) {
render_name();
@@ -263,6 +263,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
}
+ return false;
}
void suspend_power_down_user(void) { // shutdown oled when powered down to prevent OLED from showing Mercutio all the time
diff --git a/keyboards/mechwild/mercutio/keymaps/via/keymap.c b/keyboards/mechwild/mercutio/keymaps/via/keymap.c
index a08150505f..8f433292b5 100755
--- a/keyboards/mechwild/mercutio/keymaps/via/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/via/keymap.c
@@ -76,7 +76,8 @@ static void render_name(void) {
oled_write_P(mercutio_name, false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
render_name();
+ return false;
}
#endif