From 010adc92bf3f9bebffa0fd515a592317139d43d0 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Mon, 24 May 2021 23:23:20 -0700 Subject: [PATCH] [Keyboard] Corne - Remove legacy revision support (#12226) --- keyboards/crkbd/{rev1/common => }/keymaps/via/config.h | 0 keyboards/crkbd/{rev1/common => }/keymaps/via/keymap.c | 6 ++++-- keyboards/crkbd/{rev1/common => }/keymaps/via/rules.mk | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename keyboards/crkbd/{rev1/common => }/keymaps/via/config.h (100%) rename keyboards/crkbd/{rev1/common => }/keymaps/via/keymap.c (99%) rename keyboards/crkbd/{rev1/common => }/keymaps/via/rules.mk (100%) diff --git a/keyboards/crkbd/rev1/common/keymaps/via/config.h b/keyboards/crkbd/keymaps/via/config.h similarity index 100% rename from keyboards/crkbd/rev1/common/keymaps/via/config.h rename to keyboards/crkbd/keymaps/via/config.h diff --git a/keyboards/crkbd/rev1/common/keymaps/via/keymap.c b/keyboards/crkbd/keymaps/via/keymap.c similarity index 99% rename from keyboards/crkbd/rev1/common/keymaps/via/keymap.c rename to keyboards/crkbd/keymaps/via/keymap.c index ecd1f17a..4735255e 100644 --- a/keyboards/crkbd/rev1/common/keymaps/via/keymap.c +++ b/keyboards/crkbd/keymaps/via/keymap.c @@ -70,8 +70,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef OLED_DRIVER_ENABLE +#include + oled_rotation_t oled_init_user(oled_rotation_t rotation) { - if (!is_master) { + if (!is_keyboard_master()) { return OLED_ROTATION_180; // flips the display 180 degrees if offhand } return rotation; @@ -157,7 +159,7 @@ void oled_render_logo(void) { } void oled_task_user(void) { - if (is_master) { + if (is_keyboard_master()) { oled_render_layer_state(); oled_render_keylog(); } else { diff --git a/keyboards/crkbd/rev1/common/keymaps/via/rules.mk b/keyboards/crkbd/keymaps/via/rules.mk similarity index 100% rename from keyboards/crkbd/rev1/common/keymaps/via/rules.mk rename to keyboards/crkbd/keymaps/via/rules.mk