aboutsummaryrefslogtreecommitdiff
path: root/users/drashna
diff options
context:
space:
mode:
Diffstat (limited to 'users/drashna')
-rw-r--r--users/drashna/config.h9
-rw-r--r--users/drashna/drashna.c19
-rw-r--r--users/drashna/drashna.h1
3 files changed, 27 insertions, 2 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 4545b34ef..0d41359cc 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -73,4 +73,11 @@
73 73
74#define MACRO_TIMER 5 74#define MACRO_TIMER 5
75 75
76 76#if !defined(BOOTMAGIC_LITE) && !defined(BOOTMAGIC_ENABLE)
77#ifndef BOOTMAGIC_LITE_COLUMN
78 #define BOOTMAGIC_LITE_COLUMN 0
79#endif
80#ifndef BOOTMAGIC_LITE_ROW
81 #define BOOTMAGIC_LITE_ROW 0
82#endif
83#endif
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 5b9957c3d..35fa15be4 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -81,6 +81,21 @@ bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t thi
81 return false; 81 return false;
82} 82}
83 83
84void bootmagic_lite(void) {
85 matrix_scan();
86 #if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0
87 wait_ms(DEBOUNCING_DELAY * 2);
88 #elif defined(DEBOUNCE) && DEBOUNCE > 0
89 wait_ms(DEBOUNCE * 2);
90 #else
91 wait_ms(30);
92 #endif
93 matrix_scan();
94 if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
95 bootloader_jump();
96 }
97}
98
84// Add reconfigurable functions here, for keymap customization 99// Add reconfigurable functions here, for keymap customization
85// This allows for a global, userspace functions, and continued 100// This allows for a global, userspace functions, and continued
86// customization of the keymap. Use _keymap instead of _user 101// customization of the keymap. Use _keymap instead of _user
@@ -133,6 +148,10 @@ void eeconfig_init_keymap(void) {}
133// Call user matrix init, set default RGB colors and then 148// Call user matrix init, set default RGB colors and then
134// call the keymap's init function 149// call the keymap's init function
135void matrix_init_user(void) { 150void matrix_init_user(void) {
151 #if !defined(BOOTMAGIC_LITE) && !defined(BOOTMAGIC_ENABLE)
152 bootmagic_lite();
153 #endif
154
136 userspace_config.raw = eeconfig_read_user(); 155 userspace_config.raw = eeconfig_read_user();
137 156
138#ifdef BOOTLOADER_CATERINA 157#ifdef BOOTLOADER_CATERINA
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 7e69a9f8d..221a8e413 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -353,4 +353,3 @@ NOTE: These are all the same length. If you do a search/replace
353#define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5 353#define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5
354#define _________________ADJUST_R2_________________ AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN 354#define _________________ADJUST_R2_________________ AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN
355#define _________________ADJUST_R3_________________ MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT 355#define _________________ADJUST_R3_________________ MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT
356