diff options
Diffstat (limited to 'keyboards/merge')
-rw-r--r-- | keyboards/merge/um70/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/merge/um70/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/merge/um70/rules.mk | 3 |
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 d16e737b4..0a775929d 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) { | |||
89 | } | 89 | } |
90 | 90 | ||
91 | 91 | ||
92 | #ifdef OLED_DRIVER_ENABLE | 92 | #ifdef OLED_ENABLE |
93 | void suspend_power_down_user(void) { | 93 | void suspend_power_down_user(void) { |
94 | oled_off(); | 94 | oled_off(); |
95 | } | 95 | } |
diff --git a/keyboards/merge/um70/keymaps/via/keymap.c b/keyboards/merge/um70/keymaps/via/keymap.c index 17cb2895c..aaf682ffd 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) { | |||
88 | } | 88 | } |
89 | 89 | ||
90 | 90 | ||
91 | #ifdef OLED_DRIVER_ENABLE | 91 | #ifdef OLED_ENABLE |
92 | void suspend_power_down_user(void) { | 92 | void suspend_power_down_user(void) { |
93 | oled_off(); | 93 | oled_off(); |
94 | } | 94 | } |
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk index 63b5400b4..a29fa7712 100644 --- a/keyboards/merge/um70/rules.mk +++ b/keyboards/merge/um70/rules.mk | |||
@@ -22,4 +22,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth | |||
22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
23 | ENCODER_ENABLE = yes | 23 | ENCODER_ENABLE = yes |
24 | SPLIT_KEYBOARD = yes | 24 | SPLIT_KEYBOARD = yes |
25 | OLED_DRIVER_ENABLE = yes | 25 | OLED_ENABLE = yes |
26 | OLED_DRIVER = SSD1306 | ||