From 906108fb486797ab2f3eb7c3a6f70e099c1199e6 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Wed, 29 Dec 2021 06:14:48 -0800 Subject: [Keyboard] Update to ZSA Keyboards (#15644) --- keyboards/ergodox_ez/config.h | 14 ++++++----- keyboards/ergodox_ez/ergodox_ez.c | 51 +++++++++++++++++++++++++++++++++++++++ keyboards/ergodox_ez/ergodox_ez.h | 22 +++++++++++++++++ keyboards/ergodox_ez/rules.mk | 12 +++++---- 4 files changed, 88 insertions(+), 11 deletions(-) (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index c3b794f108..109a80d2c5 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -43,12 +43,14 @@ along with this program. If not, see . #define MATRIX_EXPANDER_COL_PINS { 5, 4, 3, 2, 1, 0 } #define MATRIX_EXPANDER_ROW_PINS { 0, 1, 2, 3, 4, 5, 6 } - -#define MOUSEKEY_INTERVAL 20 -#define MOUSEKEY_DELAY 0 -#define MOUSEKEY_TIME_TO_MAX 60 -#define MOUSEKEY_MAX_SPEED 7 -#define MOUSEKEY_WHEEL_DELAY 0 +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_TIME_TO_MAX 60 +#define MOUSEKEY_MAX_SPEED 7 +#define MOUSEKEY_WHEEL_DELAY 400 +#define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL +#define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED +#define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX #define DEBOUNCE 30 diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index 49f690fa70..8d3790088d 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -398,3 +398,54 @@ void eeconfig_init_kb(void) { // EEPROM is getting reset! eeconfig_update_kb(keyboard_config.raw); eeconfig_init_user(); } + +#ifdef ORYX_ENABLE +static uint16_t loops = 0; +static bool is_on = false; +#endif + +#ifdef DYNAMIC_MACRO_ENABLE +static bool is_dynamic_recording = false; +static uint16_t dynamic_loop_timer; + +void dynamic_macro_record_start_user(void) { + is_dynamic_recording = true; + dynamic_loop_timer = timer_read(); + ergodox_right_led_1_on(); +} + +void dynamic_macro_record_end_user(int8_t direction) { + is_dynamic_recording = false; + layer_state_set_user(layer_state); +} +#endif + +void matrix_scan_kb(void) { +#ifdef DYNAMIC_MACRO_ENABLE + if (is_dynamic_recording) { + ergodox_right_led_1_off(); + // if (timer_elapsed(dynamic_loop_timer) > 5) + { + static uint8_t counter; + counter++; + if (counter > 100) ergodox_right_led_1_on(); + dynamic_loop_timer = timer_read(); + } + } +#endif + +#ifdef CAPS_LOCK_STATUS + led_t led_state = host_keyboard_led_state(); + if(led_state.caps_lock) { + ergodox_right_led_3_on(); + } + else { + uint8_t layer = get_highest_layer(layer_state); + if(layer != 1) { + ergodox_right_led_3_off(); + } + } +#endif + + matrix_scan_user(); +} diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index 7bb2717147..7243a6a18d 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -292,3 +292,25 @@ extern keyboard_config_t keyboard_config; { R05, R15, R25, R35, R45, R55 }, \ { R06, R16, R26, R36, R46, KC_NO } \ } + +/* ---- LEFT HAND ---- ---- RIGHT HAND ---- */ +#define LED_LAYOUT_ergodox_pretty( \ + L01,L02,L03,L04,L05, R01,R02,R03,R04,R05, \ + L11,L12,L13,L14,L15, R11,R12,R13,R14,R15, \ + L21,L22,L23,L24,L25, R21,R22,R23,R24,R25, \ + L31,L32,L33,L34,L35, R31,R32,R33,R34,R35, \ + L41,L42,L43,L44, R42,R43,R44,R45 ) \ + \ + /* matrix positions */ \ + { R01, R02, R03, R04, R05, \ + R11, R12, R13, R14, R15, \ + R21, R22, R23, R24, R25, \ + R31, R32, R33, R34, R35, \ + R42, R43, R44, R45, \ + \ + L05, L04, L03, L02, L01, \ + L15, L14, L13, L12, L11, \ + L25, L24, L23, L22, L21, \ + L35, L34, L33, L32, L31, \ + L44, L43, L42, L41 \ + } diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index e648053922..1b4ace5ee5 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -12,15 +12,15 @@ BOOTLOADER = halfkay # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration +COMMAND_ENABLE = no # Commands for debug and configuration CUSTOM_MATRIX = lite # Custom matrix file for the ErgoDox EZ -NKRO_ENABLE = yes # Enable N-Key Rollover -UNICODE_ENABLE = yes # Unicode -SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard +NKRO_ENABLE = yes # Enable N-Key Rollover +UNICODE_ENABLE = no # Unicode +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard RGB_MATRIX_ENABLE = no # enable later RGB_MATRIX_DRIVER = IS31FL3731 @@ -36,3 +36,5 @@ LAYOUTS = ergodox # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no + +MOUSE_SHARED_EP = no -- cgit v1.2.3 From dd4e48b4a274810fc088dc43c1e9be6f0a248f1a Mon Sep 17 00:00:00 2001 From: LucW Date: Tue, 11 Jan 2022 08:52:54 +0800 Subject: [Keymap] dvorak 42 key layouts (Ergodox EZ / Atreus) updates (#15656) Co-authored-by: luc wastiaux --- keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c index 86aa1c2e6b..67a09188ab 100644 --- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c +++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c @@ -111,6 +111,7 @@ enum custom_keycodes { #define AS_CLASS LCTL(KC_N) #define AS_FINDUSAGE LALT(KC_F7) #define AS_BACK LCTL(LALT(KC_LEFT)) +#define AS_BRACKET LCTL(LSFT(KC_M)) #define AS_GO_DECLARATION LCTL(KC_B) #define AS_GO_IMPLEMENTATION LCTL(LALT(KC_B)) #define AS_CLOSETAB LCTL(KC_F4) @@ -118,6 +119,12 @@ enum custom_keycodes { #define AS_COPYLINEDOWN LCTL(KC_D) #define AS_DEL_LINE LCTL(KC_Y) #define AS_LINE LCTL(KC_G) +#define AS_CMT_BLOCK LCTL(LSFT(KC_SLSH)) +#define AS_CMT_LINE LCTL(KC_SLSH) +#define AS_BM_PREV LALT(KC_P) +#define AS_BM_NEXT LALT(KC_N) +#define AS_BM_TOGGLE KC_F11 +#define AS_BM_LIST LSFT(KC_F11) // visual studio code shortcuts #define VS_FILE LCTL(KC_P) @@ -148,7 +155,7 @@ enum custom_keycodes { #define VS_BM_PREV LCTL(LALT(KC_P)) #define VS_BM_NEXT LCTL(LALT(KC_N)) #define VS_BM_TOGGLE LCTL(LALT(KC_K)) -#define VS_BM_LABEL LCTL(LALT(KC_B)) +#define VS_BM_CLEARALL LCTL(LALT(KC_C)) #define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \ @@ -362,12 +369,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, // right hand - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, AS_COPYLINEDOWN, AS_FINDUSAGE, AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, AS_LINE, KC_TRNS, - AS_CLOSETAB, AS_TABLEFT, AS_TABRIGHT, AS_SYMBOL, AS_CLASS, AS_BACK, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, AS_CLOSETOOLWINDOW, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + AS_CMT_LINE, AS_COPYLINEDOWN, AS_FINDUSAGE, AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, AS_LINE, AS_BRACKET, + AS_CLOSETAB, AS_TABLEFT, AS_TABRIGHT, AS_SYMBOL, AS_CLASS, AS_BACK, + AS_CMT_BLOCK, KC_TRNS, AS_BM_PREV, AS_BM_NEXT, KC_TRNS, AS_CLOSETOOLWINDOW, AS_BM_TOGGLE, // bottom row - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, AS_BM_LIST, KC_TRNS, KC_TRNS, KC_TRNS, // thumb cluster KC_TRNS, KC_TRNS, KC_TRNS, @@ -393,7 +400,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { VS_CLOSETAB, VS_TABLEFT, VS_TABRIGHT, VS_SYMBOLEDITOR, VS_FILE, VS_BACK, VS_CMT_BLOCK, KC_TRNS, VS_BM_PREV, VS_BM_NEXT, VS_GROUP_1, VS_GROUP_2, VS_BM_TOGGLE, // bottom row - VS_COMMANDS, VS_OPEN_FILE, VS_TERMINAL, VS_CLOSEPANEL, VS_BM_LABEL, + VS_COMMANDS, VS_BM_LIST, VS_BM_LISTALL, VS_CLOSEPANEL, VS_BM_CLEARALL, // thumb cluster KC_TRNS, KC_TRNS, KC_TRNS, -- cgit v1.2.3 From c05d3eb365c8a3805c26f49a9abc7e4332d59155 Mon Sep 17 00:00:00 2001 From: Mewp Date: Tue, 11 Jan 2022 02:09:15 +0100 Subject: [Keyboard] Fix suspend issues on ergodox_ez. (#15300) Co-authored-by: Mewp --- keyboards/ergodox_ez/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index c091b6eb97..e84a5e2bd3 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -70,7 +70,7 @@ void matrix_init_custom(void) { // Reads and stores a row, returning // whether a change occurred. static inline bool store_raw_matrix_row(uint8_t index) { - matrix_row_t temp = read_cols(index); + matrix_row_t temp = 0x3F & read_cols(index); if (raw_matrix[index] != temp) { raw_matrix[index] = temp; return true; -- cgit v1.2.3 From e865cab48ec25c2fff958b23d89b1f86755d445c Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Thu, 13 Jan 2022 23:40:41 -0500 Subject: [Keymap] ericgebhart keymap and userspace updates (#15727) Co-authored-by: Drashna Jaelre Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jael're --- keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c | 378 ++------------------- keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h | 139 ++++++++ 2 files changed, 160 insertions(+), 357 deletions(-) create mode 100644 keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c index 55bf4209fd..e76e3296bf 100644 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c @@ -16,369 +16,33 @@ */ #include "keymap_bepo.h" #include "ericgebhart.h" - +#include "layouts.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [DVORAK] = LAYOUT_ergodox_wrapper( - // left hand - KC_GRV, ___NUMBER_L___, OSL(LAYERS), - KC_LOCK, ___DVORAK_L1___, LCTL(KC_C), - TAB_BKTAB, ___DVORAK_L2___, - KC_LSFT, ___DVORAK_L3___, TO(MDIA), - - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, - - // right hand - MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___DVORAK_R1___, KC_SLASH, - /* */ ___DVORAK_R2___, KC_MINUS, - TO(KEYPAD), ___DVORAK_R3___, KC_RSFT, - - ___BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), - - [XMONAD] = LAYOUT_ergodox_wrapper( - // left hand - ___, ___FUNC_L___, ___, - ___, ___DVORAK_L1___, ___, - ___, ___DVORAK_L2___, - ___, ___DVORAK_L3___, ___, - - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, - - // right hand - ___, ___FUNC_R___, ___, - ___, ___DVORAK_R1___, ___, - /**/ ___DVORAK_R2___, ___, - ___, ___DVORAK_R3___, ___, - - ___BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), - - [QWERTY] = LAYOUT_ergodox_wrapper( - // left hand - KC_GRV, ___NUMBER_L___, OSL(LAYERS), - KC_LOCK, ___QWERTY_L1___, LCTL(KC_C), - TAB_BKTAB, ___QWERTY_L2___, - KC_LSFT, ___QWERTY_L3___, TO(MDIA), - - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, - - // right hand - MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___QWERTY_R1___, KC_SLASH, - /* */ ___QWERTY_R2___, KC_MINUS, - TO(KEYPAD), ___QWERTY_R3___, KC_RSFT, - - ___BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), - - [COLEMAK] = LAYOUT_ergodox_wrapper( - // left hand - KC_GRV, ___NUMBER_L___, OSL(LAYERS), - KC_LOCK, ___COLEMAK_L1___, LCTL(KC_C), - TAB_BKTAB, ___COLEMAK_L2___, - KC_LSFT, ___COLEMAK_L3___, TO(MDIA), - - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, - - // right hand - MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___COLEMAK_R1___, KC_SLASH, - /* */ ___COLEMAK_R2___, KC_MINUS, - TO(KEYPAD), ___COLEMAK_R3___, KC_RSFT, - - ___BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), - - [WORKMAN] = LAYOUT_ergodox_wrapper( - // left hand - KC_GRV, ___NUMBER_L___, OSL(LAYERS), - KC_LOCK, ___WORKMAN_L1___, LCTL(KC_C), - TAB_BKTAB, ___WORKMAN_L2___, - KC_LSFT, ___WORKMAN_L3___, TO(MDIA), - - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, - - // right hand - MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___WORKMAN_R1___, KC_SLASH, - /* */ ___WORKMAN_R2___, KC_MINUS, - TO(KEYPAD), ___WORKMAN_R3___, KC_RSFT, - - ___BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), - - [NORMAN] = LAYOUT_ergodox_wrapper( - // left hand - KC_GRV, ___NUMBER_L___, OSL(LAYERS), - KC_LOCK, ___NORMAN_L1___, LCTL(KC_C), - TAB_BKTAB, ___NORMAN_L2___, - KC_LSFT, ___NORMAN_L3___, TO(MDIA), - - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, - - // right hand - MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___NORMAN_R1___, KC_SLASH, - /* */ ___NORMAN_R2___, KC_MINUS, - TO(KEYPAD), ___NORMAN_R3___, KC_RSFT, - - ___BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), - - [DVORAK_ON_BEPO] = LAYOUT_ergodox_wrapper( - // left hand - DB_GRV, ___NUMBER_BEPO_L___, OSL(LAYERS), - KC_LOCK, ___DVORAK_FR_L1___, DB_LBRC, - TAB_BKTAB, ___DVORAK_FR_L2___, - KC_LSFT, ___DVORAK_FR_L3___, DB_LPRN, - - ___BOTTOM_LEFT_FR___, - ___ERGODOX_THUMB_LEFT_BP___, - - - // right hand - MDIA_SYMB_KP_LAYERS, ___NUMBER_BEPO_R___, DB_EQL, - DB_RBRC, ___DVORAK_FR_R1___, DB_SLASH, - - /* */ ___DVORAK_FR_R2___, DB_MINUS, - DB_RPRN, ___DVORAK_FR_R3___, KC_RSFT, - - ___BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT_BP___ - ), - - [BEPO] = LAYOUT_ergodox_wrapper( - // Left hand - BP_DLR, ___SYMBOL_BEPO_L___, OSL(LAYERS), - KC_LOCK, ___BEPO_FR_L1___, DB_LBRC, - TAB_BKTAB, ___BEPO_FR_L2___, - BP_SFT_T_ECRC, ___BEPO_FR_L3___, DB_RBRC, - - ___5___, - ___6___, + // Qwerty Base layers + [_DVORAK] = Dox_base(___NUMS___, ___DVORAK___), + [_QWERTY] = Dox_base(___NUMS___, ___QWERTY___), + [_COLEMAK] = Dox_base(___NUMS___, ___COLEMAK_DH___), + [_BEAKL] = Dox_base(___NUMS___, ___BEAKL15___), + // Bepo Base layers + [_DVORAK_BP] = Dox_bepo_base(___NUMS_BP___, ___DVORAK_FR___), + [_BEAKL_BP] = Dox_bepo_base(___BKLNUMS_BP___, ___BEAKL15_FR___), + [_BEPO] = Dox_bepo_base6(___BEPO6___), - // Right hand - MDIA_SYMB_KP_LAYERS, ___SYMBOL_BEPO_R___, BP_EQL, - BP_DCIR, ___BEPO_FR_R1___, BP_W, - /* */ ___BEPO_FR_R2___, BP_CCED, - BP_C, ___BEPO_FR_R3___, KC_RSFT, + // transient layers. + // Switch to using a transient layer macro + [_SYMB] = Dox_transient(___12_FUNC___, ___SYMB_BEAKLA_3x12___), + [_SYMB_BP] = Dox_transient(___12_FUNC___, ___SYMB_BEAKLA_BP_3x12___), - ___5___, - ___6___ - ), + [_TOPROWS] = Dox_transient(___12___, ___TOPROWS_3x12___), + [_TOPROWS_BP] = Dox_transient(___12___, ___TOPROWS_BP_3x12___), - [XMONAD_FR] = LAYOUT_ergodox_wrapper( - // left hand - ___, ___FUNC_L___, ___, - ___, ___DVORAK_FR_L1___, ___, - ___, ___DVORAK_FR_L2___, - ___, ___DVORAK_FR_L3___, ___, + [_KEYPAD] = Dox_transient(___KEYPAD_BKL_FUNC_4x12___), + [_KEYPAD_BP] = Dox_transient(___KEYPAD_BKL_FUNC_BP_4x12___), - ___BOTTOM_LEFT_FR___, - ___ERGODOX_THUMB_LEFT_BP___, - - - // right hand - ___, ___FUNC_R___, ___, - ___, ___DVORAK_FR_R1___, ___, - /**/ ___DVORAK_FR_R2___, ___, - ___, ___DVORAK_FR_R3___, ___, - - ___BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT_BP___ - ), - - // SYMBOLS - [SYMB] = LAYOUT_ergodox_wrapper( - // left hand - ___FUNC_1_6___, ___, - ___SYMBOLS6_1___, ___, - ___SYMBOLS6_2___, - ___SYMBOLS6_3___, ___, - ___SYMBOLS5_4___, - ___6___, - - - // right hand - ___, ___FUNC_7_12___, - ___, ___SYMPAD_1___, - /**/ ___SYMPAD_2___, - ___, ___SYMPAD_3___, - /**/ ___5_SYMPAD_4___, - ___6___ - ), - - [SYMB_ON_BEPO] = LAYOUT_ergodox_wrapper( - // left hand - ___FUNC_1_6___, ___, - ___SYMBOLS6_1_BP___, ___, - ___SYMBOLS6_2_BP___, - ___SYMBOLS6_3_BP___, ___, - ___SYMBOLS5_4_BP___, - ___6___, - - - // right hand - ___, ___FUNC_7_12___, - ___, ___SYMPAD_1_BP___, - /**/ ___SYMPAD_2_BP___, - ___, ___SYMPAD_3_BP___, - /**/ ___5_SYMPAD_4_BP___, - ___6___ - ), - - [KEYPAD] = LAYOUT_ergodox_wrapper( - ___FUNC_1_6___, ___, - ___2___, ___FUNCPAD_T___, ___, ___, - ___2___, ___FUNCPAD_1___, ___, - ___2___, ___FUNCPAD_2___, ___, ___, - ___2___, ___FUNCPAD_3___, - ___6___, - - // right hand - ___, ___FUNC_7_12___, - ___, ___, ___KEYPAD_1___, ___, - /**/ ___, ___KEYPAD_2___, ___, - ___, ___, ___KEYPAD_3___, ___, - /* */ ___KEYPAD_4___, ___, - ___6___ - ), - - [KEYPAD_ON_BEPO] = LAYOUT_ergodox_wrapper( - ___FUNC_1_6___, ___, - ___2___, ___FUNCPAD_T___, ___, ___, - ___2___, ___FUNCPAD_1___, ___, - ___2___, ___FUNCPAD_2___, ___, ___, - ___2___, ___FUNCPAD_3___, - ___6___, - - // right hand - ___, ___FUNC_7_12___, - ___, ___, ___KEYPAD_1_BP___, ___, - /**/ ___, ___KEYPAD_2_BP___, ___, - ___, ___, ___KEYPAD_3_BP___, ___, - /* */ ___KEYPAD_4_BP___, ___, - ___6___ - ), - - // MEDIA AND MOUSE - [MDIA] = LAYOUT_ergodox_wrapper( - // left hand - ___FUNC_1_6___, ___, - ___MOUSE_BTNS_L___, ___, ___, - ___, ___MOUSE_LDUR___, ___, - ___, ___MWHEEL_LDUR___, XXX, ___, - ___, ___, ___MOUSE_ACCL_012___, - ___6___, - - // right hand - ___, ___FUNC_7_12___, - ___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, - /**/ KC_VOLD, ___VI_ARROWS___, ___, - ___, ___, ___MOUSE_BTNS_R___, - /* */ KC_PGDN, KC_PGUP, ___3___, - ___6___ - ), - - [LAYERS] = LAYOUT_ergodox_wrapper( - // left hand - ___FUNC_1_6___, ___, - XXX, XXX, XXX, ___2_LAYERS_B1___, XXX, ___, - XXX, XXX, XXX, ___2_LAYERS_B2___, XXX, - XXX, XXX, ___3_LAYERS_B3___, XXX, ___, - ___5___, - ___6___, - - // right hand - ___, ___FUNC_7_12___, - ___, XXX, ___3_LAYERS_T_BP___, ___2___, - /**/ XXX, ___3_LAYERS_T___, ___2___, - ___, XXX, ___3_LAYERS_T_CTL___, ___2___, - ___5___, - ___6___ - ), + [_NAV] = Dox_transient(___12___, ___NAV_3x12___), + [_LAYERS] = Dox_transient(___12___, ___LAYERS_3x12___), + [_RGB] = Dox_transient(___12___, ___RGB_3x12___), }; - - - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void) { - - uint8_t layer = biton32(layer_state); - - ergodox_board_led_off(); - ergodox_right_led_1_off(); - ergodox_right_led_2_off(); - ergodox_right_led_3_off(); - if(!on_qwerty()) - ergodox_right_led_1_on(); - switch (layer) { - //case DVORAK: - //ergodox_right_led_1_off(); - //break; - // first led on for a bepo software keyboard layer - case DVORAK_ON_BEPO: - ergodox_right_led_2_on(); - break; - case BEPO: - ergodox_right_led_1_on(); - ergodox_right_led_1_off(); - ergodox_right_led_1_on(); - ergodox_right_led_1_off(); - ergodox_right_led_1_on(); - break; - case SYMB: - ergodox_right_led_3_on(); - break; - case MDIA: - ergodox_right_led_3_on(); - break; - case LAYERS: - ergodox_right_led_1_on(); - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - break; - default: - ergodox_board_led_off(); - break; - - /* default: */ - /* // none */ - /* break; */ - - } -} - - -/* - clear_oneshot_mods(); - set_oneshot_locked_mods(mods); - register_mods(mods); - - register_code(action.key.code); - unregister_code(action.key.code); - - layer_on(action.layer_tap.val); - layer_off(action.layer_tap.val); - - clear_oneshot_locked_mods(); - clear_oneshot_mods(); - unregister_mods(mods); - -*/ diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h b/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h new file mode 100644 index 0000000000..dd8f193dfc --- /dev/null +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h @@ -0,0 +1,139 @@ +/* + Copyright 2018 Eric Gebhart + + 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 . +*/ + +/********************************************************************/ +/* Ergodox EZ */ +/********************************************************************/ +// This one is is set up to pass in the number row. +// Beakl and bepo both change the number row. +// Left, middle, right, bottom, and thumbs all stay the same. +#define Base_dox( \ + K01, K02, K03, K04, K05, \ + K06, K07, K08, K09, K0A, \ + K11, K12, K13, K14, K15, \ + K16, K17, K18, K19, K1A, \ + K21, K22, K23, K24, K25, \ + K26, K27, K28, K29, K2A, \ + K31, K32, K33, K34, K35, \ + K36, K37, K38, K39, K3A \ + ) \ + LVARG_edox( \ + ROW0_LEFT(K01, K02, K03, K04, K05), \ + ___2_MIDDLE_1___, \ + ROW0_RIGHT(K06, K07, K08, K09, K0A), \ + \ + ROW1_LEFT(K11, K12, K13, K14, K15), \ + ___2_MIDDLE_2___, \ + ROW1_RIGHT(K16, K17, K18, K19, K1A), \ + \ + ROW2_LEFT(K21, K22, K23, K24, K25), \ + ROW2_RIGHT(K26, K27, K28, K29, K2A), \ + \ + ROW3_LEFT(K31, K32, K33, K34, K35), \ + ___2_MIDDLE_3___, \ + ROW3_RIGHT(K36, K37, K38, K39, K3A), \ + ___5_BOTTOM_LEFT___, ___5_BOTTOM_RIGHT___, \ + ___12_DOX_ALL_THUMBS___ \ + ) + +#define Base_dox_bepo( \ + K01, K02, K03, K04, K05, \ + K06, K07, K08, K09, K0A, \ + K11, K12, K13, K14, K15, \ + K16, K17, K18, K19, K1A, \ + K21, K22, K23, K24, K25, \ + K26, K27, K28, K29, K2A, \ + K31, K32, K33, K34, K35, \ + K36, K37, K38, K39, K3A \ + ) \ + LVARG_edox( \ + ROW0_LEFT(K01, K02, K03, K04, K05), \ + ___2_MIDDLE_1___, \ + ROW0_RIGHT(K06, K07, K08, K09, K0A), \ + \ + ROW1_LEFT(K11, K12, K13, K14, K15), \ + ___2_MIDDLE_2___, \ + ROW1_RIGHT(K16, K17, K18, K19, K1A), \ + \ + ROW2_LEFT(K21, K22, K23, K24, K25), \ + ROW2_RIGHT(K26, K27, K28, K29, K2A), \ + \ + ROW3_LEFT(K31, K32, K33, K34, K35), \ + ___2_MIDDLE_3___, \ + ROW3_RIGHT(K36, K37, K38, K39, K3A), \ + ___5_BOTTOM_LEFT___, ___5_BOTTOM_RIGHT___, \ + ___12_DOX_ALL_THUMBS_BP___ \ + ) + + +#define Base_dox_bepo6( \ + K01, K02, K03, K04, K05, K06, \ + K07, K08, K09, K0A, K0B, K0C, \ + K11, K12, K13, K14, K15, K16, \ + K17, K18, K19, K1A, K1B, K1C, \ + K21, K22, K23, K24, K25, K26, \ + K27, K28, K29, K2A, K2B, K2C \ + ) \ + LVARG_edox( \ + ___6SYMBOL_BEPO_L___, \ + ___2_MIDDLE_T_BP___, \ + ___6SYMBOL_BEPO_R___, \ + ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06), \ + ___2_MIDDLE_2_BP___, \ + ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C), \ + \ + ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16), \ + ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C), \ + \ + ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26), \ + ___2_MIDDLE_3_BP___, \ + ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C), \ + \ + ___5_BOTTOM_LEFT_BP___, ___5_BOTTOM_RIGHT_BP___, \ + ___12_DOX_ALL_THUMBS_BP___ \ + ) + +#define Transient_dox6( \ + K01, K02, K03, K04, K05, K06, \ + K07, K08, K09, K0A, K0B, K0C, \ + K11, K12, K13, K14, K15, K16, \ + K17, K18, K19, K1A, K1B, K1C, \ + K21, K22, K23, K24, K25, K26, \ + K27, K28, K29, K2A, K2B, K2C, \ + K31, K32, K33, K34, K35, K36, \ + K37, K38, K39, K3A, K3B, K3C \ + ) \ + LVARG_edox( \ + K01, K02, K03, K04, K05, K06, \ + ___2___, \ + K07, K08, K09, K0A, K0B, K0C, \ + K11, K12, K13, K14, K15, K16, \ + ___2___, \ + K17, K18, K19, K1A, K1B, K1C, \ + K21, K22, K23, K24, K25, K26, \ + K27, K28, K29, K2A, K2B, K2C, \ + K31, K32, K33, K34, K35, K36, \ + ___2___, \ + K37, K38, K39, K3A, K3B, K3C, \ + ___5___, ___5___, \ + ___12___ \ + ) + +#define Dox_base(...) Base_dox(__VA_ARGS__) +#define Dox_bepo_base(...) Base_dox_bepo(__VA_ARGS__) +#define Dox_bepo_base6(...) Base_dox_bepo6(__VA_ARGS__) +#define Dox_transient(...) Transient_dox6(__VA_ARGS__) -- cgit v1.2.3 From 13e6517460718dbdddd10661d176480a2388c69d Mon Sep 17 00:00:00 2001 From: IFo Hancroft Date: Sat, 29 Jan 2022 08:58:28 +0200 Subject: [Keymap] Further improvements to ifohancroft ErgoDox keymap (#15672) --- keyboards/ergodox_ez/keymaps/ifohancroft/config.h | 2 - keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c | 100 +++++++++++++++------ keyboards/ergodox_ez/keymaps/ifohancroft/readme.md | 19 ++-- keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk | 3 +- 4 files changed, 82 insertions(+), 42 deletions(-) (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/config.h b/keyboards/ergodox_ez/keymaps/ifohancroft/config.h index fcc7c11be7..9a0d0e54f7 100644 --- a/keyboards/ergodox_ez/keymaps/ifohancroft/config.h +++ b/keyboards/ergodox_ez/keymaps/ifohancroft/config.h @@ -19,5 +19,3 @@ // place overrides here #define USB_POLLING_INTERVAL_MS 1 #define FORCE_NKRO -#undef DEBOUNCE -#define DEBOUNCE 5 diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c b/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c index 27524b1782..56c1ff28a7 100644 --- a/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c +++ b/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c @@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| * | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \ | * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - * | ESC | A | S | D | F | G | | | | H | J | K | L | ; | ' | + * | ESC | A | S | D | F | G | Del | | | H | J | K | L | ; | ' | * |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------| * | Shift | Z | X | C | V | B | | N | M | , | . | / | Shift | * |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------| - * | Ctrl | Super | Alt | TT(3) | MO(2) | | MO(2) | Left | Down | Up | Right | + * | Ctrl | Super | Alt | MO(4) | MO(3) | | MO(3) | Left | Down | Up | Right | * *-------------------------------------------------* *-------------------------------------------------* * * *-------------------* *-------------------* - * | | TG(1) | | | | + * | MO(2) | | | | | * *---------+---------+---------| |---------+---------+---------* * | | | | | | | | * | Bckspc | Enter |---------| |---------| Enter | Space | - * | | | PgDn | | PgUp | | | + * | | | Space | | | | | * *---------+---------+---------* *---------+---------+---------* */ @@ -44,14 +44,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, TT(3), MO(2), MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, MO(4), MO(3), MO(3), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, - KC_NO, TG(1), KC_NO, KC_NO, + MO(2), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_BSPC, KC_ENT, KC_PGDN, KC_PGUP, KC_ENT, KC_SPC + KC_BSPC, KC_ENT, KC_SPC, KC_NO, KC_ENT, KC_SPC ), + + /* Gaming Layer * *---------------------------------------------------------------------* *---------------------------------------------------------------------* * | | | | | | | 6 | | | | | | | | | @@ -86,15 +88,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_SPC, _______, _______, _______, _______, _______ ), - /* Function Keys Layer + + + /* Left Hand Layer * *---------------------------------------------------------------------* *---------------------------------------------------------------------* - * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | + * | | 6 | 7 | 8 | 9 | 0 | = | | | | | | | | | * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - * | | | Up | | | | | | | | | | | | | + * | \ | Y | U | I | O | P | ] | | | | | | | | | * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - * | | Left | Down | Right | | | | | | Left | Down | Up | Right | | | + * | ' | H | J | K | L | ; | | | | | | | | | | * |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------| - * | | | | | | | | | | | | | | + * | | N | M | , | . | / | | | | | | | | * |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------| * | | | | | | | | | | | | * *-------------------------------------------------* *-------------------------------------------------* @@ -109,10 +113,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ LAYOUT_ergodox_pretty( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, _______, _______, _______, _______, _______, _______, _______, + KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, + KC_QUOT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, _______, _______, _______, _______, _______, _______, + _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -120,15 +124,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - /* CAD Layer + + + /* Function Keys Layer * *---------------------------------------------------------------------* *---------------------------------------------------------------------* - * | Del | 0 | 9 | 8 | 7 | 6 | = | | | | | | | | | + * | NumLock | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - * | \ | P | O | I | U | Y | ] | | | | | | | | | + * | | + | 7 | 8 | 9 | * | | | | | | | | | | * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - * | ' | ; | L | K | J | H | | | | | | | | | | + * | | - | 4 | 5 | 6 | / | | | | Left | Down | Up | Right | | | * |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------| - * | | / | . | , | M | N | | | | | | | | + * | | 0 | 1 | 2 | 3 | . | | | | | | | | * |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------| * | | | | | | | | | | | | * *-------------------------------------------------* *-------------------------------------------------* @@ -137,21 +143,57 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | * *---------+---------+---------| |---------+---------+---------* * | | | | | | | | - * | Space | |---------| |---------| | | - * | | | PgUp | | | | | + * | | Enter |---------| |---------| | | + * | | | PgUp | | PgDn | | | + * *---------+---------+---------* *---------+---------+---------* + */ + + LAYOUT_ergodox_pretty( + KC_NUM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PAST, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PSLS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + + _______, _______, _______, _______, + _______, _______, + _______, KC_PENT, KC_PGUP, KC_PGDN, _______, _______ + ), + + + + /* Layers Layer + * *---------------------------------------------------------------------* *---------------------------------------------------------------------* + * | | TO(0) | TO(1) | | | | | | | | | | | | | + * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| + * | | | | | | | | | | | | | | | | + * |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| + * | | | | | | | | | | | | | | | | + * |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------| + * | | | | | | | | | | | | | | + * |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------| + * | | | | | | | | | | | | + * *-------------------------------------------------* *-------------------------------------------------* + * + * *-------------------* *-------------------* + * | | | | | | + * *---------+---------+---------| |---------+---------+---------* + * | | | | | | | | + * | | |---------| |---------| | | + * | | | | | | | | * *---------+---------+---------* *---------+---------+---------* */ LAYOUT_ergodox_pretty( - KC_DEL, KC_0, KC_9, KC_8, KC_7, KC_6, KC_EQL, _______, _______, _______, _______, _______, _______, _______, - KC_BSLS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, - KC_QUOT, KC_SCLN, KC_L, KC_K, KC_J, KC_H, _______, _______, _______, _______, _______, _______, - _______, KC_SLSH, KC_DOT, KC_COMM, KC_M, KC_N, _______, _______, _______, _______, _______, _______, _______, _______, + _______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_SPC, _______, KC_PGUP, _______, _______, _______ + _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md b/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md index 6bda1f2fc5..daa581062c 100644 --- a/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md +++ b/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md @@ -1,19 +1,20 @@ -![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/v0kRHX5.png) +![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/BlH0ZdE.png) # IFo Hancroft's ErgoDox EZ Layout -- Layer 0: A Standard ANSI QWERTY Layer. -- Layer 1: A Gaming Layer. It replaces the Backspace with a Space, and the Dash with a 6, so you can play CS:GO without needing to lift your right hand from the mouse. -- Layer 2: A function layer. It contains the F1-F12 keys and arrows on WASD. -- Layer 3: A CAD Layer. It is basically a mirrored version of the right hand side, so you can use CAD without needing to lift your right hand from the the mouse. +- Layer 0: A Standard ANSI QWERTY Layer. It adds some additional keys from the right half in-order to avoid having to lift your right hand of the mouse. +- Layer 1: A Gaming Layer. It replaces the Backspace with a Space, and the Dash with a 6, so you can play CS:GO without needing to lift your right hand of the mouse. +- Layer 2: A Left Hand Layer. It is basically a left hand version of the right half, so you can have access to a full-sized keyboard without needing to lift your right hand from the the mouse. +- Layer 3: A Function Layer. It contains the F1-F12 keys, PgUp, PgDn, Numpad, and arrows on HJKL. +- Layer 4: A Layer Switching Layer. The keys in this layer turn on a specific layer while disabling the rest. Basically, you come here to switch between the QWERTY and Gaming layers. + This keymap also does the following: - Sets the polling rate of the keyboard to 1ms -- Sets the debounce time to 5ms -- NKRO (Forced on) +- Forces NKRO on +- Enables: + - Command - Disables: - Mouse Key - Extra Key - - Unicode - - Swap Hands diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk b/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk index bf0efc77e5..775ecbd12b 100644 --- a/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk +++ b/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk @@ -1,4 +1,3 @@ MOUSEKEY_ENABLE = no EXTRAKEY_ENABLE = no -UNICODE_ENABLE = no -SWAP_HANDS_ENABLE = no +COMMAND_ENABLE = yes -- cgit v1.2.3 From c2c2f30f9f479f280b283919013a1b95b408a9b8 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 10 Feb 2022 07:02:53 +1100 Subject: Remove parent-relative paths from keyboards. (#16282) * Remove parent-relative paths from keyboards. * Update keyboards/capsunlocked/cu75/rules.mk Co-authored-by: Ryan Co-authored-by: Ryan --- keyboards/ergodox_ez/keymaps/default_glow/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk index 360c3c51b8..20bac4ab9d 100644 --- a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk +++ b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk @@ -1,4 +1,4 @@ RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes # enable later -SRC += ../default/keymap.c +SRC += keymaps/default/keymap.c -- cgit v1.2.3 From 764dc18a81f762fdff5f74eb6d3b517ba79d5c11 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 16 Mar 2022 00:56:58 +1100 Subject: Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h (#16655) --- keyboards/ergodox_ez/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 109a80d2c5..f25ff162cd 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -205,6 +205,5 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION + //#define DEBUG_MATRIX_SCAN_RATE -- cgit v1.2.3 From f610011aa3d43c41489ddc638a3a8731ae0d51bf Mon Sep 17 00:00:00 2001 From: Luc Date: Wed, 23 Mar 2022 00:38:50 +0800 Subject: [Keymap] personal keymap, ergodox_ez and atreus / dvorak_42_key (#16695) --- .../ergodox_ez/keymaps/dvorak_42_key/keymap.c | 77 ++++++++++++++++------ 1 file changed, 58 insertions(+), 19 deletions(-) (limited to 'keyboards/ergodox_ez') diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c index 67a09188ab..fab2977356 100644 --- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c +++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c @@ -79,9 +79,9 @@ enum custom_keycodes { SCREEN_READREG_1, SCREEN_READREG_2, - SCREEN_READREG_3, + SCREEN_READREG_3, SCREEN_PASTEREG_1, - SCREEN_PASTEREG_2, + SCREEN_PASTEREG_2, SCREEN_PASTEREG_3, // Windows 10 macros, @@ -101,6 +101,7 @@ enum custom_keycodes { #define COMBINED 7 // combined numbers and symbols layer #define ANDROID_STUDIO 8 // android studio specific layer #define VSCODE 9 // visual studio code specific layer +#define VSCODE_NAV 10 // visual studio code, navigation within IDE @@ -131,22 +132,22 @@ enum custom_keycodes { #define VS_OPEN_FILE LCTL(KC_O) #define VS_LINE LCTL(KC_G) #define VS_SYMBOLEDITOR LCTL(LSFT(KC_O)) -#define VS_DEFINITION KC_F12 -#define VS_IMPLEMENTATION LCTL(KC_F12) -#define VS_REFERENCES LSFT(KC_F12) +#define VS_DEFINITION MEH(KC_F5) +#define VS_IMPLEMENTATION MEH(KC_F6) +#define VS_REFERENCES MEH(KC_F7) #define VS_BACK LALT(KC_LEFT) #define VS_BRACKET LCTL(LSFT(KC_BSLS)) -#define VS_TABLEFT LCTL(KC_PGUP) -#define VS_TABRIGHT LCTL(KC_PGDN) -#define VS_CLOSETAB LCTL(KC_W) +#define VS_TABLEFT MEH(KC_F1) +#define VS_TABRIGHT MEH(KC_F2) +#define VS_CLOSETAB MEH(KC_F3) #define VS_CLOSEPANEL LCTL(LSFT(KC_W)) #define VS_GROUP_1 LCTL(KC_1) #define VS_GROUP_2 LCTL(KC_2) #define VS_TERMINAL LCTL(KC_GRAVE) #define VS_BUILD LCTL(LSFT(KC_B)) -#define VS_COMMANDS LCTL(LSFT(KC_P)) +#define VS_COMMANDS MEH(KC_F4) #define VS_CMT_BLOCK LSFT(LALT(KC_A)) -#define VS_CMT_LINE LCTL(KC_SLSH) +#define VS_CMT_LINE MEH(KC_F18) #define VS_DEL_LINE LCTL(LSFT(KC_K)) #define VS_COPYLINEDOWN LSFT(LALT(KC_DOWN)) // visual studio bookmark commands @@ -156,6 +157,18 @@ enum custom_keycodes { #define VS_BM_NEXT LCTL(LALT(KC_N)) #define VS_BM_TOGGLE LCTL(LALT(KC_K)) #define VS_BM_CLEARALL LCTL(LALT(KC_C)) +// visual studio code navigation shortcuts +#define VS_FOCUS_EDITOR MEH(KC_F8) +#define VS_FOCUS_TERMINAL MEH(KC_F9) +#define VS_TOGGLE_TERMINAL MEH(KC_F10) +#define VS_CLEAR_TERMINAL MEH(KC_F11) +#define VS_TERMINAL_PREV MEH(KC_F12) +#define VS_TERMINAL_NEXT MEH(KC_F13) +#define VS_TERMINAL_NEW MEH(KC_F14) +#define VS_TERMINAL_DETACH MEH(KC_F15) +#define VS_TERMINAL_RENAME MEH(KC_F16) +#define VS_JUMPY MEH(KC_F17) +#define VS_FIND MEH(KC_F19) #define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \ @@ -204,10 +217,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_ergodox( // left hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - OSL(SCREEN_NAV), KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, MO(ANDROID_STUDIO), + OSL(SCREEN_NAV), KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, MO(VSCODE_NAV), OSL(SHELL_NAV), KC_A, KC_O, KC_E, KC_U, KC_I, OSL(SHELL_SCREEN), KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, MO(VSCODE), - MEH(KC_1), OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), + MEH(KC_0), OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), // left thumb cluster WINDOWS10_WORKSPACE_LEFT, WINDOWS10_WORKSPACE_RIGHT, @@ -215,14 +228,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(COMBINED),MO(KEYNAV), OSM(MOD_LALT), // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MEH(KC_9), - MEH(KC_7), KC_F, KC_G, KC_C, KC_R, KC_L, KC_TAB, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MEH(KC_7), + MEH(KC_1), KC_F, KC_G, KC_C, KC_R, KC_L, KC_TAB, KC_D, KC_H, KC_T, KC_N, KC_S, RCTL(KC_BSPC), - MEH(KC_8), KC_B, KC_M, KC_W, KC_V, KC_Z, MEH(KC_F3), - KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT),MEH(KC_F4), + MEH(KC_2), KC_B, KC_M, KC_W, KC_V, KC_Z, MEH(KC_8), + KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT),MEH(KC_9), // right thumb cluster - MEH(KC_F5),MEH(KC_F6),MEH(KC_F7),MEH(KC_F8),KC_ENTER,KC_SPACE + MEH(KC_3), MEH(KC_4), MEH(KC_5), MEH(KC_6),KC_ENTER,KC_SPACE ), @@ -398,7 +411,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, VS_CMT_LINE, VS_COPYLINEDOWN, VS_REFERENCES, VS_DEFINITION, VS_IMPLEMENTATION, VS_LINE, VS_BRACKET, VS_CLOSETAB, VS_TABLEFT, VS_TABRIGHT, VS_SYMBOLEDITOR, VS_FILE, VS_BACK, - VS_CMT_BLOCK, KC_TRNS, VS_BM_PREV, VS_BM_NEXT, VS_GROUP_1, VS_GROUP_2, VS_BM_TOGGLE, + VS_CMT_BLOCK, VS_FIND, VS_BM_PREV, VS_BM_NEXT, VS_GROUP_1, VS_GROUP_2, VS_BM_TOGGLE, // bottom row VS_COMMANDS, VS_BM_LIST, VS_BM_LISTALL, VS_CLOSEPANEL, VS_BM_CLEARALL, // thumb cluster @@ -407,6 +420,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, VS_DEL_LINE, KC_TRNS ), + // vscode navigation shortcuts + [VSCODE_NAV] = LAYOUT_ergodox( + // left hand + KC_NO, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + // bottom row + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, + // thumb cluster + KC_TRNS,KC_TRNS, + KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS, + // right hand + 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, + VS_TOGGLE_TERMINAL, VS_FOCUS_TERMINAL, VS_FOCUS_EDITOR, VS_JUMPY, KC_TRNS, KC_TRNS, + KC_TRNS, VS_CLEAR_TERMINAL, VS_TERMINAL_PREV, VS_TERMINAL_NEXT, VS_TERMINAL_NEW, VS_TERMINAL_DETACH, VS_TERMINAL_RENAME, + // bottom row + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + // thumb cluster + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + [COMBINED] = LAYOUT_ergodox( // left hand @@ -659,7 +698,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { tap_code16(C(KC_A)); tap_code16(S(KC_SCOLON)); SEND_STRING("paste 1\n"); - break; + break; case SCREEN_PASTEREG_2: tap_code16(C(KC_A)); tap_code16(S(KC_SCOLON)); -- cgit v1.2.3