summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/um70/keymaps/default/keymap.c2
-rw-r--r--keyboards/merge/um70/keymaps/via/keymap.c2
-rw-r--r--keyboards/merge/um70/rules.mk3
3 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/merge/um70/keymaps/default/keymap.c b/keyboards/merge/um70/keymaps/default/keymap.c
index d16e737b4e..0a775929d0 100644
--- a/keyboards/merge/um70/keymaps/default/keymap.c
+++ b/keyboards/merge/um70/keymaps/default/keymap.c
@@ -89,7 +89,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void suspend_power_down_user(void) {
oled_off();
}
diff --git a/keyboards/merge/um70/keymaps/via/keymap.c b/keyboards/merge/um70/keymaps/via/keymap.c
index 17cb2895cb..aaf682ffd1 100644
--- a/keyboards/merge/um70/keymaps/via/keymap.c
+++ b/keyboards/merge/um70/keymaps/via/keymap.c
@@ -88,7 +88,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
void suspend_power_down_user(void) {
oled_off();
}
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
index 63b5400b48..a29fa77121 100644
--- a/keyboards/merge/um70/rules.mk
+++ b/keyboards/merge/um70/rules.mk
@@ -22,4 +22,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
SPLIT_KEYBOARD = yes
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306