Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

keyboards/kyria/keymaps/muppetjones/config.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #endif
 

keyboards/lily58/keymaps/muppetjones/features/bongo_cat.c

@@ -9,7 +9,7 @@ WPM-responsive animation of bongo cat!
 
 #include QMK_KEYBOARD_H
 
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 
 #    define IDLE_FRAMES 5
 #    define IDLE_SPEED 30  // below this wpm value your animation will idle
@@ -28,7 +28,6 @@ uint32_t anim_sleep         = 0;
 uint8_t  current_idle_frame = 0;
 // uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
 uint8_t current_tap_frame = 0;
-char    wpm_str[12];
 
 /* Animation */
 
@@ -91,15 +90,6 @@ static const char PROGMEM ANIM_TAP[TAP_FRAMES][ANIM_SIZE] = {
 
 /* Functions */
 
-const char *wpm_state(void) {
-    uint8_t n = get_current_wpm();
-    // index:            01234567
-    char *wpm_counter = "WPM:    ";
-    wpm_counter[7]    = '0' + n % 10;
-    wpm_counter[6]    = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
-    wpm_counter[5]    = n / 10 ? '0' + n / 10 : ' ';
-    return wpm_counter;
-}
 
 void animation_phase(uint8_t wpm) {
     // NOTE: Optimized the conditional. We don't need to recheck each.

keyboards/lily58/keymaps/muppetjones/keymap.c

@@ -206,7 +206,7 @@ const char *read_layer_state_user(void) {
     return layer_state_str;
 }
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
     if (is_keyboard_master()) {
         // If you want to change the display of OLED, you need to change here
         oled_write_ln(read_layer_state_user(), false);
@@ -215,7 +215,8 @@ void oled_task_user(void) {
     } else {
         render_bongo_cat();
         oled_set_cursor(0, 6);
-        oled_write(wpm_state(), false);
+        oled_write_P(WPM:  " false);
+        oled_write(get_u8_str(get_current_wpm(), ' '), false);
     }
 }
 #endif  // OLED_DRIVER_ENABLE

keyboards/lily58/keymaps/muppetjones/rules.mk

@@ -1,4 +1,4 @@
-OLED_DRIVER_ENABLE= yes     # OLED display
+OLED_ENABLE= yes     # OLED display
 WPM_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 COMBO_ENABLE = yes

keyboards/planck/keymaps/muppetjones/config.h

@@ -1,3 +1,15 @@
+ /* Copyright 2020 Stephen Bush <muppetjones>
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  */
 #pragma once
 
 #ifdef AUDIO_ENABLE