Merge remote-tracking branch 'origin/master' into develop

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) {

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

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

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[] = {

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:

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