aboutsummaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2022-01-21 19:36:52 -0800
committerGitHub <noreply@github.com>2022-01-21 19:36:52 -0800
commitb090ff03ed4391f27e8e3d9a843f529bedd08e19 (patch)
treee734aa4541f05ed4f919f86ff36d85cbd17f795a /layouts
parent8901c9eca1db8d10b06f544553a5fc941eda51ae (diff)
downloadqmk_firmware-b090ff03ed4391f27e8e3d9a843f529bedd08e19.tar.gz
qmk_firmware-b090ff03ed4391f27e8e3d9a843f529bedd08e19.zip
[Keymap] Drashna's OLED rewrite (#15981)
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ergodox/drashna/keymap.c4
-rw-r--r--layouts/community/ergodox/drashna/rules.mk3
-rw-r--r--layouts/community/ortho_4x12/drashna/keymap.c2
-rw-r--r--layouts/community/split_3x6_3/drashna/keymap.c2
4 files changed, 2 insertions, 9 deletions
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 798680628..0b81232af 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -16,10 +16,6 @@
16 16
17#include "drashna.h" 17#include "drashna.h"
18 18
19#ifdef UNICODEMAP_ENABLE
20# include "drashna_unicode.h"
21#endif // UNICODEMAP_ENABLE
22#include "drivers/sensors/pimoroni_trackball.h"
23enum more_custom_keycodes { 19enum more_custom_keycodes {
24 KC_SWAP_NUM = NEW_SAFE_RANGE, 20 KC_SWAP_NUM = NEW_SAFE_RANGE,
25 PM_SCROLL, 21 PM_SCROLL,
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index 61b626307..f5e9b500e 100644
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@@ -2,7 +2,6 @@ BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
2TAP_DANCE_ENABLE = no 2TAP_DANCE_ENABLE = no
3COMMAND_ENABLE = no # Commands for debug and configuration 3COMMAND_ENABLE = no # Commands for debug and configuration
4CONSOLE_ENABLE = no 4CONSOLE_ENABLE = no
5SPACE_CADET_ENABLE = no
6 5
7ifeq ($(strip $(KEYBOARD)), ergodox_ez) 6ifeq ($(strip $(KEYBOARD)), ergodox_ez)
8 RGBLIGHT_ENABLE = yes 7 RGBLIGHT_ENABLE = yes
@@ -16,5 +15,3 @@ endif
16UNICODE_ENABLE = no 15UNICODE_ENABLE = no
17UNICDOEMAP_ENABLE = no 16UNICDOEMAP_ENABLE = no
18CUSTOM_UNICODE_ENABLE = no 17CUSTOM_UNICODE_ENABLE = no
19
20DEBOUNCE_TYPE = sym_eager_pr
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index ce241fd76..522fc772b 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
106 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST, 106 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
107 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, 107 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
108 TH_LVL, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, 108 TH_LVL, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
109 KEYLOCK, _______, _______, _______, _______, KC_NUKE, _______, _______, _______, _______, _______, TG_MODS 109 KEYLOCK, _______, _______, REBOOT, _______, KC_NUKE, _______, _______, AUTO_CTN,_______, _______, TG_MODS
110 ) 110 )
111 111
112}; 112};
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index 476ca5fce..4bd4618d0 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
90 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, 90 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
91 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, 91 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
92 KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, 92 KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
93 AUTO_CTN,KC_NUKE, _______, _______, TG_MODS, HPT_FBK 93 REBOOT, KC_NUKE, _______, _______, TG_MODS, AUTO_CTN
94 ) 94 )
95}; 95};
96// clang-format on 96// clang-format on