aboutsummaryrefslogtreecommitdiff
path: root/keyboards/sofle
diff options
context:
space:
mode:
authorXelus22 <17491233+Xelus22@users.noreply.github.com>2021-08-24 16:28:26 +1000
committerGitHub <noreply@github.com>2021-08-24 16:28:26 +1000
commit4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (patch)
tree24ff5bdf570a6a9f5a77a517005bffbb35e46b22 /keyboards/sofle
parent6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff)
downloadqmk_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/sofle')
-rw-r--r--keyboards/sofle/keymaps/default/keymap.c2
-rw-r--r--keyboards/sofle/keymaps/default/rules.mk3
-rw-r--r--keyboards/sofle/keymaps/devdev/keymap.c2
-rw-r--r--keyboards/sofle/keymaps/devdev/rules.mk3
-rw-r--r--keyboards/sofle/keymaps/helltm/keymap.c2
-rw-r--r--keyboards/sofle/keymaps/helltm/rules.mk3
-rw-r--r--keyboards/sofle/keymaps/killmaster/keymap.c4
-rw-r--r--keyboards/sofle/keymaps/rgb_default/keymap.c2
-rw-r--r--keyboards/sofle/keymaps/rgb_default/rules.mk3
-rw-r--r--keyboards/sofle/keymaps/via/oled.c32
-rw-r--r--keyboards/sofle/keymaps/via/rules.mk5
-rw-r--r--keyboards/sofle/rev1/rules.mk3
12 files changed, 35 insertions, 29 deletions
diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c
index 2360a45d4..a64d274b5 100644
--- a/keyboards/sofle/keymaps/default/keymap.c
+++ b/keyboards/sofle/keymaps/default/keymap.c
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
135 ) 135 )
136}; 136};
137 137
138#ifdef OLED_DRIVER_ENABLE 138#ifdef OLED_ENABLE
139 139
140static void render_logo(void) { 140static void render_logo(void) {
141 static const char PROGMEM qmk_logo[] = { 141 static const char PROGMEM qmk_logo[] = {
diff --git a/keyboards/sofle/keymaps/default/rules.mk b/keyboards/sofle/keymaps/default/rules.mk
index 6da1df16f..e87a55ede 100644
--- a/keyboards/sofle/keymaps/default/rules.mk
+++ b/keyboards/sofle/keymaps/default/rules.mk
@@ -1,5 +1,6 @@
1 1
2OLED_DRIVER_ENABLE = yes 2OLED_ENABLE = yes
3OLED_DRIVER = SSD1306
3ENCODER_ENABLE = yes 4ENCODER_ENABLE = yes
4CONSOLE_ENABLE = yes 5CONSOLE_ENABLE = yes
5EXTRAKEY_ENABLE = yes 6EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/devdev/keymap.c b/keyboards/sofle/keymaps/devdev/keymap.c
index 681e7dd6a..a0945b28f 100644
--- a/keyboards/sofle/keymaps/devdev/keymap.c
+++ b/keyboards/sofle/keymaps/devdev/keymap.c
@@ -393,7 +393,7 @@ void keyboard_post_init_user(void) {
393} 393}
394#endif 394#endif
395 395
396#ifdef OLED_DRIVER_ENABLE 396#ifdef OLED_ENABLE
397 397
398static void render_logo(void) { 398static void render_logo(void) {
399 static const char PROGMEM qmk_logo[] = { 399 static const char PROGMEM qmk_logo[] = {
diff --git a/keyboards/sofle/keymaps/devdev/rules.mk b/keyboards/sofle/keymaps/devdev/rules.mk
index 3dffb0368..92a293196 100644
--- a/keyboards/sofle/keymaps/devdev/rules.mk
+++ b/keyboards/sofle/keymaps/devdev/rules.mk
@@ -4,4 +4,5 @@ CONSOLE_ENABLE = yes
4RGBLIGHT_ENABLE = yes 4RGBLIGHT_ENABLE = yes
5ENCODER_ENABLE = yes 5ENCODER_ENABLE = yes
6LTO_ENABLE = yes 6LTO_ENABLE = yes
7OLED_DRIVER_ENABLE = yes 7OLED_ENABLE = yes
8OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/helltm/keymap.c b/keyboards/sofle/keymaps/helltm/keymap.c
index 507b9e6d7..3e1bcc82e 100644
--- a/keyboards/sofle/keymaps/helltm/keymap.c
+++ b/keyboards/sofle/keymaps/helltm/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
157}; 157};
158// clang-format on 158// clang-format on
159 159
160#ifdef OLED_DRIVER_ENABLE 160#ifdef OLED_ENABLE
161 161
162/* 32 * 32 logo */ 162/* 32 * 32 logo */
163static void render_logo(void) { 163static void render_logo(void) {
diff --git a/keyboards/sofle/keymaps/helltm/rules.mk b/keyboards/sofle/keymaps/helltm/rules.mk
index 9601ec40b..b905bd94f 100644
--- a/keyboards/sofle/keymaps/helltm/rules.mk
+++ b/keyboards/sofle/keymaps/helltm/rules.mk
@@ -1,4 +1,5 @@
1OLED_DRIVER_ENABLE = yes 1OLED_ENABLE = yes
2OLED_DRIVER = SSD1306
2ENCODER_ENABLE = yes 3ENCODER_ENABLE = yes
3CONSOLE_ENABLE = yes 4CONSOLE_ENABLE = yes
4EXTRAKEY_ENABLE = yes 5EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/killmaster/keymap.c b/keyboards/sofle/keymaps/killmaster/keymap.c
index 950dee36b..34c07f3c4 100644
--- a/keyboards/sofle/keymaps/killmaster/keymap.c
+++ b/keyboards/sofle/keymaps/killmaster/keymap.c
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
127 ) 127 )
128}; 128};
129 129
130#ifdef OLED_DRIVER_ENABLE 130#ifdef OLED_ENABLE
131 131
132static void render_logo(void) { 132static void render_logo(void) {
133 static const char PROGMEM bananas_logo[] = { 133 static const char PROGMEM bananas_logo[] = {
@@ -221,7 +221,7 @@ void oled_task_user(void) {
221 221
222 222
223 223
224#endif // OLED_DRIVER_ENABLE 224#endif // OLED_ENABLE
225 225
226bool process_record_user(uint16_t keycode, keyrecord_t *record) { 226bool process_record_user(uint16_t keycode, keyrecord_t *record) {
227 switch (keycode) { 227 switch (keycode) {
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index bd0993c99..13edbc520 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -393,7 +393,7 @@ void keyboard_post_init_user(void) {
393} 393}
394#endif 394#endif
395 395
396#ifdef OLED_DRIVER_ENABLE 396#ifdef OLED_ENABLE
397 397
398static void render_logo(void) { 398static void render_logo(void) {
399 static const char PROGMEM qmk_logo[] = { 399 static const char PROGMEM qmk_logo[] = {
diff --git a/keyboards/sofle/keymaps/rgb_default/rules.mk b/keyboards/sofle/keymaps/rgb_default/rules.mk
index 3dffb0368..92a293196 100644
--- a/keyboards/sofle/keymaps/rgb_default/rules.mk
+++ b/keyboards/sofle/keymaps/rgb_default/rules.mk
@@ -4,4 +4,5 @@ CONSOLE_ENABLE = yes
4RGBLIGHT_ENABLE = yes 4RGBLIGHT_ENABLE = yes
5ENCODER_ENABLE = yes 5ENCODER_ENABLE = yes
6LTO_ENABLE = yes 6LTO_ENABLE = yes
7OLED_DRIVER_ENABLE = yes 7OLED_ENABLE = yes
8OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/via/oled.c b/keyboards/sofle/keymaps/via/oled.c
index 06839da17..8a230f000 100644
--- a/keyboards/sofle/keymaps/via/oled.c
+++ b/keyboards/sofle/keymaps/via/oled.c
@@ -1,23 +1,23 @@
1 /* Copyright 2020 Josef Adamcik 1 /* Copyright 2020 Josef Adamcik
2 * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang 2 * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or 6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18//Sets up what the OLED screens display. 18//Sets up what the OLED screens display.
19 19
20#ifdef OLED_DRIVER_ENABLE 20#ifdef OLED_ENABLE
21 21
22static void render_logo(void) { 22static void render_logo(void) {
23 static const char PROGMEM qmk_logo[] = { 23 static const char PROGMEM qmk_logo[] = {
@@ -81,4 +81,4 @@ void oled_task_user(void) {
81 } 81 }
82} 82}
83 83
84#endif \ No newline at end of file 84#endif
diff --git a/keyboards/sofle/keymaps/via/rules.mk b/keyboards/sofle/keymaps/via/rules.mk
index f482499d4..db254512a 100644
--- a/keyboards/sofle/keymaps/via/rules.mk
+++ b/keyboards/sofle/keymaps/via/rules.mk
@@ -1,7 +1,8 @@
1OLED_DRIVER_ENABLE = yes 1OLED_ENABLE = yes
2OLED_DRIVER = SSD1306
2ENCODER_ENABLE = yes 3ENCODER_ENABLE = yes
3CONSOLE_ENABLE = no 4CONSOLE_ENABLE = no
4EXTRAKEY_ENABLE = yes 5EXTRAKEY_ENABLE = yes
5VIA_ENABLE = yes 6VIA_ENABLE = yes
6LTO_ENABLE = yes 7LTO_ENABLE = yes
7RGBLIGHT_ENABLE = yes \ No newline at end of file 8RGBLIGHT_ENABLE = yes
diff --git a/keyboards/sofle/rev1/rules.mk b/keyboards/sofle/rev1/rules.mk
index 2ba231d86..46ec39ee4 100644
--- a/keyboards/sofle/rev1/rules.mk
+++ b/keyboards/sofle/rev1/rules.mk
@@ -1,2 +1,3 @@
1ENCODER_ENABLE = yes 1ENCODER_ENABLE = yes
2OLED_DRIVER_ENABLE = yes 2OLED_ENABLE = yes
3OLED_DRIVER = SSD1306