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/aeboards | |
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/aeboards')
-rw-r--r-- | keyboards/aeboards/ext65/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/aeboards/ext65/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/aeboards/ext65/keymaps/via/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/aeboards/ext65/rev2/rev2.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/keyboards/aeboards/ext65/keymaps/default/keymap.c b/keyboards/aeboards/ext65/keymaps/default/keymap.c index af7537925..466b34539 100644 --- a/keyboards/aeboards/ext65/keymaps/default/keymap.c +++ b/keyboards/aeboards/ext65/keymaps/default/keymap.c | |||
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
62 | ) | 62 | ) |
63 | }; | 63 | }; |
64 | 64 | ||
65 | #ifdef OLED_DRIVER_ENABLE | 65 | #ifdef OLED_ENABLE |
66 | 66 | ||
67 | void render_layer_state(void) { | 67 | void render_layer_state(void) { |
68 | oled_write_ln(PSTR("LAYER"), false); | 68 | oled_write_ln(PSTR("LAYER"), false); |
diff --git a/keyboards/aeboards/ext65/keymaps/via/keymap.c b/keyboards/aeboards/ext65/keymaps/via/keymap.c index af7537925..466b34539 100644 --- a/keyboards/aeboards/ext65/keymaps/via/keymap.c +++ b/keyboards/aeboards/ext65/keymaps/via/keymap.c | |||
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
62 | ) | 62 | ) |
63 | }; | 63 | }; |
64 | 64 | ||
65 | #ifdef OLED_DRIVER_ENABLE | 65 | #ifdef OLED_ENABLE |
66 | 66 | ||
67 | void render_layer_state(void) { | 67 | void render_layer_state(void) { |
68 | oled_write_ln(PSTR("LAYER"), false); | 68 | oled_write_ln(PSTR("LAYER"), false); |
diff --git a/keyboards/aeboards/ext65/keymaps/via/rules.mk b/keyboards/aeboards/ext65/keymaps/via/rules.mk index 1e5b99807..e9a8bec87 100644 --- a/keyboards/aeboards/ext65/keymaps/via/rules.mk +++ b/keyboards/aeboards/ext65/keymaps/via/rules.mk | |||
@@ -1 +1,3 @@ | |||
1 | VIA_ENABLE = yes | 1 | VIA_ENABLE = yes |
2 | OLED_ENABLE = yes | ||
3 | # OLED_DRIVER = not a real thing | ||
diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c index 5d7658101..ce16eb4c4 100644 --- a/keyboards/aeboards/ext65/rev2/rev2.c +++ b/keyboards/aeboards/ext65/rev2/rev2.c | |||
@@ -3,7 +3,7 @@ | |||
3 | // Tested and verified working on ext65rev2 | 3 | // Tested and verified working on ext65rev2 |
4 | void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); } | 4 | void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); } |
5 | 5 | ||
6 | #ifdef OLED_DRIVER_ENABLE | 6 | #ifdef OLED_ENABLE |
7 | void board_init(void) { | 7 | void board_init(void) { |
8 | SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; | 8 | SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; |
9 | SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP); | 9 | SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP); |