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/ristretto | |
| 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/ristretto')
| -rw-r--r-- | keyboards/ristretto/ristretto.c | 28 | ||||
| -rw-r--r-- | keyboards/ristretto/rules.mk | 3 |
2 files changed, 16 insertions, 15 deletions
diff --git a/keyboards/ristretto/ristretto.c b/keyboards/ristretto/ristretto.c index 1ea43bcee..a39c366b0 100644 --- a/keyboards/ristretto/ristretto.c +++ b/keyboards/ristretto/ristretto.c | |||
| @@ -1,17 +1,17 @@ | |||
| 1 | /* Copyright 2021 Brandon Lewis | 1 | /* Copyright 2021 Brandon Lewis |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 3 | * This program is free software: you can redistribute it and/or modify |
| 4 | * it under the terms of the GNU General Public License as published by | 4 | * it under the terms of the GNU General Public License as published by |
| 5 | * the Free Software Foundation, either version 2 of the License, or | 5 | * the Free Software Foundation, either version 2 of the License, or |
| 6 | * (at your option) any later version. | 6 | * (at your option) any later version. |
| 7 | * | 7 | * |
| 8 | * This program is distributed in the hope that it will be useful, | 8 | * This program is distributed in the hope that it will be useful, |
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 11 | * GNU General Public License for more details. | 11 | * GNU General Public License for more details. |
| 12 | * | 12 | * |
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "ristretto.h" | 17 | #include "ristretto.h" |
| @@ -35,7 +35,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { | |||
| 35 | return true; | 35 | return true; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | #ifdef OLED_DRIVER_ENABLE | 38 | #ifdef OLED_ENABLE |
| 39 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 39 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
| 40 | return OLED_ROTATION_270; | 40 | return OLED_ROTATION_270; |
| 41 | } | 41 | } |
diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk index a24dc0c54..0be0b414a 100644 --- a/keyboards/ristretto/rules.mk +++ b/keyboards/ristretto/rules.mk | |||
| @@ -21,5 +21,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | |||
| 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
| 23 | ENCODER_ENABLE = yes | 23 | ENCODER_ENABLE = yes |
| 24 | OLED_DRIVER_ENABLE = yes | 24 | OLED_ENABLE = yes |
| 25 | OLED_DRIVER = SSD1306 | ||
| 25 | WAIT_FOR_USB = yes | 26 | WAIT_FOR_USB = yes |
