summaryrefslogtreecommitdiff
path: root/layouts/community/ergodox
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-10-16 13:11:22 -0700
committerGitHub <noreply@github.com>2019-10-16 13:11:22 -0700
commite3a21348c3879c11072c7c42d3b4d04b022f4fe2 (patch)
treeb4b007bce3d0b9167dfe651a537df330dbf7bead /layouts/community/ergodox
parent7662ee71f0d1df7cee03a563f52dba21854fd0be (diff)
[Keymap] Drashna's Hardware Features Experimentations (#6920)
* Change RGBLight pin for Planck Light Move it to A0, so that the SPI? pins are available for BT hackery * Add QMK DFU bootloader info * Add Solenoid * Disable annoying white LED on bottom * Enable Solenoid on Corne * Remove bounds for animations * Increase debounce for Ergodox EZ to reduce repeat key issues * Set swap hands key to be a hold-tap key This way, it's not ANNOYING and doesn't swap the hands inteniontally * Move MT Alt in Corne keymap * Re-Add fine tuned control of secrets * Squash mods to single row * Add LRA settings to haptic feedback settings for Rev6 * Fix issue with non-Planck EZ keymaps * Add 40 Percent Nano with Analog Joystick * Add Collide39 keymap * Fix OLED printing to be more flavorful * Fix up Iris GamePad and come cleanup * Expand OLED char map further * Add modded characters to keylogger * Here be dragons Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Fix up rules for community layouts * Some more OLED tweaks * Add mod mask check function * Change QMK DFU Audio pin to be correct * Use manual STM config instead of CTPC for Collide 39
Diffstat (limited to 'layouts/community/ergodox')
-rw-r--r--layouts/community/ergodox/drashna/config.h2
-rw-r--r--layouts/community/ergodox/drashna/rules.mk6
-rw-r--r--layouts/community/ergodox/drashna_glow/config.h3
-rw-r--r--layouts/community/ergodox/drashna_glow/rules.mk6
4 files changed, 10 insertions, 7 deletions
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h
index 0ccf10c31c..4943832990 100644
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@@ -13,6 +13,6 @@
#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Shine
#undef DEBOUNCE
-#define DEBOUNCE 15
+#define DEBOUNCE 30
#define TAPPING_TERM_PER_KEY
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index f14353f4c6..f9f9ea2bab 100644
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@@ -2,9 +2,9 @@ TAP_DANCE_ENABLE = yes
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
COMMAND_ENABLE = no # Commands for debug and configuration
SPACE_CADET_ENABLE = no
-ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
- RGBLIGHT_ENABLE = yes
- RGB_MATRIX_ENABLE = no
+ifeq ($(strip $(KEYBOARD)), ergodox_ez)
+ RGBLIGHT_ENABLE = yes
+ RGB_MATRIX_ENABLE = no
endif
CONSOLE_ENABLE = no
BOOTMAGIC_ENABLE = yes
diff --git a/layouts/community/ergodox/drashna_glow/config.h b/layouts/community/ergodox/drashna_glow/config.h
index 28bed20e08..6431cb4ff8 100644
--- a/layouts/community/ergodox/drashna_glow/config.h
+++ b/layouts/community/ergodox/drashna_glow/config.h
@@ -4,3 +4,6 @@
#undef PRODUCT
#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Glow
+
+#undef RGB_MATRIX_LED_PROCESS_LIMIT
+#undef RGB_MATRIX_LED_FLUSH_LIMIT
diff --git a/layouts/community/ergodox/drashna_glow/rules.mk b/layouts/community/ergodox/drashna_glow/rules.mk
index e1da86443f..45addc7c22 100644
--- a/layouts/community/ergodox/drashna_glow/rules.mk
+++ b/layouts/community/ergodox/drashna_glow/rules.mk
@@ -6,8 +6,8 @@ SRC += $(CORRECTED_LAYOUT)/keymap.c
-include $(CORRECTED_LAYOUT)/rules.mk
-ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
- RGBLIGHT_ENABLE = no
- RGB_MATRIX_ENABLE = yes
+ifeq ($(strip $(KEYBOARD)), ergodox_ez)
+ RGBLIGHT_ENABLE = no
+ RGB_MATRIX_ENABLE = yes
# TAP_DANCE_ENABLE = no
endif