aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/crkbd
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-06-15 03:41:28 -0700
committerGitHub <noreply@github.com>2020-06-15 03:41:28 -0700
commit357a888d805c21c9cb4917f55d558195e8b85db5 (patch)
treefd1e8c30c3754ff89e8efd7e94ced3a1a8d92035 /keyboards/crkbd
parent7f5656996ca2f5a62a148ef9165d0681ba806f07 (diff)
downloadfirmware-357a888d805c21c9cb4917f55d558195e8b85db5.tar.gz
firmware-357a888d805c21c9cb4917f55d558195e8b85db5.tar.bz2
firmware-357a888d805c21c9cb4917f55d558195e8b85db5.zip
[Keymap] Drashna's Keymap Update - Display Edition (#9282)
OLED Display fixes Add support for RGBLIGHT Layers Add gaming layer to corn and kyria RGBLight Startup Animation fixes and improvements (uses matrix_scan now!) Pimoroni Trackball support added (IT'S RGB!!!) Fix issues due to code changes
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/keymaps/drashna/keymap.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/keyboards/crkbd/keymaps/drashna/keymap.c b/keyboards/crkbd/keymaps/drashna/keymap.c
index 0769edf3b..d9c1605ce 100644
--- a/keyboards/crkbd/keymaps/drashna/keymap.c
+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
@@ -121,7 +121,17 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
}
#ifdef OLED_DRIVER_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+# ifndef SPLIT_KEYBOARD
+ if (is_master) {
+# endif
+ return OLED_ROTATION_270;
+# ifndef SPLIT_KEYBOARD
+ } else {
+ return rotation;
+ }
+# endif
+}
#endif
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {