aboutsummaryrefslogtreecommitdiff
path: root/keyboards/yampad
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/yampad
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/yampad')
-rw-r--r--keyboards/yampad/keymaps/default/keymap.c2
-rw-r--r--keyboards/yampad/keymaps/traditional/keymap.c4
-rw-r--r--keyboards/yampad/rules.mk3
-rw-r--r--keyboards/yampad/yampad.c6
4 files changed, 8 insertions, 7 deletions
diff --git a/keyboards/yampad/keymaps/default/keymap.c b/keyboards/yampad/keymaps/default/keymap.c
index dfecab17e..d22eb2617 100644
--- a/keyboards/yampad/keymaps/default/keymap.c
+++ b/keyboards/yampad/keymaps/default/keymap.c
@@ -116,7 +116,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
116 return true; 116 return true;
117}; 117};
118 118
119#ifdef OLED_DRIVER_ENABLE 119#ifdef OLED_ENABLE
120 120
121oled_rotation_t oled_init_user(oled_rotation_t rotation) { 121oled_rotation_t oled_init_user(oled_rotation_t rotation) {
122 return OLED_ROTATION_270; // flips the display 270 degrees 122 return OLED_ROTATION_270; // flips the display 270 degrees
diff --git a/keyboards/yampad/keymaps/traditional/keymap.c b/keyboards/yampad/keymaps/traditional/keymap.c
index e9fd2b8ae..57462c050 100644
--- a/keyboards/yampad/keymaps/traditional/keymap.c
+++ b/keyboards/yampad/keymaps/traditional/keymap.c
@@ -19,7 +19,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 19LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 20OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21SOFTWARE. 21SOFTWARE.
22*/ 22*/
23 23
24#include QMK_KEYBOARD_H 24#include QMK_KEYBOARD_H
25 25
@@ -116,7 +116,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
116 return true; 116 return true;
117}; 117};
118 118
119#ifdef OLED_DRIVER_ENABLE 119#ifdef OLED_ENABLE
120 120
121oled_rotation_t oled_init_user(oled_rotation_t rotation) { 121oled_rotation_t oled_init_user(oled_rotation_t rotation) {
122 return OLED_ROTATION_270; // flips the display 270 degrees 122 return OLED_ROTATION_270; // flips the display 270 degrees
diff --git a/keyboards/yampad/rules.mk b/keyboards/yampad/rules.mk
index 872fd4c72..f42be7ca5 100644
--- a/keyboards/yampad/rules.mk
+++ b/keyboards/yampad/rules.mk
@@ -20,5 +20,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth 21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output 22AUDIO_ENABLE = no # Audio output
23OLED_DRIVER_ENABLE = yes 23OLED_ENABLE = yes
24OLED_DRIVER = SSD1306
24DEBOUNCE_TYPE = sym_eager_pk 25DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c
index 764f48404..950a98721 100644
--- a/keyboards/yampad/yampad.c
+++ b/keyboards/yampad/yampad.c
@@ -1,4 +1,4 @@
1 1
2/* Copyright 2019 2/* Copyright 2019
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
@@ -16,13 +16,13 @@
16 */ 16 */
17#include "yampad.h" 17#include "yampad.h"
18 18
19#if defined(OLED_DRIVER_ENABLE) 19#if defined(OLED_ENABLE)
20__attribute__((weak)) 20__attribute__((weak))
21oled_rotation_t oled_init_user(oled_rotation_t rotation) { 21oled_rotation_t oled_init_user(oled_rotation_t rotation) {
22 return OLED_ROTATION_270; // flips the display 270 degrees 22 return OLED_ROTATION_270; // flips the display 270 degrees
23} 23}
24 24
25__attribute__((weak)) 25__attribute__((weak))
26void oled_task_user(void) { 26void oled_task_user(void) {
27 // Host Keyboard Layer Status 27 // Host Keyboard Layer Status
28 oled_write_P(PSTR("Layer"), false); 28 oled_write_P(PSTR("Layer"), false);