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/snowe | |
| 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/snowe')
| -rw-r--r-- | users/snowe/oled_setup.c | 4 | ||||
| -rw-r--r-- | users/snowe/oled_setup.h | 4 | ||||
| -rw-r--r-- | users/snowe/readme_ocean_dream.md | 5 | ||||
| -rw-r--r-- | users/snowe/rules.mk | 2 | ||||
| -rw-r--r-- | users/snowe/snowe.h | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/users/snowe/oled_setup.c b/users/snowe/oled_setup.c index b3e04df45..3d21ea9f0 100644 --- a/users/snowe/oled_setup.c +++ b/users/snowe/oled_setup.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #ifdef OLED_DRIVER_ENABLE | 19 | #ifdef OLED_ENABLE |
| 20 | 20 | ||
| 21 | # include QMK_KEYBOARD_H | 21 | # include QMK_KEYBOARD_H |
| 22 | # include "quantum.h" | 22 | # include "quantum.h" |
| @@ -138,4 +138,4 @@ void oled_task_user(void) { | |||
| 138 | } | 138 | } |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | #endif // OLED_DRIVER_ENABLE | 141 | #endif // OLED_ENABLE |
diff --git a/users/snowe/oled_setup.h b/users/snowe/oled_setup.h index 031ce6bd0..7281dcd76 100644 --- a/users/snowe/oled_setup.h +++ b/users/snowe/oled_setup.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #include "quantum.h" | 20 | #include "quantum.h" |
| 21 | #ifdef OLED_DRIVER_ENABLE | 21 | #ifdef OLED_ENABLE |
| 22 | # include "oled_driver.h" | 22 | # include "oled_driver.h" |
| 23 | # define OLED_RENDER_WPM_COUNTER " WPM: " | 23 | # define OLED_RENDER_WPM_COUNTER " WPM: " |
| 24 | #endif | 24 | #endif |
| @@ -27,4 +27,4 @@ | |||
| 27 | #endif | 27 | #endif |
| 28 | #ifdef OCEAN_DREAM_ENABLE | 28 | #ifdef OCEAN_DREAM_ENABLE |
| 29 | # include "ocean_dream.h" | 29 | # include "ocean_dream.h" |
| 30 | #endif \ No newline at end of file | 30 | #endif |
diff --git a/users/snowe/readme_ocean_dream.md b/users/snowe/readme_ocean_dream.md index ca15dd47c..688afc899 100644 --- a/users/snowe/readme_ocean_dream.md +++ b/users/snowe/readme_ocean_dream.md | |||
| @@ -41,7 +41,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 41 | ``` | 41 | ``` |
| 42 | 4. In your `rules.mk` to make it easier to turn the animation on/off, add | 42 | 4. In your `rules.mk` to make it easier to turn the animation on/off, add |
| 43 | ```makefile | 43 | ```makefile |
| 44 | ifeq ($(strip $(OLED_DRIVER_ENABLE)), yes) | 44 | ifeq ($(strip $(OLED_ENABLE)), yes) |
| 45 | #... your code here... | 45 | #... your code here... |
| 46 | 46 | ||
| 47 | ifdef OCEAN_DREAM_ENABLE | 47 | ifdef OCEAN_DREAM_ENABLE |
| @@ -59,7 +59,8 @@ endif | |||
| 59 | 59 | ||
| 60 | You're done! Now you can enable **Ocean Dream** by simply turning on the OLED feature | 60 | You're done! Now you can enable **Ocean Dream** by simply turning on the OLED feature |
| 61 | ```makefile | 61 | ```makefile |
| 62 | OLED_DRIVER_ENABLE = yes | 62 | OLED_ENABLE = yes |
| 63 | OLED_DRIVER = SSD1306 | ||
| 63 | ``` | 64 | ``` |
| 64 | 65 | ||
| 65 | And if you want to disable it without turning off the OLED Driver you can simply set | 66 | And if you want to disable it without turning off the OLED Driver you can simply set |
diff --git a/users/snowe/rules.mk b/users/snowe/rules.mk index a6e152c1c..f188c9022 100644 --- a/users/snowe/rules.mk +++ b/users/snowe/rules.mk | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | 2 | ||
| 3 | ifeq ($(strip $(OLED_DRIVER_ENABLE)), yes) | 3 | ifeq ($(strip $(OLED_ENABLE)), yes) |
| 4 | SRC += oled_setup.c | 4 | SRC += oled_setup.c |
| 5 | 5 | ||
| 6 | ifdef OCEAN_DREAM_ENABLE | 6 | ifdef OCEAN_DREAM_ENABLE |
diff --git a/users/snowe/snowe.h b/users/snowe/snowe.h index 4453b2646..21764ca50 100644 --- a/users/snowe/snowe.h +++ b/users/snowe/snowe.h | |||
| @@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 35 | //#if defined(RGB_MATRIX_ENABLE) | 35 | //#if defined(RGB_MATRIX_ENABLE) |
| 36 | //# include "rgb_matrix_stuff.h" | 36 | //# include "rgb_matrix_stuff.h" |
| 37 | //#endif | 37 | //#endif |
| 38 | #ifdef OLED_DRIVER_ENABLE | 38 | #ifdef OLED_ENABLE |
| 39 | # include "oled_setup.h" | 39 | # include "oled_setup.h" |
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
