diff options
author | Xelus22 <17491233+Xelus22@users.noreply.github.com> | 2021-08-24 16:28:26 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-24 16:28:26 +1000 |
commit | 4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (patch) | |
tree | 24ff5bdf570a6a9f5a77a517005bffbb35e46b22 /keyboards/mechllama | |
parent | 6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff) | |
download | qmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.tar.gz qmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.zip |
[Core] Refactor OLED to allow easy addition of other types (#13454)
* 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>
Diffstat (limited to 'keyboards/mechllama')
-rw-r--r-- | keyboards/mechllama/g35/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/mechllama/g35/rules.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keyboards/mechllama/g35/keymaps/default/keymap.c b/keyboards/mechllama/g35/keymaps/default/keymap.c index 4b7bf7651..814f6fdcd 100644 --- a/keyboards/mechllama/g35/keymaps/default/keymap.c +++ b/keyboards/mechllama/g35/keymaps/default/keymap.c | |||
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
51 | ), | 51 | ), |
52 | }; | 52 | }; |
53 | 53 | ||
54 | #if defined(OLED_DRIVER_ENABLE) | 54 | #if defined(OLED_ENABLE) |
55 | const char* get_layer_name(uint8_t layer) { | 55 | const char* get_layer_name(uint8_t layer) { |
56 | switch (layer) { | 56 | switch (layer) { |
57 | case _BASE: | 57 | case _BASE: |
diff --git a/keyboards/mechllama/g35/rules.mk b/keyboards/mechllama/g35/rules.mk index 20fbf160a..b844eb90c 100644 --- a/keyboards/mechllama/g35/rules.mk +++ b/keyboards/mechllama/g35/rules.mk | |||
@@ -12,7 +12,8 @@ MCU = atmega32u4 | |||
12 | BOOTLOADER = atmel-dfu | 12 | BOOTLOADER = atmel-dfu |
13 | 13 | ||
14 | NKRO_ENABLE = yes | 14 | NKRO_ENABLE = yes |
15 | OLED_DRIVER_ENABLE = yes | 15 | OLED_ENABLE = yes |
16 | OLED_DRIVER = SSD1306 | ||
16 | RGBLIGHT_ENABLE = yes | 17 | RGBLIGHT_ENABLE = yes |
17 | 18 | ||
18 | DEFAULT_FOLDER = mechllama/g35/v2 | 19 | DEFAULT_FOLDER = mechllama/g35/v2 |