aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-11-28 21:00:02 +0000
committerGitHub <noreply@github.com>2021-11-28 21:00:02 +0000
commit4ee33f1ffd921d4691207c5c3ab8c12742ddc12d (patch)
tree349bba10fae8fcefb630d28f67a0339eb0ee0774
parent097ae9d8172a1d7774e81e98aec8b88c147fa7e2 (diff)
downloadqmk_firmware-4ee33f1ffd921d4691207c5c3ab8c12742ddc12d.tar.gz
qmk_firmware-4ee33f1ffd921d4691207c5c3ab8c12742ddc12d.zip
Fix keyboard level use of OLED_DRIVER_ENABLE (#15343)
-rw-r--r--keyboards/lyra/lyra.c2
-rw-r--r--keyboards/plut0nium/0x3e/keymaps/default/keymap.c2
-rw-r--r--keyboards/plut0nium/0x3e/rules.mk2
-rw-r--r--keyboards/pteron36/keymaps/via/keymap.c2
-rw-r--r--keyboards/pteron36/pteron36.c4
-rw-r--r--keyboards/pteron36/rules.mk2
6 files changed, 7 insertions, 7 deletions
diff --git a/keyboards/lyra/lyra.c b/keyboards/lyra/lyra.c
index f479cbfd7..6b9c47c4a 100644
--- a/keyboards/lyra/lyra.c
+++ b/keyboards/lyra/lyra.c
@@ -15,7 +15,7 @@
15 */ 15 */
16#include "lyra.h" 16#include "lyra.h"
17 17
18#ifdef OLED_DRIVER_ENABLE 18#ifdef OLED_ENABLE
19 19
20// 'lyralogooled', 32x128px 20// 'lyralogooled', 32x128px
21oled_rotation_t oled_init_kb(oled_rotation_t rotation) { 21oled_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 8f1a1d196..bca46e991 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] = {
39 ) 39 )
40}; 40};
41 41
42#ifdef OLED_DRIVER_ENABLE 42#ifdef OLED_ENABLE
43static void render_logo(void) { 43static void render_logo(void) {
44 static const char PROGMEM my_logo[] = { 44 static const char PROGMEM my_logo[] = {
45 // '0x3E_logo_32x16', 32x16px 45 // '0x3E_logo_32x16', 32x16px
diff --git a/keyboards/plut0nium/0x3e/rules.mk b/keyboards/plut0nium/0x3e/rules.mk
index c82a7231a..820f08573 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
15NKRO_ENABLE = no # USB Nkey Rollover 15NKRO_ENABLE = no # USB Nkey Rollover
16BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 16BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
17RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 17RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
18OLED_DRIVER_ENABLE = yes 18OLED_ENABLE = yes
19LTO_ENABLE = yes 19LTO_ENABLE = yes
diff --git a/keyboards/pteron36/keymaps/via/keymap.c b/keyboards/pteron36/keymaps/via/keymap.c
index 40e3088a8..47533efc9 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] = {
84 84
85}; 85};
86 86
87#ifdef OLED_DRIVER_ENABLE 87#ifdef OLED_ENABLE
88 88
89static void render_logo(void) { 89static void render_logo(void) {
90 static const char PROGMEM qmk_logo[] = { 90 static const char PROGMEM qmk_logo[] = {
diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c
index b7f7d8d44..1281b5306 100644
--- a/keyboards/pteron36/pteron36.c
+++ b/keyboards/pteron36/pteron36.c
@@ -36,7 +36,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
36 return true; 36 return true;
37} 37}
38//common oled support. 38//common oled support.
39#ifdef OLED_DRIVER_ENABLE 39#ifdef OLED_ENABLE
40bool oled_task_kb(void) { 40bool oled_task_kb(void) {
41 if (!oled_task_user()) { 41 if (!oled_task_user()) {
42 return false; 42 return false;
@@ -44,7 +44,7 @@ bool oled_task_kb(void) {
44 if (is_keyboard_master()) { 44 if (is_keyboard_master()) {
45 oled_write_P(PSTR("Layer: "), false); 45 oled_write_P(PSTR("Layer: "), false);
46 switch (get_highest_layer(layer_state)) { 46 switch (get_highest_layer(layer_state)) {
47 case _QWERTY: 47 case 0:
48 oled_write_ln_P(PSTR("Default"), false); 48 oled_write_ln_P(PSTR("Default"), false);
49 break; 49 break;
50 default: 50 default:
diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk
index a12be2635..dc6d2485f 100644
--- a/keyboards/pteron36/rules.mk
+++ b/keyboards/pteron36/rules.mk
@@ -19,7 +19,7 @@ NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22OLED_DRIVER_ENABLE = yes # OLED display 22OLED_ENABLE = yes # OLED display
23ENCODER_ENABLE = yes # Encoder support 23ENCODER_ENABLE = yes # Encoder support
24SPLIT_KEYBOARD = yes # Split enable 24SPLIT_KEYBOARD = yes # Split enable
25 25