~ruther/qmk_firmware

4ee33f1ffd921d4691207c5c3ab8c12742ddc12d — Joel Challis 3 years ago 097ae9d
Fix keyboard level use of OLED_DRIVER_ENABLE (#15343)

M keyboards/lyra/lyra.c => keyboards/lyra/lyra.c +1 -1
@@ 15,7 15,7 @@
  */
#include "lyra.h"

#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE

// 'lyralogooled', 32x128px
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {

M keyboards/plut0nium/0x3e/keymaps/default/keymap.c => keyboards/plut0nium/0x3e/keymaps/default/keymap.c +1 -1
@@ 39,7 39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
};

#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
static void render_logo(void) {
    static const char PROGMEM my_logo[] = {
        // '0x3E_logo_32x16', 32x16px

M keyboards/plut0nium/0x3e/rules.mk => keyboards/plut0nium/0x3e/rules.mk +1 -1
@@ 15,5 15,5 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
NKRO_ENABLE = no            # USB Nkey Rollover
BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
OLED_DRIVER_ENABLE = yes
OLED_ENABLE = yes
LTO_ENABLE = yes

M keyboards/pteron36/keymaps/via/keymap.c => keyboards/pteron36/keymaps/via/keymap.c +1 -1
@@ 84,7 84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

};

#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE

static void render_logo(void) {
    static const char PROGMEM qmk_logo[] = {

M keyboards/pteron36/pteron36.c => keyboards/pteron36/pteron36.c +2 -2
@@ 36,7 36,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
    return true;
}
//common oled support.
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
    if (!oled_task_user()) {
        return false;


@@ 44,7 44,7 @@ bool oled_task_kb(void) {
    if (is_keyboard_master()) {
        oled_write_P(PSTR("Layer: "), false);
        switch (get_highest_layer(layer_state)) {
            case _QWERTY:
            case 0:
                oled_write_ln_P(PSTR("Default"), false);
                break;
            default:

M keyboards/pteron36/rules.mk => keyboards/pteron36/rules.mk +1 -1
@@ 19,7 19,7 @@ NKRO_ENABLE = no            # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
OLED_DRIVER_ENABLE = yes    # OLED display
OLED_ENABLE = yes           # OLED display
ENCODER_ENABLE = yes        # Encoder support
SPLIT_KEYBOARD = yes        # Split enable