qmk_firmware

commit 8b8c69b77e598f8d5f241f725c9b2474a4550911
parent 32712af7128f2515c1058f557826b53b61529f07
Author: Nick Brassel <nick@tzarc.org>
Date:   Sun, 29 Aug 2021 08:20:25 +1000

Breaking changes develop merge to master, 2021Q3 edition. (#14196)

Diffstat:
M
keyboards/crkbd/keymaps/mine/keymap.c
 | 
4
++--
M
keyboards/crkbd/keymaps/mine/rules.mk
 | 
3
++-

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/keyboards/crkbd/keymaps/mine/keymap.c b/keyboards/crkbd/keymaps/mine/keymap.c
@@ -70,7 +70,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) {
   if (!is_keyboard_master()) {
     return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
@@ -172,4 +172,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-#endif // OLED_DRIVER_ENABLE
+#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/mine/rules.mk b/keyboards/crkbd/keymaps/mine/rules.mk
@@ -1 +1,2 @@
-OLED_DRIVER_ENABLE  = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306