diff options
Diffstat (limited to 'keyboards/ergodox_infinity/keymaps')
5 files changed, 712 insertions, 424 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/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c index 7df97bd01f..b1cfdf42fc 100644 --- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c +++ b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c @@ -10,12 +10,13 @@ #define HALFQWERTY 1 // mirrored qwerty layer #define DVORAK 2 // dvorak layer #define HALFDVORAK 3 // mirrored dvorak layer +//no layer 4 #define SYMB 5 // symbols #define HALFSYMB 6 // media keys #define PLVR 7 // steno plover layout -#define SHORTCUTS 8 //layer with shortcut keys -#define MDIA 9 - +#define SHORTCUTS 8 //layer with shortcut keys and other layer nav +#define FUNCTION 9 //all F-keys, all day +#define PROPERSTENO 10 //real steno layout enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here @@ -28,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: qwerty * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | ` | | \ | 6 | 7 | 8 | 9 | 0 | BSPC | + * | ESC | 1 | 2 | 3 | 4 | 5 | RMB | | \ | 6 | 7 | 8 | 9 | 0 | BSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | ' | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -39,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |LCTRL|ALT |CTLShTab|CTL-TAB| LGui| | RGui| UP | DOWN | ALT | RCTRL | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * |Symbol|Dvorak| |Plover|HalfSymb| + * |Symbol|LMB | |Plover|HalfSymb| * ,------|------|------| |------+--------+------. * | | |MU_TOG| | PgUp | | | * | Space|DELETE|------| |------| Tab |Enter | @@ -50,21 +51,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Otherwise, it needs KC_* [QWERTY] = LAYOUT_ergodox( // layer 0 : default // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRAVE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_BTN2, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_EQL, KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MINUS, KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), MO(SHORTCUTS), - TG(SYMB), TG(DVORAK), + KC_LGUI, KC_BTN1, MU_ON, - LT(HALFQWERTY, KC_SPACE),KC_DEL,KC_END, + KC_SPACE,KC_DEL,KC_END, // right hand - KC_BSLS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_BTN2, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLASH, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_EQL,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLASH, KC_RSFT, - MO(MDIA), KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, - TG(PLVR), TG(MDIA), + MO(SHORTCUTS), KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, + KC_BTN1, KC_RGUI, MU_OFF, KC_PGDN,KC_TAB, LT(HALFQWERTY, KC_ENT) ), @@ -93,25 +94,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Otherwise, it needs KC_* [HALFQWERTY] = LAYOUT_ergodox( // layer 0 : default // left hand - KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_BSLS, - KC_BSLS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_RBRC, + KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_TRNS, + KC_BSLS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_LBRC, KC_ENT, KC_SCLN, KC_L, KC_K, KC_J, KC_H, - KC_LSFT, KC_SLASH, KC_DOT, KC_COMM,KC_M, KC_N, KC_EQL, + KC_LSFT, KC_SLASH, KC_DOT, KC_COMM,KC_M, KC_N, KC_RBRC, KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, - KC_TRNS, KC_TRANSPARENT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRANSPARENT,KC_DEL,KC_END, // right hand - KC_GRAVE, KC_5, KC_4, KC_3, KC_2, KC_1, KC_BSPC, - KC_LBRC, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_BSLS, + KC_TRNS, KC_5, KC_4, KC_3, KC_2, KC_1, KC_BSPC, + KC_MINUS, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_BSLS, KC_G, KC_F, KC_D, KC_S, KC_A, KC_ENT, - KC_MINUS,KC_B, KC_V, KC_C, KC_X, KC_Z, KC_RSFT, + KC_EQL,KC_B, KC_V, KC_C, KC_X, KC_Z, KC_RSFT, KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, KC_TRANSPARENT, KC_TRNS, KC_TRNS, KC_PGDN,KC_TAB, KC_TRANSPARENT ), -/* Keymap 3: dvorak +/* Keymap 2: dvorak * * ,--------------------------------------------------. ,--------------------------------------------------. * | ESC | 1 | 2 | 3 | 4 | 5 | ` | | \ | 6 | 7 | 8 | 9 | 0 | BSPC | @@ -134,24 +135,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* -[DVORAK] = LAYOUT_ergodox( // layer 0 : default +[DVORAK] = LAYOUT_ergodox( // layer 2 : dvorak // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRAVE, - KC_TAB, KC_QUOTE, KC_COMM,KC_DOT, KC_P, KC_Y, KC_LBRC, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, + KC_TAB, KC_QUOTE, KC_COMM,KC_DOT, KC_P, KC_Y, KC_MINUS, KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I, - KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_MINUS, + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_EQL, KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, - TG(SYMB), KC_TRANSPARENT, - KC_TRNS, - LT(HALFDVORAK, KC_SPACE),KC_DEL,KC_END, + KC_TRNS, KC_TRANSPARENT, + KC_UP, + LT(HALFDVORAK, KC_SPACE),KC_DEL,KC_DOWN, // right hand - KC_BSLS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_RBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH, + KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_LBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENT, - KC_EQL,KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, + KC_RBRC,KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, - KC_TRANSPARENT, TG(MDIA), - KC_TRNS, + KC_TRANSPARENT, KC_TRANSPARENT, + KC_PGUP, KC_PGDN,KC_TAB, LT(HALFDVORAK, KC_ENT) ), /* Keymap 3: mirrored dvorak @@ -179,23 +180,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Otherwise, it needs KC_* [HALFDVORAK] = LAYOUT_ergodox( // layer 0 : default // left hand - KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_BSLS, - KC_SLASH, KC_L, KC_R, KC_C, KC_G, KC_F, KC_RBRC, + KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_TRNS, + KC_SLASH, KC_L, KC_R, KC_C, KC_G, KC_F, KC_LBRC, KC_ENT, KC_S, KC_N, KC_T, KC_H, KC_D, - KC_LSFT, KC_Z, KC_V, KC_W, KC_M, KC_B, KC_EQL, + KC_LSFT, KC_Z, KC_V, KC_W, KC_M, KC_B, KC_RBRC, KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRNS, - KC_TRANSPARENT,KC_DEL,KC_END, + KC_TRANSPARENT,KC_ENT,KC_TRNS, // right hand - KC_GRAVE, KC_5, KC_4, KC_3, KC_2, KC_5, KC_ESC, - KC_LBRC, KC_Y, KC_P, KC_DOT, KC_COMM,KC_P, KC_TAB, + KC_TRNS, KC_5, KC_4, KC_3, KC_2, KC_5, KC_ESC, + KC_MINUS, KC_Y, KC_P, KC_DOT, KC_COMM,KC_P, KC_TAB, KC_I, KC_U, KC_E, KC_O, KC_A, KC_BSPC, - KC_MINUS,KC_X, KC_K, KC_J, KC_Q, KC_SCLN, KC_RSFT, + KC_EQL,KC_X, KC_K, KC_J, KC_Q, KC_SCLN, KC_RSFT, KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, KC_TRANSPARENT, KC_TRNS, KC_TRNS, - KC_PGDN,KC_TAB, KC_TRANSPARENT + KC_TRNS,KC_TAB, KC_TRANSPARENT ), /* Keymap 5: Symbol Layer * @@ -235,8 +236,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_DOWN, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_KP_ENTER, KC_NO,KC_AMPR,KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_PLUS, KC_NO, KC_TRNS,KC_DOT, KC_0, KC_KP_EQUAL, KC_NO, - KC_NO, KC_TRNS, - KC_NO, + BL_OFF, KC_TRNS, + BL_ON, KC_NO, KC_NO, LT(HALFSYMB, KC_ENT) ), /* Keymap 6: Mirrored Symbol Layer @@ -263,7 +264,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // SYMBOLS [HALFSYMB] = LAYOUT_ergodox( // left hand - KC_BSPC, KC_F12, KC_F11, KC_F10, KC_F9, KC_F8, KC_F7, + KC_BSPC, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_NO,KC_NO,KC_KP_7, KC_KP_8, KC_KP_9,KC_KP_ASTERISK,KC_KP_SLASH, KC_ENTER,KC_NO,KC_KP_4, KC_KP_5, KC_KP_6,KC_KP_MINUS, KC_NO,KC_NO,KC_KP_1, KC_KP_2, KC_KP_3,KC_KP_PLUS,KC_KP_ENTER, @@ -272,7 +273,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRANSPARENT,KC_NO,KC_NO, // right hand - KC_F6, KC_F5, KC_F4, KC_F3, KC_F2, KC_F1, KC_BSPC, + KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_BSPC, KC_NO,KC_PIPE,KC_LCBR,KC_RCBR, KC_SLASH, KC_BSLS, KC_NO, KC_GRV,KC_LPRN,KC_RPRN, KC_SCLN, KC_QUOT, KC_NO, KC_NO, KC_TILD,KC_LBRC,KC_RBRC, KC_EQL, KC_MINUS, KC_NO, @@ -281,7 +282,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_NO, KC_NO, KC_TRANSPARENT ), - /* Keymap 7: Steno for Plover from https://github.com/shayneholmes/tmk_keyboard/commit/11290f8489013018f778627db725160c745e75bd * * ,--------------------------------------------------. ,--------------------------------------------------. @@ -304,26 +304,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `--------------------' */ -[PLVR] = LAYOUT_ergodox( // layout: layer 4: Steno for Plover +[PLVR] = KEYMAP( // layout: layer 7: Steno for Plover // left hand KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, STN_N6, KC_NO, - STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, - KC_NO, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, KC_NO, + KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, + KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, + KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, - KC_TRNS, - STN_A, STN_O, KC_NO, + KC_NO, + KC_C, KC_V, KC_NO, // right hand - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_TRNS, STN_N7, STN_N8, STN_N9, STN_NA, STN_NB, STN_NC, - STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, - KC_NO,STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, - KC_NO, STN_E, STN_U + KC_NO, KC_N, KC_M ), + /* Keymap 8: shortcuts * * ,--------------------------------------------------. ,--------------------------------------------------. @@ -338,7 +339,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |LCTRL|ALT |CTLShTab|CTL-TAB| | | RGui| UP | DOWN | ALT | RCTRL | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * | Alt |Dvorak| |Plover|Alt | + * |SYMBOLS|Dvorak| |Steno |Plover| * ,------|------|------| |------+--------+------. * | | | Home | | PgUp | | | * | Space|DELETE|------| |------| Tab |Enter | @@ -349,35 +350,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Otherwise, it needs KC_* [SHORTCUTS] = LAYOUT_ergodox( // layer 0 : default // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, + RGB_MODE_KNIGHT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_TAB, LCTL(KC_Q), LCTL(KC_W),LCTL(KC_E),LCTL(KC_R),LCTL(KC_T), KC_NO, KC_BSPC, LCTL(KC_A), LCTL(KC_S),LCTL(KC_D),LCTL(KC_F),LCTL(KC_G), KC_LSFT, LCTL(KC_Z), LCTL(KC_X),LCTL(KC_C),LCTL(KC_V),LCTL(KC_B), KC_MINUS, - KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRANSPARENT, - KC_NO, KC_NO, + RESET, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRANSPARENT, + TG(SYMB), TG(DVORAK), - KC_NO, + TG(FUNCTION), KC_NO,KC_NO,KC_NO, - // right hand +// right hand KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - KC_EQL,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLASH, KC_RSFT, - KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, - KC_NO, KC_TRNS, + TG(SYMB),LCTL(KC_Y),LCTL(KC_U),LCTL(KC_I),LCTL(KC_O),LCTL(KC_P),KC_BSLS, + LCTL(KC_H),LCTL(KC_J),LCTL(KC_K),LCTL(KC_L),LCTL(KC_SCLN),KC_ENT, + KC_EQL,LCTL(KC_N),LCTL(KC_M),LCTL(KC_COMM),LCTL(KC_DOT),LCTL(KC_SLASH),KC_RSFT, + KC_TRNS, KC_UP,KC_DOWN,KC_RALT, RESET, + TG(PROPERSTENO),TG(PLVR), KC_NO, KC_NO,KC_NO, KC_NO ), - /* Keymap 2: Media and mouse keys + /* Keymap 9: Functions * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F1 | F2 | F3 | F4 | F5 | F6 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | |LClick| MsUp |RClick| | | | | |LClick| MsUp |RClick| | | + * | F7 | F8 | F9 | F10 | F11 | F12 | | | | F7 | F8 | F9 | F10 | F11 | F12 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | |MsLeft|MsDown|MsRght| |------| |------| |MsLeft|MsDown|MsRght| | | + * | F13 | F14 | F15 | F16 | F17 | F18 |------| |------| F13 | F14 | F15 | F16 | F17 | F18 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | F19 | F20 | F21 | F22 | F23 | F24 | | | | F19 | F20 | F21 | F22 | F23 | F24 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' @@ -385,74 +386,74 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | * ,------|------|------| |------+------+------. * | | | | | | | | - * | | |------| |------| | | + * | c | v |------| |------| n | m | * | | | | | | | | * `--------------------' `--------------------' */ -// MEDIA AND MOUSE -[MDIA] = LAYOUT_ergodox( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_WH_U, - KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_WH_L, KC_WH_R, KC_TRNS, - // right hand - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_WH_U, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, - KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, - KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_WH_L, KC_WH_R + +[FUNCTION] = LAYOUT_ergodox( // layout: layer 9 + // left hand + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, + KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, + KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_NO, KC_NO, KC_NO, + // right hand + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, + KC_NO,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, + KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_NO, KC_NO, KC_NO ), -/* Keymap 8: shortcuts + /* Keymap 10: Steno * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | BSPC | + * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | TAB | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | + * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | BkSp | A | S | D | F | G |------| |------| H | J | K | L | ; |ENTER | - * |--------+------+------+------+------+------| - | | = |------+------+------+------+------+--------| - * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift | + * | | q | w | e | r | t |------| |------| y | u | i | o | p | [ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | a | s | d | f | g | | | | h | j | k | l | ; | ' | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |LCTRL|ALT |CTLShTab|CTL-TAB| | | RGui| UP | DOWN | ALT | RCTRL | + * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * | Alt |Dvorak| |Plover|Alt | - * ,------|------|------| |------+--------+------. - * | | | Home | | PgUp | | | - * | Space|DELETE|------| |------| Tab |Enter | - * |mirror| | End | | PgDn | |mirror| - * `--------------------' `----------------------' + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | c | v |------| |------| n | m | + * | | | | | | | | + * `--------------------' `--------------------' */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. -// Otherwise, it needs KC_* -[SHORTCUTS] = LAYOUT_ergodox( // layer 0 : default - // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, - KC_TAB, LCTL(KC_Q), LCTL(KC_W),LCTL(KC_E),LCTL(KC_R),LCTL(KC_T), KC_NO, - KC_BSPC, LCTL(KC_A), LCTL(KC_S),LCTL(KC_D),LCTL(KC_F),LCTL(KC_G), - KC_LSFT, LCTL(KC_Z), LCTL(KC_X),LCTL(KC_C),LCTL(KC_V),LCTL(KC_B), KC_MINUS, - KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRANSPARENT, - KC_NO, KC_NO, - KC_NO, - KC_NO,KC_NO,KC_NO, +[PROPERSTENO] = LAYOUT_ergodox( // layout: layer 10 + // left hand + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, STN_N6, KC_NO, + STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, + KC_NO, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + STN_A, STN_O, KC_NO, // right hand - KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - KC_EQL,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLASH, KC_RSFT, - KC_RGUI, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, - KC_NO, KC_NO, - KC_NO, - KC_NO,KC_NO, KC_NO - ), + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, STN_N7, STN_N8, STN_N9, STN_NA, STN_NB, STN_NC, + STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, + KC_NO,STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, + KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_NO, STN_E, STN_U +), + }; const uint16_t PROGMEM fn_actions[] = { diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c b/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c index 7bd5a0783f..61a724c63f 100644 --- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c +++ b/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c @@ -18,15 +18,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "default_animations.h" #include "led_backlight_keyframes.h" -#define ONESIDESCAN 9 -#define BOTHSIDESCAN 16 +#define NUM_ROWS LED_HEIGHT +#define NUM_COLS LED_WIDTH + +#define ONESIDESCAN 10 +#define BOTHSIDESCAN 20 #define FULL_ON LUMA2COLOR(255) #define THREE_QUARTER LUMA2COLOR(200) #define HALF_ON LUMA2COLOR(150) #define ONE_QUARTER LUMA2COLOR(50) -#define CROSSFADE_TIME 8000 -bool KITT_scan_one_side_left_to_right(keyframe_animation_t* animation, visualizer_state_t* state); -bool KITT_scan_one_side_right_to_left(keyframe_animation_t* animation, visualizer_state_t* state); + +#define CROSSFADE_TIME 500 +#define GRADIENT_TIME 3000 +bool led_backlight_keyframe_one_period_sweep(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_backlight_keyframe_half_period_sweep_to_on(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_backlight_keyframe_half_period_sweep_to_off(keyframe_animation_t* animation, visualizer_state_t* state); keyframe_animation_t Fade_in_all_leds = { .num_frames = 1, .loop = false, @@ -37,114 +43,272 @@ keyframe_animation_t Fade_in_all_leds = { led_backlight_keyframe_fade_in_all, }, }; -/* - * one set left to right. then reverse to go back. - * | left side | right side | | - |---|---|---|---|---|---|---|:-:|---|---|---|---|---|---|-------| - | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | phase | - _________________________________________________________________ - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | - | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | - | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 2 | - | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 3 | - | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 4 | - | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 5 | - | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 6 | - | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 7 | - | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 8 | - | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 9 | - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 10 | - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 11 | - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 12 | - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 13 | - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 14 | - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 15 | - | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 16 | - */ - -#ifdef MASTER_IS_ON_RIGHT /*right side*/ - -keyframe_animation_t KITT_Scanner_animation = { - .num_frames = 2, +keyframe_animation_t decreasing_gradient = { + .num_frames = 8, .loop = true, .frame_lengths = { - CROSSFADE_TIME * BOTHSIDESCAN, - CROSSFADE_TIME * BOTHSIDESCAN, + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + 0, // normal leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + 0, // normal leds }, .frame_functions = { - KITT_scan_one_side_left_to_right, - KITT_scan_one_side_right_to_left, + led_backlight_keyframe_one_period_sweep, + led_backlight_keyframe_mirror_orientation, + keyframe_no_operation, + keyframe_no_operation, + keyframe_no_operation, + keyframe_no_operation, + led_backlight_keyframe_one_period_sweep, + led_backlight_keyframe_normal_orientation, + }, }; -bool KITT_scan_one_side_left_to_right(keyframe_animation_t* animation, visualizer_state_t* state) { + + +static uint8_t off_on_off_gradient(float t, float index, float num) { + const float two_pi = M_PI * 2.0f; + float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi; + float x = t * two_pi + normalized_index-M_PI; + if((1*M_PI) < x && x < (3*M_PI)) + { + float v = 0.5 * (cosf(x) + 1.0f); + return (uint8_t)(255.0f * v); + } + else + { + return 0; + } +} +static uint8_t off_on_gradient(float t, float index, float num) { + const float two_pi = M_PI * 2.0f; + float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi; + float x = t * two_pi + normalized_index-M_PI; + float v; + if((1*M_PI) < x && x < (2*M_PI)) + { + v = 0.5 * (cosf(x) + 1.0f); + } + else if(x >= (2*M_PI)) + { + v = 1; + } + else + { + v = 0; + } + return (uint8_t)(255.0f * v); +} +static uint8_t on_off_gradient(float t, float index, float num) { + const float two_pi = M_PI * 2.0f; + float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi; + float x = t * two_pi + normalized_index-M_PI; + float v; + if((2*M_PI) < x && x < (3*M_PI)) + { + v = 0.5 * (cosf(x) + 1.0f); + + } + else if(x >= (3*M_PI)) + { + v = 0; + } + else + { + v = 1; + } + return (uint8_t)(255.0f * v); +} + +bool led_backlight_keyframe_one_period_sweep(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; float frame_length = animation->frame_lengths[animation->current_frame]; float current_pos = frame_length - animation->time_left_in_frame; - int phase = current_pos/(frame_length/BOTHSIDESCAN); - int row = 0; - gdispGClear(LED_DISPLAY, ONE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, 14-phase, row, FULL_ON); - gdispGDrawPixel(LED_DISPLAY, 15-phase, row, THREE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, 16-phase, row, HALF_ON); - gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER); + float t = current_pos / frame_length; + for (int i=0; i< NUM_COLS; i++) { + uint8_t color = off_on_off_gradient(t*2, i, NUM_COLS); + gdispGDrawLine(LED_DISPLAY, i, 0, i, NUM_ROWS - 1, LUMA2COLOR(color)); + } return true; } -bool KITT_scan_one_side_right_to_left(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_backlight_keyframe_half_period_sweep_to_on(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)state; + float frame_length = animation->frame_lengths[animation->current_frame]; + float current_pos = frame_length - animation->time_left_in_frame; + float t = current_pos / frame_length; + for (int i=0; i< NUM_COLS; i++) { + uint8_t color = off_on_gradient(t*2, i, NUM_COLS); + gdispGDrawLine(LED_DISPLAY, i, 0, i, NUM_ROWS - 1, LUMA2COLOR(color)); + } + return true; +} +bool led_backlight_keyframe_half_period_sweep_to_off(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; float frame_length = animation->frame_lengths[animation->current_frame]; float current_pos = frame_length - animation->time_left_in_frame; - int phase = current_pos/(frame_length/BOTHSIDESCAN); - int row = 0; - gdispGClear(LED_DISPLAY, ONE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, phase, row, FULL_ON); - gdispGDrawPixel(LED_DISPLAY, phase-1, row, THREE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, phase-2, row, HALF_ON); - gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER); + float t = current_pos / frame_length; + for (int i=0; i< NUM_COLS; i++) { + uint8_t color = on_off_gradient(t*2, i, NUM_COLS); + gdispGDrawLine(LED_DISPLAY, i, 0, i, NUM_ROWS - 1, LUMA2COLOR(color)); + } return true; } + + +/* + +---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+ +| 0 | 1 | 2 | 3 | 4 | 5 | 6 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | phase | ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+ +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | +| 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | +| 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 2 | +| 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 3 | +| 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 4 | +| 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 5 | +| 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 6 | +| 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 7 | +| 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 8 | +| 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 9 | +| 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 10 | +| 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 11 | +| 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 12 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 13 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 14 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 15 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 16 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 17 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 18 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 19 | +| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 20 | ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+ +*/ + +#ifdef MASTER_IS_ON_RIGHT /*right side*/ +keyframe_animation_t sweep_on_sweep_off_left_and_right = { + .num_frames = 12, + .loop = true, + .frame_lengths = { + 0, + 1, + gfxMillisecondsToTicks(GRADIENT_TIME), // left on + gfxMillisecondsToTicks(GRADIENT_TIME), // right on + gfxMillisecondsToTicks(GRADIENT_TIME), // left off + gfxMillisecondsToTicks(GRADIENT_TIME), // right off + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // right on + gfxMillisecondsToTicks(GRADIENT_TIME), // left on + gfxMillisecondsToTicks(GRADIENT_TIME), // right off + gfxMillisecondsToTicks(GRADIENT_TIME), // left off + 0, // normal leds + }, + .frame_functions = { + led_backlight_keyframe_mirror_orientation, + led_backlight_keyframe_fade_out_all, + keyframe_no_operation, + led_backlight_keyframe_half_period_sweep_to_on, + keyframe_no_operation, + led_backlight_keyframe_half_period_sweep_to_off, + led_backlight_keyframe_normal_orientation, + led_backlight_keyframe_half_period_sweep_to_on, + keyframe_no_operation, + led_backlight_keyframe_half_period_sweep_to_off, + keyframe_no_operation, + led_backlight_keyframe_mirror_orientation, + + }, +}; +keyframe_animation_t both_sides_fade_across = { + .num_frames = 10, + .loop = true, + .frame_lengths = { + 0, + 1, + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + 0, // normal leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + 0, // normal leds + }, + .frame_functions = { + led_backlight_keyframe_mirror_orientation, + led_backlight_keyframe_fade_out_all, + keyframe_no_operation, + keyframe_no_operation, + led_backlight_keyframe_one_period_sweep, + led_backlight_keyframe_normal_orientation, + led_backlight_keyframe_one_period_sweep, + led_backlight_keyframe_mirror_orientation, + keyframe_no_operation, + keyframe_no_operation, + }, +}; + #else /*left side*/ -keyframe_animation_t KITT_Scanner_animation = { - .num_frames = 2, +keyframe_animation_t sweep_on_sweep_off_left_and_right = { + .num_frames = 10, + .loop = true, + .frame_lengths = { + gfxMillisecondsToTicks(GRADIENT_TIME), // left on + gfxMillisecondsToTicks(GRADIENT_TIME), // right on + gfxMillisecondsToTicks(GRADIENT_TIME), // left off + gfxMillisecondsToTicks(GRADIENT_TIME), // right off + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // right on + gfxMillisecondsToTicks(GRADIENT_TIME), // left on + gfxMillisecondsToTicks(GRADIENT_TIME), // right off + gfxMillisecondsToTicks(GRADIENT_TIME), // left off + 0, // normal leds + }, + .frame_functions = { + led_backlight_keyframe_half_period_sweep_to_on, + keyframe_no_operation, + led_backlight_keyframe_half_period_sweep_to_off, + keyframe_no_operation, + led_backlight_keyframe_mirror_orientation, + keyframe_no_operation, + led_backlight_keyframe_half_period_sweep_to_on, + keyframe_no_operation, + led_backlight_keyframe_half_period_sweep_to_off, + led_backlight_keyframe_normal_orientation, + + }, +}; +keyframe_animation_t both_sides_fade_across = { + .num_frames = 8, .loop = true, .frame_lengths = { - CROSSFADE_TIME * BOTHSIDESCAN, - CROSSFADE_TIME * BOTHSIDESCAN, + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + 0, // normal leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + 0, // mirror leds + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + 0, // normal leds }, .frame_functions = { - KITT_scan_one_side_left_to_right, - KITT_scan_one_side_right_to_left, + led_backlight_keyframe_one_period_sweep, + led_backlight_keyframe_mirror_orientation, + keyframe_no_operation, + keyframe_no_operation, + keyframe_no_operation, + keyframe_no_operation, + led_backlight_keyframe_one_period_sweep, + led_backlight_keyframe_normal_orientation, + }, }; -bool KITT_scan_one_side_left_to_right(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)state; - float frame_length = animation->frame_lengths[animation->current_frame]; - float current_pos = frame_length - animation->time_left_in_frame; - int phase = current_pos/(frame_length/BOTHSIDESCAN); - int row = 0; - gdispGClear(LED_DISPLAY, ONE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, phase, row, FULL_ON); - gdispGDrawPixel(LED_DISPLAY, phase-1, row, THREE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, phase-2, row, HALF_ON); - gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER); - return true; -} -bool KITT_scan_one_side_right_to_left(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)state; - float frame_length = animation->frame_lengths[animation->current_frame]; - float current_pos = frame_length - animation->time_left_in_frame; - int phase = current_pos/(frame_length/BOTHSIDESCAN); - int row = 0; - gdispGClear(LED_DISPLAY, ONE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, (14 - phase), row, FULL_ON); - gdispGDrawPixel(LED_DISPLAY, 14 - (phase-1), row, THREE_QUARTER); - gdispGDrawPixel(LED_DISPLAY, 14 - (phase-2), row, HALF_ON); - gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER); - return true; -} #endif #define RED 0 @@ -170,19 +334,24 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) { /* if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { saturation = 255; } */ - if (state->status.layer & 0x200) { + + if (state->status.layer & 0x400) { + state->target_lcd_color = LCD_COLOR(OCEAN, saturation, 0xFF); + state->layer_text = "STENOGRAPHY"; + } + else if (state->status.layer & 0x200) { state->target_lcd_color = LCD_COLOR(GREEN, saturation, 0xFF); - state->layer_text = "MOUSE"; + state->layer_text = "FUNCTION"; } else if (state->status.layer & 0x100) { state->target_lcd_color = LCD_COLOR(MAGENTA, saturation, 0xFF); state->layer_text = "Shortcuts Layer"; + stop_keyframe_animation(&sweep_on_sweep_off_left_and_right); + start_keyframe_animation(&led_test_animation); } else if (state->status.layer & 0x80) { state->target_lcd_color = LCD_COLOR(VIOLET, saturation, 0xFF); state->layer_text = "Plover"; - start_keyframe_animation(&KITT_Scanner_animation); - } else if (state->status.layer & 0x40) { state->target_lcd_color = LCD_COLOR(RASPBERRY, saturation, 0xFF); @@ -199,6 +368,8 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) { else if (state->status.layer & 0x4) { state->target_lcd_color = LCD_COLOR(BLUE, saturation, 0xFF); state->layer_text = "Dvorak"; + stop_keyframe_animation(&led_test_animation); + start_keyframe_animation(&sweep_on_sweep_off_left_and_right); } else if (state->status.layer & 0x2) { state->target_lcd_color = LCD_COLOR(ORANGE, saturation, 0xFF); @@ -207,7 +378,7 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) { else { state->target_lcd_color = LCD_COLOR(YELLOW, saturation, 0xFF); state->layer_text = "Qwerty"; - stop_keyframe_animation(&KITT_Scanner_animation); + stop_keyframe_animation(&led_test_animation); start_keyframe_animation(&Fade_in_all_leds); } } |