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/basekeys/slice/rev1_rgb | |
| 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/basekeys/slice/rev1_rgb')
| -rw-r--r-- | keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/basekeys/slice/rev1_rgb/rules.mk | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c index 36bfb79ab..55d914cbc 100644 --- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c +++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c | |||
| @@ -187,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 187 | return result; | 187 | return result; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | #ifdef OLED_DRIVER_ENABLE | 190 | #ifdef OLED_ENABLE |
| 191 | 191 | ||
| 192 | const char *read_logo(void) { | 192 | const char *read_logo(void) { |
| 193 | static char logo[] = { | 193 | static char logo[] = { |
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c index 5670f275e..d0893ae86 100644 --- a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c +++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c | |||
| @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 84 | ) | 84 | ) |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | #ifdef OLED_DRIVER_ENABLE | 87 | #ifdef OLED_ENABLE |
| 88 | 88 | ||
| 89 | static void render_qmk_logo(void) { | 89 | static void render_qmk_logo(void) { |
| 90 | static const char PROGMEM qmk_logo[] = { | 90 | static const char PROGMEM qmk_logo[] = { |
diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk index b49c6e7a9..2b8982384 100644 --- a/keyboards/basekeys/slice/rev1_rgb/rules.mk +++ b/keyboards/basekeys/slice/rev1_rgb/rules.mk | |||
| @@ -27,7 +27,8 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 27 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 27 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 28 | NKRO_ENABLE = no # USB Nkey Rollover | 28 | NKRO_ENABLE = no # USB Nkey Rollover |
| 29 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 29 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 30 | OLED_DRIVER_ENABLE = yes # Disable OLED driver. | 30 | OLED_ENABLE = yes |
| 31 | OLED_DRIVER = SSD1306 # Disable OLED driver. | ||
| 31 | UNICODE_ENABLE = no # Unicode | 32 | UNICODE_ENABLE = no # Unicode |
| 32 | 33 | ||
| 33 | LTO_ENABLE = yes \ No newline at end of file | 34 | LTO_ENABLE = yes |
