aboutsummaryrefslogtreecommitdiff
path: root/users/drashna/drashna.h
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-05-31 22:11:06 -0700
committerJack Humbert <jack.humb@gmail.com>2018-06-01 01:11:06 -0400
commit3d1349b280d9c0a57e37b5347a405426de6dba10 (patch)
tree0b8c989d0c902115e2ce51c8bb9dc201b0e2eb0c /users/drashna/drashna.h
parent8eaf23ae8146766615cc1cec3fc8e04111e8ef49 (diff)
downloadqmk_firmware-3d1349b280d9c0a57e37b5347a405426de6dba10.tar.gz
qmk_firmware-3d1349b280d9c0a57e37b5347a405426de6dba10.zip
Big overhaul to Drashna keymaps and userspace (#3097)
* Optimize secrets code * Orthodox tweaks * rules.mk features * Minor cleanup * Revert mod bits * Force Hold breaks One Shot Tap Toggle * Cleanup * Moke keymaps more consistent * minor ergodox tweak * More OSM for the Orthodox * Cleanup of userspace * Toggle Secrets * Add hidden process record for super secret macros * Make sure secret macros always compiles * finish up making them super secret * Add ColinTA's rgb twinkle as WIP * Optimize RGB Twinkling for typing Also, tweak RGB indicators. AND WTF, I HAVE NO IDEA WHY THE INDICATORS ONLY WORK AS IS. The logical method for getting them working doesn't ... and it's beyond bizarre * Make console logging more configurable * Indicator travisty * Clean up userspace rgb code * Optimize RGB Twinking to work on default layer only, and to base it's color on the curent hue * Eff it... rgblight_sethsv_at runs at every matrix scan * RGB Twinkle cleanup * Update Iris code for new board * Move RGB Indicator and RGB Twinkle into userspace * Move RGB Indicator code to rgb_stuff.c * Major cleanup of RGB Code in userspace * Additional cleanup of RGB code in userspace * Use noeeprom functions to save my boards! * Enable RGB Sleep on all boards now * Add old iris board * tapping tweak * Use byte 19 for eeprom to prepare for possible merge of eeconfig function pr * Add code to fix default layer after eeprom reset
Diffstat (limited to 'users/drashna/drashna.h')
-rw-r--r--users/drashna/drashna.h30
1 files changed, 24 insertions, 6 deletions
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 87a72f528..e035b86fb 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -42,6 +42,7 @@ enum userspace_layers {
42#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) 42#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
43#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) 43#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
44 44
45
45// RGB color codes are no longer located here anymore. Instead, you will want to 46// RGB color codes are no longer located here anymore. Instead, you will want to
46// head to https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h 47// head to https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h
47 48
@@ -51,7 +52,11 @@ extern bool clicky_enable;
51void rgblight_sethsv_default_helper(uint8_t index); 52void rgblight_sethsv_default_helper(uint8_t index);
52#endif // RGBLIGHT_ENABLE 53#endif // RGBLIGHT_ENABLE
53 54
54#define EECONFIG_USERSPACE (uint8_t *)20 55void tap(uint16_t keycode);
56bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
57
58
59#define EECONFIG_USERSPACE (uint8_t *)19
55 60
56typedef union { 61typedef union {
57 uint8_t raw; 62 uint8_t raw;
@@ -59,6 +64,7 @@ typedef union {
59 bool clicky_enable :1; 64 bool clicky_enable :1;
60 bool rgb_layer_change :1; 65 bool rgb_layer_change :1;
61 bool is_overwatch :1; 66 bool is_overwatch :1;
67 bool nuke_switch :1;
62 }; 68 };
63} userspace_config_t; 69} userspace_config_t;
64 70
@@ -91,6 +97,8 @@ enum userspace_custom_keycodes {
91 KC_SECRET_4, 97 KC_SECRET_4,
92 KC_SECRET_5, 98 KC_SECRET_5,
93 KC_CCCV, 99 KC_CCCV,
100 KC_NUKE,
101
94#ifdef UNICODE_ENABLE 102#ifdef UNICODE_ENABLE
95 UC_FLIP, 103 UC_FLIP,
96#endif //UNICODE_ENABLE 104#endif //UNICODE_ENABLE
@@ -112,8 +120,8 @@ enum userspace_custom_keycodes {
112#define DVORAK KC_DVORAK 120#define DVORAK KC_DVORAK
113#define COLEMAK KC_COLEMAK 121#define COLEMAK KC_COLEMAK
114#define WORKMAN KC_WORKMAN 122#define WORKMAN KC_WORKMAN
115#define KC_RST KC_RESET
116 123
124#define KC_RST KC_RESET
117 125
118#ifdef SWAP_HANDS_ENABLE 126#ifdef SWAP_HANDS_ENABLE
119#define KC_C1R3 SH_TT 127#define KC_C1R3 SH_TT
@@ -125,6 +133,16 @@ enum userspace_custom_keycodes {
125#define KC_MLSF OSM(MOD_LSFT) 133#define KC_MLSF OSM(MOD_LSFT)
126#define KC_MRSF OSM(MOD_RSFT) 134#define KC_MRSF OSM(MOD_RSFT)
127 135
136#define OS_LGUI OSM(MOD_LGUI)
137#define OS_RGUI OSM(MOD_RGUI)
138#define OS_LSFT OSM(MOD_LSFT)
139#define OS_RSFT OSM(MOD_RSFT)
140#define OS_LCTL OSM(MOD_LCTL)
141#define OS_RCTL OSM(MOD_RCTL)
142#define OS_LALT OSM(MOD_LALT)
143#define OS_RALT OSM(MOD_RALT)
144#define ALT_APP ALT_T(KC_APP)
145
128#define MG_NKRO MAGIC_TOGGLE_NKRO 146#define MG_NKRO MAGIC_TOGGLE_NKRO
129 147
130 148
@@ -200,8 +218,8 @@ enum {
200#define ______________COLEMAK_MOD_DH_L3____________ CTL_T(KC_Z), KC_X, KC_C, KC_D, KC_V 218#define ______________COLEMAK_MOD_DH_L3____________ CTL_T(KC_Z), KC_X, KC_C, KC_D, KC_V
201 219
202#define ______________COLEMAK_MOD_DH_R1____________ KC_J, KC_L, KC_U, KC_Y, KC_SCLN 220#define ______________COLEMAK_MOD_DH_R1____________ KC_J, KC_L, KC_U, KC_Y, KC_SCLN
203#define ______________COLEMAK_MOD_DH_R2____________ KC_K, KC_N, KC_E, KC_I, KC_O 221#define ______________COLEMAK_MOD_DH_R2____________ KC_M, KC_N, KC_E, KC_I, KC_O
204#define ______________COLEMAK_MOD_DH_R3____________ KC_M, KC_H, KC_COMM, KC_DOT, CTL_T(KC_SLASH) 222#define ______________COLEMAK_MOD_DH_R3____________ KC_K, KC_H, KC_COMM, KC_DOT, CTL_T(KC_SLASH)
205 223
206 224
207#define _________________DVORAK_L1_________________ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y 225#define _________________DVORAK_L1_________________ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
@@ -227,7 +245,7 @@ enum {
227#define _________________NORMAN_L3_________________ CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B 245#define _________________NORMAN_L3_________________ CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B
228 246
229#define _________________NORMAN_R1_________________ KC_J, KC_U, KC_R, KC_L, KC_SCLN 247#define _________________NORMAN_R1_________________ KC_J, KC_U, KC_R, KC_L, KC_SCLN
230#define _________________NORMAN_R2_________________ KC_J, KC_N, KC_I, KC_O, KC_U 248#define _________________NORMAN_R2_________________ KC_Y, KC_N, KC_I, KC_O, KC_U
231#define _________________NORMAN_R3_________________ KC_P, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH) 249#define _________________NORMAN_R3_________________ KC_P, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH)
232 250
233#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5 251#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5
@@ -243,7 +261,7 @@ enum {
243#define ___________ERGODOX_BOTTOM_RIGHT____________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 261#define ___________ERGODOX_BOTTOM_RIGHT____________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
244 262
245 263
246#define __________________ERGODOX_THUMB_CLUSTER_____________________ ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE), \ 264#define __________________ERGODOX_THUMB_CLUSTER_____________________ ALT_T(KC_APP), OSM(MOD_LGUI), OSM(MOD_RGUI), CTL_T(KC_ESCAPE), \
247 KC_HOME, KC_PGUP, \ 265 KC_HOME, KC_PGUP, \
248 LT(_LOWER, KC_SPACE),KC_BSPC, KC_END, KC_PGDN, KC_DEL, LT(_RAISE, KC_ENTER) 266 LT(_LOWER, KC_SPACE),KC_BSPC, KC_END, KC_PGDN, KC_DEL, LT(_RAISE, KC_ENTER)
249 267