summaryrefslogtreecommitdiff
path: root/keyboards/mechwild
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechwild')
-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
-rw-r--r--keyboards/mechwild/murphpad/keymaps/default/keymap.c3
-rw-r--r--keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c6
-rw-r--r--keyboards/mechwild/murphpad/keymaps/via/keymap.c3
8 files changed, 18 insertions, 9 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
diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
index a30bf6bfa1..fe46e8ce5e 100644
--- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
@@ -115,7 +115,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
oled_write_P(logo_4, false);
}
- void oled_task_user(void) {
+ bool oled_task_user(void) {
render_logo();
oled_set_cursor(0,6);
@@ -143,5 +143,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
+ return false;
}
#endif
diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
index dc03e334bf..043eeb992b 100644
--- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
@@ -296,7 +296,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
}
#ifdef LANDSCAPE_MODE
- void oled_task_user(void) {
+ bool oled_task_user(void) {
render_logo();
oled_set_cursor(8,2);
@@ -359,6 +359,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false);
oled_write_P(led_state.scroll_lock ? PSTR("SCR") : PSTR(" "), false);
+ return false;
}
#endif // LANDSCAPE_MODE
@@ -368,7 +369,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
return OLED_ROTATION_270; // flips the display 270 degrees
}
- void oled_task_user(void) {
+ bool oled_task_user(void) {
render_logo();
oled_set_cursor(0,5);
@@ -408,6 +409,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
oled_write_ln_P(led_state.num_lock ? PSTR(" NUM") : PSTR(" "), false);
oled_write_ln_P(led_state.caps_lock ? PSTR(" CAP") : PSTR(" "), false);
oled_write_ln_P(led_state.scroll_lock ? PSTR(" SCR") : PSTR(" "), false);
+ return false;
}
#endif // !LANDSCAPE_MODE
diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
index 17e4699a98..4f4f6d571a 100644
--- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
@@ -113,7 +113,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
oled_write_P(logo_4, false);
}
- void oled_task_user(void) {
+ bool oled_task_user(void) {
render_logo();
oled_set_cursor(0,6);
@@ -141,5 +141,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
+ return false;
}
#endif