summaryrefslogtreecommitdiffstats
path: root/layouts/community/ergodox
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-01-21 20:11:30 -0800
committerDrashna Jael're <drashna@live.com>2022-01-21 20:11:30 -0800
commit102cec82418b785c6f503f90dacc452843323c86 (patch)
tree5085627003a13d2cb2136d7da28b8d08ecbe87fd /layouts/community/ergodox
parentad702096a97677eab5c1931d6f0d4a51e1a564a5 (diff)
parent7ecb47958c7e13ffb87e9ee25ee639daeb78b36d (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'layouts/community/ergodox')
-rw-r--r--layouts/community/ergodox/drashna/keymap.c4
-rw-r--r--layouts/community/ergodox/drashna/rules.mk3
2 files changed, 0 insertions, 7 deletions
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 798680628f..0b81232af9 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -16,10 +16,6 @@
#include "drashna.h"
-#ifdef UNICODEMAP_ENABLE
-# include "drashna_unicode.h"
-#endif // UNICODEMAP_ENABLE
-#include "drivers/sensors/pimoroni_trackball.h"
enum more_custom_keycodes {
KC_SWAP_NUM = NEW_SAFE_RANGE,
PM_SCROLL,
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index 61b6263071..f5e9b500e0 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
TAP_DANCE_ENABLE = no
COMMAND_ENABLE = no # Commands for debug and configuration
CONSOLE_ENABLE = no
-SPACE_CADET_ENABLE = no
ifeq ($(strip $(KEYBOARD)), ergodox_ez)
RGBLIGHT_ENABLE = yes
@@ -16,5 +15,3 @@ endif
UNICODE_ENABLE = no
UNICDOEMAP_ENABLE = no
CUSTOM_UNICODE_ENABLE = no
-
-DEBOUNCE_TYPE = sym_eager_pr