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/tkc | |
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/tkc')
-rw-r--r-- | keyboards/tkc/m0lly/keymaps/default/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/tkc/m0lly/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/tkc/m0lly/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/tkc/tkc1800/keymaps/default/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/tkc/tkc1800/keymaps/smt/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/tkc/tkc1800/keymaps/via/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/tkc/tkc1800/keymaps/wkl/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/tkc/tkc1800/rules.mk | 3 |
10 files changed, 21 insertions, 19 deletions
diff --git a/keyboards/tkc/m0lly/keymaps/default/keymap.c b/keyboards/tkc/m0lly/keymaps/default/keymap.c index 03f07aff4..846429674 100644 --- a/keyboards/tkc/m0lly/keymaps/default/keymap.c +++ b/keyboards/tkc/m0lly/keymaps/default/keymap.c | |||
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
67 | ) | 67 | ) |
68 | }; | 68 | }; |
69 | 69 | ||
70 | #ifdef OLED_DRIVER_ENABLE | 70 | #ifdef OLED_ENABLE |
71 | void oled_task_user(void) { | 71 | void oled_task_user(void) { |
72 | oled_write_P(PSTR("M0lly\n"),false); | 72 | oled_write_P(PSTR("M0lly\n"),false); |
73 | 73 | ||
@@ -92,4 +92,4 @@ void oled_task_user(void) { | |||
92 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 92 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
93 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 93 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
94 | } | 94 | } |
95 | #endif \ No newline at end of file | 95 | #endif |
diff --git a/keyboards/tkc/m0lly/keymaps/via/keymap.c b/keyboards/tkc/m0lly/keymaps/via/keymap.c index 4dd35169d..333e29f4e 100644 --- a/keyboards/tkc/m0lly/keymaps/via/keymap.c +++ b/keyboards/tkc/m0lly/keymaps/via/keymap.c | |||
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
85 | ) | 85 | ) |
86 | }; | 86 | }; |
87 | 87 | ||
88 | #ifdef OLED_DRIVER_ENABLE | 88 | #ifdef OLED_ENABLE |
89 | void oled_task_user(void) { | 89 | void oled_task_user(void) { |
90 | oled_write_P(PSTR("M0lly\n"),false); | 90 | oled_write_P(PSTR("M0lly\n"),false); |
91 | 91 | ||
diff --git a/keyboards/tkc/m0lly/rules.mk b/keyboards/tkc/m0lly/rules.mk index 4cfa4e424..66cfdcc51 100644 --- a/keyboards/tkc/m0lly/rules.mk +++ b/keyboards/tkc/m0lly/rules.mk | |||
@@ -20,4 +20,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | |||
20 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = yes # 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 | OLED_DRIVER_ENABLE = yes | 23 | OLED_ENABLE = yes |
24 | OLED_DRIVER = SSD1306 | ||
diff --git a/keyboards/tkc/tkc1800/keymaps/default/keymap.c b/keyboards/tkc/tkc1800/keymaps/default/keymap.c index 4f4c7f8e9..762d5c4ed 100644 --- a/keyboards/tkc/tkc1800/keymaps/default/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/default/keymap.c | |||
@@ -13,7 +13,7 @@ | |||
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 QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | //Layers | 19 | //Layers |
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
79 | }; | 79 | }; |
80 | 80 | ||
81 | 81 | ||
82 | #ifdef OLED_DRIVER_ENABLE | 82 | #ifdef OLED_ENABLE |
83 | void oled_task_user(void) { | 83 | void oled_task_user(void) { |
84 | oled_write_P(PSTR("TKC1800\n"),false); | 84 | oled_write_P(PSTR("TKC1800\n"),false); |
85 | // Host Keyboard Layer Status | 85 | // Host Keyboard Layer Status |
@@ -103,4 +103,4 @@ void oled_task_user(void) { | |||
103 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 103 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
104 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 104 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
105 | } | 105 | } |
106 | #endif \ No newline at end of file | 106 | #endif |
diff --git a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c index 9b6ad80d3..dd552cee8 100644 --- a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c | |||
@@ -144,7 +144,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
144 | return true; | 144 | return true; |
145 | } | 145 | } |
146 | 146 | ||
147 | #ifdef OLED_DRIVER_ENABLE | 147 | #ifdef OLED_ENABLE |
148 | void oled_task_user(void) { | 148 | void oled_task_user(void) { |
149 | oled_write_P(PSTR("TKC1800\n"),false); | 149 | oled_write_P(PSTR("TKC1800\n"),false); |
150 | // Host Keyboard Layer Status | 150 | // Host Keyboard Layer Status |
@@ -174,4 +174,4 @@ void oled_task_user(void) { | |||
174 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 174 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
175 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 175 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
176 | } | 176 | } |
177 | #endif \ No newline at end of file | 177 | #endif |
diff --git a/keyboards/tkc/tkc1800/keymaps/via/keymap.c b/keyboards/tkc/tkc1800/keymaps/via/keymap.c index 55c2874c6..d05a1d420 100644 --- a/keyboards/tkc/tkc1800/keymaps/via/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/via/keymap.c | |||
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
97 | ), | 97 | ), |
98 | }; | 98 | }; |
99 | 99 | ||
100 | #ifdef OLED_DRIVER_ENABLE | 100 | #ifdef OLED_ENABLE |
101 | void oled_task_user(void) { | 101 | void oled_task_user(void) { |
102 | oled_write_P(PSTR("TKC1800\n"),false); | 102 | oled_write_P(PSTR("TKC1800\n"),false); |
103 | // Host Keyboard Layer Status | 103 | // Host Keyboard Layer Status |
@@ -127,4 +127,4 @@ void oled_task_user(void) { | |||
127 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 127 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
128 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 128 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
129 | } | 129 | } |
130 | #endif \ No newline at end of file | 130 | #endif |
diff --git a/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c index 3c65b61d1..da8e8b932 100644 --- a/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c | |||
@@ -13,7 +13,7 @@ | |||
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 QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | //Layers | 19 | //Layers |
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
61 | ), | 61 | ), |
62 | }; | 62 | }; |
63 | 63 | ||
64 | #ifdef OLED_DRIVER_ENABLE | 64 | #ifdef OLED_ENABLE |
65 | void oled_task_user(void) { | 65 | void oled_task_user(void) { |
66 | oled_write_P(PSTR("TKC1800\n"),false); | 66 | oled_write_P(PSTR("TKC1800\n"),false); |
67 | // Host Keyboard Layer Status | 67 | // Host Keyboard Layer Status |
@@ -85,4 +85,4 @@ void oled_task_user(void) { | |||
85 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 85 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
86 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 86 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
87 | } | 87 | } |
88 | #endif \ No newline at end of file | 88 | #endif |
diff --git a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c index bbffc2d20..cee80a48c 100644 --- a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c | |||
@@ -13,7 +13,7 @@ | |||
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 QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | //Layers | 19 | //Layers |
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
61 | ), | 61 | ), |
62 | }; | 62 | }; |
63 | 63 | ||
64 | #ifdef OLED_DRIVER_ENABLE | 64 | #ifdef OLED_ENABLE |
65 | void oled_task_user(void) { | 65 | void oled_task_user(void) { |
66 | oled_write_P(PSTR("TKC1800\n"),false); | 66 | oled_write_P(PSTR("TKC1800\n"),false); |
67 | // Host Keyboard Layer Status | 67 | // Host Keyboard Layer Status |
@@ -85,4 +85,4 @@ void oled_task_user(void) { | |||
85 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 85 | oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
86 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 86 | oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
87 | } | 87 | } |
88 | #endif \ No newline at end of file | 88 | #endif |
diff --git a/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk b/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk index b595964f7..517f469b6 100644 --- a/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk +++ b/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk | |||
@@ -1 +1 @@ | |||
OLED_DRIVER_ENABLE = no | OLED_ENABLE = no | ||
diff --git a/keyboards/tkc/tkc1800/rules.mk b/keyboards/tkc/tkc1800/rules.mk index a81223745..7f169d51a 100644 --- a/keyboards/tkc/tkc1800/rules.mk +++ b/keyboards/tkc/tkc1800/rules.mk | |||
@@ -29,4 +29,5 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this w | |||
29 | UNICODE_ENABLE = no # Unicode | 29 | UNICODE_ENABLE = no # Unicode |
30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
31 | AUDIO_ENABLE = no # Audio output on port C6 | 31 | AUDIO_ENABLE = no # Audio output on port C6 |
32 | OLED_DRIVER_ENABLE = yes \ No newline at end of file | 32 | OLED_ENABLE = yes |
33 | OLED_DRIVER = SSD1306 | ||