summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/ergodox_infinity/keymaps/gordon/config.h31
-rw-r--r--keyboards/ergodox_infinity/keymaps/gordon/keymap.c497
-rw-r--r--keyboards/ergodox_infinity/keymaps/gordon/rules.mk2
-rw-r--r--users/gordon/gordon.c241
-rw-r--r--users/gordon/gordon.h192
-rw-r--r--users/gordon/rules.mk4
6 files changed, 656 insertions, 311 deletions
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/config.h b/keyboards/ergodox_infinity/keymaps/gordon/config.h
new file mode 100644
index 0000000000..88d495b12b
--- /dev/null
+++ b/keyboards/ergodox_infinity/keymaps/gordon/config.h
@@ -0,0 +1,31 @@
+/*
+Copyright 2018 Daniel Gordon <Dgordon8765@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#define PREVENT_STUCK_MODIFIERS
+
+#undef IGNORE_MOD_TAP_INTERRUPT
+#define IGNORE_MOD_TAP_INTERRUPT
+
+#undef PERMISSIVE_HOLD
+// #define PERMISSIVE_HOLD
+
+#define ONESHOT_TAP_TOGGLE 2
+
+#undef TAPPING_TERM
+#define TAPPING_TERM 200
+
+#define FORCE_NKRO
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
index 7e3e51cdd1..73dd3b325e 100644
--- a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
@@ -10,16 +10,6 @@
#include "keymap_nordic.h"
-#define TLSLSH M(TIL_SLASH)
-#define F1_F13 TD(F1F13)
-#define F2_F14 TD(F2F14)
-#define F5_F15 TD(F5F15)
-#define F4_ALTF4 TD(ALTF4)
-#define END_ESC TD(ENDESC)
-#define SHF6_AF7 TD(F6F7)
-#define F12_RUN TD(F12ETAPS)
-#define COMMA_TD TD(COMMA)
-
enum custom_keycodes {
PLACEHOLDER = SAFE_RANGE, // can always be here
EPRM,
@@ -27,129 +17,94 @@ enum custom_keycodes {
RGB_SLD,
};
-//Tap dance enums
-enum {
- F12TAP = 0,
- F12ETAPS,
- CALCCOMP,
- REFRESH, //send R, or Control+R if double tapped.
- ENDESC,
- XESC, //'quad function'. x, control, escape, alt
- ALY2, //'quad function': a, Hyper, ctrl+a, layer 2
- PRLOCK,
- F6F7, // Shift F6 or Alt F7
- TABCOMBO,
- FCTRL,
- F3D,
- ALTF4,
- COMMA,
- AT,
- HTAB,
- F1F13,
- F2F14,
- F5F15
-};
-
-
// Custom tapping terms for each key.
// Requires changes to action_taping.c
-/* uint16_t get_tapping_term(keyevent_t* event) {
- uint16_t keycode = keymap_key_to_keycode(layer_switch_get_layer(event->key), event->key);
- if (keycode == LT(3,KC_E) ) {
- return TAPPING_TERM + 50;
- }
- return TAPPING_TERM;
-} */
-
-
-// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
- // simple tap dance
- [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),
- [REFRESH] = ACTION_TAP_DANCE_DOUBLE(KC_R,LCTL(KC_R)),
- [ENDESC] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_ESC),
- [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER),
- [ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)),
- [F6F7] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F6), LALT(KC_F7)),
- [F1F13] = ACTION_TAP_DANCE_DOUBLE(KC_F1, KC_F13),
- [F2F14] = ACTION_TAP_DANCE_DOUBLE(KC_F2, KC_F14),
- [F5F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5, KC_F15),
- [TABCOMBO] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tab_finished, tab_reset),
- [F3D] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, bt_finished, bt_reset),
- [COMMA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, comma_finished, comma_reset),
- [HTAB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,h_finished, h_reset)
-};
+// uint16_t get_tapping_term(keyevent_t* event) {
+// uint16_t keycode = keymap_key_to_keycode(layer_switch_get_layer(event->key), event->key);
+// if (keycode == NAV_E ) {
+// return TAPPING_TERM + 50;
+// }
+// return TAPPING_TERM;
+// }
+
+
+// _XXXXXX_ is a symbol that means, "DO NOT ASSIGN THIS KEY TO ANTYING", because the key
+// underneath this layer is the key that sends you to/from this layer.
+// Meaning, if you were to put something here - then you will be stuck in this layer.
+// It is simply a visual reminder not to use that key for this layer.
+// Example: On the numpad layer, under the letter `D` is `_XXXXXXX_`, because pressing and holding
+// `D` sends you to the numpad layer
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-//**************************FIRST LAYER - LAYER ZERO **************************************
+//**************************FIRST LAYER - LAYER ZERO **************************************
[_QWERTY] = KEYMAP(
- SHF6_AF7, F1_F13, F2_F14, TD(F3D), F4_ALTF4, F5_F15, KC_F11,
- ________, KC_Q, CTR_SH_W, NAV_E, CTR_AL_R, KC_T, PRINTSCR,
- KC_TAB, KC_A, MEH_S, NUMPAD_D, CTRL_F, WIN_G,
- ALT_SHFT, CTRL_Z, HYPER_X, MOUSE_C, ALT_V, KC_B, TT(_MOUSE),
+ SHF6_AF7, F1_F13 , F2_F14, TD(F3D), F4_ALTF4, F5_F15, KC_F11,
+ SPRK_TCK , Q_ESC , CTR_SH_W, NAV_E, ALT_SH_R, KC_T, PRINTSCR,
+ KC_TAB , KC_A , MEH_S, NUMPAD_D, CTRL_F, WIN_G,
+ OSL(_ONESHOT), CTRL_Z , HYPER_X, MOUSE_C, ALT_V, KC_B, OSL(_MOUSE),
KC_MINUS, KC_GRAVE, KC_DELETE, KC_LEFT, KC_RIGHT,
-
- KC_INSERT, KC_DELETE,
- ALT_HOME,
- KC_LSHIFT, SYMB_BSP, END_ESC,
+
+ LSFT(KC_INSERT), TT(_QWERTY_KIDS),
+ ________ ,
+ KC_LSHIFT, SYMB_BSP, KC_INSERT ,
F12_RUN, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, TD(CALCCOMP),
- ________, KC_Y, KC_U, KC_I, KC_O, KC_P, ________,
- WIN_H, CTRL_J, KC_K, MEH_L, COL_MOUS, ________,
- KC_LEAD, KC_N, ALT_M, COMMA_TD, HYPE_DOT, KC_SLASH, TD(TABCOMBO),
- KC_UP, KC_DOWN, KC_ESC, KC_TILD, KC_UNDS,
+ CALTDEL , KC_Y, KC_U, KC_I, KC_O, KC_P, MODRESET,
+ WIN_H, CTRL_J, APP_SW_K, MEH_L, COL_MOUS, END_HOME,
+ OSL(_ONESHOT), KC_N, ALT_M, COMMA_TD, HYPE_DOT, KC_SLASH, ID_MAN_IP,
+ KC_UP, KC_DOWN,KC_DELETE, KC_TILD, KC_UNDS,
- KC_ESCAPE, KC_DELETE,
- ALT_T(KC_PGUP),
- RCTL_T(KC_PGDOWN), LT(_NAV,KC_ENTER), SPAC_SYM),
+ TT(_STREET_FIGHTER), ________,
+ KC_PGUP,
+ KC_PGDOWN, LT(_NAV,KC_ENTER), SPAC_TXT),
//**************************SYMBOLS LAYER**************************
[_SYMBOLS] = KEYMAP(
________, ________, ________, ________, ________, ________, ________,
- ________, TLSLSH, KC_AT, KC_LCBR, KC_RCBR, KC_CIRC, ________,
- ________, KC_EXLM, KC_PIPE, KC_LPRN, KC_RPRN, M(DEREF),
+ ________, DEREF , KC_AT, KC_LCBR, KC_RCBR, KC_CIRC, ________,
+ ________, KC_EXLM, KC_HASH, KC_LPRN, KC_RPRN, ________,
________,KC_DOLLAR, KC_PERC, LSQUIGLY, RSQUIGLY, ________, ________,
- ________, M(TICK3), ________, ________, ________,
+ ________,TICK3 , ________, ________, ________,
________,________,
________,
- ________,________,________,
+ ________,_XXXXXX_,________,
________, ________, ________, ________, ________, ________, NUMLOCK,
- ________, TLSLSH, KC_PIPE, KC_PLUS, KC_AMPR, ________, CAPLOCK,
- M(EQRIGHT), KC_DQUO, KC_EQUAL, KC_QUOTE,KC_SCOLON, ________,
- ________, KC_PIPE, BK_SLASH, ASTERSK, KC_DOT, KC_SLASH, ________,
- ________,________,________,M(TILD3),________,
+ ________,TIL_SLASH, KC_PIPE, KC_PLUS, KC_AMPR, ________, CAPLOCK,
+ EQRIGHT, KC_DQUO, KC_EQUAL, KC_QUOTE,KC_SCOLON, ________,
+ ________, KC_M, BK_SLASH, ASTERSK, KC_DOT, KC_SLASH, ________,
+ ________,________ ,________,TILD3,________,
________,________,
________,
- ________,________,________),
-
+ ________,________,_XXXXXX_),
+
//**************************MOUSE MOVEMENT LAYER**************************
- [_MOUSE] = KEYMAP(RESET,________,________,________,________,________,________,
- RESET,________,________,KC_MS_UP,________,KC_MS_WH_UP,CALTDEL,
+ [_MOUSE] = KEYMAP(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
+ RESET,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________,
________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN,
- KC_SECRET_1,________,HYPR(KC_F13),________,HYPR(KC_F14),KC_SECRET_2,________,
+ KC_SECRET_5,KC_SECRET_4,KC_SECRET_3,_XXXXXX_,KC_SECRET_2,KC_SECRET_1,_XXXXXX_,
________,________,HYPR(KC_F15),KC_MS_WH_LEFT,KC_MS_WH_RIGHT,
-
+
________,________,
________,
KC_MS_BTN1,KC_MS_BTN2,________,
-
-
+
+
________,________,________,________,________,________,________,
- KC_MS_WH_UP,________,________,KC_UP,________,________,________,
- ________,KC_LEFT,KC_DOWN,KC_RIGHT,________,________,
- KC_MS_WH_DOWN,________,KC_PGUP,KC_PGDOWN,KC_MEDIA_NEXT_TRACK,________,________,
- KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_MEDIA_PLAY_PAUSE,________,
+ ________,________,________,KC_UP,________,KC_MEDIA_PLAY_PAUSE,________,
+ ________,KC_LEFT,KC_DOWN,KC_RIGHT,_XXXXXX_,________,
+ ________,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_MUTE,________,________,
+ KC_MS_WH_UP,KC_MS_WH_DOWN,________,________,________,
________,________,
________,
- ________,________,KC_WWW_BACK),
+ ________,KC_WWW_BACK,KC_WWW_FORWARD),
@@ -157,23 +112,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//**************************WINDOWS NAVIGATION LAYER**************************
[_NAV] = KEYMAP(________,________,________,________,________,________,________,
- ________,________,SNAPLEFT,________,SNAPRGHT,LALT(KC_LEFT),________,
- ________,LCTL(KC_W),PREVTAB,LGUI(KC_D),NEXTTAB,________,
- ________,________,WORKLEFT,________,WORKRIGHT,________,________,
+ ________,________,SNAPLEFT,_XXXXXX_,SNAPRGHT,________,________,
+ ________,KC_WWW_BACK,PREVTAB,________,NEXTTAB,SNAPUP,
+ ________,________,WORKLEFT,________,WORKRIGHT,SNAPDOWN,________,
________,________,________,________,________,
-
+
________,________,
________,
- ________,________,________,
-
-
+ ________,________,________,
+
+
________,________,________,________,________,________,________,
________,________,SNAPUP ,KC_UP ,SNAPDOWN,________,________,
________,KC_LEFT ,KC_DOWN ,KC_RIGHT,________,________,
________,________,________,________,________,________,________,
________,________,________,________,________,
-
-
+
+
________,________,
________,
________,________,________),
@@ -181,95 +136,207 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//****************************NUMPAD LAYER****************************
[_NUMPAD] = KEYMAP(________,________,________,________,________,________,________,
________,________,________,________,________,________,________,
- ________,________,________,________,________,________,
- ________,________,________,________,________,________,________,
+ ________,KC_DOT ,KC_SPACE,_XXXXXX_, KC_ESC ,________,
+ ________,DBMS_OUT,________,________,________,________,________,
________,________,________,________,________,
-
+
________,________,
________,
- ________,________,________,
-
+ KC_PLUS,KC_MINUS,________,
+
BL_TOGG ,BL_STEP ,________,________,________,________,________,
________,________,KC_7 ,KC_8 ,KC_9 ,________,________,
________,KC_4 ,KC_5 ,KC_6 ,________,________,
- ________,________,KC_1 ,KC_2 ,KC_3 ,________,________,
- KC_0 ,KC_0 , KC_DOT ,________,________,
-
+ ________,KC_DOT, KC_1 ,KC_2 ,KC_3 ,________,________,
+ KC_0 ,KC_DOT , KC_DOT ,________,________,
+
________,________,
________,
________,________,KC_0),
+
+ //****************************APP SWITCH LAYER****************************
+ [_APPSWITCH] = KEYMAP(________,________,________,________,________,________,________,
+ ________,________ , ________ , ________ ,________ ,________,________,
+ ________,APP_5,APP_6,APP_7,APP_8,________,
+ ________,DBMS_OUT,________,________,________,________,________,
+ ________,________,________,________,________,
+
+ ________,________,
+ ________,
+ KC_PLUS,________,________,
+
+ ________,________,________,________,________,________,________,
+ ________,________,APP_3 ,________,APP_4 ,________,________,
+ ________,APP_1 ,_XXXXXX_,APP_2 ,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,
+
+ ________,________,
+ ________,
+ ________,________,________),
+
+
+ [_ONESHOT] = KEYMAP( UP_ENTER_RESET , ________, ________, ________, ________, ________, ________,
+ ________, ________, ________, KC_UP , ________, ________, ________,
+ ________, ________, KC_LEFT , KC_DOWN , KC_RIGHT, ________,
+ MAGIC_TOGGLE_NKRO, ________, ________, ________, ________, ________, ________,
+ ________, ________, ________, ________, ________,
+
+ ________, ________,
+ ________,
+ ________, ________, ________,
+
+ ________, ________, ________, ________, ________, ________, ________,
+ ________, ________, KC_7, KC_8, KC_9, KC_PLUS, ________,
+ ________, KC_4, KC_5, KC_6, KC_EQUAL, ________,
+ ________, ________, KC_1, KC_2, KC_3, KC_ASTR, ________,
+ ________, ________, KC_0, ________, ________,
+
+ ________, ________,
+ ________,
+ ________, ________, ________),
//****************************TEXT/INTELLIJ NAVIGATION LAYER****************************
[_TEXTNAV] = KEYMAP(________,________,________,________,________,________,________,
________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________,
- ________,LALT(KC_F7),LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)),
- ________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________,________,________,________,________,________,________,________,________,________,LCTL(KC_DELETE),________,LALT(LSFT(KC_F9)),________,________,________,________,________,________,________,MEH(KC_5),LALT(LSFT(KC_Z)),________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)),LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________)
+ ________,________,LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)),
+ ________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________,
+ ________,________,________,________,________,
+
+ ________,________,________,________,________,________,
+
+ LALT(LSFT(KC_F9)),________,________,________,________,________,________,________,MEH(KC_5),LALT(LSFT(KC_Z)),
+ ________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)),
+ LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,________,________,_XXXXXX_),
+ [_QWERTY_KIDS] = KEYMAP(
+
+ KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO ,
+ KC_NO , KC_Q , KC_W, KC_E, KC_R, KC_T, KC_NO ,
+ KC_NO , KC_A , KC_S, KC_D, KC_F, KC_G ,
+ KC_NO , KC_Z , KC_X, KC_C, KC_V, KC_B, KC_NO ,
+ KC_MINUS, KC_GRAVE, KC_DELETE, KC_LEFT, KC_RIGHT,
+
+ KC_NO , TT(_QWERTY_KIDS) ,
+ KC_NO ,
+ KC_LSHIFT, KC_BSPACE, KC_NO ,
+
+ KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO ,
+ KC_NO , KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO ,
+ KC_H, KC_J, KC_K, KC_L, KC_SCOLON , KC_NO,
+ KC_NO , KC_N, KC_M, KC_COMMA , KC_DOT , KC_SLASH, KC_NO ,
+ KC_UP, KC_DOWN, KC_DELETE, KC_TILD, KC_UNDS,
+
+ KC_NO , KC_NO ,
+ KC_NO,
+ KC_NO, KC_ENTER, KC_SPACE),
+
+ [_STREET_FIGHTER] = KEYMAP(
+
+ KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO ,
+ KC_NO , KC_NO , DIE_1000X_LEFT, KC_UP, DIE_1000X_RIGHT, KC_NO, KC_NO ,
+ KC_NO , KC_NO , KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO ,
+ KC_NO , KC_NO , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+
+ ________ , ________ ,
+ ________ ,
+ ________, ________, ________ ,
+
+ KC_NO, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO ,
+ KC_NO , KC_NO, KC_G, KC_H, KC_J, KC_NO, KC_NO ,
+ KC_NO, KC_B, KC_N, KC_M, KC_K , KC_NO,
+ KC_NO , KC_NO, KC_NO, KC_NO , KC_NO , KC_NO, KC_NO ,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+
+ TT(_STREET_FIGHTER) , ________ ,
+ ________,
+ ________, ________, ________),
+
+
+ //************************Windows navigation to directories*************************
+ [_DIRNAV] = KEYMAP(
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,KC_A,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,
+
+ ________,________,
+ ________,
+ ________,________,________,
+
+
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,_______,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,
+
+
+ ________,________,
+ ________,
+ ________,________,________),
+
+
+ [_TEXT_MACROS] = KEYMAP(
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,KC_A,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,
+
+ ________,________,
+ ________,
+ ________,________,________,
+
+
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,_______,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,
+
+
+ ________,________,
+ ________,
+ ________,________,________)
+
+
+/* FOR FORMATTING FUTURE LAYERS
+ NO KEY CODES SHOULD BE MORE THAN 8 CHARACTERS
+ GOES LEFT HAND THEN RIGHT HAND
+ [_DIRNAV] = KEYMAP(
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,
+
+ ________,________,
+ ________,
+ ________,________,________,
+
+
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,________,
+ ________,________,________,________,________,________,________,
+ ________,________,________,________,________,
+
+
+ ________,________,
+ ________,
+ ________,________,________), */
+
+
+
+
};
const uint16_t PROGMEM fn_actions[] = {
[1] = ACTION_LAYER_TAP_TOGGLE(1)
};
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- switch(id) {
- case INFOQM: {
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- }
-
- case TIL_SLASH: {
- if (record->event.pressed) {
- SEND_STRING ("~/.");
- }
- break;
- }
-
- case DEREF: {
- if (record->event.pressed) {
- SEND_STRING ("->");
- }
- break;
- }
-
- case EQRIGHT: {
- if (record->event.pressed) {
- SEND_STRING ("=>");
- }
- break;
- }
-
- case TICK3: {
- if (record->event.pressed) {
- SEND_STRING ("```");
- }
- break;
- }
-
- case TILD3: {
- if (record->event.pressed) {
- SEND_STRING ("~~~");
- }
- break;
- }
-
- case ALTTAB_START: {
- register_code(KC_LALT);
- layer_on(8);
- }
-
- case ALTTAB_END: {
- unregister_code(KC_LALT);
- layer_off(8);
- }
-
-
-
- }
- return MACRO_NONE;
-};
-
void matrix_scan_user(void) {
uint8_t layer = biton32(layer_state);
@@ -281,35 +348,51 @@ void matrix_scan_user(void) {
ergodox_right_led_1_off();
ergodox_right_led_2_off();
ergodox_right_led_3_off();
- switch (layer) {
- case _SYMBOLS:
- ergodox_right_led_1_on();
- break;
- case _MOUSE:
- ergodox_right_led_2_on();
- break;
- case _NUMPAD:
- ergodox_right_led_3_on();
- break;
- case _NAV:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- break;
- case 5:
- ergodox_right_led_1_on();
- ergodox_right_led_3_on();
- break;
- case 6:
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
- case 7:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
- default:
- break;
+ // _delay_ms(45);
+
+ switch (layer)
+ {
+ case _SYMBOLS:
+ ergodox_right_led_1_on();
+ break;
+ case _MOUSE:
+ ergodox_right_led_2_on();
+ break;
+ case _NUMPAD:
+ ergodox_right_led_3_on();
+ break;
+ case _NAV:
+ ergodox_right_led_1_on();
+ ergodox_right_led_2_on();
+ break;
+ case _MACROS:
+ //layer unused right now
+ break;
+ case _FUNCTION:
+ //layer unused right nowex
+ break;
+ case _APPSWITCH:
+ ergodox_right_led_2_on();
+ ergodox_right_led_3_on();
+ break;
+ case _ONESHOT:
+ ergodox_right_led_1_on();
+ ergodox_right_led_2_on();
+ ergodox_right_led_3_on();
+ break;
+ case _TEXTNAV:
+ ergodox_right_led_1_on();
+ ergodox_right_led_3_on();
+ break;
+ case _QWERTY_KIDS:
+ ergodox_right_led_1_on();
+ ergodox_right_led_2_on();
+ ergodox_right_led_3_on();
+ break;
+ case _STREET_FIGHTER:
+ ergodox_right_led_2_on();
+ ergodox_right_led_3_on();
+ default:
+ break;
}
-
};
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/rules.mk b/keyboards/ergodox_infinity/keymaps/gordon/rules.mk
new file mode 100644
index 0000000000..9a56408f8e
--- /dev/null
+++ b/keyboards/ergodox_infinity/keymaps/gordon/rules.mk
@@ -0,0 +1,2 @@
+TAP_DANCE_ENABLE = yes
+
diff --git a/users/gordon/gordon.c b/users/gordon/gordon.c
index 056012a21c..3115e1c328 100644
--- a/users/gordon/gordon.c
+++ b/users/gordon/gordon.c
@@ -15,20 +15,17 @@ const char secret[][64] = {
};
#endif
-
-
-
void register_hyper (void) { //Helper function to invoke Hyper
register_code (KC_LSFT);
- register_code (KC_LCTL);
- register_code (KC_LALT);
- register_code (KC_LGUI);
+ register_code (KC_LCTL);
+ register_code (KC_LALT);
+ register_code (KC_LGUI);
}
void unregister_hyper (void) { //Helper function to invoke Hyper
unregister_code (KC_LSFT);
- unregister_code (KC_LCTL);
- unregister_code (KC_LALT);
- unregister_code (KC_LGUI);
+ unregister_code (KC_LCTL);
+ unregister_code (KC_LALT);
+ unregister_code (KC_LGUI);
}
void register_ctrl_a (void) {
@@ -41,55 +38,55 @@ void unregister_ctrl_a (void) {
unregister_code(KC_A);
}
-void register_alt_f7 (void) {
- register_code (KC_LALT);
+void register_alt_f7 (void) {
+ register_code (KC_LALT);
register_code (KC_F7);
}
-void unregister_alt_f7 (void) {
- unregister_code (KC_LALT);
+void unregister_alt_f7 (void) {
+ unregister_code (KC_LALT);
unregister_code (KC_F7);
}
-void register_shift_f6 (void) {
- register_code (KC_LSFT);
+void register_shift_f6 (void) {
+ register_code (KC_LSFT);
register_code (KC_F6);
}
-void unregister_shift_f6 (void) {
- unregister_code (KC_LSFT);
+void unregister_shift_f6 (void) {
+ unregister_code (KC_LSFT);
unregister_code (KC_F6);
}
-void register_ctrl_shift (void) {
- register_code (KC_LSFT);
+void register_ctrl_shift (void) {
+ register_code (KC_LSFT);
register_code (KC_LCTRL);
}
-void unregister_ctrl_shift (void) {
- unregister_code (KC_LSFT);
+void unregister_ctrl_shift (void) {
+ unregister_code (KC_LSFT);
unregister_code (KC_LCTRL);
}
-void register_alt_shift (void) {
- register_code (KC_LSFT);
+void register_alt_shift (void) {
+ register_code (KC_LSFT);
register_code (KC_LALT);
}
-void unregister_alt_shift (void) {
- unregister_code (KC_LSFT);
+void unregister_alt_shift (void) {
+ unregister_code (KC_LSFT);
unregister_code (KC_LALT);
}
-// To activate SINGLE_HOLD, you will need to hold for 200ms first.
+// To activate SINGLE_HOLD, you will need to hold for 200ms first.
// This tap dance favors keys that are used frequently in typing like 'f'
int cur_dance (qk_tap_dance_state_t *state) {
if (state->count == 1) {
//If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP
if (state->interrupted) {
- // if (!state->pressed) return SINGLE_TAP;
+ // if (!state->pressed) return SINGLE_TAP;
//need "permissive hold" here.
- // else return SINsGLE_HOLD;
+ // else return SINsGLE_HOLD;
//If the interrupting key is released before the tap-dance key, then it is a single HOLD
//However, if the tap-dance key is released first, then it is a single TAP
//But how to get access to the state of the interrupting key????
@@ -105,8 +102,8 @@ int cur_dance (qk_tap_dance_state_t *state) {
else if (state->count == 2) {
if (state->interrupted) return DOUBLE_SINGLE_TAP;
else if (state->pressed) return DOUBLE_HOLD;
- else return DOUBLE_TAP;
- }
+ else return DOUBLE_TAP;
+ }
else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
else if (state->count == 3) return TRIPLE_HOLD;
else return 8; //magic number. At some point this method will expand to work for more presses
@@ -116,8 +113,8 @@ int cur_dance (qk_tap_dance_state_t *state) {
int hold_cur_dance (qk_tap_dance_state_t *state) {
if (state->count == 1) {
if (state->interrupted) {
- if (!state->pressed) return SINGLE_TAP;
- else return SINGLE_HOLD;
+ if (!state->pressed) return SINGLE_TAP;
+ else return SINGLE_HOLD;
}
else {
if (!state->pressed) return SINGLE_TAP;
@@ -128,8 +125,8 @@ int hold_cur_dance (qk_tap_dance_state_t *state) {
//with single tap.
else if (state->count == 2) {
if (state->pressed) return DOUBLE_HOLD;
- else return DOUBLE_TAP;
- }
+ else return DOUBLE_TAP;
+ }
else if (state->count == 3) {
if (!state->pressed) return TRIPLE_TAP;
else return TRIPLE_HOLD;
@@ -138,7 +135,7 @@ int hold_cur_dance (qk_tap_dance_state_t *state) {
}
-static xtap htap_state = {
+static xtap htap_state = {
.is_press_action = true,
.state = 0
};
@@ -168,7 +165,7 @@ void h_reset (qk_tap_dance_state_t *state, void *user_data) {
/**************** QUAD FUNCTION FOR TAB ****************/
// TAB, ALT + SHIFT, TAB TAB, CTRL + SHIFT
-static xtap tab_state = {
+static xtap tab_state = {
.is_press_action = true,
.state = 0
};
@@ -183,7 +180,7 @@ void tab_finished (qk_tap_dance_state_t *state, void *user_data) {
case TRIPLE_TAP: register_code(KC_LSHIFT) ;register_code(KC_ESC); break;
case TRIPLE_HOLD: register_code(KC_LSHIFT); register_code(KC_LGUI); break;
}
-}
+}
void tab_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (tab_state.state) {
@@ -201,7 +198,7 @@ void tab_reset (qk_tap_dance_state_t *state, void *user_data) {
//*************** SUPER COMMA *******************//
// Assumption: we don't care about trying to hit ,, quickly
//*************** SUPER COMMA *******************//
-static xtap comma_state = {
+static xtap comma_state = {
.is_press_action = true,
.state = 0
};
@@ -209,19 +206,19 @@ static xtap comma_state = {
void comma_finished (qk_tap_dance_state_t *state, void *user_data) {
comma_state.state = hold_cur_dance(state); //Use the dance that favors being held
switch (comma_state.state) {
- case SINGLE_TAP: register_code(KC_COMMA); break;
+ case SINGLE_TAP: register_code(KC_COMMA); break;
case SINGLE_HOLD: layer_on(1); break; //turn on symbols layer
case DOUBLE_TAP: layer_invert(4); break; //toggle numbers layer
case DOUBLE_HOLD: layer_on(2); break;
case TRIPLE_TAP: register_code(KC_CALCULATOR); break;
case TRIPLE_HOLD: layer_on(3);
}
-}
+}
void comma_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (comma_state.state) {
case SINGLE_TAP: unregister_code(KC_COMMA); break; //unregister comma
- case SINGLE_HOLD: layer_off(1); break;
+ case SINGLE_HOLD: layer_off(1); break;
case DOUBLE_TAP: ;break;
case DOUBLE_HOLD: layer_off(2); break;
case TRIPLE_TAP: unregister_code(KC_CALCULATOR); break;
@@ -235,7 +232,7 @@ void comma_reset (qk_tap_dance_state_t *state, void *user_data) {
//*************** F3 TAP DANCE *******************//
//Good example for accessing multiple layers from the same key.
-static xtap S1_state = {
+static xtap S1_state = {
.is_press_action = true,
.state = 0
};
@@ -244,17 +241,17 @@ void bt_finished (qk_tap_dance_state_t *state, void *user_data) {
S1_state.state = cur_dance(state);
switch (S1_state.state) {
case SINGLE_TAP: register_code(KC_F3); break;
- case SINGLE_HOLD: layer_on(4); break;
- case DOUBLE_TAP: layer_invert(4); break;
+ case SINGLE_HOLD: layer_on(_MACROS); break;
+ case DOUBLE_TAP: layer_invert(_MACROS); break;
case DOUBLE_HOLD: layer_on(5); break;
- case DOUBLE_SINGLE_TAP: layer_invert(4); break;
+ case DOUBLE_SINGLE_TAP: layer_invert(_MACROS); break;
}
}
void bt_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (S1_state.state) {
case SINGLE_TAP: unregister_code(KC_F3); break;
- case SINGLE_HOLD: layer_off(4); break;
+ case SINGLE_HOLD: layer_off(_MACROS); break;
case DOUBLE_TAP: break; //already inverted. Don't do anything.
case DOUBLE_HOLD: layer_off(5); break;
case DOUBLE_SINGLE_TAP: break;
@@ -262,14 +259,152 @@ void bt_reset (qk_tap_dance_state_t *state, void *user_data) {
S1_state.state = 0;
}
+// Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+ // simple tap dance
+ [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),
+ [REFRESH] = ACTION_TAP_DANCE_DOUBLE(KC_R,LCTL(KC_R)),
+ [ENDESC] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_ESC),
+ [Q_ESCAPE] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC),
+ [ENDHOME] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_HOME),
+ [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER),
+ [ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)),
+ [F6F7] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F6), LALT(KC_F7)),
+ [F1F13] = ACTION_TAP_DANCE_DOUBLE(KC_F1, KC_F13),
+ [F2F14] = ACTION_TAP_DANCE_DOUBLE(KC_F2, KC_F14),
+ [F5F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5, KC_F15),
+ [TABCOMBO] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tab_finished, tab_reset),
+ [F3D] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, bt_finished, bt_reset),
+ [COMMA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, comma_finished, comma_reset),
+ [HTAB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,h_finished, h_reset)
+};
+
+// bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+// if (!record->event.pressed) {
+// switch (keycode) {
+
+// case KC_SECRET_1 ... KC_SECRET_5:
+// send_string(secret[keycode - KC_SECRET_1]);
+// // clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+// return true; break;
+
+// case UP_ENTER_RESET:
+// register_code(KC_UP);
+// unregister_code(KC_UP);
+// register_code(KC_ENTER);
+// unregister_code(KC_ENTER);
+// reset_keyboard();
+// return false; break;
+
+// case TIL_SLASH:
+// SEND_STRING ("~/.");
+// return false; break;
+
+// case DBMS_OUT:
+// SEND_STRING ("dbms_output.put_line('');");
+// SEND_STRING (SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+// return false; break;
+
+// case ID_MAN_IP:
+// SEND_STRING ("http://dev-1967110238.us-east-1.elb.amazonaws.com");
+// return false; break;
+
+// case MODRESET:
+// clear_mods();
+// return false; break;
+
+// case DEREF:
+// SEND_STRING ("->");
+// return false; break;
+
+// case EQRIGHT:
+// SEND_STRING ("=>");
+// return false; break;
+
+// case TICK3:
+// SEND_STRING ("```");
+// return false; break;
+
+// case TILD3:
+// SEND_STRING ("~~~");
+// return false; break;
+// }
+// }
+// return true;
+// };
+
+
+
+
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case KC_SECRET_1 ... KC_SECRET_5:
- if (!record->event.pressed) {
- send_string(secret[keycode - KC_SECRET_1]);
+ if (!record->event.pressed) {
+ switch (keycode) {
+ case KC_SECRET_1 ... KC_SECRET_5:
+ send_string(secret[keycode - KC_SECRET_1]);
+ // clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+ return true; break;
+ case UP_ENTER_RESET:
+ SEND_STRING("make ergodox_infinity:gordon:dfu-util");
+ register_code(KC_ENTER);
+ unregister_code(KC_ENTER);
+ reset_keyboard();
+ return false; break;
+
+ case TIL_SLASH:
+ SEND_STRING ("~/.");
+ return false; break;
+
+ case DBMS_OUT:
+ SEND_STRING ("dbms_output.put_line('');");
+ SEND_STRING (SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+ return false; break;
+ case DIE_1000X_RIGHT:
+ SEND_STRING (SS_TAP(X_G) SS_TAP(X_G) SS_TAP(X_RIGHT) SS_TAP(X_B) SS_TAP(X_J));
+ return false; break;
+ case DIE_1000X_LEFT:
+ SEND_STRING (SS_TAP(X_GRAVE) SS_TAP(X_G) SS_TAP(X_LEFT) SS_TAP(X_B) SS_TAP(X_J));
+ return false; break;
+ case ID_MAN_IP:
+ SEND_STRING ("http://dev-1967110238.us-east-1.elb.amazonaws.com");
+ return false; break;
+
+ case MODRESET:
+ clear_mods();
+ return false; break;
+
+ case DEREF:
+ SEND_STRING ("->");
+ return false; break;
+
+ case EQRIGHT:
+ SEND_STRING ("=>");
+ return false; break;
+
+ case TICK3:
+ SEND_STRING ("```");
+
+ return false; break;
+
+ case SPRK_TCK:
+ SEND_STRING ("```");
+ SEND_STRING (SS_DOWN(X_LSHIFT) SS_TAP(X_ENTER) SS_UP(X_LSHIFT));
+ SEND_STRING (SS_DOWN(X_LSHIFT) SS_TAP(X_ENTER) SS_UP(X_LSHIFT));
+ SEND_STRING ("```");
+ SEND_STRING (SS_TAP(X_UP));
+ return false; break;
+
+ case TILD3:
+ SEND_STRING ("~~~");
+ return false; break;
+ }
+ }
+ else { //On key being pressed
+ switch (keycode) {
+ case KC_SECRET_1 ... KC_SECRET_5:
+ clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+ return false; break;
}
- return false;
- break;
}
return true;
-} \ No newline at end of file
+};
+
diff --git a/users/gordon/gordon.h b/users/gordon/gordon.h
index 548c630496..92641a8aae 100644
--- a/users/gordon/gordon.h
+++ b/users/gordon/gordon.h
@@ -6,20 +6,21 @@
// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define ________ KC_TRNS
+#define _______ KC_TRNS
+#define ________ KC_TRNS
#define _________ KC_TRNS
-#define XXXXXXX KC_NO
+#define _XXXXXX_ KC_TRNS
+#define XXXXXXX KC_NO
// KC codes that are too long
-#define DOLLAR KC_DOLLAR
-#define LSQUIGLY KC_LBRACKET
-#define RSQUIGLY KC_RBRACKET
-#define NUMLOCK KC_NUMLOCK
-#define CAPLOCK KC_CAPSLOCK
-#define BK_SLASH KC_BSLASH
-#define ASTERSK KC_KP_ASTERISK
-
+#define DOLLAR KC_DOLLAR
+#define LSQUIGLY KC_LBRACKET
+#define RSQUIGLY KC_RBRACKET
+#define NUMLOCK KC_NUMLOCK
+#define CAPLOCK KC_CAPSLOCK
+#define BK_SLASH KC_BSLASH
+#define ASTERSK KC_KP_ASTERISK
+
// Navigation
#define SNAPLEFT LGUI(KC_LEFT)
#define SNAPRGHT LGUI(KC_RIGHT)
@@ -30,19 +31,28 @@
#define WORKRIGHT LCTL(LGUI(KC_RIGHT))
#define WORKLEFT LCTL(LGUI(KC_LEFT))
+#define APP_1 LCTL(LGUI(KC_1))
+#define APP_2 LCTL(LGUI(KC_2))
+#define APP_3 LCTL(LGUI(KC_3))
+#define APP_4 LCTL(LGUI(KC_4))
+#define APP_5 LCTL(LGUI(KC_5))
+#define APP_6 LCTL(LGUI(KC_6))
+#define APP_7 LCTL(LGUI(KC_7))
+#define APP_8 LCTL(LGUI(KC_8))
+
// KC/modifier hold
-#define CTRL_F CTL_T(KC_F)
-#define CTRL_J CTL_T(KC_J)
-#define CTRL_Z CTL_T(KC_Z)
-#define ALT_V ALT_T(KC_V)
-#define ALT_M ALT_T(KC_M)
-#define WIN_G GUI_T(KC_G)
-#define WIN_H GUI_T(KC_H)
-#define HYPER_X ALL_T(KC_X)
-#define HYPE_DOT ALL_T(KC_DOT)
-#define MEH_S MEH_T(KC_S)
-#define MEH_L MEH_T(KC_L)
-#define ALT_HOME ALT_T(KC_HOME)
+#define CTRL_F CTL_T(KC_F)
+#define CTRL_J CTL_T(KC_J)
+#define CTRL_Z CTL_T(KC_Z)
+#define ALT_V ALT_T(KC_V)
+#define ALT_M ALT_T(KC_M)
+#define WIN_G GUI_T(KC_G)
+#define WIN_H GUI_T(KC_H)
+#define HYPER_X ALL_T(KC_X)
+#define HYPE_DOT ALL_T(KC_DOT)
+#define MEH_S MEH_T(KC_S)
+#define MEH_L MEH_T(KC_L)
+#define ALT_HOME ALT_T(KC_HOME)
// KC/Layer Hold
@@ -52,6 +62,15 @@
#define SYMB_BSP LT(_SYMBOLS,KC_BSPACE)
#define COL_MOUS LT(_MOUSE,KC_SCOLON)
#define SPAC_SYM LT(_SYMBOLS,KC_SPACE)
+#define SPAC_TXT LT(_TEXTNAV,KC_SPACE)
+
+#define APP_SW_I LT(_APPSWITCH,KC_I)
+#define APP_SW_K LT(_APPSWITCH,KC_K)
+
+// #define TLSLSH TIL_SLASH
+// #define TILDA_3x TILD3
+// #define _RESET_ UP_ENTER_RESET
+
// Double Modifier ONLY hold
#define ALT_SHFT LSFT(KC_LALT)
@@ -60,6 +79,7 @@
// KC/Double modifier Hold
#define CTR_SH_W MT(MOD_LCTL|MOD_LSFT,KC_W)
#define CTR_AL_R MT(MOD_LCTL|MOD_LALT,KC_R)
+#define ALT_SH_R MT(MOD_LSFT|MOD_LALT,KC_R)
//MISC
#define PRINTSCR KC_PSCREEN
@@ -82,16 +102,77 @@ enum {
TRIPLE_HOLD = 7
};
+//Tap dance enums
+enum
+{
+ F12TAP = 0,
+ F12ETAPS,
+ CALCCOMP,
+ REFRESH, //send R, or Control+R if double tapped.
+ ENDESC,
+ XESC, //'quad function'. x, control, escape, alt
+ ALY2, //'quad function': a, Hyper, ctrl+a, layer 2
+ PRLOCK,
+ F6F7, // Shift F6 or Alt F7
+ TABCOMBO,
+ FCTRL,
+ F3D,
+ ALTF4,
+ COMMA,
+ AT,
+ HTAB,
+ F1F13,
+ F2F14,
+ F5F15,
+ ENDHOME,
+ Q_ESCAPE
+};
+
+#ifdef TAP_DANCE_ENABLE
+#define F1_F13 TD(F1F13)
+#define F2_F14 TD(F2F14)
+#define F5_F15 TD(F5F15)
+#define F4_ALTF4 TD(ALTF4)
+#define END_ESC TD(ENDESC)
+#define Q_ESC TD(Q_ESCAPE)
+#define END_HOME TD(ENDHOME)
+#define SHF6_AF7 TD(F6F7)
+#define F12_RUN TD(F12ETAPS)
+#define COMMA_TD TD(COMMA)
+#define CALC_COM TD(CALCCOMP)
+#else //just to make things compile
+#define F1_F13 KC_1
+#define F2_F14 KC_1
+#define F5_F15 KC_1
+#define F4_ALTF4 KC_1
+#define END_ESC KC_1
+#define END_HOME KC_1
+#define SHF6_AF7 KC_1
+#define F12_RUN KC_1
+#define COMMA_TD KC_1
+#define CALC_COM KC_1
+#endif
+
enum gordon_layers
{
_QWERTY = 0,
- _SYMBOLS,
- _MOUSE,
- _NUMPAD,
- _NAV,
- _MACROS,
- _FUNCTION,
- _TEXTNAV
+ _SYMBOLS, // Programming and all other commonlye used symbols
+ _MOUSE, // Mouse movement and also a few macros
+ _NUMPAD, // For getting a numpad under the right hand, and a few helpful things under the left
+ _NAV, // Windows navigation. Windows snapping, changing workspaces, and ARROWS
+ _MACROS, // Non-text related Macros.
+ _FUNCTION, // Not sure what I had in mind for this one
+ _APPSWITCH, // For switching between apps using the `ctrl + Win + [num]` shortcut.
+ // This allows for toggling windows of the same app with one button.
+ // Example: Press and hold `I`, then tap `j` multiple times to cycle through all
+ // Intellij windows (and only Intellij). This requires the app to be pinned to the Windows bar
+ _ONESHOT, // A layer I use for shortcuts that require multiple modifiers and a button not on my home layer
+ // Example: If I need to hit `alt + shift + 5`
+ _TEXTNAV, // Navigate through text
+ _QWERTY_KIDS, // So my kids can do nothing but type. Could also be a `speed typing` layer with no LT or MTs
+ _STREET_FIGHTER, // For Street Fighter 5. Die 1000x Deaths!!!!
+ _DIRNAV, // For navigating to different directories.
+ _TEXT_MACROS // For text-manipulation macros. Passwords, saved strings, pre-formatting
};
@@ -99,23 +180,23 @@ enum gordon_layers
void register_hyper (void);
void unregister_hyper (void);
-void register_ctrl_a (void);
-void unregister_ctrl_a (void);
+void register_ctrl_a (void);
+void unregister_ctrl_a (void);
-void register_alt_f7 (void);
+void register_alt_f7 (void);
void unregister_alt_f7 (void);
-void register_shift_f6 (void);
-void unregister_shift_f6 (void);
+void register_shift_f6 (void);
+void unregister_shift_f6 (void);
-void register_ctrl_shift (void);
-void unregister_ctrl_shift (void);
+void register_ctrl_shift (void);
+void unregister_ctrl_shift (void);
-void register_alt_shift (void);
+void register_alt_shift (void);
void unregister_alt_shift (void);
-int cur_dance (qk_tap_dance_state_t *state);
-int hold_cur_dance (qk_tap_dance_state_t *state);
+int cur_dance (qk_tap_dance_state_t *state);
+int hold_cur_dance (qk_tap_dance_state_t *state);
void x_finished (qk_tap_dance_state_t *state, void *user_data);
void x_reset (qk_tap_dance_state_t *state, void *user_data);
@@ -132,26 +213,37 @@ void comma_reset (qk_tap_dance_state_t *state, void *user_data);
void bt_finished (qk_tap_dance_state_t *state, void *user_data);
void bt_reset (qk_tap_dance_state_t *state, void *user_data);
+enum secret_strings {
+ KC_SECRET_1 = SAFE_RANGE,
+ KC_SECRET_2,
+ KC_SECRET_3,
+ KC_SECRET_4,
+ KC_SECRET_5,
+ END_SECRET_SAFE_RANGE
+};
+
+
// Macro Declarations
enum {
- INFOQM,
+ INFOQM = END_SECRET_SAFE_RANGE,
+ MODRESET,
TIL_SLASH,
DEREF,
EQRIGHT,
TILD3,
TICK3,
+ SPRK_TCK,
ALTTAB_START,
- ALTTAB_END
+ ALTTAB_END,
+ UP_ENTER_RESET,
+ DBMS_OUT,
+ DIE_1000X_RIGHT,
+ DIE_1000X_LEFT,
+ ID_MAN_IP
};
-enum secret_strings {
- KC_SECRET_1 = SAFE_RANGE,
- KC_SECRET_2,
- KC_SECRET_3,
- KC_SECRET_4,
- KC_SECRET_5,
-};
+
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
-#endif \ No newline at end of file
+#endif
diff --git a/users/gordon/rules.mk b/users/gordon/rules.mk
index 359478912c..19e77b01b1 100644
--- a/users/gordon/rules.mk
+++ b/users/gordon/rules.mk
@@ -1,2 +1,4 @@
TAP_DANCE_ENABLE = yes
-SRC += gordon.c \ No newline at end of file
+SRC += gordon.c
+
+# BOOTMAGIC_ENABLE = yes
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-24 22:20:15 +0000