diff options
Diffstat (limited to 'keyboards/input_club/ergodox_infinity')
13 files changed, 40 insertions, 465 deletions
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index 00dd0bd1f3..19a777e615 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -67,7 +67,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* LED matrix driver */ #define LED_DRIVER_ADDR_1 0x74 #define LED_DRIVER_COUNT 1 -#define DRIVER_LED_TOTAL 76 +#define LED_MATRIX_LED_COUNT 76 #define LED_MATRIX_SPLIT { 38, 38 } #define LED_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c index e6ac2c4559..d699d76333 100644 --- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c +++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c @@ -174,7 +174,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { #endif #ifdef LED_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { // The numbers in the comments are the led numbers DXX on the PCB /* Refer to IS31 manual for these locations * driver diff --git a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c index 6f9967b46e..b84f83c3ad 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |EEP_RST| | | | | | | . | 0 | = | | + * |EE_CLR | | | | | | | . | 0 | = | | * `-----------------------------------' `----------------------------------' * ,-------------. ,-------------. * |Animat| | |Toggle|Solid | @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, - EEP_RST,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, + EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, RGB_MOD,KC_TRNS, KC_TRNS, RGB_VAD,RGB_VAI,KC_TRNS, diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c index 266194de35..ebdedcbe6b 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ergodox( // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRACKET, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER, @@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - KC_RBRACKET, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, - KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, + KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, _______, KC_N, KC_M, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT), RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_WORKMAN] = LAYOUT_ergodox( // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, - KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_LBRACKET, + KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_LBRC, KC_ESC, KC_A, KC_S, KC_H, KC_T, KC_G, KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V, _______, TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER, @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - KC_RBRACKET, KC_J, KC_F, KC_U, KC_P, KC_SCOLON, KC_BSPACE, + KC_RBRC, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSPC, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOTE, _______, KC_K, KC_L, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT), RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, @@ -131,9 +131,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = LAYOUT_ergodox( // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, - KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_LBRACKET, + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_LBRC, KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, - KC_LSFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, _______, + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, _______, TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_MPLY, _______, @@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - KC_RBRACKET, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPACE, + KC_RBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_D, KC_H, KC_T, KC_N, KC_S, LT(MOUSE, KC_SLSH), _______, KC_B, KC_M, KC_W, KC_V, KC_Z, RSFT_T(KC_ENT), RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, @@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK] = LAYOUT_ergodox( // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_LBRACKET, + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_LBRC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER, @@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - KC_RBRACKET, KC_J, KC_L, KC_U, KC_Y, KC_SCOLON, KC_BSPACE, + KC_RBRC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOTE, _______, KC_K, KC_M, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT), RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, @@ -311,7 +311,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_ergodox( // left hand VRSN, _______, _______, _______, _______, _______, _______, - _______, QK_BOOT, DEBUG, BL_TOGG, BL_STEP, _______, _______, + _______, QK_BOOT, DB_TOGG, BL_TOGG, BL_STEP, _______, _______, KC_CAPS, _______, _______, _______, _______, AG_NORM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -322,7 +322,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand _______, _______, _______, _______, _______, _______, _______, - _______, _______, TERM_ON, TERM_OFF, _______, _______, KC_DEL, + _______, _______, _______, _______, _______, _______, KC_DEL, AG_SWAP, QWERTY, WORKMAN, DVORAK, COLEMAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h b/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h deleted file mode 100644 index 772ce0bac9..0000000000 --- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -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/>. -*/ - -#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/input_club/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c deleted file mode 100644 index a95302b3f6..0000000000 --- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c +++ /dev/null @@ -1,394 +0,0 @@ -#include QMK_KEYBOARD_H -#include "debug.h" -#include "action_layer.h" -#include "version.h" -#include "process_keycode/process_tap_dance.h" -#include "gordon.h" - -#include "keymap_german.h" - -#include "keymap_nordic.h" - - -enum custom_keycodes { - PLACEHOLDER = SAFE_RANGE, // can always be here - EPRM, - VRSN, - RGB_SLD, -}; - - -// 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 == 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 ************************************** - [_QWERTY] = LAYOUT_ergodox( - - 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, - - 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), - 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, - - TT(_STREET_FIGHTER), ________, - KC_PGUP, - KC_PGDOWN, LT(_NAV,KC_ENTER), SPAC_TXT), - - - //**************************SYMBOLS LAYER************************** - [_SYMBOLS] = LAYOUT_ergodox( - ________, ________, ________, ________, ________, ________, ________, - ________, DEREF , KC_AT, KC_LCBR, KC_RCBR, KC_CIRC, ________, - ________, KC_EXLM, KC_HASH, KC_LPRN, KC_RPRN, ________, - ________,KC_DOLLAR, KC_PERC, LSQUIGLY, RSQUIGLY, ________, ________, - ________,TICK3 , ________, ________, ________, - - ________,________, - ________, - ________,_XXXXXX_,________, - - - ________, ________, ________, ________, ________, ________, NUMLOCK, - ________,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] = LAYOUT_ergodox(UP_ENTER_RESET,________,________,________,________,________,MODRESET, - QK_BOOT,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_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_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_FORWARD), - - - - - //**************************WINDOWS NAVIGATION LAYER************************** - - [_NAV] = LAYOUT_ergodox(________,________,________,________,________,________,________, - ________,________,SNAPLEFT,_XXXXXX_,SNAPRGHT,________,________, - ________,KC_WWW_BACK,PREVTAB,________,NEXTTAB,SNAPUP, - ________,________,WORKLEFT,________,WORKRIGHT,SNAPDOWN,________, - ________,________,________,________,________, - - ________,________, - ________, - ________,________,________, - - - ________,________,________,________,________,________,________, - ________,________,SNAPUP ,KC_UP ,SNAPDOWN,________,________, - ________,KC_LEFT ,KC_DOWN ,KC_RIGHT,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - - ________,________, - ________, - ________,________,________), - - //****************************NUMPAD LAYER**************************** - [_NUMPAD] = LAYOUT_ergodox(________,________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,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_DOT, KC_1 ,KC_2 ,KC_3 ,________,________, - KC_0 ,KC_DOT , KC_DOT ,________,________, - - ________,________, - ________, - ________,________,KC_0), - - //****************************APP SWITCH LAYER**************************** - [_APPSWITCH] = LAYOUT_ergodox(________,________,________,________,________,________,________, - ________,________ , ________ , ________ ,________ ,________,________, - ________,APP_5,APP_6,APP_7,APP_8,________, - ________,DBMS_OUT,________,________,________,________,________, - ________,________,________,________,________, - - ________,________, - ________, - KC_PLUS,________,________, - - ________,________,________,________,________,________,________, - ________,________,APP_3 ,________,APP_4 ,________,________, - ________,APP_1 ,_XXXXXX_,APP_2 ,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - ________,________, - ________, - ________,________,________), - - - [_ONESHOT] = LAYOUT_ergodox( 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] = LAYOUT_ergodox(________,________,________,________,________,________,________, - ________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________, - ________,________,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] = LAYOUT_ergodox( - - 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] = LAYOUT_ergodox( - - 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] = LAYOUT_ergodox( - ________,________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,KC_A,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - ________,________, - ________, - ________,________,________, - - - ________,________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,_______,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - - ________,________, - ________, - ________,________,________), - - - [_TEXT_MACROS] = LAYOUT_ergodox( - ________,________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,KC_A,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - ________,________, - ________, - ________,________,________, - - - ________,________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,_______,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - - ________,________, - ________, - ________,________,________) - - -/* FOR FORMATTING FUTURE LAYERS - NO KEY CODES SHOULD BE MORE THAN 8 CHARACTERS - GOES LEFT HAND THEN RIGHT HAND - [_DIRNAV] = LAYOUT_ergodox( - ________,________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - ________,________, - ________, - ________,________,________, - - - ________,________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________,________, - ________,________,________,________,________,________,________, - ________,________,________,________,________, - - - ________,________, - ________, - ________,________,________), */ - - - - -}; - -void matrix_scan_user(void) { - - uint8_t layer = get_highest_layer(layer_state); - - ergodox_board_led_on(); - ergodox_led_all_on(); - - ergodox_board_led_off(); - ergodox_right_led_1_off(); - ergodox_right_led_2_off(); - ergodox_right_led_3_off(); - // _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/input_club/ergodox_infinity/keymaps/gordon/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk deleted file mode 100644 index 9a56408f8e..0000000000 --- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -TAP_DANCE_ENABLE = yes - diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c index 0498cb48bb..ca0442103d 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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), + KC_LCTL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), MO(SHORTCUTS), KC_LGUI, KC_BTN1, MU_ON, KC_SPACE,KC_DEL,KC_END, @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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(SHORTCUTS), KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, + MO(SHORTCUTS), KC_UP,KC_DOWN,KC_RALT, KC_RCTL, KC_BTN1, KC_RGUI, MU_OFF, KC_PGDN,KC_TAB, LT(HALFQWERTY, KC_ENT) @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_RBRC, - KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, + KC_LCTL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRANSPARENT,KC_DEL,KC_END, @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_EQL,KC_B, KC_V, KC_C, KC_X, KC_Z, KC_RSFT, - KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, + KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTL, KC_TRANSPARENT, KC_TRNS, KC_TRNS, KC_PGDN,KC_TAB, KC_TRANSPARENT @@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_EQL, - KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, + KC_LCTL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, KC_TRNS, KC_TRANSPARENT, KC_UP, LT(HALFDVORAK, KC_SPACE),KC_DEL,KC_DOWN, @@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_RBRC,KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, - KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, + KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTL, KC_TRANSPARENT, KC_TRANSPARENT, KC_PGUP, KC_PGDN,KC_TAB, LT(HALFDVORAK, KC_ENT) @@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_RBRC, - KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, + KC_LCTL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRNS, KC_TRANSPARENT,KC_ENT,KC_TRNS, @@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_EQL,KC_X, KC_K, KC_J, KC_Q, KC_SCLN, KC_RSFT, - KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL, + KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTL, KC_TRANSPARENT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TAB, KC_TRANSPARENT diff --git a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c index 13cf68e758..17ff9d615d 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c @@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | * +-----+-----+-----+ */ - KC_TRNS, KC_TRNS, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TRNS, KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_TRNS, diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c index 4869cfae20..2ad9151bed 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c @@ -354,7 +354,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, S(KC_EQL), S(KC_9), S(KC_0), _______, S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), _______, - _______, KC_EQL, S(KC_BSLASH), S(KC_COMM), S(KC_DOT), S(KC_SLSH), _______, + _______, KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH), _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c index a122b83af8..0933e37eb5 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c @@ -47,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(2), - KC_LCTRL, MO(3), KC_EQL, KC_LGUI, KC_LALT, - KC_NLCK, KC_SLCK, + KC_LCTL, MO(3), KC_EQL, KC_LGUI, KC_LALT, + KC_NUM, KC_SCRL, KC_HOME, KC_SPC, KC_DEL, KC_END, @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_BSLS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, - MO(2), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_NONUS_BSLASH, + MO(2), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_NUBS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_RBRC, KC_RGUI, KC_RALT, KC_PGUP, diff --git a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c index ad512082fb..bfbe2a0318 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c @@ -62,22 +62,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [L01] = LAYOUT_ergodox_wrapper( KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, - KC_ESC, L01_LEFT_01, KC_LEAD, + KC_ESC, L01_LEFT_01, QK_LEAD, MO(L03), L01_LEFT_02, - KC_LSHIFT, L01_LEFT_03, MO(LFN), - KC_LCTRL,KC_LGUI,KC_LALT, MO(L05), MO(L04), + KC_LSFT, L01_LEFT_03, MO(LFN), + KC_LCTL, KC_LGUI,KC_LALT, MO(L05), MO(L04), XXXXXXX, XXXXXXX, KC_PGUP, - KC_SPACE,KC_LSHIFT,KC_PGDN, + KC_SPACE,KC_LSFT, KC_PGDN, //-- - XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPACE, - KC_LEAD, L01_RIGHT_01, KC_ENTER, + XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + QK_LEAD, L01_RIGHT_01, KC_ENTER, L01_RIGHT_02, MO(L03), - MO(LFN), L01_RIGHT_03, KC_RSHIFT, - MO(L04), MO(L05), KC_RALT, MO(LFN), KC_RCTRL, + MO(LFN), L01_RIGHT_03, KC_RSFT, + MO(L04), MO(L05), KC_RALT, MO(LFN), KC_RCTL, KC_LEFT, KC_RIGHT, KC_UP, - KC_DOWN, KC_RSHIFT, KC_SPACE + KC_DOWN, KC_RSFT, KC_SPACE ), @@ -244,7 +244,7 @@ L06 -> <TBD>: UNSPECIFIED _______, _______, _______, //-- _______, _______, _______, _______, _______, _______, QK_BOOT, - _______, L06_RIGHT_01, KC_BSPACE, + _______, L06_RIGHT_01, KC_BSPC, L06_RIGHT_02, KC_INSERT, _______, L06_RIGHT_03, KC_DELETE, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c index c322222baf..0fb88de421 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c @@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_LSFT, KC_TAB, MO(MANLNX), GUI_ESC, _______, _______, _______, - KC_LCTRL, KC_BSPC, _______, + KC_LCTL, KC_BSPC, _______, // right hand _______, _______, _______, _______, _______, _______, _______, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |