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/palette1202 | |
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/palette1202')
-rw-r--r-- | keyboards/palette1202/config.h | 2 | ||||
-rw-r--r-- | keyboards/palette1202/keymaps/default/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/palette1202/keymaps/key-check/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/palette1202/lib/oled_helper.c | 2 | ||||
-rw-r--r-- | keyboards/palette1202/lib/oled_helper.h | 6 | ||||
-rw-r--r-- | keyboards/palette1202/palette1202.c | 3 | ||||
-rw-r--r-- | keyboards/palette1202/rules.mk | 3 |
7 files changed, 14 insertions, 14 deletions
diff --git a/keyboards/palette1202/config.h b/keyboards/palette1202/config.h index 411e5f916..e0be3bd6c 100644 --- a/keyboards/palette1202/config.h +++ b/keyboards/palette1202/config.h | |||
@@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
48 | #define DEBOUNCE 5 | 48 | #define DEBOUNCE 5 |
49 | 49 | ||
50 | /* Register custom font file */ | 50 | /* Register custom font file */ |
51 | #ifdef OLED_DRIVER_ENABLE | 51 | #ifdef OLED_ENABLE |
52 | #define OLED_FONT_H "lib/glcdfont.c" | 52 | #define OLED_FONT_H "lib/glcdfont.c" |
53 | #endif | 53 | #endif |
54 | 54 | ||
diff --git a/keyboards/palette1202/keymaps/default/keymap.c b/keyboards/palette1202/keymaps/default/keymap.c index b55b39a40..fb28dedbe 100644 --- a/keyboards/palette1202/keymaps/default/keymap.c +++ b/keyboards/palette1202/keymaps/default/keymap.c | |||
@@ -14,7 +14,7 @@ | |||
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 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
17 | #ifdef OLED_DRIVER_ENABLE | 17 | #ifdef OLED_ENABLE |
18 | #include <string.h> | 18 | #include <string.h> |
19 | #include "lib/oled_helper.h" | 19 | #include "lib/oled_helper.h" |
20 | #endif | 20 | #endif |
@@ -273,7 +273,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
273 | } | 273 | } |
274 | 274 | ||
275 | // OLED Display | 275 | // OLED Display |
276 | #ifdef OLED_DRIVER_ENABLE | 276 | #ifdef OLED_ENABLE |
277 | void oled_task_user(void) { | 277 | void oled_task_user(void) { |
278 | // get layer Number | 278 | // get layer Number |
279 | uint8_t currentDefault = get_highest_layer(default_layer_state); | 279 | uint8_t currentDefault = get_highest_layer(default_layer_state); |
@@ -327,4 +327,4 @@ void oled_task_user(void) { | |||
327 | render_row(3, " "); | 327 | render_row(3, " "); |
328 | } | 328 | } |
329 | } | 329 | } |
330 | #endif // #ifdef OLED_DRIVER_ENABLE | 330 | #endif // #ifdef OLED_ENABLE |
diff --git a/keyboards/palette1202/keymaps/key-check/keymap.c b/keyboards/palette1202/keymaps/key-check/keymap.c index 207cf1c2b..6291b5f8a 100644 --- a/keyboards/palette1202/keymaps/key-check/keymap.c +++ b/keyboards/palette1202/keymaps/key-check/keymap.c | |||
@@ -14,7 +14,7 @@ | |||
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 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
17 | #ifdef OLED_DRIVER_ENABLE | 17 | #ifdef OLED_ENABLE |
18 | #include <string.h> | 18 | #include <string.h> |
19 | #include "lib/oled_helper.h" | 19 | #include "lib/oled_helper.h" |
20 | #endif | 20 | #endif |
@@ -141,11 +141,11 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
141 | } | 141 | } |
142 | 142 | ||
143 | // OLED Display | 143 | // OLED Display |
144 | #ifdef OLED_DRIVER_ENABLE | 144 | #ifdef OLED_ENABLE |
145 | void oled_task_user(void) { | 145 | void oled_task_user(void) { |
146 | render_row(0, "TEST"); | 146 | render_row(0, "TEST"); |
147 | render_row(1, "test"); | 147 | render_row(1, "test"); |
148 | render_row(2, "TEST"); | 148 | render_row(2, "TEST"); |
149 | render_row(3, "test"); | 149 | render_row(3, "test"); |
150 | } | 150 | } |
151 | #endif // #ifdef OLED_DRIVER_ENABLE | 151 | #endif // #ifdef OLED_ENABLE |
diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c index d4a0b2eb5..5fb3cc753 100644 --- a/keyboards/palette1202/lib/oled_helper.c +++ b/keyboards/palette1202/lib/oled_helper.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifdef OLED_DRIVER_ENABLE | 1 | #ifdef OLED_ENABLE |
2 | #include QMK_KEYBOARD_H | 2 | #include QMK_KEYBOARD_H |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <string.h> | 4 | #include <string.h> |
diff --git a/keyboards/palette1202/lib/oled_helper.h b/keyboards/palette1202/lib/oled_helper.h index 0d1dde461..c844264c3 100644 --- a/keyboards/palette1202/lib/oled_helper.h +++ b/keyboards/palette1202/lib/oled_helper.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | #ifdef OLED_DRIVER_ENABLE | 2 | #ifdef OLED_ENABLE |
3 | 3 | ||
4 | void render_row(int row, const char* status); | 4 | void render_row(int row, const char* status); |
5 | 5 | ||
6 | #endif /* #ifdef OLED_DRIVER_ENABLE */ | 6 | #endif /* #ifdef OLED_ENABLE */ |
7 | 7 | ||
diff --git a/keyboards/palette1202/palette1202.c b/keyboards/palette1202/palette1202.c index 74ce08319..be7fd6443 100644 --- a/keyboards/palette1202/palette1202.c +++ b/keyboards/palette1202/palette1202.c | |||
@@ -16,9 +16,8 @@ | |||
16 | #include "palette1202.h" | 16 | #include "palette1202.h" |
17 | 17 | ||
18 | // initialize OLED if OLED is enabled | 18 | // initialize OLED if OLED is enabled |
19 | #ifdef OLED_DRIVER_ENABLE | 19 | #ifdef OLED_ENABLE |
20 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 20 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
21 | return OLED_ROTATION_180; | 21 | return OLED_ROTATION_180; |
22 | } | 22 | } |
23 | #endif | 23 | #endif |
24 | \ No newline at end of file | ||
diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk index fc4729194..ddf248a07 100644 --- a/keyboards/palette1202/rules.mk +++ b/keyboards/palette1202/rules.mk | |||
@@ -28,7 +28,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | |||
28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
29 | AUDIO_ENABLE = no # Audio output on port C6 | 29 | AUDIO_ENABLE = no # Audio output on port C6 |
30 | ENCODER_ENABLE = yes # Enable support for rotary encoders | 30 | ENCODER_ENABLE = yes # Enable support for rotary encoders |
31 | OLED_DRIVER_ENABLE = yes # Enable support for OLED display | 31 | OLED_ENABLE = yes |
32 | OLED_DRIVER = SSD1306 # Enable support for OLED display | ||
32 | 33 | ||
33 | # Additional code | 34 | # Additional code |
34 | SRC += lib/oled_helper.c # Adding OLED | 35 | SRC += lib/oled_helper.c # Adding OLED |