drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[Core] Refactor OLED to allow easy addition of other types (#13454)

Browse source 
* add docs

* core changes

* update keyboards to new OLED

* updated users to new OLED

* update layouts to new OLED

* fixup docs

* drashna's suggestion

* fix up docs

* new keyboards with oled

* core split changes

* remaining keyboard files

* Fix The Helix keyboards oled options

* reflect develop

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
This commit is contained in:
Xelus22 2021-08-24 16:28:26 +10:00 • committed by GitHub
parent 6fd20acf4b
commit 4e1c5887c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
500 changed files with 1579 additions and 1387 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/merge/um70/keymaps/default/keymap.c
View file

@ -89,7 +89,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
void suspend_power_down_user(void) {
oled_off();
}

2
keyboards/merge/um70/keymaps/via/keymap.c
View file

@ -88,7 +88,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
void suspend_power_down_user(void) {
oled_off();
}

3
keyboards/merge/um70/rules.mk
View file

@ -22,4 +22,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
SPLIT_KEYBOARD = yes
OLED_DRIVER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306