summaryrefslogtreecommitdiff
path: root/keyboards/draculad
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/draculad
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/draculad')
-rw-r--r--keyboards/draculad/config.h4
-rw-r--r--keyboards/draculad/keymaps/default/keymap.c2
-rw-r--r--keyboards/draculad/keymaps/pimoroni/keymap.c2
-rw-r--r--keyboards/draculad/keymaps/pimoroni/rules.mk3
-rw-r--r--keyboards/draculad/rules.mk3
5 files changed, 8 insertions, 6 deletions
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index d8a9fbd37c..abcdc76b4b 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_SERIAL
#define SOFT_SERIAL_PIN D2
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
#define OLED_DISPLAY_128X64
#define OLED_TIMEOUT 30000
#endif
@@ -66,4 +66,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EE_HANDS
-#define LAYER_STATE_8BIT \ No newline at end of file
+#define LAYER_STATE_8BIT
diff --git a/keyboards/draculad/keymaps/default/keymap.c b/keyboards/draculad/keymaps/default/keymap.c
index d19aa66257..657ef2048d 100644
--- a/keyboards/draculad/keymaps/default/keymap.c
+++ b/keyboards/draculad/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
diff --git a/keyboards/draculad/keymaps/pimoroni/keymap.c b/keyboards/draculad/keymaps/pimoroni/keymap.c
index 9af6185768..c7b6cd35d5 100644
--- a/keyboards/draculad/keymaps/pimoroni/keymap.c
+++ b/keyboards/draculad/keymaps/pimoroni/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
diff --git a/keyboards/draculad/keymaps/pimoroni/rules.mk b/keyboards/draculad/keymaps/pimoroni/rules.mk
index d8dc92fbfc..704aad070a 100644
--- a/keyboards/draculad/keymaps/pimoroni/rules.mk
+++ b/keyboards/draculad/keymaps/pimoroni/rules.mk
@@ -2,5 +2,6 @@
POINTING_DEVICE_ENABLE = yes
SRC += drivers/sensors/pimoroni_trackball.c
QUANTUM_LIB_SRC += i2c_master.c
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
MOUSEKEY_ENABLE = no
diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk
index 2a5dd5f1f9..666657cfe5 100644
--- a/keyboards/draculad/rules.mk
+++ b/keyboards/draculad/rules.mk
@@ -21,7 +21,8 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
WPM_ENABLE = yes
ENCODER_ENABLE = yes
LTO_ENABLE = yes