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 /users/tominabox1 | |
| 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 'users/tominabox1')
| -rw-r--r-- | users/tominabox1/rules.mk | 3 | ||||
| -rw-r--r-- | users/tominabox1/tominabox1.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/users/tominabox1/rules.mk b/users/tominabox1/rules.mk index a7759f802..160dcce7b 100644 --- a/users/tominabox1/rules.mk +++ b/users/tominabox1/rules.mk | |||
| @@ -11,7 +11,8 @@ ifeq ($(strip $(KEYBOARD)), crkbd/rev1) | |||
| 11 | RGB_MATRIX_ENABLE = yes | 11 | RGB_MATRIX_ENABLE = yes |
| 12 | EXTRAFLAGS += -flto | 12 | EXTRAFLAGS += -flto |
| 13 | BOOTLOADER = qmk-dfu | 13 | BOOTLOADER = qmk-dfu |
| 14 | OLED_DRIVER_ENABLE = yes | 14 | OLED_ENABLE = yes |
| 15 | OLED_DRIVER = SSD1306 | ||
| 15 | endif | 16 | endif |
| 16 | 17 | ||
| 17 | ifeq ($(strip $(KEYBOARD)), lazydesigners/dimple) | 18 | ifeq ($(strip $(KEYBOARD)), lazydesigners/dimple) |
diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c index 34fe3068a..e48959be9 100644 --- a/users/tominabox1/tominabox1.c +++ b/users/tominabox1/tominabox1.c | |||
| @@ -172,10 +172,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 172 | #endif | 172 | #endif |
| 173 | 173 | ||
| 174 | if (record->event.pressed) { | 174 | if (record->event.pressed) { |
| 175 | #ifdef OLED_DRIVER_ENABLE | 175 | #ifdef OLED_ENABLE |
| 176 | oled_timer = timer_read(); | 176 | oled_timer = timer_read(); |
| 177 | oled_on(); | 177 | oled_on(); |
| 178 | #endif // OLED_DRIVER_ENABLE | 178 | #endif // OLED_ENABLE |
| 179 | switch (keycode) { | 179 | switch (keycode) { |
| 180 | case KC_BBB: | 180 | case KC_BBB: |
| 181 | if (record->event.pressed) { | 181 | if (record->event.pressed) { |
| @@ -193,7 +193,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 193 | 193 | ||
| 194 | } | 194 | } |
| 195 | #ifdef KEYBOARD_crkbd_rev1 | 195 | #ifdef KEYBOARD_crkbd_rev1 |
| 196 | #ifdef OLED_DRIVER_ENABLE | 196 | #ifdef OLED_ENABLE |
| 197 | void render_logo(void) { | 197 | void render_logo(void) { |
| 198 | static const char PROGMEM logo[] = { | 198 | static const char PROGMEM logo[] = { |
| 199 | 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, | 199 | 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, |
