forked from mirrors/qmk_userspace
		
	OLED: driver naming cleanups (#21710)
This commit is contained in:
		
					parent
					
						
							
								0ac8221a0a
							
						
					
				
			
			
				commit
				
					
						5d2f2af198
					
				
			
		
					 263 changed files with 19 additions and 306 deletions
				
			
		| 
						 | 
					@ -747,8 +747,8 @@ ifeq ($(strip $(HD44780_ENABLE)), yes)
 | 
				
			||||||
    SRC += hd44780.c
 | 
					    SRC += hd44780.c
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
VALID_OLED_DRIVER_TYPES := SSD1306 custom
 | 
					VALID_OLED_DRIVER_TYPES := custom ssd1306
 | 
				
			||||||
OLED_DRIVER ?= SSD1306
 | 
					OLED_DRIVER ?= ssd1306
 | 
				
			||||||
VALID_OLED_TRANSPORT_TYPES := i2c spi custom
 | 
					VALID_OLED_TRANSPORT_TYPES := i2c spi custom
 | 
				
			||||||
OLED_TRANSPORT ?= i2c
 | 
					OLED_TRANSPORT ?= i2c
 | 
				
			||||||
ifeq ($(strip $(OLED_ENABLE)), yes)
 | 
					ifeq ($(strip $(OLED_ENABLE)), yes)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,17 +29,17 @@ OLED_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
|OLED Driver        |Supported Device                    |
 | 
					|OLED Driver        |Supported Device                    |
 | 
				
			||||||
|-------------------|------------------------------------|
 | 
					|-------------------|------------------------------------|
 | 
				
			||||||
|SSD1306 (default)  |For both SSD1306, SH1106, and SH1107|
 | 
					|`ssd1306` (default)|For both SSD1306, SH1106, and SH1107|
 | 
				
			||||||
 | 
					
 | 
				
			||||||
e.g.
 | 
					e.g.
 | 
				
			||||||
```make
 | 
					```make
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					OLED_DRIVER = ssd1306
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
|OLED Transport |                                                |
 | 
					|OLED Transport |                                                |
 | 
				
			||||||
|---------------|------------------------------------------------|
 | 
					|---------------|------------------------------------------------|
 | 
				
			||||||
|i2c (default)  | Uses I2C for communication with the OLED panel |
 | 
					|`i2c` (default)| Uses I2C for communication with the OLED panel |
 | 
				
			||||||
|spi            | Uses SPI for communication with the OLED panel |
 | 
					|`spi`          | Uses SPI for communication with the OLED panel |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
e.g.
 | 
					e.g.
 | 
				
			||||||
```make
 | 
					```make
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,6 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 | 
				
			||||||
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
					BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
					RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
 | 
					 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					@ -15,5 +15,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
BLUETOOTH_ENABLE = yes
 | 
					BLUETOOTH_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,4 +22,3 @@ WS2812_DRIVER         = vendor
 | 
				
			||||||
ENCODER_ENABLE        = yes
 | 
					ENCODER_ENABLE        = yes
 | 
				
			||||||
ENCODER_MAP_ENABLE    = yes
 | 
					ENCODER_MAP_ENABLE    = yes
 | 
				
			||||||
OLED_ENABLE           = yes
 | 
					OLED_ENABLE           = yes
 | 
				
			||||||
OLED_DRIVER           = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
 | 
					DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
SRC += ./common/oled_helper.c
 | 
					SRC += ./common/oled_helper.c
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,5 +5,4 @@ GRAVE_ESC_ENABLE = no
 | 
				
			||||||
MAGIC_ENABLE = no
 | 
					MAGIC_ENABLE = no
 | 
				
			||||||
ENCODER_MAP_ENABLE = yes
 | 
					ENCODER_MAP_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
WPM_ENABLE = yes
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes		    # Encoder functionality
 | 
					ENCODER_ENABLE = yes		    # Encoder functionality
 | 
				
			||||||
OLED_ENABLE = yes           # OLED functionality
 | 
					OLED_ENABLE = yes           # OLED functionality
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,2 @@
 | 
				
			||||||
VIA_ENABLE = yes
 | 
					VIA_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
# OLED_DRIVER = not a real thing
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,2 @@
 | 
				
			||||||
VIA_ENABLE = yes
 | 
					VIA_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
# OLED_DRIVER = not a real thing
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1 +0,0 @@
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
				
			||||||
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
					RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
SPLIT_KEYBOARD = yes
 | 
					SPLIT_KEYBOARD = yes
 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
					OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
					OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
					RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
UNICODE_ENABLE = yes        # Unicode
 | 
					UNICODE_ENABLE = yes        # Unicode
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306    # Enable Support for Oled Display
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes        # Enable Support for Encoder
 | 
					ENCODER_ENABLE = yes        # Enable Support for Encoder
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,2 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
WPM_ENABLE = yes
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
SPLIT_KEYBOARD = yes
 | 
					SPLIT_KEYBOARD = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,6 +12,5 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = no            # Enable N-Key Rollover
 | 
					NKRO_ENABLE = no            # Enable N-Key Rollover
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
					RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306     # Disable OLED driver.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,6 @@ LTO_ENABLE = no
 | 
				
			||||||
EXTRAKEY_ENABLE = no
 | 
					EXTRAKEY_ENABLE = no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# ENCODER_ENABLE = no
 | 
					# ENCODER_ENABLE = no
 | 
				
			||||||
# OLED_DRIVER_ENABLE = no
 | 
					 | 
				
			||||||
# WPM_ENABLE = no
 | 
					# WPM_ENABLE = no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Enable keyboard underlight functionality
 | 
					# Enable keyboard underlight functionality
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,4 +14,3 @@ RGB_MATRIX_ENABLE = no
 | 
				
			||||||
HAPTIC_ENABLE = yes
 | 
					HAPTIC_ENABLE = yes
 | 
				
			||||||
HAPTIC_DRIVER = drv2605l
 | 
					HAPTIC_DRIVER = drv2605l
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,2 @@
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
PS2_ENABLE = yes
 | 
					PS2_ENABLE = yes
 | 
				
			||||||
PS2_DRIVER = interrupt
 | 
					PS2_DRIVER = interrupt
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,8 +16,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes           # Enable N-Key Rollover
 | 
					NKRO_ENABLE = yes           # Enable N-Key Rollover
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
#BACKLIGHT_ENABLE = yes
 | 
					#BACKLIGHT_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
 | 
					DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes        # Enable support for encoders
 | 
					ENCODER_ENABLE = yes        # Enable support for encoders
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306    # Enable support for OLED displays
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
SERIAL_DRIVER = vendor
 | 
					SERIAL_DRIVER = vendor
 | 
				
			||||||
OLED_DRIVER   = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
SERIAL_DRIVER = vendor
 | 
					SERIAL_DRIVER = vendor
 | 
				
			||||||
OLED_DRIVER   = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
MOUSEKEY_ENABLE = yes
 | 
					MOUSEKEY_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE      = yes
 | 
					LTO_ENABLE      = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,2 @@
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,6 @@ RGB_MATRIX_ENABLE  = yes
 | 
				
			||||||
MOUSEKEY_ENABLE    = no
 | 
					MOUSEKEY_ENABLE    = no
 | 
				
			||||||
NKRO_ENABLE        = no
 | 
					NKRO_ENABLE        = no
 | 
				
			||||||
OLED_ENABLE        = yes
 | 
					OLED_ENABLE        = yes
 | 
				
			||||||
OLED_DRIVER        = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE         = yes
 | 
					LTO_ENABLE         = yes
 | 
				
			||||||
SLEEP_LED_ENABLE   = yes
 | 
					SLEEP_LED_ENABLE   = yes
 | 
				
			||||||
WPM_ENABLE         = yes
 | 
					WPM_ENABLE         = yes
 | 
				
			||||||
| 
						 | 
					@ -16,4 +15,4 @@ BOOTMAGIC_ENABLE   = no
 | 
				
			||||||
COMBO_ENABLE	   = no
 | 
					COMBO_ENABLE	   = no
 | 
				
			||||||
AUDIO_ENABLE	   = no
 | 
					AUDIO_ENABLE	   = no
 | 
				
			||||||
MIDI_ENABLE		   = no
 | 
					MIDI_ENABLE		   = no
 | 
				
			||||||
BLUETOOTH_ENABLE   = no
 | 
					BLUETOOTH_ENABLE   = no
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
BOOTMAGIC_ENABLE = no
 | 
					BOOTMAGIC_ENABLE = no
 | 
				
			||||||
BOOLOADER = atmel-dfu
 | 
					BOOLOADER = atmel-dfu
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 | 
					 | 
				
			||||||
RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
 | 
					RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
 | 
				
			||||||
COMMAND_ENABLE = no 		# Disables the command feature
 | 
					COMMAND_ENABLE = no 		# Disables the command feature
 | 
				
			||||||
COMBO_ENABLE = yes
 | 
					COMBO_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					@ -12,4 +11,4 @@ MIDI_ENABLE = no
 | 
				
			||||||
BLUETOOTH_ENABLE = no
 | 
					BLUETOOTH_ENABLE = no
 | 
				
			||||||
BACKLIGHT_ENABLE = no
 | 
					BACKLIGHT_ENABLE = no
 | 
				
			||||||
CAPS_WORD_ENABLE = yes
 | 
					CAPS_WORD_ENABLE = yes
 | 
				
			||||||
CUSTOM_ONESHOT_ENABLE = yes
 | 
					CUSTOM_ONESHOT_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ SPLIT_KEYBOARD = yes
 | 
				
			||||||
TAP_DANCE_ENABLE = yes
 | 
					TAP_DANCE_ENABLE = yes
 | 
				
			||||||
MOUSEKEY_ENABLE = no
 | 
					MOUSEKEY_ENABLE = no
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Link Time Optimization (Reduces compiled size)
 | 
					# Link Time Optimization (Reduces compiled size)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,6 +3,5 @@ RGBLIGHT_ENABLE = no
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes    # Enable WS2812 RGB underlight.
 | 
					RGB_MATRIX_ENABLE = yes    # Enable WS2812 RGB underlight.
 | 
				
			||||||
VIA_ENABLE      = yes    # Enable VIA
 | 
					VIA_ENABLE      = yes    # Enable VIA
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE      = yes
 | 
					LTO_ENABLE      = yes
 | 
				
			||||||
WPM_ENABLE = yes
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 | 
				
			||||||
MOUSEKEY_ENABLE    = no
 | 
					MOUSEKEY_ENABLE    = no
 | 
				
			||||||
NKRO_ENABLE        = yes
 | 
					NKRO_ENABLE        = yes
 | 
				
			||||||
OLED_ENABLE        = yes
 | 
					OLED_ENABLE        = yes
 | 
				
			||||||
OLED_DRIVER        = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE         = yes
 | 
					LTO_ENABLE         = yes
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 | 
				
			||||||
MOUSEKEY_ENABLE    = no
 | 
					MOUSEKEY_ENABLE    = no
 | 
				
			||||||
NKRO_ENABLE        = yes
 | 
					NKRO_ENABLE        = yes
 | 
				
			||||||
OLED_ENABLE        = yes
 | 
					OLED_ENABLE        = yes
 | 
				
			||||||
OLED_DRIVER        = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE         = yes
 | 
					LTO_ENABLE         = yes
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,4 +2,3 @@ MOUSEKEY_ENABLE = yes
 | 
				
			||||||
EXTRAKEY_ENABLE = yes
 | 
					EXTRAKEY_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,6 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
				
			||||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
					SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
				
			||||||
TAP_DANCE_ENABLE = yes
 | 
					TAP_DANCE_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
					SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,5 +3,4 @@ EXTRAKEY_ENABLE = yes
 | 
				
			||||||
AUDIO_ENABLE = yes
 | 
					AUDIO_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,5 +10,4 @@ SRC +=  ./lib/rgb_state_reader.c \
 | 
				
			||||||
TAP_DANCE_ENABLE = yes
 | 
					TAP_DANCE_ENABLE = yes
 | 
				
			||||||
EXTRAKEY_ENABLE = yes        # Audio control and System control
 | 
					EXTRAKEY_ENABLE = yes        # Audio control and System control
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
# LOCAL_GLCDFONT = yes
 | 
					# LOCAL_GLCDFONT = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
					RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
				
			||||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
					SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
					SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,5 @@
 | 
				
			||||||
# Shared rules for both of my Corne
 | 
					# Shared rules for both of my Corne
 | 
				
			||||||
OLED_ENABLE       = yes
 | 
					OLED_ENABLE       = yes
 | 
				
			||||||
OLED_DRIVER       = SSD1306
 | 
					 | 
				
			||||||
VIA_ENABLE        = yes
 | 
					VIA_ENABLE        = yes
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,4 +21,3 @@ else
 | 
				
			||||||
    SRC +=  oled/avr/master/oled_master_handler.c \
 | 
					    SRC +=  oled/avr/master/oled_master_handler.c \
 | 
				
			||||||
            oled/avr/slave/oled_slave_handler.c
 | 
					            oled/avr/slave/oled_slave_handler.c
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
WPM_ENABLE = yes
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,6 @@ MOUSEKEY_ENABLE = no
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					RGBLIGHT_ENABLE = no
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# If you want to change the display of OLED, you need to change here
 | 
					# If you want to change the display of OLED, you need to change here
 | 
				
			||||||
SRC +=  logo_reader.c \
 | 
					SRC +=  logo_reader.c \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# If you want to change the display of OLED, you need to change here
 | 
					# If you want to change the display of OLED, you need to change here
 | 
				
			||||||
SRC +=  ./lib/rgb_state_reader.c \
 | 
					SRC +=  ./lib/rgb_state_reader.c \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,6 @@ MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 | 
				
			||||||
EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
 | 
					EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix.
 | 
					RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix.
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
SLEEP_LED_ENABLE = yes    # Breathing sleep LED during USB suspend
 | 
					SLEEP_LED_ENABLE = yes    # Breathing sleep LED during USB suspend
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,5 @@
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
COMBO_ENABLE = yes
 | 
					COMBO_ENABLE = yes
 | 
				
			||||||
TAP_DANCE_ENABLE = yes  # enable tap dance features
 | 
					TAP_DANCE_ENABLE = yes  # enable tap dance features
 | 
				
			||||||
EXTRAKEY_ENABLE = no
 | 
					EXTRAKEY_ENABLE = no
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
MOUSEKEY_ENABLE = no
 | 
					MOUSEKEY_ENABLE = no
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,4 +5,3 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
					RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
SRC += oled.c
 | 
					SRC += oled.c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
EXTRAKEY_ENABLE = yes
 | 
					EXTRAKEY_ENABLE = yes
 | 
				
			||||||
UNICODE_ENABLE = yes
 | 
					UNICODE_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,9 +4,6 @@ BOOTLOADER = atmel-dfu
 | 
				
			||||||
# Enable RGB matric
 | 
					# Enable RGB matric
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Enable OLED driver
 | 
					 | 
				
			||||||
OLED_DRIVER_ENABLE = yes
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Enable media keys
 | 
					# Enable media keys
 | 
				
			||||||
EXTRAKEY_ENABLE = yes
 | 
					EXTRAKEY_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,4 +5,3 @@ BOOTLOADER = atmel-dfu
 | 
				
			||||||
EXTRAKEY_ENABLE = yes
 | 
					EXTRAKEY_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
TAP_DANCE_ENABLE = yes
 | 
					TAP_DANCE_ENABLE = yes
 | 
				
			||||||
AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods
 | 
					AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,7 +29,6 @@ SLEEP_LED_ENABLE   = no    # Breathing sleep LED during USB suspend
 | 
				
			||||||
BOOTLOADER       = qmk-dfu
 | 
					BOOTLOADER       = qmk-dfu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifeq ($(strip $(THEME)), godspeed)
 | 
					ifeq ($(strip $(THEME)), godspeed)
 | 
				
			||||||
    OPT_DEFS += -DTHEME_GODSPEED
 | 
					    OPT_DEFS += -DTHEME_GODSPEED
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,5 @@
 | 
				
			||||||
MOUSEKEY_ENABLE = yes
 | 
					MOUSEKEY_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE      = yes
 | 
					LTO_ENABLE      = yes
 | 
				
			||||||
BOOTLOADER = caterina
 | 
					BOOTLOADER = caterina
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,7 +14,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
				
			||||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
					SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
				
			||||||
RGBLIGHT_TWINKLE = no
 | 
					RGBLIGHT_TWINKLE = no
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OCEAN_DREAM_ENABLE = yes
 | 
					OCEAN_DREAM_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 | 
				
			||||||
MOUSEKEY_ENABLE    = no
 | 
					MOUSEKEY_ENABLE    = no
 | 
				
			||||||
NKRO_ENABLE        = yes
 | 
					NKRO_ENABLE        = yes
 | 
				
			||||||
OLED_ENABLE        = yes
 | 
					OLED_ENABLE        = yes
 | 
				
			||||||
OLED_DRIVER        = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE         = yes
 | 
					LTO_ENABLE         = yes
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,2 @@
 | 
				
			||||||
EXTRAKEY_ENABLE = yes
 | 
					EXTRAKEY_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
					RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
				
			||||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
					SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
					SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ AUDIO_ENABLE = no
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					RGBLIGHT_ENABLE = no
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TAP_DANCE_ENABLE = yes
 | 
					TAP_DANCE_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,6 @@ MOUSEKEY_ENABLE   = yes    # Mouse keys
 | 
				
			||||||
RGBLIGHT_ENABLE   = no
 | 
					RGBLIGHT_ENABLE   = no
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE       = yes
 | 
					OLED_ENABLE       = yes
 | 
				
			||||||
OLED_DRIVER       = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE        = yes
 | 
					LTO_ENABLE        = yes
 | 
				
			||||||
BOOTLOADER        = atmel-dfu
 | 
					BOOTLOADER        = atmel-dfu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
# Build Options
 | 
					# Build Options
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
					RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
BOOTLOADER = atmel-dfu
 | 
					BOOTLOADER = atmel-dfu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
				
			||||||
RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 | 
					RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 | 
				
			||||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
					SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
					SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,5 +5,4 @@ MOUSEKEY_ENABLE = yes    # Mouse keys
 | 
				
			||||||
RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
 | 
					RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
 | 
				
			||||||
# RGB_MATRIX_ENABLE = no
 | 
					# RGB_MATRIX_ENABLE = no
 | 
				
			||||||
OLED_ENABLE     = yes
 | 
					OLED_ENABLE     = yes
 | 
				
			||||||
OLED_DRIVER     = SSD1306
 | 
					 | 
				
			||||||
LTO_ENABLE      = yes
 | 
					LTO_ENABLE      = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
MOUSEKEY_ENABLE    = no
 | 
					MOUSEKEY_ENABLE    = no
 | 
				
			||||||
MIDI_ENABLE        = no
 | 
					MIDI_ENABLE        = no
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,7 +20,6 @@ SPACE_CADET_ENABLE = no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# OLED enabled
 | 
					# OLED enabled
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# RGB Matrix enabled
 | 
					# RGB Matrix enabled
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,6 @@ AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# OLED enabled
 | 
					# OLED enabled
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# RGB Matrix enabled
 | 
					# RGB Matrix enabled
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
RGB_MATRIX_ENABLE = yes
 | 
					RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,5 +2,4 @@
 | 
				
			||||||
POINTING_DEVICE_ENABLE = yes
 | 
					POINTING_DEVICE_ENABLE = yes
 | 
				
			||||||
POINTING_DEVICE_DRIVER = pimoroni_trackball
 | 
					POINTING_DEVICE_DRIVER = pimoroni_trackball
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
MOUSEKEY_ENABLE = yes
 | 
					MOUSEKEY_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
SPLIT_KEYBOARD = yes
 | 
					SPLIT_KEYBOARD = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
WPM_ENABLE = yes
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
LTO_ENABLE = yes
 | 
					LTO_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,2 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 | 
					ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 | 
					ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 | 
				
			||||||
WPM_ENABLE = yes
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,5 +13,4 @@ AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
WPM_ENABLE = yes
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
VIA_ENABLE = yes
 | 
					VIA_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					WPM_ENABLE = yes
 | 
				
			||||||
WPM_ENABLE = yes
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
RGB_MATRIX_ENABLE = no      # Enable for pretty RGB matrix effects
 | 
					RGB_MATRIX_ENABLE = no      # Enable for pretty RGB matrix effects
 | 
				
			||||||
ENCODER_ENABLE = yes        # Enables the use of one or more encoders
 | 
					ENCODER_ENABLE = yes        # Enables the use of one or more encoders
 | 
				
			||||||
OLED_ENABLE = yes           # Enables the use of OLED displays
 | 
					OLED_ENABLE = yes           # Enables the use of OLED displays
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,6 +14,4 @@ KEY_LOCK_ENABLE = yes       # kc_lock use
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OLED_ENABLE = no
 | 
					OLED_ENABLE = no
 | 
				
			||||||
OLED_DRIVER = SSD1306      # OLED display
 | 
					 | 
				
			||||||
SPLIT_KEYBOARD = yes       # split type
 | 
					SPLIT_KEYBOARD = yes       # split type
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,7 +8,6 @@ BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
 | 
				
			||||||
SCROLLSTEP = 1 			# Lines to scroll with ball
 | 
					SCROLLSTEP = 1 			# Lines to scroll with ball
 | 
				
			||||||
MOUSEKEY_ENABLE = yes  		# Mouse keys, needed for baller
 | 
					MOUSEKEY_ENABLE = yes  		# Mouse keys, needed for baller
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
LOCAL_GLCDFONT = yes
 | 
					LOCAL_GLCDFONT = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#Debug options
 | 
					#Debug options
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,4 +22,3 @@ RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# OLED enabled
 | 
					# OLED enabled
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306       # OLED display
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight
 | 
					RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,5 +14,4 @@ RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
 | 
				
			||||||
HAPTIC_ENABLE = yes
 | 
					HAPTIC_ENABLE = yes
 | 
				
			||||||
HAPTIC_DRIVER = drv2605l
 | 
					HAPTIC_DRIVER = drv2605l
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
ENCODER_ENABLER = yes
 | 
					ENCODER_ENABLER = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,7 +13,6 @@ USE_I2C = no
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
UNICODE_ENABLE = yes
 | 
					UNICODE_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SRC += ds1307.c taphold.c
 | 
					SRC += ds1307.c taphold.c
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
KEY_LOCK_ENABLE = yes
 | 
					KEY_LOCK_ENABLE = yes
 | 
				
			||||||
CONSOLE_ENABLE = no
 | 
					CONSOLE_ENABLE = no
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
VIA_ENABLE = yes
 | 
					VIA_ENABLE = yes
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306    # OLED Driver Enable
 | 
					 | 
				
			||||||
WPM_ENABLE = yes			# WPM counting Enable
 | 
					WPM_ENABLE = yes			# WPM counting Enable
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
SPLIT_KEYBOARD = yes        # Enables split keyboard support
 | 
					SPLIT_KEYBOARD = yes        # Enables split keyboard support
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
NO_USB_STARTUP_CHECK = yes
 | 
					NO_USB_STARTUP_CHECK = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,6 +14,4 @@ UNICODE_ENABLE = yes     # Unicode
 | 
				
			||||||
AUDIO_ENABLE = no        # Audio output
 | 
					AUDIO_ENABLE = no        # Audio output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306 # Enable OLED display support
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes     # Enable encoder support
 | 
					ENCODER_ENABLE = yes     # Enable encoder support
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
					OPT_DEFS += -DHAL_USE_I2C=TRUE
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
OLED_ENABLE = yes
 | 
					OLED_ENABLE = yes
 | 
				
			||||||
OLED_DRIVER = SSD1306
 | 
					 | 
				
			||||||
TAP_DANCE_ENABLE = yes
 | 
					TAP_DANCE_ENABLE = yes
 | 
				
			||||||
CONSOLE_ENABLE = yes
 | 
					CONSOLE_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
Some files were not shown because too many files have changed in this diff Show more
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue