Fix keyboard level use of OLED_DRIVER_ENABLE (#15343)
This commit is contained in:
		
							parent
							
								
									097ae9d817
								
							
						
					
					
						commit
						4ee33f1ffd
					
				
					 6 changed files with 7 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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[] = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue