diff options
| author | QMK Bot <hello@qmk.fm> | 2021-11-28 21:00:34 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-11-28 21:00:34 +0000 |
| commit | ccc2030beee932c1de855f663890b028820cc2da (patch) | |
| tree | f9ffe6a08f903a2d5ff651932aba966bfa20a508 | |
| parent | 6932e22dd85a539f920c93b62fa78b3fc272c0d2 (diff) | |
| parent | 4ee33f1ffd921d4691207c5c3ab8c12742ddc12d (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/lyra/lyra.c | 2 | ||||
| -rw-r--r-- | keyboards/plut0nium/0x3e/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/plut0nium/0x3e/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/pteron36/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/pteron36/pteron36.c | 4 | ||||
| -rw-r--r-- | keyboards/pteron36/rules.mk | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/keyboards/lyra/lyra.c b/keyboards/lyra/lyra.c index f479cbfd7b..6b9c47c4a0 100644 --- a/keyboards/lyra/lyra.c +++ b/keyboards/lyra/lyra.c @@ -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) { diff --git a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c index 8f1a1d1960..bca46e9910 100644 --- a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c +++ b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c @@ -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 diff --git a/keyboards/plut0nium/0x3e/rules.mk b/keyboards/plut0nium/0x3e/rules.mk index c82a7231ae..820f08573b 100644 --- a/keyboards/plut0nium/0x3e/rules.mk +++ b/keyboards/plut0nium/0x3e/rules.mk @@ -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 diff --git a/keyboards/pteron36/keymaps/via/keymap.c b/keyboards/pteron36/keymaps/via/keymap.c index 40e3088a8e..47533efc93 100644 --- a/keyboards/pteron36/keymaps/via/keymap.c +++ b/keyboards/pteron36/keymaps/via/keymap.c @@ -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[] = { diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c index b7f7d8d44d..1281b5306e 100644 --- a/keyboards/pteron36/pteron36.c +++ b/keyboards/pteron36/pteron36.c @@ -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: diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk index a12be26351..dc6d2485f6 100644 --- a/keyboards/pteron36/rules.mk +++ b/keyboards/pteron36/rules.mk @@ -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 |