diff options
| author | Joel Challis <git@zvecr.com> | 2021-11-28 21:00:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 21:00:02 +0000 |
| commit | 4ee33f1ffd921d4691207c5c3ab8c12742ddc12d (patch) | |
| tree | 349bba10fae8fcefb630d28f67a0339eb0ee0774 /keyboards/pteron36 | |
| parent | 097ae9d8172a1d7774e81e98aec8b88c147fa7e2 (diff) | |
| download | qmk_firmware-4ee33f1ffd921d4691207c5c3ab8c12742ddc12d.tar.gz qmk_firmware-4ee33f1ffd921d4691207c5c3ab8c12742ddc12d.zip | |
Fix keyboard level use of OLED_DRIVER_ENABLE (#15343)
Diffstat (limited to 'keyboards/pteron36')
| -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 |
3 files changed, 4 insertions, 4 deletions
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 | ||
| 89 | static void render_logo(void) { | 89 | static 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 |
| 40 | bool oled_task_kb(void) { | 40 | bool 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 | |||
| 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 20 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 21 | AUDIO_ENABLE = no # Audio output | 21 | AUDIO_ENABLE = no # Audio output |
| 22 | OLED_DRIVER_ENABLE = yes # OLED display | 22 | OLED_ENABLE = yes # OLED display |
| 23 | ENCODER_ENABLE = yes # Encoder support | 23 | ENCODER_ENABLE = yes # Encoder support |
| 24 | SPLIT_KEYBOARD = yes # Split enable | 24 | SPLIT_KEYBOARD = yes # Split enable |
| 25 | 25 | ||