From b1b5176de673465a98777b239c8dd76f4bbe22ae Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Sun, 5 Apr 2020 12:03:19 -0700 Subject: [PATCH 01/23] Fix bug with layer caching in get_event_keycode --- quantum/quantum.c | 13 ++++++++----- quantum/quantum.h | 4 ++-- tmk_core/common/action.c | 2 +- tmk_core/common/action_tapping.c | 8 ++++---- tmk_core/common/action_tapping.h | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 76a48cc77cfd..55cdaa3b023e 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -149,18 +149,21 @@ void reset_keyboard(void) { } /* Convert record into usable keycode via the contained event. */ -uint16_t get_record_keycode(keyrecord_t *record) { return get_event_keycode(record->event); } +uint16_t get_record_keycode(keyrecord_t *record, bool do_update) { return get_event_keycode(record->event, do_update); } /* Convert event into usable keycode. Checks the layer cache to ensure that it * retains the correct keycode after a layer change, if the key is still pressed. + * "do_update" is to ensure that it only updates the layer cache when appropriate, + * otherwise, it will update it and cause layer tap (and other keys) from + * triggering properly. */ -uint16_t get_event_keycode(keyevent_t event) { +uint16_t get_event_keycode(keyevent_t event, bool do_update) { #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) /* TODO: Use store_or_get_action() or a similar function. */ if (!disable_action_cache) { uint8_t layer; - if (event.pressed) { + if (event.pressed && do_update) { layer = layer_switch_get_layer(event.key); update_source_layers_cache(event.key, layer); } else { @@ -174,7 +177,7 @@ uint16_t get_event_keycode(keyevent_t event) { /* Get keycode, and then call keyboard function */ void post_process_record_quantum(keyrecord_t *record) { - uint16_t keycode = get_record_keycode(record); + uint16_t keycode = get_record_keycode(record, false); post_process_record_kb(keycode, record); } @@ -182,7 +185,7 @@ void post_process_record_quantum(keyrecord_t *record) { then processes internal quantum keycodes, and then processes ACTIONs. */ bool process_record_quantum(keyrecord_t *record) { - uint16_t keycode = get_record_keycode(record); + uint16_t keycode = get_record_keycode(record, true); // This is how you use actions here // if (keycode == KC_LEAD) { diff --git a/quantum/quantum.h b/quantum/quantum.h index 4b94ebcc052d..9fdd36e788ec 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -252,8 +252,8 @@ void matrix_init_kb(void); void matrix_scan_kb(void); void matrix_init_user(void); void matrix_scan_user(void); -uint16_t get_record_keycode(keyrecord_t *record); -uint16_t get_event_keycode(keyevent_t event); +uint16_t get_record_keycode(keyrecord_t *record, bool do_update); +uint16_t get_event_keycode(keyevent_t event, bool do_update); bool process_action_kb(keyrecord_t *record); bool process_record_kb(uint16_t keycode, keyrecord_t *record); bool process_record_user(uint16_t keycode, keyrecord_t *record); diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 74db245c12dc..27c0abe6faa4 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -324,7 +324,7 @@ void process_action(keyrecord_t *record, action_t action) { # if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY) if ( # ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY - !get_ignore_mod_tap_interrupt(get_event_keycode(record->event)) && + !get_ignore_mod_tap_interrupt(get_event_keycode(record->event, false)) && # endif record->tap.interrupted) { dprint("mods_tap: tap: cancel: add_mods\n"); diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index acce3ee5157f..34f08d890486 100644 --- a/tmk_core/common/action_tapping.c +++ b/tmk_core/common/action_tapping.c @@ -22,7 +22,7 @@ __attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode) { return TAPPING_TERM; } # ifdef TAPPING_TERM_PER_KEY -# define WITHIN_TAPPING_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < get_tapping_term(get_event_keycode(tapping_key.event))) +# define WITHIN_TAPPING_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < get_tapping_term(get_event_keycode(tapping_key.event, false))) # else # define WITHIN_TAPPING_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < TAPPING_TERM) # endif @@ -122,10 +122,10 @@ bool process_tapping(keyrecord_t *keyp) { # if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY) else if ( # ifdef TAPPING_TERM_PER_KEY - (get_tapping_term(get_event_keycode(tapping_key.event)) >= 500) && + (get_tapping_term(get_event_keycode(tapping_key.event, false)) >= 500) && # endif # ifdef PERMISSIVE_HOLD_PER_KEY - !get_permissive_hold(get_event_keycode(tapping_key.event), keyp) && + !get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp) && # endif IS_RELEASED(event) && waiting_buffer_typed(event)) { debug("Tapping: End. No tap. Interfered by typing key\n"); @@ -246,7 +246,7 @@ bool process_tapping(keyrecord_t *keyp) { # if !defined(TAPPING_FORCE_HOLD) || defined(TAPPING_FORCE_HOLD_PER_KEY) if ( # ifdef TAPPING_FORCE_HOLD_PER_KEY - !get_tapping_force_hold(get_event_keycode(tapping_key.event), keyp) && + !get_tapping_force_hold(get_event_keycode(tapping_key.event, false), keyp) && # endif !tapping_key.tap.interrupted && tapping_key.tap.count > 0) { // sequential tap. diff --git a/tmk_core/common/action_tapping.h b/tmk_core/common/action_tapping.h index 509d5eabd84f..ffba830cf020 100644 --- a/tmk_core/common/action_tapping.h +++ b/tmk_core/common/action_tapping.h @@ -32,7 +32,7 @@ along with this program. If not, see . #define WAITING_BUFFER_SIZE 8 #ifndef NO_ACTION_TAPPING -uint16_t get_event_keycode(keyevent_t event); +uint16_t get_event_keycode(keyevent_t event, bool do_update); uint16_t get_tapping_term(uint16_t keycode); void action_tapping_process(keyrecord_t record); #endif From f62426cc358e742d68061cc4842c90344ec464e0 Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Sun, 5 Apr 2020 19:19:58 -0700 Subject: [PATCH 02/23] Improve naming --- quantum/quantum.c | 12 ++++++------ quantum/quantum.h | 4 ++-- tmk_core/common/action_tapping.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 55cdaa3b023e..2053a1a5f479 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -149,21 +149,21 @@ void reset_keyboard(void) { } /* Convert record into usable keycode via the contained event. */ -uint16_t get_record_keycode(keyrecord_t *record, bool do_update) { return get_event_keycode(record->event, do_update); } +uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) { return get_event_keycode(record->event, update_layer_cache); } /* Convert event into usable keycode. Checks the layer cache to ensure that it * retains the correct keycode after a layer change, if the key is still pressed. - * "do_update" is to ensure that it only updates the layer cache when appropriate, - * otherwise, it will update it and cause layer tap (and other keys) from - * triggering properly. + * "update_layer_cache" is to ensure that it only updates the layer cache when + * appropriate, otherwise, it will update it and cause layer tap (and other keys) + * from triggering properly. */ -uint16_t get_event_keycode(keyevent_t event, bool do_update) { +uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache) { #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) /* TODO: Use store_or_get_action() or a similar function. */ if (!disable_action_cache) { uint8_t layer; - if (event.pressed && do_update) { + if (event.pressed && update_layer_cache) { layer = layer_switch_get_layer(event.key); update_source_layers_cache(event.key, layer); } else { diff --git a/quantum/quantum.h b/quantum/quantum.h index 9fdd36e788ec..45f44f49a1a7 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -252,8 +252,8 @@ void matrix_init_kb(void); void matrix_scan_kb(void); void matrix_init_user(void); void matrix_scan_user(void); -uint16_t get_record_keycode(keyrecord_t *record, bool do_update); -uint16_t get_event_keycode(keyevent_t event, bool do_update); +uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache); +uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); bool process_action_kb(keyrecord_t *record); bool process_record_kb(uint16_t keycode, keyrecord_t *record); bool process_record_user(uint16_t keycode, keyrecord_t *record); diff --git a/tmk_core/common/action_tapping.h b/tmk_core/common/action_tapping.h index ffba830cf020..5eaef1c5f09a 100644 --- a/tmk_core/common/action_tapping.h +++ b/tmk_core/common/action_tapping.h @@ -32,7 +32,7 @@ along with this program. If not, see . #define WAITING_BUFFER_SIZE 8 #ifndef NO_ACTION_TAPPING -uint16_t get_event_keycode(keyevent_t event, bool do_update); +uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); uint16_t get_tapping_term(uint16_t keycode); void action_tapping_process(keyrecord_t record); #endif From a227a8752451ca3bf439ca7eb1b29637d610e43c Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sat, 11 Apr 2020 07:37:52 +0200 Subject: [PATCH 03/23] new xd75 keymap --- .../ergodox_ez/keymaps}/ericgebhart/rules.mk | 10 +- keyboards/xd75/keymaps/ericgebhart/config.h | 28 + keyboards/xd75/keymaps/ericgebhart/keymap.c | 242 +++++++++ keyboards/xd75/keymaps/ericgebhart/readme.md | 1 + keyboards/xd75/keymaps/ericgebhart/rules.mk | 32 ++ keyboards/xd75/keymaps/ericgebhart/rules2.mk | 18 + users/ericgebhart/ericgebhart.c | 12 +- users/ericgebhart/ericgebhart.h | 512 +++++++++++++----- 8 files changed, 707 insertions(+), 148 deletions(-) rename {users => keyboards/ergodox_ez/keymaps}/ericgebhart/rules.mk (56%) create mode 100644 keyboards/xd75/keymaps/ericgebhart/config.h create mode 100644 keyboards/xd75/keymaps/ericgebhart/keymap.c create mode 100644 keyboards/xd75/keymaps/ericgebhart/readme.md create mode 100644 keyboards/xd75/keymaps/ericgebhart/rules.mk create mode 100755 keyboards/xd75/keymaps/ericgebhart/rules2.mk diff --git a/users/ericgebhart/rules.mk b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk similarity index 56% rename from users/ericgebhart/rules.mk rename to keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk index 2572d21118f6..373760c77bd0 100755 --- a/users/ericgebhart/rules.mk +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk @@ -3,16 +3,16 @@ SRC += ericgebhart.c MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key TAP_DANCE_ENABLE = yes # Enable the tap dance feature. -CONSOLE_ENABLE = yes # Console for debug +CONSOLE_ENABLE = no # Console for debug BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration UNICODE_ENABLE = no SLEEP_LED_ENABLE = no API_SYSEX_ENABLE = no -RGBLIGHT_ENABLE = no +RGBLIGHT_ENABLE = yes RGBLIGHT_ANIMATION = no diff --git a/keyboards/xd75/keymaps/ericgebhart/config.h b/keyboards/xd75/keymaps/ericgebhart/config.h new file mode 100644 index 000000000000..22a2c75ddfa6 --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/config.h @@ -0,0 +1,28 @@ +/* Copyright 2017 Benjamin Kesselring + * + * 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 . + */ + +#pragma once + +#undef RGBLED_NUM +#define RGBLED_NUM 6 +#define RGBLIGHT_LAYERS + +#undef RGBLIGHT_ANIMATIONS +//#define RGBLIGHT_HUE_STEP 8 +//#define RGBLIGHT_SAT_STEP 8 + + +// place overrides here diff --git a/keyboards/xd75/keymaps/ericgebhart/keymap.c b/keyboards/xd75/keymaps/ericgebhart/keymap.c new file mode 100644 index 000000000000..efc809bba79e --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/keymap.c @@ -0,0 +1,242 @@ +/* + 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 . +*/ + +#include "keymap_bepo.h" +#include "ericgebhart.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [DVORAK] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___DVORAK_L1___, ___MIDDLE_1___, ___DVORAK_R1___, KC_SLASH, + TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE_2___, ___DVORAK_R2___, KC_MINUS, + KC_LSFT, ___DVORAK_L3___, ___MIDDLE_3___, ___DVORAK_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [QWERTY] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___QWERTY_L1___, ___MIDDLE_1___, ___QWERTY_R1___, KC_SLASH, + TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE_2___, ___QWERTY_R2___, KC_MINUS, + KC_LSFT, ___QWERTY_L3___, ___MIDDLE_3___, ___QWERTY_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [COLEMAK] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___COLEMAK_L1___, ___MIDDLE_1___, ___COLEMAK_R1___, KC_SLASH, + TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE_2___, ___COLEMAK_R2___, KC_MINUS, + KC_LSFT, ___COLEMAK_L3___, ___MIDDLE_3___, ___COLEMAK_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [WORKMAN] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___WORKMAN_L1___, ___MIDDLE_1___, ___WORKMAN_R1___, KC_SLASH, + TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE_2___, ___WORKMAN_R2___, KC_MINUS, + KC_LSFT, ___WORKMAN_L3___, ___MIDDLE_3___, ___WORKMAN_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [NORMAN] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___NORMAN_L1___, ___MIDDLE_1___, ___NORMAN_R1___, KC_SLASH, + TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE_1___, ___NORMAN_R2___, KC_MINUS, + KC_LSFT, ___NORMAN_L3___, ___MIDDLE_1___, ___NORMAN_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [DVORAK_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( + DB_GRV, ___NUMBER_BEPO_L___, ___MIDDLE_T_BP___, ___NUMBER_BEPO_R___, DB_EQL, + KC_LOCK, ___DVORAK_FR_L1___, ___MIDDLE_1_BP___, ___DVORAK_FR_R1___, DB_SLASH, + TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, + KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, + ___XD75_BOTTOM_FR___ + ), + + [XMONAD] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___, ___DVORAK_L1___, ___3___, ___DVORAK_R1___, ___, + ___, ___DVORAK_L2___, ___3___, ___DVORAK_R2___, ___, + ___, ___DVORAK_L3___, ___3___, ___DVORAK_R3___, ___, + ___15___ + ), + + [XMONAD_FR] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___, ___DVORAK_FR_L1___, ___3___, ___DVORAK_FR_R1___, ___, + ___, ___DVORAK_FR_L2___, ___3___, ___DVORAK_FR_R2___, ___, + ___, ___DVORAK_FR_L3___, ___3___, ___DVORAK_FR_R3___, ___, + ___15___ + ), + + [BEPO] = LAYOUT_ortho_5x15_wrapper( + BP_DLR, ___SYMBOL_BEPO_L___, ___MIDDLE_T_BP___, ___SYMBOL_BEPO_R___, BP_EQL, + KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE_1_BP___, ___BEPO_FR_R1___, BP_W, + TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE_2_BP___, ___BEPO_FR_R2___, BP_CCED, + BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, + ___XD75_BOTTOM_FR___ + ), + + // SYMBOLS + [SYMB] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___SYMBOLS6_1___, ___3___, ___SYMPAD_1___, + ___SYMBOLS6_2___, ___3___, ___SYMPAD_2___, + ___SYMBOLS6_3___, ___3___, ___SYMPAD_3___, + ___SYMBOLS6_4___, ___3___, ___SYMPAD_4___ + ), + + [KEYPAD] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1___, ___, + ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2___, ___, + ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4___, ___ + ), + + [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1_BP___, ___, + ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2_BP___, ___, + ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3_BP___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4_BP___, ___ + ), + + [SYMB_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___SYMBOLS6_1_BP___, ___3___, ___SYMPAD_1_BP___, + ___SYMBOLS6_2_BP___, ___3___, ___SYMPAD_2_BP___, + ___SYMBOLS6_3_BP___, ___3___, ___SYMPAD_3_BP___, + ___SYMBOLS6_4_BP___, ___3___, ___SYMPAD_4_BP___ + ), + + // MEDIA AND MOUSE + [MDIA] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___MOUSE_BTNS_L___, ___4___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, + ___, ___MOUSE_LDUR___, ___4___, KC_VOLD, ___VI_ARROWS___, ___, + ___, ___MWHEEL_LDUR___, ___4___, KC_PGUP, ___MOUSE_BTNS_R___, + ___2___, ___MACCL___, ___4___, KC_PGDN, ___5___ + ), + + [LAYERS] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___X3___, ___LAYERS_B1_2___, ___5___, ___LAYERS_T_BP_3___, ___X2___, + ___X3___, ___LAYERS_B2_2___, ___5___, ___LAYERS_T_3___, ___X2___, + ___X2___, ___LAYERS_B3_3___, ___5___, ___LAYERS_T_DEF___, ___X2___, + ___5___, ___5___, ___5___ + ), + + [_RGB] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___, ___RGB_HUE_SAT_INT_UP___, ___5___, ___5___, + ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___4___, ___RGB_P_B_R_SW_SN___, + ___5___, ___5___, ___RGB_KXGT___, ___, + ___15___ + ), +}; + + +/********************************************************************************/ +/* Using layers to do RGB underlighting */ +/********************************************************************************/ + +const rgblight_segment_t PROGMEM on_bepo[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 2, HSV_AZURE} + ); + +const rgblight_segment_t PROGMEM bepo[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 2, HSV_MAGENTA} + ); + +const rgblight_segment_t PROGMEM dvorak[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 2, HSV_AZURE} + ); + +const rgblight_segment_t PROGMEM media[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_GREEN} + ); + +const rgblight_segment_t PROGMEM symbol[] = RGBLIGHT_LAYER_SEGMENTS( + {4, 2, HSV_GOLD} + ); + +const rgblight_segment_t PROGMEM keypad[] = RGBLIGHT_LAYER_SEGMENTS( + {4, 2, HSV_BLUE} + ); + +const rgblight_segment_t PROGMEM layers[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_RED} + ); + +const rgblight_segment_t PROGMEM rgb[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_ORANGE} + ); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(on_bepo, bepo, dvorak, media, symbol, + keypad, layers, rgb); + +void keyboard_post_init_user(void) { + rgblight_sethsv_noeeprom(HSV_PURPLE); + rgblight_layers = rgb_layers; +} + +layer_state_t layer_state_set_user(layer_state_t state) { + // rgblight_set_layer_state(0, !on_qwerty()); + rgblight_set_layer_state(0, layer_state_cmp(state, DVORAK)); + + rgblight_set_layer_state(1, layer_state_cmp(state, BEPO)); + rgblight_set_layer_state(2, layer_state_cmp(state, DVORAK)); + //|| layer_state_cmp(state, DVORAK_ON_BEPO))); + rgblight_set_layer_state(3, layer_state_cmp(state, MDIA)); + rgblight_set_layer_state(4, layer_state_cmp(state, SYMB) ); + + //(layer_state_cmp(state, SYMB) || (layer_state_cmp(state, SYMB_ON_BEPO)))); + rgblight_set_layer_state(5, layer_state_cmp(state, KEYPAD) ); + ///(layer_state_cmp(state, KEYPAD) || (layer_state_cmp(state, KEYPAD_ON_BEPO)))); + rgblight_set_layer_state(6, layer_state_cmp(state, LAYERS)); + rgblight_set_layer_state(7, layer_state_cmp(state, _RGB)); + return state; +} + +/* void suspend_power_down_user(void) { */ +/* rgblight_disable(); */ +/* } */ + +/* void suspend_wakeup_init_user(void) { */ +/* rgblight_enable(); */ +/* } */ + +/* bool is_shift_pressed = false; */ + +/* bool led_update_user(led_t led_state) { */ +/* rgblight_set_layer_state(2, is_shift_pressed != led_state.caps_lock); */ +/* return true; */ +/* } */ + +/* bool process_record_user(uint16_t keycode, keyrecord_t* record) { */ +/* switch (keycode) { */ +/* case KC_LSFT: */ +/* case KC_RSFT: */ +/* is_shift_pressed = record->event.pressed; */ +/* rgblight_set_layer_state(2, is_shift_pressed != host_keyboard_led_state().caps_lock); */ +/* default: */ +/* return true; */ +/* } */ +/* } */ diff --git a/keyboards/xd75/keymaps/ericgebhart/readme.md b/keyboards/xd75/keymaps/ericgebhart/readme.md new file mode 100644 index 000000000000..a1c0236ed9cd --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/readme.md @@ -0,0 +1 @@ +# The default keymap for xd75, with led controls \ No newline at end of file diff --git a/keyboards/xd75/keymaps/ericgebhart/rules.mk b/keyboards/xd75/keymaps/ericgebhart/rules.mk new file mode 100644 index 000000000000..2fed81b89609 --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/rules.mk @@ -0,0 +1,32 @@ +USER_NAME := ericgebhart +SRC += ericgebhart.c +# 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 3 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 . + +RGBLIGHT_ENABLE = yes +RGBLIGHT_ANIMATION = yes +# BACKLIGHT_ENABLE = yes + +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. +CONSOLE_ENABLE = no # Console for debug + +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +UNICODE_ENABLE = no +SLEEP_LED_ENABLE = no +API_SYSEX_ENABLE = no diff --git a/keyboards/xd75/keymaps/ericgebhart/rules2.mk b/keyboards/xd75/keymaps/ericgebhart/rules2.mk new file mode 100755 index 000000000000..373760c77bd0 --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/rules2.mk @@ -0,0 +1,18 @@ +USER_NAME := ericgebhart +SRC += ericgebhart.c + +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. +CONSOLE_ENABLE = no # Console for debug + +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +UNICODE_ENABLE = no +SLEEP_LED_ENABLE = no +API_SYSEX_ENABLE = no +RGBLIGHT_ENABLE = yes +RGBLIGHT_ANIMATION = no diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c index 69aa450e0a91..e59ea93d3ea6 100644 --- a/users/ericgebhart/ericgebhart.c +++ b/users/ericgebhart/ericgebhart.c @@ -14,6 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + #include "ericgebhart.h" #include "quantum.h" @@ -122,8 +123,6 @@ const uint8_t key_translations[][2][2] = { [GR(DB_CIRC)] = {{BP_AT, MOD_BIT(KC_RALT)}, {BP_AT, MOD_BIT(KC_RALT)}}, [GR(DB_LESS)] = {{BP_LGIL, MOD_BIT(KC_RALT)}, {BP_LGIL, MOD_BIT(KC_RALT)}}, [GR(DB_GRTR)] = {{BP_RGIL, MOD_BIT(KC_RALT)}, {BP_RGIL, MOD_BIT(KC_RALT)}}, - - }; @@ -390,13 +389,20 @@ void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) { if(on_qwerty()) layer_invert(SYMB); else - layer_invert(SYMB_ON_BEPO); + layer_invert(SYMB_ON_BEPO); break; case 2: layer_invert(MDIA); break; case 3: layer_invert(LAYERS); + break; + case 4: + if(on_qwerty()) + layer_invert(KEYPAD); + else + layer_invert(KEYPAD_ON_BEPO); + break; default: break; } diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index 6eb11ddfc078..fa381fd1fbe6 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -22,6 +22,7 @@ #include "quantum.h" #include "process_keycode/process_tap_dance.h" +//#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ void tap(uint16_t keycode); bool process_record_secrets(uint16_t keycode, keyrecord_t *record); @@ -39,13 +40,6 @@ typedef union { }; } userspace_config_t; -#define ___ KC_TRNS -#define XXX KC_NO - -// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). -#define MK_CUT LSFT(KC_DEL) // shift + delete -#define MK_COPY LCTL(KC_INS) // ctrl + insert -#define MK_PASTE LSFT(KC_INS) // shift + insert #define DVORAK 0 // dvorak layout (default) @@ -63,6 +57,9 @@ typedef union { #define LAYERS 11 // layers and right mousekeys. #define XMONAD 12 // xmonad ie. dvorak. #define XMONAD_FR 13 // xmonad ie. dvorak. +#define KEYPAD 14 // number and Fkey pads +#define KEYPAD_ON_BEPO 15 // number and Fkey pads. +#define _RGB 16 // RGB stuff. // for the creation of dvorak keys on an Bepo keyboard at the OS layer. @@ -150,26 +147,8 @@ enum userspace_custom_keycodes { #define GUI_ESC GUI_T(KC_ESC) // Gui or escape #define ALGR_SYMB ALGR_T(TG(SYMB)) // Alt gre or toggle symbol layer -#define KC_SFT_T_U SFT_T(KC_U) -#define KC_SFT_T_H SFT_T(KC_H) -#define KC_LT_SYMB_I LT(SYMB, KC_I) -#define KC_LT_SYMB_D LT(SYMB, KC_D) - -// for dvorak on bepo -#define BP_SFT_T_U SFT_T(BP_U) -#define BP_SFT_T_H SFT_T(BP_H) -#define BP_LT_SYMB_D LT(SYMB, BP_D) -// for bepo on bepo -#define BP_SFT_T_T SFT_T(BP_T) -#define BP_LT_SYMB_C LT(SYMB_ON_BEPO, BP_C) -#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) -#define BP_SFT_T_E SFT_T(BP_E) -#define BP_SFT_T_ECRC SFT_T(BP_ECRC) -#define BP_SFT_T_CCED SFT_T(BP_CCED) -#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) - // OSM keycodes, to keep things clean and easy to change #define KC_MLSF OSM(MOD_LSFT) #define KC_MRSF OSM(MOD_RSFT) @@ -188,38 +167,38 @@ enum userspace_custom_keycodes { //// TAP DANCE -typedef struct { - bool is_press_action; + typedef struct { + bool is_press_action; int state; -} tdtap; + } tdtap; enum { - SINGLE_TAP = 1, - SINGLE_HOLD = 2, - DOUBLE_TAP = 3, - DOUBLE_HOLD = 4, - DOUBLE_SINGLE_TAP = 5, //send two single taps - TRIPLE_TAP = 6, - TRIPLE_HOLD = 7 - }; + SINGLE_TAP = 1, + SINGLE_HOLD = 2, + DOUBLE_TAP = 3, + DOUBLE_HOLD = 4, + DOUBLE_SINGLE_TAP = 5, //send two single taps + TRIPLE_TAP = 6, + TRIPLE_HOLD = 7 +}; - //Tap Dance Declarations - enum { - TD_ESC_CAPS = 0, - TD_TAB_BKTAB = 1, - TD_MDIA_SYMB = 2, - TD_HOME_END = 3, - TD_XMONAD_ESC = 4, - TD_DEF_LAYER_SW = 5, - TD_DEF_OS_LAYER_SW = 6, - TD_MOUSE_BTNS = 7, - TD_DVORAK_BEPO = 8 - }; +//Tap Dance Declarations +enum { + TD_ESC_CAPS = 0, + TD_TAB_BKTAB = 1, + TD_MDIA_SYMB = 2, + TD_HOME_END = 3, + TD_XMONAD_ESC = 4, + TD_DEF_LAYER_SW = 5, + TD_DEF_OS_LAYER_SW = 6, + TD_MOUSE_BTNS = 7, + TD_DVORAK_BEPO = 8 +}; // Tap dance #define TAB_BKTAB TD(TD_TAB_BKTAB) // Tab or backtab tapdance. -#define MDIA_SYMB TD(TD_MDIA_SYMB) // MDIA or Symb layer tapdance toggle. +#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB) // MDIA, symb, keypad, layouts layer tapdance toggle. #define DEF_LAYER_SW TD(TD_DEF_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer #define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer #define HOME_END TD(TD_HOME_END) // home or end tapdance. @@ -227,6 +206,108 @@ enum { #define DVORAK_ET_BEPO TD(TD_DVORAK_BEPO) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 #define TDMOUSE_BTNS TD(TD_MOUSE_BTNS) // hmmm. 1-5 +// HOME ROW LAYER TOGGLE (LT) and Shift. +// both sides of the home row have "shift, ___, media , symb, ___" and "___, symb, media, ___, shift". +// so pinky fingers are shift when held and the index and second fingers are symbol and +// media layers when held. + +// Dvorak +// shift and layer switch on hold on the home row. +#define KC_SFT_T_A SFT_T(KC_A) +#define KC_SFT_T_S SFT_T(KC_S) + +#define KC_LT_SYMB_U LT(SYMB, KC_U) +#define KC_LT_SYMB_H LT(SYMB, KC_H) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_MDIA_T LT(MDIA, KC_T) + +// Need to add this to the others. +#define KC_LT_KP_N LT(KEYPAD, KC_N) +#define KC_LT_KP_O LT(KEYPAD, KC_O) + +// for dvorak on bepo +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) + +#define BP_LT_SYMB_U LT(SYMB, BP_U) +#define BP_LT_SYMB_H LT(MDIA, BP_H) + +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_MDIA_T LT(MDIA, BP_T) + +// Need to add this to the others. +#define BP_LT_KP_N LT(KEYPAD, BP_N) +#define BP_LT_KP_O LT(KEYPAD, BP_O) + +// for bepo on bepo +#define BP_SFT_T_T SFT_T(BP_T) +#define BP_SFT_T_W SFT_T(BP_W) + +#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_KP_U LT(KEYPAD, BP_U) + +#define BP_LT_SYMB_S LT(SYMB_ON_BEPO, BP_S) +#define BP_LT_MDIA_R LT(MDIA, BP_R) +#define BP_LT_KP_N LT(KEYPAD, BP_N) + +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) +#define BP_SFT_T_E SFT_T(BP_E) +#define BP_SFT_T_M SFT_T(BP_M) + +#define BP_SFT_T_ECRC SFT_T(BP_ECRC) +#define BP_SFT_T_CCED SFT_T(BP_CCED) +#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) + +//QWERTY +#define KC_SFT_T_SCLN SFT_T(KC_SCLN) + +#define KC_LT_MDIA_D LT(MDIA, KC_D) +#define KC_LT_MDIA_K LT(MDIA, KC_K) +#define KC_LT_SYMB_F LT(SYMB, KC_F) +#define KC_LT_SYMB_J LT(SYMB, KC_J) + +//COLEMAK +#define KC_SFT_T_O SFT_T(KC_O) +#define KC_LT_MDIA_S LT(MDIA, KC_S) +#define KC_LT_SYMB_T LT(SYMB, KC_T) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_SYMB_N LT(SYMB, KC_N) + +//WORKMAN +#define KC_SFT_T_I SFT_T(KC_I) +#define KC_LT_MDIA_H LT(MDIA, KC_H) + +//NORMAN +// For keys on the homerow. Hold for shift, keypad,mouse,and smbol layers +#define KC_SFT_T_U SFT_T(KC_U) +#define KC_LT_MDIA_I LT(MDIA, KC_I) + +// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). +#define MK_CUT LSFT(KC_DEL) // shift + delete +#define MK_COPY LCTL(KC_INS) // ctrl + insert +#define MK_PASTE LSFT(KC_INS) // shift + insert + +#define ___ KC_TRNS +#define XXX KC_NO + +// Blocking keys +#define ___X___ XXX +#define ___X2___ XXX, XXX +#define ___X3___ ___X2___, XXX +#define ___X5___ ___X3___, XXX, XXX +#define ___X15___ ___X5___, ___X5___, ___X5___ + +// Transparent keys +#define ___2___ ___, ___ +#define ___3___ ___2___, ___ +#define ___4___ ___3___, ___ +#define ___5___ ___4___, ___ +#define ___6___ ___5___, ___ +#define ___15___ ___5___, ___5___, ___5___ int on_qwerty(void); int get_xmonad_layer(void); @@ -259,46 +340,141 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) -//Dvorak on a qwerty software layer in the OS -#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y -#define ___DVORAK_L2___ KC_A, KC_O, KC_E, KC_SFT_T_U, KC_LT_SYMB_I -#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X +#define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) -#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L -#define ___DVORAK_R2___ KC_LT_SYMB_D, KC_SFT_T_H, KC_T, KC_N, KC_S -#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z +/********************************************************************/ +/** The Core rows of each given layout. **/ +/********************************************************************/ +//Dvorak on a qwerty software layer in the OS +#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y +#define ___DVORAK_L2___ KC_SFT_T_A, KC_LT_KP_O, KC_LT_MDIA_E, KC_LT_SYMB_U, KC_I +#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X +#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L +#define ___DVORAK_R2___ KC_D, KC_LT_SYMB_H, KC_LT_MDIA_T, KC_LT_KP_N, KC_SFT_T_S +#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z +// Qwerty based layers that I don't really use. +#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T +#define ___QWERTY_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_D, KC_LT_SYMB_F, KC_G +#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P +#define ___QWERTY_R2___ KC_H, KC_LT_SYMB_J, KC_LT_MDIA_K, KC_L, KC_SFT_T_SCLN +#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK +#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G +#define ___COLEMAK_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_D +#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_R2___ KC_H, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK-DH +#define ___COLEMAK_MOD_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B +#define ___COLEMAK_MOD_DH_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_G +#define ___COLEMAK_MOD_DH_L3___ KC_Z, KC_X, KC_C, KC_D, KC_V + +#define ___COLEMAK_MOD_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_MOD_DH_R2___ KC_M, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_MOD_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH + +// WORKMAN +#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B +#define ___WORKMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_H, KC_LT_SYMB_T, KC_G +#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V + +#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN +#define ___WORKMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_O, KC_SFT_T_I +#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH + +// NORMAN +#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K +#define ___NORMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_E, KC_LT_SYMB_T, KC_G +#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN +#define ___NORMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_I, KC_O, KC_SFT_T_U +#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// BEPO MAPS // Dvorak on fr-bepo software layer in the OS. // for dvorak and all the other qwerty like keyboards on bepo -#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 -#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 - #define ___DVORAK_FR_L1___ DB_QUOT, DB_COMM, DB_DOT, BP_P, BP_Y -#define ___DVORAK_FR_L2___ BP_A, BP_O, BP_E, BP_SFT_T_U, BP_LT_SYMB_I +#define ___DVORAK_FR_L2___ BP_SFT_T_A, BP_LT_KP_O, BP_LT_MDIA_E, BP_LT_SYMB_U, BP_I #define ___DVORAK_FR_L3___ DB_SCOLON, BP_Q, BP_J, BP_K, BP_X -#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L -#define ___DVORAK_FR_R2___ BP_LT_SYMB_D, BP_SFT_T_H, BP_T, BP_N, BP_S -#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z +#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L +#define ___DVORAK_FR_R2___ BP_D, BP_LT_SYMB_H, BP_LT_MDIA_T, BP_LT_KP_N, BP_SFT_T_S +#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z // Bepo on fr-bepo software layer // for bepo on bepo +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ #define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ #define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ -#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV -#define ___BEPO_FR_L2___ BP_A, BP_U, BP_I, BP_SFT_T_E, BP_LT_SYMB_COMM -#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K - -#define ___BEPO_FR_R1___ /* BP_DCRC*/ BP_V, BP_D, BP_L, BP_J, BP_Z //, BP_W -#define ___BEPO_FR_R2___ /* BP_C */ BP_SFT_T_T, BP_S, BP_R, BP_N, BP_M //BP_CCED -#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F - +#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV +#define ___BEPO_FR_L2___ BP_SFT_T_A, BP_LT_KP_U, BP_LT_SYMB_I, BP_LT_MDIA_E, BP_COMM +#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K + +#define ___BEPO_FR_R1___ /* BP_DCRC,*/ BP_V, BP_D, BP_L, BP_J, BP_Z +#define ___BEPO_FR_R2___ /* BP_C, */ BP_T, BP_LT_SYMB_S, BP_LT_MDIA_R, BP_LT_KP_N, BP_SFT_T_M //BP_CCED +#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F //BP_SFT_T_W + +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ +/* KC_TAB, BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV, KC_BSPC, */ +/* KC_LSFT, BP_A, BP_U, BP_I, BP_E, BP_COMM, */ +/* KC_LCTRL, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_ENT, */ +/* ESC_FN, BP_ECRC, KC_LGUI, KC_LALT, SPC_RALT, */ +/* TT(SWAP), KC_MNXT, */ +/* KC_MPLY, */ +/* TT(FN), TT(NUMS), KC_MPRV, */ + +/* /\* right hand *\/ */ +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +/* KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, */ +/* BP_C, BP_T, BP_S, BP_R, BP_N, M_RSFT, */ +/* KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, W_RCTL, */ + + +/******************************************************************/ +/* Middle Keysets for the XD75 */ +/******************************************************************/ +// For the middle keys of an xd75. It's got one more column in the middle than +// the ergodox, or the viterbi. And the Ergodox is missing a key in column 7 +// counting from either end. Which is the first and 3rd columns of these sets. + +// it's all an experient. I'm not sure what make sense here. +// stealing what I can from the ergodox layout. +/* The XD75 has 3 keys inbetween the usual left and right hand */ +#define ___MIDDLE_T___ OSL(LAYERS), LCTL(KC_A), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE_1___ LCTL(KC_C), LCTL(KC_X), LCTL(KC_V) +#define ___MIDDLE_2___ TO(SYMB), TO(_RGB), TO(KEYPAD) +#define ___MIDDLE_3___ OSL(SYMB), TO(MDIA), OSL(KEYPAD) +#define ___MIDDLE_4___ CTL_BSPC, ALT_DEL, XMONAD_ESC, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___MIDDLE_T_BP___ OSL(LAYERS), LCTL(BP_A), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_X), LCTL(BP_V) +#define ___MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) +#define ___MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) + +/********************************************************************/ +/** The bottom row and thumbs as needed. **/ +/********************************************************************/ // the bottom rows for keyboards on bepo. -#define ___ERGODOX_BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, LCTL(BP_V), LCTL(BP_C) -#define ___ERGODOX_BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_V), KC_INS, KC_LEFT, KC_RIGHT +// bepo on bepo - not enough space to go around.... +#define ___ERGODOX_BOTTOM_LEFT_BP___ LCTL(BP_C), BP_ECRC, LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___ERGODOX_BOTTOM_RIGHT_BP___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC + +// for dvorak on bepo +#define ___ERGODOX_BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_C), LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___ERGODOX_BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC // Since we have 7 default layouts (QWERTY, DVORAK, COLEMAK and WORKMAN, NORMAN, // 2 of them based on a Bepo software keyboard, --- DVORAK_ON_BEPO and BEPO), @@ -308,76 +484,33 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___ERGODOX_BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT #define ___ERGODOX_BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) +#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___XD75_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ + + #define ___ERGODOX_THUMB_LEFT___ \ - KC_RALT, ALGR_SYMB, \ + OS_RALT, TG(MDIA), \ HOME_END, \ CTL_BSPC, ALT_DEL, XMONAD_ESC #define ___ERGODOX_THUMB_RIGHT___ \ - ALGR_SYMB, TD_MOUSE_BTNS, \ + TG(SYMB), OS_RALT, \ KC_PGUP, \ KC_PGDN, ALT_ENT, CTL_SPC -#define ___ERGODOX_TRANS_THUMBS___ \ - ___, ___, \ - ___, \ - ___, ___, ___ \ - -#define ___ERGODOX_TRANS_BOTTOM___ \ - ___,___,___,___,___ - -#define ___ERGODOX_TRANS_6_ROW___ \ - ___,___,___,___,___,___ - - - -// Qwerty based layers that I don't really use. -#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T -#define ___QWERTY_L2___ KC_A, KC_S, KC_D, KC_F, KC_G -#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P -#define ___QWERTY_R2___ KC_H, KC_J, KC_K, KC_L, KC_SCLN -#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH - - -#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G -#define ___COLEMAK_L2___ KC_A, KC_R, KC_S, KC_T, KC_D -#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_R2___ KC_H, KC_N, KC_E, KC_I, KC_O -#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH - - -#define ___COLEMAK_MOD_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B -#define ___COLEMAK_MOD_DH_L2___ KC_A, KC_R, KC_S, KC_T, KC_G -#define ___COLEMAK_MOD_DH_L3___ CTL_T(KC_Z), KC_X, KC_C, KC_D, KC_V - -#define ___COLEMAK_MOD_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_MOD_DH_R2___ KC_M, KC_N, KC_E, KC_I, KC_O -#define ___COLEMAK_MOD_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH - - -#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B -#define ___WORKMAN_L2___ KC_A, KC_S, KC_H, KC_T, KC_G -#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V - -#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN -#define ___WORKMAN_R2___ KC_Y, KC_N, KC_E, KC_O, KC_I -#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH - - -#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K -#define ___NORMAN_L2___ KC_A, KC_S, KC_E, KC_T, KC_G -#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN -#define ___NORMAN_R2___ KC_Y, KC_N, KC_I, KC_O, KC_U -#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH +#define ___ERGODOX_THUMB_RIGHT_BP___ \ + TG(SYMB_ON_BEPO), OS_RALT, \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC +#define ___ERGODOX_TRANS_THUMBS___ ___6___ +#define ___ERGODOX_TRANS_BOTTOM___ ___5___ +#define ___ERGODOX_TRANS_6_ROW___ ___6___ +#define ___TRANS_6_COL___ ___6___ -// For the top rows. Numbers for most things, symbols for Bepo. +/*******************************************************************/ +/** For the top rows. Numbers for most things, symbols for Bepo. **/ +/*******************************************************************/ // for everything on qwerty. #define ___NUMBER_L___ KC_1, KC_2, KC_3, KC_4, KC_5 @@ -387,43 +520,142 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___FUNC_L___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 #define ___FUNC_R___ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 +#define ___FUNC_1_6___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 +#define ___FUNC_7_12___ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 -// Rows for the auxillary layers. +// a top symbol row if someone wants it. +#define ___SYMB_L___ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC +#define ___SYMB_R___ KC_CIRC, KC_AMPR, KC_AST, KC_LPRN, KC_RPRN -// The symbol layer is for qwerty. I need another one for Bepo... +// For numbers on bepo. Bepo has numbers on shifted keys, the +// reverse of most keyboard layouts. +#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 +#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 -// the KC_P? codes don't work for me. I don't use those shifted values anyway. + +/*******************************************************************/ +/* Rows for the auxillary layers. */ +/* the KC_P? codes don't work for me. I don't use those shifted */ +/* values anyway. */ +/*******************************************************************/ + +// Keypads #define ___KEYPAD_1___ KC_7, KC_8, KC_9, KC_PSLS #define ___KEYPAD_2___ KC_4, KC_5, KC_6, KC_PAST #define ___KEYPAD_3___ KC_1, KC_2, KC_3, KC_PMNS #define ___KEYPAD_4___ KC_0, KC_DOT, KC_PEQL, KC_PPLS +// Keypad from the default keymap.c of the xd75 +#define ___KEYPAD_1_ALT___ KC_P7, KC_P8, KC_P9, KC_MINS +#define ___KEYPAD_2_ALT___ KC_P4, KC_P5, KC_P6, KC_PLUS +#define ___KEYPAD_3_ALT___ KC_P1, KC_P2, KC_P3, KC_PENT +#define ___KEYPAD_4_ALT___ KC_P0, KC_DOT, KC_PENT, KC_PENT + +// For Bepo #define ___KEYPAD_1_BP___ DB_7, DB_8, DB_9, BP_SLASH #define ___KEYPAD_2_BP___ DB_4, DB_5, DB_6, BP_ASTR #define ___KEYPAD_3_BP___ DB_1, DB_2, DB_3, DB_MINUS #define ___KEYPAD_4_BP___ DB_0, DB_DOT, DB_EQL, BP_PLUS + + +// SYMBOLS + +// An arrangement for the left hand with a focus on the ()[]{}s. #define ___SYMBOLS_1___ KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE #define ___SYMBOLS_2___ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV #define ___SYMBOLS_3___ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1___ KC_GRV, KC_LT, KC_GT, KC_LCBR, KC_RCBR, KC_HASH +#define ___SYMBOLS6_2___ KC_AMPR, KC_AT, KC_ASTR, KC_LPRN, KC_RPRN, KC_PERC +#define ___SYMBOLS6_3___ KC_DLR, KC_DQT, KC_QUOT, KC_LBRC, KC_RBRC, KC_COLON +#define ___SYMBOLS6_4___ ___2___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1___ KC_GRV, KC_AMPR, KC_ASTR, KC_LCBR, KC_PLUS, KC_PIPE +#define ___SYMPAD_2___ KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_ASTR, KC_GRV +#define ___SYMPAD_3___ ___, KC_EXLM, KC_AT, KC_HASH, KC_MINUS, KC_SLASH +#define ___SYMPAD_4___ ___, KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH + +// Function pad. Same idea as above, but for function keys. +#define ___FUNCPAD_T___ KC_F10, KC_F11, KC_F12 +#define ___FUNCPAD_1___ KC_F7, KC_F8, KC_F9 +#define ___FUNCPAD_2___ KC_F4, KC_F5, KC_F6 +#define ___FUNCPAD_3___ KC_F1, KC_F2, KC_F3 + + +//--- all over again for BEPO + +// SYMBOLS FOR BEPO +// The top row. Bepo has symbols not numbers. Numbers are the shifted values. +#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ + +// An arrangement for the left hand with a focus on the ()[]{}s. #define ___SYMBOLS_1_BP___ KC_EXLM, BP_AT, DB_LCBR, DB_RCBR, DB_PIPE #define ___SYMBOLS_2_BP___ DB_HASH, BP_DLR, DB_LPRN, DB_RPRN, DB_GRV #define ___SYMBOLS_3_BP___ BP_PERC, DB_CIRC, DB_LBRC, DB_RBRC, DB_TILD +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1_BP___ DB_GRV, DB_LESS, DB_GRTR, DB_LCBR, DB_RCBR, DB_HASH +#define ___SYMBOLS6_2_BP___ KC_AMPR, BP_AT, BP_ASTR, DB_LPRN, DB_RPRN, BP_PERC +#define ___SYMBOLS6_3_BP___ BP_DLR, BP_DQOT, DB_QUOT, DB_LBRC, DB_RBRC, KC_COLON + +#define ___SYMBOLS6_4_BP___ ___2___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1_BP___ DB_GRV, BP_AMPR, BP_ASTR, DB_LCBR, BP_PLUS, DB_PIPE +#define ___SYMPAD_2_BP___ DB_TILD, BP_DLR, BP_PERC, DB_CIRC, BP_ASTR, DB_GRV +#define ___SYMPAD_3_BP___ ___, BP_EXLM, BP_AT, DB_HASH, BP_MINS, BP_SLSH +#define ___SYMPAD_4_BP___ ___, DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH + + + +// MOUSE, ARROW and MEDIA KEY SETS + #define ___MOUSE_LDUR___ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R #define ___MWHEEL_LDUR___ KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R #define ___MOUSE_BTNS_R___ KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5 #define ___MOUSE_BTNS_L___ KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1 #define ___MOUSE_ACCL_012___ KC_ACL0, KC_ACL1, KC_ACL2 +#define ___MACCL___ ___MOUSE_ACCL_012___ + +#define ___PRV_PLAY_NXT_STOP KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP +#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU +#define ___MUTE_PRV_PLAY_NXT_STOP___ KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP #define ___MUTE_PLAY_STOP___ KC_MUTE, KC_MPLY, KC_MSTP #define ___VI_ARROWS___ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT -#define ___LAYERS_L1___ DF(BEPO), DF(DVORAK_ON_BEPO) -#define ___LAYERS_L2___ DF(COLEMAK), DF(DVORAK) -#define ___LAYERS_L3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) -#define ___LAYERS_L4___ TO(MDIA), TO(SYMB_ON_BEPO), TO(SYMB) +// RGB FUNCTION Keysets +// RGB row for the _FN layer from the redo of the default keymap.c +#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD +#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD +#define ___RGB_MODE_PRV_NXT___ RGB_RMOD, RGB_MOD +#define ___RGB_TOGGLE___ RGB_TOG +#define ___RGB_P_B_R_SW_SN___ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN +#define ___RGB_KXGT___ RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T + +// Print screen, screen lock, pause +#define ___PSCR_SLCK_PAUS___ KC_PSCR, KC_SLCK, KC_PAUS + + +// LAYER Keysets. Changing the Default base layer or the transient layers. +#define ___LAYERS_B1_2___ DF(BEPO), DF(DVORAK_ON_BEPO) +#define ___LAYERS_B2_2___ DF(COLEMAK), DF(DVORAK) +#define ___LAYERS_B3_3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) +#define ___LAYERS_B4_3___ ___X3___ + +// transient layers. +#define ___LAYERS_T_BP_3___ TO(MDIA), TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___LAYERS_T_3___ TO(MDIA), TO(SYMB), TO(KEYPAD) +#define ___LAYERS_T_DEF___ TO(_RGB), ___X2___ #endif From 7794c78442ecca21ed8f8e2caa50e2067b15775b Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sun, 12 Apr 2020 01:20:24 +0200 Subject: [PATCH 04/23] Revert "Improve naming" This reverts commit f62426cc358e742d68061cc4842c90344ec464e0. --- quantum/quantum.c | 12 ++++++------ quantum/quantum.h | 4 ++-- tmk_core/common/action_tapping.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 2053a1a5f479..55cdaa3b023e 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -149,21 +149,21 @@ void reset_keyboard(void) { } /* Convert record into usable keycode via the contained event. */ -uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) { return get_event_keycode(record->event, update_layer_cache); } +uint16_t get_record_keycode(keyrecord_t *record, bool do_update) { return get_event_keycode(record->event, do_update); } /* Convert event into usable keycode. Checks the layer cache to ensure that it * retains the correct keycode after a layer change, if the key is still pressed. - * "update_layer_cache" is to ensure that it only updates the layer cache when - * appropriate, otherwise, it will update it and cause layer tap (and other keys) - * from triggering properly. + * "do_update" is to ensure that it only updates the layer cache when appropriate, + * otherwise, it will update it and cause layer tap (and other keys) from + * triggering properly. */ -uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache) { +uint16_t get_event_keycode(keyevent_t event, bool do_update) { #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) /* TODO: Use store_or_get_action() or a similar function. */ if (!disable_action_cache) { uint8_t layer; - if (event.pressed && update_layer_cache) { + if (event.pressed && do_update) { layer = layer_switch_get_layer(event.key); update_source_layers_cache(event.key, layer); } else { diff --git a/quantum/quantum.h b/quantum/quantum.h index 45f44f49a1a7..9fdd36e788ec 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -252,8 +252,8 @@ void matrix_init_kb(void); void matrix_scan_kb(void); void matrix_init_user(void); void matrix_scan_user(void); -uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache); -uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); +uint16_t get_record_keycode(keyrecord_t *record, bool do_update); +uint16_t get_event_keycode(keyevent_t event, bool do_update); bool process_action_kb(keyrecord_t *record); bool process_record_kb(uint16_t keycode, keyrecord_t *record); bool process_record_user(uint16_t keycode, keyrecord_t *record); diff --git a/tmk_core/common/action_tapping.h b/tmk_core/common/action_tapping.h index 5eaef1c5f09a..ffba830cf020 100644 --- a/tmk_core/common/action_tapping.h +++ b/tmk_core/common/action_tapping.h @@ -32,7 +32,7 @@ along with this program. If not, see . #define WAITING_BUFFER_SIZE 8 #ifndef NO_ACTION_TAPPING -uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); +uint16_t get_event_keycode(keyevent_t event, bool do_update); uint16_t get_tapping_term(uint16_t keycode); void action_tapping_process(keyrecord_t record); #endif From bde075f8e133526640410d314b7f8d6062afe114 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sun, 12 Apr 2020 01:30:43 +0200 Subject: [PATCH 05/23] Added a viterbi keymap --- .../ergodox_ez/keymaps/ericgebhart/rules.mk | 2 +- keyboards/keebio/viterbi/config.h | 2 +- .../viterbi/keymaps/ericgebhart/config.h | 32 +++ .../viterbi/keymaps/ericgebhart/keymap.c | 192 ++++++++++++++++++ .../viterbi/keymaps/ericgebhart/rules.mk | 18 ++ keyboards/keebio/viterbi/rules.mk | 7 +- users/ericgebhart/ericgebhart.h | 30 ++- 7 files changed, 279 insertions(+), 4 deletions(-) create mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/config.h create mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c create mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk index 373760c77bd0..3b5ab2d6d639 100755 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk @@ -14,5 +14,5 @@ BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration UNICODE_ENABLE = no SLEEP_LED_ENABLE = no API_SYSEX_ENABLE = no -RGBLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = no RGBLIGHT_ANIMATION = no diff --git a/keyboards/keebio/viterbi/config.h b/keyboards/keebio/viterbi/config.h index b628c83c8553..9976f0e86836 100644 --- a/keyboards/keebio/viterbi/config.h +++ b/keyboards/keebio/viterbi/config.h @@ -17,4 +17,4 @@ along with this program. If not, see . #pragma once -#include "config_common.h" +//#include "config_common.h" diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h new file mode 100644 index 000000000000..a841066f4d0b --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h @@ -0,0 +1,32 @@ +/* +Copyright 2017 Danny Nguyen + +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 . +*/ + +#pragma once + +// #define USE_I2C + +/* Select hand configuration */ + +// #define MASTER_RIGHT +// #define EE_HANDS + +#undef RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 12 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c new file mode 100644 index 000000000000..59f8511dc116 --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c @@ -0,0 +1,192 @@ +/* + 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 . +*/ + +#include "keymap_bepo.h" +#include "ericgebhart.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [DVORAK] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___DVORAK_L1___, ___MIDDLE2_T___, ___DVORAK_R1___, KC_SLASH, + TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE2_2___, ___DVORAK_R2___, KC_MINUS, + KC_LSFT, ___DVORAK_L3___, ___MIDDLE2_3___, ___DVORAK_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [QWERTY] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___QWERTY_L1___, ___MIDDLE2_T___, ___QWERTY_R1___, KC_SLASH, + TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE2_2___, ___QWERTY_R2___, KC_MINUS, + KC_LSFT, ___QWERTY_L3___, ___MIDDLE2_3___, ___QWERTY_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [COLEMAK] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___COLEMAK_L1___, ___MIDDLE2_T___, ___COLEMAK_R1___, KC_SLASH, + TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE2_2___, ___COLEMAK_R2___, KC_MINUS, + KC_LSFT, ___COLEMAK_L3___, ___MIDDLE2_3___, ___COLEMAK_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [WORKMAN] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___WORKMAN_L1___, ___MIDDLE2_T___, ___WORKMAN_R1___, KC_SLASH, + TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE2_2___, ___WORKMAN_R2___, KC_MINUS, + KC_LSFT, ___WORKMAN_L3___, ___MIDDLE2_3___, ___WORKMAN_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [NORMAN] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___NORMAN_L1___, ___MIDDLE2_T___, ___NORMAN_R1___, KC_SLASH, + TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE2_2___, ___NORMAN_R2___, KC_MINUS, + KC_LSFT, ___NORMAN_L3___, ___MIDDLE2_3___, ___NORMAN_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [DVORAK_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___DVORAK_FR_L1___, ___MIDDLE2_T_BP___, ___DVORAK_FR_R1___, DB_SLASH, + TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE2_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, + KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE2_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, + ___VITERBI_BOTTOM_FR___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [XMONAD] = LAYOUT_ortho_5x14_wrapper( + ___FUNC_1_6___, ___2___, ___FUNC_7_12___, + ___, ___DVORAK_L1___, ___2___, ___DVORAK_R1___, ___, + ___, ___DVORAK_L2___, ___2___, ___DVORAK_R2___, ___, + ___, ___DVORAK_L3___, ___2___, ___DVORAK_R3___, ___, + ___14___ + ), + + [XMONAD_FR] = LAYOUT_ortho_5x14_wrapper( + ___FUNC_1_6___, ___2___, ___FUNC_7_12___, + ___, ___DVORAK_FR_L1___, ___2___, ___DVORAK_FR_R1___, ___, + ___, ___DVORAK_FR_L2___, ___2___, ___DVORAK_FR_R2___, ___, + ___, ___DVORAK_FR_L3___, ___2___, ___DVORAK_FR_R3___, ___, + ___14___ + ), + + [BEPO] = LAYOUT_ortho_5x14_wrapper( + KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE2_T_BP___, ___BEPO_FR_R1___, BP_W, + TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE2_2_BP___, ___BEPO_FR_R2___, BP_CCED, + BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE2_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, + ___VITERBI_BOTTOM_BP___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + // SYMBOLS + [SYMB] = LAYOUT_ortho_5x14_wrapper( + ___SYMBOLS6_1___, ___2___, ___SYMPAD_1___, + ___SYMBOLS6_2___, ___2___, ___SYMPAD_2___, + ___SYMBOLS6_3___, ___2___, ___SYMPAD_3___, + ___SYMBOLS6_4___, ___2___, ___SYMPAD_4___, + ___14___ + ), + + [KEYPAD] = LAYOUT_ortho_5x14_wrapper( + ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1___, ___, + ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2___, ___, + ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4___, ___, + ___14___ + ), + + [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( + ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1_BP___, ___, + ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2_BP___, ___, + ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3_BP___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4_BP___, ___, + ___14___ + ), + + [SYMB_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( + ___SYMBOLS6_1_BP___, ___2___, ___SYMPAD_1_BP___, + ___SYMBOLS6_2_BP___, ___2___, ___SYMPAD_2_BP___, + ___SYMBOLS6_3_BP___, ___2___, ___SYMPAD_3_BP___, + ___SYMBOLS6_4_BP___, ___2___, ___SYMPAD_4_BP___, + ___14___ + ), + + // MEDIA AND MOUSE + [MDIA] = LAYOUT_ortho_5x14_wrapper( + ___MOUSE_BTNS_L___, ___3___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, + ___, ___MOUSE_LDUR___, ___3___, KC_VOLD, ___VI_ARROWS___, ___, + ___, ___MWHEEL_LDUR___, ___3___, KC_PGUP, ___MOUSE_BTNS_R___, + ___2___, ___MACCL___, ___3___, KC_PGDN, ___5___, + ___14___ + ), + + [LAYERS] = LAYOUT_ortho_5x14_wrapper( + ___X3___, ___LAYERS_B1_2___, ___4___, ___LAYERS_T_BP_3___, ___X2___, + ___X3___, ___LAYERS_B2_2___, ___4___, ___LAYERS_T_3___, ___X2___, + ___X2___, ___LAYERS_B3_3___, ___4___, ___LAYERS_T_DEF___, ___X2___, + ___14___, + ___14___ + ), + + [_RGB] = LAYOUT_ortho_5x14_wrapper( + ___, ___RGB_HUE_SAT_INT_UP___, ___4___, ___5___, + ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___3___, ___RGB_P_B_R_SW_SN___, + ___5___, ___4___, ___RGB_KXGT___, ___, + ___14___, + ___14___ + ), +}; + +/* bool process_record_user(uint16_t keycode, keyrecord_t *record) { */ +/* switch (keycode) { */ +/* case QWERTY: */ +/* if (record->event.pressed) { */ +/* set_single_persistent_default_layer(_QWERTY); */ +/* } */ +/* return false; */ +/* break; */ +/* case LOWER: */ +/* if (record->event.pressed) { */ +/* layer_on(_LOWER); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } else { */ +/* layer_off(_LOWER); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } */ +/* return false; */ +/* break; */ +/* case RAISE: */ +/* if (record->event.pressed) { */ +/* layer_on(_RAISE); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } else { */ +/* layer_off(_RAISE); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } */ +/* return false; */ +/* break; */ +/* case ADJUST: */ +/* if (record->event.pressed) { */ +/* layer_on(_ADJUST); */ +/* } else { */ +/* layer_off(_ADJUST); */ +/* } */ +/* return false; */ +/* break; */ +/* } */ +/* return true; */ +/* } */ diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk new file mode 100644 index 000000000000..3b5ab2d6d639 --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk @@ -0,0 +1,18 @@ +USER_NAME := ericgebhart +SRC += ericgebhart.c + +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. +CONSOLE_ENABLE = no # Console for debug + +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +UNICODE_ENABLE = no +SLEEP_LED_ENABLE = no +API_SYSEX_ENABLE = no +RGBLIGHT_ENABLE = no +RGBLIGHT_ANIMATION = no diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index 0b746d17207f..02ee008ce8dc 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/rules.mk @@ -30,7 +30,12 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. + + SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = keebio/viterbi/rev2 +DEFAULT_FOLDER = keebio/viterbi/rev1 LAYOUTS = ortho_5x14 diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index fa381fd1fbe6..57acbd1bc791 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -307,6 +307,7 @@ enum { #define ___4___ ___3___, ___ #define ___5___ ___4___, ___ #define ___6___ ___5___, ___ +#define ___14___ ___5___, ___4___, ___5___ #define ___15___ ___5___, ___5___, ___5___ int on_qwerty(void); @@ -341,6 +342,7 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) #define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) +#define LAYOUT_ortho_5x14_wrapper(...) LAYOUT_ortho_5x14(__VA_ARGS__) /********************************************************************/ /** The Core rows of each given layout. **/ @@ -464,6 +466,27 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) #define ___MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) +// The Viterbi only has 2 keys in the middle. +#define ___MIDDLE2_T___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE2_1___ LCTL(KC_C), LCTL(KC_V) +#define ___MIDDLE2_2___ TO(SYMB), TO(KEYPAD) +#define ___MIDDLE2_3___ OSL(SYMB), OSL(KEYPAD) + +// becomes the upper thumbs, the real 4th row if we throw away +// the number row at the top +#define ___MIDDLE2_4___ XXX, HOME_END, KC_PGDN, XXX +// basically the thumb keys like on the ergodox. +#define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC, KC_PGDN, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___MIDDLE2_T_BP___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE2_1_BP___ LCTL(BP_C), LCTL(BP_V) +#define ___MIDDLE2_2_BP___ TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___MIDDLE2_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO) + +#define ___MIDDLE2_4_BP___ XXX, HOME_END, KC_PGUP, XXX + + /********************************************************************/ /** The bottom row and thumbs as needed. **/ /********************************************************************/ @@ -484,9 +507,14 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___ERGODOX_BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT #define ___ERGODOX_BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) -#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT___ #define ___XD75_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___VITERBI_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT___ +#define ___VITERBI_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___VITERBI_BOTTOM_BP___ ___ERGODOX_BOTTOM_LEFT_BP___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_BP___ +#define ___VITERBI_THUMBS_BOTTOM___ ___4___, ___MIDDLE_THUMBS___, ___4___ + #define ___ERGODOX_THUMB_LEFT___ \ OS_RALT, TG(MDIA), \ From ce56c18cd770ec53062207ea3ebd30f6759d297c Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Mon, 13 Apr 2020 02:30:07 +0200 Subject: [PATCH 06/23] refactor --- .../ergodox_ez/keymaps/ericgebhart/keymap.c | 432 ++++++------ .../viterbi/keymaps/ericgebhart/keymap.c | 187 ++--- keyboards/xd75/keymaps/ericgebhart/keymap.c | 182 ++--- users/ericgebhart/base_layers.h | 280 ++++++++ users/ericgebhart/core_keys.h | 293 ++++++++ users/ericgebhart/core_keysets.h | 292 ++++++++ users/ericgebhart/ericgebhart.h | 646 +----------------- 7 files changed, 1282 insertions(+), 1030 deletions(-) create mode 100644 users/ericgebhart/base_layers.h create mode 100644 users/ericgebhart/core_keys.h create mode 100644 users/ericgebhart/core_keysets.h diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c index 3b1bdb6fb15e..80907c4210d9 100644 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c @@ -21,268 +21,298 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DVORAK] = LAYOUT_ergodox_wrapper( - // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___DVORAK_L1___, KC_LBRC, - TAB_BKTAB, ___DVORAK_L2___, - KC_LSFT, ___DVORAK_L3___, KC_LPRN, + // 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), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___DVORAK_R1___, KC_SLASH, - /* */ ___DVORAK_R2___, KC_MINUS, - KC_RPRN, ___DVORAK_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [XMONAD] = LAYOUT_ergodox_wrapper( - // left hand - ___, ___FUNC_L___, ___, - ___, ___DVORAK_L1___, ___, - ___, ___DVORAK_L2___, - ___, ___DVORAK_L3___, ___, + // left hand + ___, ___FUNC_L___, ___, + ___, ___DVORAK_L1___, ___, + ___, ___DVORAK_L2___, + ___, ___DVORAK_L3___, ___, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - ___, ___FUNC_R___, ___, - ___, ___DVORAK_R1___, ___, - /**/ ___DVORAK_R2___, ___, - ___, ___DVORAK_R3___, ___, + // right hand + ___, ___FUNC_R___, ___, + ___, ___DVORAK_R1___, ___, + /**/ ___DVORAK_R2___, ___, + ___, ___DVORAK_R3___, ___, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [QWERTY] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___QWERTY_L1___, KC_LBRC, - TAB_BKTAB, ___QWERTY_L2___, - KC_LSFT, ___QWERTY_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___QWERTY_L1___, LCTL(KC_C), + TAB_BKTAB, ___QWERTY_L2___, + KC_LSFT, ___QWERTY_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___QWERTY_R1___, KC_SLASH, - /* */ ___QWERTY_R2___, KC_MINUS, - KC_RPRN, ___QWERTY_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [COLEMAK] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___COLEMAK_L1___, KC_LBRC, - TAB_BKTAB, ___COLEMAK_L2___, - KC_LSFT, ___COLEMAK_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___COLEMAK_L1___, LCTL(KC_C), + TAB_BKTAB, ___COLEMAK_L2___, + KC_LSFT, ___COLEMAK_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___COLEMAK_R1___, KC_SLASH, - /* */ ___COLEMAK_R2___, KC_MINUS, - KC_RPRN, ___COLEMAK_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [WORKMAN] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___WORKMAN_L1___, KC_LBRC, - TAB_BKTAB, ___WORKMAN_L2___, - KC_LSFT, ___WORKMAN_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___WORKMAN_L1___, LCTL(KC_C), + TAB_BKTAB, ___WORKMAN_L2___, + KC_LSFT, ___WORKMAN_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___WORKMAN_R1___, KC_SLASH, - /* */ ___WORKMAN_R2___, KC_MINUS, - KC_RPRN, ___WORKMAN_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [NORMAN] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___NORMAN_L1___, KC_LBRC, - TAB_BKTAB, ___NORMAN_L2___, - KC_LSFT, ___NORMAN_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___NORMAN_L1___, LCTL(KC_C), + TAB_BKTAB, ___NORMAN_L2___, + KC_LSFT, ___NORMAN_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___NORMAN_R1___, KC_SLASH, - /* */ ___NORMAN_R2___, KC_MINUS, - KC_RPRN, ___NORMAN_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [DVORAK_ON_BEPO] = LAYOUT_ergodox_wrapper( // left hand - DB_GRV, ___NUMBER_BEPO_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___DVORAK_FR_L1___, DB_LBRC, - TAB_BKTAB, ___DVORAK_FR_L2___, - KC_LSFT, ___DVORAK_FR_L3___, DB_LPRN, + 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, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_BEPO_R___, DB_EQL, - DB_RBRC, ___DVORAK_FR_R1___, DB_SLASH, + // 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, + /* */ ___DVORAK_FR_R2___, DB_MINUS, + DB_RPRN, ___DVORAK_FR_R3___, KC_RSFT, - ___ERGODOX_BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT_FR___, + ___ERGODOX_THUMB_RIGHT___ + ), - [XMONAD_FR] = LAYOUT_ergodox_wrapper( - // left hand - ___, ___FUNC_L___, ___, - ___, ___DVORAK_FR_L1___, ___, - ___, ___DVORAK_FR_L2___, - ___, ___DVORAK_FR_L3___, ___, + [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, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - ___, ___FUNC_R___, ___, - ___, ___DVORAK_FR_R1___, ___, - /**/ ___DVORAK_FR_R2___, ___, - ___, ___DVORAK_FR_R3___, ___, + // Right hand + MDIA_SYMB_KP_LAYERS, ___SYMBOL_BEPO_R___, BP_EQL, + BP_DCRC, ___BEPO_FR_R1___, BP_W, + /* */ ___BEPO_FR_R2___, BP_CCED, + BP_C, ___BEPO_FR_R3___, KC_RSFT, - ___ERGODOX_BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), - [BEPO] = LAYOUT_ergodox_wrapper( - // Left hand - BP_DLR, ___SYMBOL_BEPO_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___BEPO_FR_L1___, DB_LBRC, - TAB_BKTAB, ___BEPO_FR_L2___, - BP_SFT_T_ECRC, ___BEPO_FR_L3___, DB_RBRC, + [XMONAD_FR] = LAYOUT_ergodox_wrapper( + // left hand + ___, ___FUNC_L___, ___, + ___, ___DVORAK_FR_L1___, ___, + ___, ___DVORAK_FR_L2___, + ___, ___DVORAK_FR_L3___, ___, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // Right hand - MDIA_SYMB, ___SYMBOL_BEPO_R___, BP_EQL, - BP_DCRC, ___BEPO_FR_R1___, BP_W, - /* */ ___BEPO_FR_R2___, BP_CCED, - BP_C, ___BEPO_FR_R3___, KC_RSFT, + // right hand + ___, ___FUNC_R___, ___, + ___, ___DVORAK_FR_R1___, ___, + /**/ ___DVORAK_FR_R2___, ___, + ___, ___DVORAK_FR_R3___, ___, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT_FR___, + ___ERGODOX_THUMB_RIGHT___ + ), // SYMBOLS [SYMB] = LAYOUT_ergodox_wrapper( // left hand - ___, ___FUNC_L___, ___, - ___, ___SYMBOLS_1___, ___, - ___, ___SYMBOLS_2___, - ___, ___SYMBOLS_3___, ___, - - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___, - - - // right hand - ___, ___FUNC_R___, KC_F11, - ___, KC_UP, ___KEYPAD_1___, KC_F12, - /**/ KC_DOWN, ___KEYPAD_2___, KC_TRNS, - ___, KC_AMPR, ___KEYPAD_3___, KC_PENT, - /* */ ___KEYPAD_4___, ___, - - ___ERGODOX_TRANS_THUMBS___ - ), + ___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_L___, ___, - ___, ___SYMBOLS_1_BP___, ___, - ___, ___SYMBOLS_2_BP___, - ___, ___SYMBOLS_3_BP___, ___, - - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___, - - - // right hand - ___, ___FUNC_R___, KC_F11, - ___, KC_UP, ___KEYPAD_1_BP___, KC_F12, - /**/ KC_DOWN, ___KEYPAD_2_BP___, KC_TRNS, - ___, KC_AMPR, ___KEYPAD_3_BP___, KC_PENT, - /* */ ___KEYPAD_4_BP___, ___, - - ___ERGODOX_TRANS_THUMBS___ - ), + // 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_L___, ___, - ___MOUSE_BTNS_L___, ___, ___, - ___, ___MOUSE_LDUR___, ___, - ___, ___MWHEEL_LDUR___, XXX, ___, - ___, ___, ___MOUSE_ACCL_012___, - ___ERGODOX_TRANS_THUMBS___, - - // right hand - ___, ___FUNC_R___, KC_F11, - KC_VOLU, ___, ___MUTE_PLAY_STOP___, ___, KC_F12, - /* */ KC_PGUP, ___VI_ARROWS___, ___, - KC_VOLD, KC_PGDN, ___MOUSE_BTNS_R___, - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___ - ), + // 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_L___, ___, - XXX, XXX, XXX, ___LAYERS_L1___, XXX, XXX, - XXX, XXX, XXX, ___LAYERS_L2___, XXX, - XXX, XXX, ___LAYERS_L3___, XXX, XXX, - ___, ___, ___LAYERS_L4___, - ___ERGODOX_TRANS_THUMBS___, - - // right hand - ___, ___FUNC_R___, KC_F11, - KC_VOLU, ___, ___MUTE_PLAY_STOP___, ___, KC_F12, - /* */ KC_PGUP, ___VI_ARROWS___, ___, - KC_VOLD, KC_PGDN, ___MOUSE_BTNS_R___, - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___ - ), + // 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___ + ), }; diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c index 59f8511dc116..baf6637eaa9c 100644 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c @@ -21,134 +21,135 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DVORAK] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___DVORAK_L1___, ___MIDDLE2_T___, ___DVORAK_R1___, KC_SLASH, - TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE2_2___, ___DVORAK_R2___, KC_MINUS, - KC_LSFT, ___DVORAK_L3___, ___MIDDLE2_3___, ___DVORAK_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_DVORAK_1___, KC_SLASH, + TAB_BKTAB, ___12_DVORAK_2___, KC_MINUS, + KC_LSFT, ___12_DVORAK_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [QWERTY] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___QWERTY_L1___, ___MIDDLE2_T___, ___QWERTY_R1___, KC_SLASH, - TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE2_2___, ___QWERTY_R2___, KC_MINUS, - KC_LSFT, ___QWERTY_L3___, ___MIDDLE2_3___, ___QWERTY_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_QWERTY_1___, KC_SLASH, + TAB_BKTAB, ___12_QWERTY_2___, KC_MINUS, + KC_LSFT, ___12_QWERTY_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [COLEMAK] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___COLEMAK_L1___, ___MIDDLE2_T___, ___COLEMAK_R1___, KC_SLASH, - TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE2_2___, ___COLEMAK_R2___, KC_MINUS, - KC_LSFT, ___COLEMAK_L3___, ___MIDDLE2_3___, ___COLEMAK_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_COLEMAK_1___, KC_SLASH, + TAB_BKTAB, ___12_COLEMAK_2___, KC_MINUS, + KC_LSFT, ___12_COLEMAK_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [WORKMAN] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___WORKMAN_L1___, ___MIDDLE2_T___, ___WORKMAN_R1___, KC_SLASH, - TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE2_2___, ___WORKMAN_R2___, KC_MINUS, - KC_LSFT, ___WORKMAN_L3___, ___MIDDLE2_3___, ___WORKMAN_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_WORKMAN_1___, KC_SLASH, + TAB_BKTAB, ___12_WORKMAN_2___, KC_MINUS, + KC_LSFT, ___12_WORKMAN_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [NORMAN] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___NORMAN_L1___, ___MIDDLE2_T___, ___NORMAN_R1___, KC_SLASH, - TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE2_2___, ___NORMAN_R2___, KC_MINUS, - KC_LSFT, ___NORMAN_L3___, ___MIDDLE2_3___, ___NORMAN_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_NORMAN_1___, KC_SLASH, + TAB_BKTAB, ___12_NORMAN_2___, KC_MINUS, + KC_LSFT, ___12_NORMAN_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [DVORAK_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___DVORAK_FR_L1___, ___MIDDLE2_T_BP___, ___DVORAK_FR_R1___, DB_SLASH, - TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE2_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, - KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE2_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, - ___VITERBI_BOTTOM_FR___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_DVORAK_B_1___, KC_SLASH, + TAB_BKTAB, ___12_DVORAK_B_2___, KC_MINUS, + KC_LSFT, ___12_DVORAK_B_3___, KC_RSFT, + ___ORTHO_14_BOTTOM_FR___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), + + [BEPO] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___12_DVORAK_B_1___, KC_SLASH, + TAB_BKTAB, ___12_DVORAK_B_2___, KC_MINUS, + KC_LSFT, ___12_DVORAK_B_3___, KC_RSFT, + ___ORTHO_14_BOTTOM_BP___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [XMONAD] = LAYOUT_ortho_5x14_wrapper( - ___FUNC_1_6___, ___2___, ___FUNC_7_12___, - ___, ___DVORAK_L1___, ___2___, ___DVORAK_R1___, ___, - ___, ___DVORAK_L2___, ___2___, ___DVORAK_R2___, ___, - ___, ___DVORAK_L3___, ___2___, ___DVORAK_R3___, ___, + ___, ___12_DVORAK_1___, ___, + ___, ___12_DVORAK_2___, ___, + ___, ___12_DVORAK_3___, ___, + ___14___, ___14___ - ), + ), [XMONAD_FR] = LAYOUT_ortho_5x14_wrapper( - ___FUNC_1_6___, ___2___, ___FUNC_7_12___, - ___, ___DVORAK_FR_L1___, ___2___, ___DVORAK_FR_R1___, ___, - ___, ___DVORAK_FR_L2___, ___2___, ___DVORAK_FR_R2___, ___, - ___, ___DVORAK_FR_L3___, ___2___, ___DVORAK_FR_R3___, ___, + ___, ___12_DVORAK_B_1___, ___, + ___, ___12_DVORAK_B_2___, ___, + ___, ___12_DVORAK_B_3___, ___, + ___14___, ___14___ - ), + ), - [BEPO] = LAYOUT_ortho_5x14_wrapper( - KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE2_T_BP___, ___BEPO_FR_R1___, BP_W, - TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE2_2_BP___, ___BEPO_FR_R2___, BP_CCED, - BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE2_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, - ___VITERBI_BOTTOM_BP___, - ___VITERBI_THUMBS_BOTTOM___ - ), // SYMBOLS [SYMB] = LAYOUT_ortho_5x14_wrapper( - ___SYMBOLS6_1___, ___2___, ___SYMPAD_1___, - ___SYMBOLS6_2___, ___2___, ___SYMPAD_2___, - ___SYMBOLS6_3___, ___2___, ___SYMPAD_3___, - ___SYMBOLS6_4___, ___2___, ___SYMPAD_4___, - ___14___ + ___14_SYMB_1___, + ___14_SYMB_2___, + ___14_SYMB_3___, + ___14_SYMB_4___, + ___14___ ), [KEYPAD] = LAYOUT_ortho_5x14_wrapper( - ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1___, ___, - ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2___, ___, - ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4___, ___, - ___14___ - ), + ___14_KP_1___, + ___14_KP_2___, + ___14_KP_3___, + ___14_KP_4___, + ___14___ + ), [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( - ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1_BP___, ___, - ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2_BP___, ___, - ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3_BP___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4_BP___, ___, - ___14___ - ), + ___14_KP_B_1___, + ___14_KP_B_2___, + ___14_KP_B_3___, + ___14_KP_B_4___, + ___14___ + ), [SYMB_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( - ___SYMBOLS6_1_BP___, ___2___, ___SYMPAD_1_BP___, - ___SYMBOLS6_2_BP___, ___2___, ___SYMPAD_2_BP___, - ___SYMBOLS6_3_BP___, ___2___, ___SYMPAD_3_BP___, - ___SYMBOLS6_4_BP___, ___2___, ___SYMPAD_4_BP___, - ___14___ - ), + ___14_SYMB_B_1___, + ___14_SYMB_B_2___, + ___14_SYMB_B_3___, + ___14_SYMB_B_4___, + ___14___ + ), // MEDIA AND MOUSE [MDIA] = LAYOUT_ortho_5x14_wrapper( - ___MOUSE_BTNS_L___, ___3___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, - ___, ___MOUSE_LDUR___, ___3___, KC_VOLD, ___VI_ARROWS___, ___, - ___, ___MWHEEL_LDUR___, ___3___, KC_PGUP, ___MOUSE_BTNS_R___, - ___2___, ___MACCL___, ___3___, KC_PGDN, ___5___, - ___14___ - ), + ___14_MDIA_1___, + ___14_MDIA_2___, + ___14_MDIA_3___, + ___14_MDIA_4___, + ___14___ + ), [LAYERS] = LAYOUT_ortho_5x14_wrapper( - ___X3___, ___LAYERS_B1_2___, ___4___, ___LAYERS_T_BP_3___, ___X2___, - ___X3___, ___LAYERS_B2_2___, ___4___, ___LAYERS_T_3___, ___X2___, - ___X2___, ___LAYERS_B3_3___, ___4___, ___LAYERS_T_DEF___, ___X2___, - ___14___, - ___14___ + ___14_LAYERS_1___, + ___14_LAYERS_2___, + ___14_LAYERS_3___, + ___14___, + ___14___ ), [_RGB] = LAYOUT_ortho_5x14_wrapper( - ___, ___RGB_HUE_SAT_INT_UP___, ___4___, ___5___, - ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___3___, ___RGB_P_B_R_SW_SN___, - ___5___, ___4___, ___RGB_KXGT___, ___, - ___14___, - ___14___ - ), + ___14_RGB_1___, + ___14_RGB_2___, + ___14_RGB_3___, + ___14___, + ___14___ + ), }; /* bool process_record_user(uint16_t keycode, keyrecord_t *record) { */ diff --git a/keyboards/xd75/keymaps/ericgebhart/keymap.c b/keyboards/xd75/keymaps/ericgebhart/keymap.c index efc809bba79e..9661972bfac6 100644 --- a/keyboards/xd75/keymaps/ericgebhart/keymap.c +++ b/keyboards/xd75/keymaps/ericgebhart/keymap.c @@ -22,134 +22,134 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DVORAK] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___DVORAK_L1___, ___MIDDLE_1___, ___DVORAK_R1___, KC_SLASH, - TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE_2___, ___DVORAK_R2___, KC_MINUS, - KC_LSFT, ___DVORAK_L3___, ___MIDDLE_3___, ___DVORAK_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_DVORAK_1___, KC_SLASH, + TAB_BKTAB, ___13_DVORAK_2___, KC_MINUS, + KC_LSFT, ___13_DVORAK_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [QWERTY] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___QWERTY_L1___, ___MIDDLE_1___, ___QWERTY_R1___, KC_SLASH, - TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE_2___, ___QWERTY_R2___, KC_MINUS, - KC_LSFT, ___QWERTY_L3___, ___MIDDLE_3___, ___QWERTY_R3___, KC_RSFT, - ___XD75_BOTTOM___ + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_QWERTY_1___, KC_SLASH, + TAB_BKTAB, ___13_QWERTY_2___, KC_MINUS, + KC_LSFT, ___13_QWERTY_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ ), [COLEMAK] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___COLEMAK_L1___, ___MIDDLE_1___, ___COLEMAK_R1___, KC_SLASH, - TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE_2___, ___COLEMAK_R2___, KC_MINUS, - KC_LSFT, ___COLEMAK_L3___, ___MIDDLE_3___, ___COLEMAK_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_COLEMAK_1___, KC_SLASH, + TAB_BKTAB, ___13_COLEMAK_2___, KC_MINUS, + KC_LSFT, ___13_COLEMAK_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [WORKMAN] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___WORKMAN_L1___, ___MIDDLE_1___, ___WORKMAN_R1___, KC_SLASH, - TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE_2___, ___WORKMAN_R2___, KC_MINUS, - KC_LSFT, ___WORKMAN_L3___, ___MIDDLE_3___, ___WORKMAN_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_WORKMAN_1___, KC_SLASH, + TAB_BKTAB, ___13_WORKMAN_2___, KC_MINUS, + KC_LSFT, ___13_WORKMAN_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [NORMAN] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___NORMAN_L1___, ___MIDDLE_1___, ___NORMAN_R1___, KC_SLASH, - TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE_1___, ___NORMAN_R2___, KC_MINUS, - KC_LSFT, ___NORMAN_L3___, ___MIDDLE_1___, ___NORMAN_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_NORMAN_1___, KC_SLASH, + TAB_BKTAB, ___13_NORMAN_2___, KC_MINUS, + KC_LSFT, ___13_NORMAN_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [DVORAK_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( - DB_GRV, ___NUMBER_BEPO_L___, ___MIDDLE_T_BP___, ___NUMBER_BEPO_R___, DB_EQL, - KC_LOCK, ___DVORAK_FR_L1___, ___MIDDLE_1_BP___, ___DVORAK_FR_R1___, DB_SLASH, - TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, - KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, - ___XD75_BOTTOM_FR___ - ), + DB_GRV, ___ORTHO_15_B_N___, DB_EQL, + KC_LOCK, ___13_DVORAK_B_1___, DB_SLASH, + TAB_BKTAB, ___13_DVORAK_B_2___, DB_MINUS, + KC_LSFT, ___13_DVORAK_B_3___, KC_RSFT, + ___ORTHO_15_BOTTOM_FR___ + ), [XMONAD] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___, ___DVORAK_L1___, ___3___, ___DVORAK_R1___, ___, - ___, ___DVORAK_L2___, ___3___, ___DVORAK_R2___, ___, - ___, ___DVORAK_L3___, ___3___, ___DVORAK_R3___, ___, + ___ORTHO_15_FUNC_1_12___, + ___, ___13_DVORAK_1___, ___, + ___, ___13_DVORAK_2___, ___, + ___, ___13_DVORAK_3___, ___, ___15___ - ), + ), [XMONAD_FR] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___, ___DVORAK_FR_L1___, ___3___, ___DVORAK_FR_R1___, ___, - ___, ___DVORAK_FR_L2___, ___3___, ___DVORAK_FR_R2___, ___, - ___, ___DVORAK_FR_L3___, ___3___, ___DVORAK_FR_R3___, ___, + ___ORTHO_15_FUNC_1_12___, + ___, ___13_DVORAK_B_1___, ___, + ___, ___13_DVORAK_B_2___, ___, + ___, ___13_DVORAK_B_3___, ___, ___15___ - ), + ), [BEPO] = LAYOUT_ortho_5x15_wrapper( - BP_DLR, ___SYMBOL_BEPO_L___, ___MIDDLE_T_BP___, ___SYMBOL_BEPO_R___, BP_EQL, - KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE_1_BP___, ___BEPO_FR_R1___, BP_W, - TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE_2_BP___, ___BEPO_FR_R2___, BP_CCED, - BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, - ___XD75_BOTTOM_FR___ + ___ORTHO_15_B_SYMB___, + KC_LOCK, ___13_BEPO_1___, BP_W, + TAB_BKTAB, ___13_BEPO_2___, BP_CCED, + BP_SFT_T_ECRC, ___13_BEPO_3___, BP_SFT_T_W, + ___ORTHO_15_BOTTOM_BP___ ), // SYMBOLS [SYMB] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___SYMBOLS6_1___, ___3___, ___SYMPAD_1___, - ___SYMBOLS6_2___, ___3___, ___SYMPAD_2___, - ___SYMBOLS6_3___, ___3___, ___SYMPAD_3___, - ___SYMBOLS6_4___, ___3___, ___SYMPAD_4___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_SYMB_1___, + ___15_SYMB_2___, + ___15_SYMB_3___, + ___15_SYMB_4___ + ), [KEYPAD] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1___, ___, - ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2___, ___, - ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4___, ___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_KP_1___, + ___15_KP_2___, + ___15_KP_3___, + ___15_KP_4___ + ), [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1_BP___, ___, - ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2_BP___, ___, - ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3_BP___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4_BP___, ___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_KP_B_1___, + ___15_KP_B_2___, + ___15_KP_B_3___, + ___15_KP_B_4___ + ), [SYMB_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___SYMBOLS6_1_BP___, ___3___, ___SYMPAD_1_BP___, - ___SYMBOLS6_2_BP___, ___3___, ___SYMPAD_2_BP___, - ___SYMBOLS6_3_BP___, ___3___, ___SYMPAD_3_BP___, - ___SYMBOLS6_4_BP___, ___3___, ___SYMPAD_4_BP___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_SYMB_B_1___, + ___15_SYMB_B_2___, + ___15_SYMB_B_3___, + ___15_SYMB_B_4___ + ), // MEDIA AND MOUSE [MDIA] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___MOUSE_BTNS_L___, ___4___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, - ___, ___MOUSE_LDUR___, ___4___, KC_VOLD, ___VI_ARROWS___, ___, - ___, ___MWHEEL_LDUR___, ___4___, KC_PGUP, ___MOUSE_BTNS_R___, - ___2___, ___MACCL___, ___4___, KC_PGDN, ___5___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_MDIA_1___, + ___15_MDIA_2___, + ___15_MDIA_3___, + ___15_MDIA_4___ + ), [LAYERS] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___X3___, ___LAYERS_B1_2___, ___5___, ___LAYERS_T_BP_3___, ___X2___, - ___X3___, ___LAYERS_B2_2___, ___5___, ___LAYERS_T_3___, ___X2___, - ___X2___, ___LAYERS_B3_3___, ___5___, ___LAYERS_T_DEF___, ___X2___, - ___5___, ___5___, ___5___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_LAYERS_1___, + ___15_LAYERS_2___, + ___15_LAYERS_3___, + ___15___ + ), [_RGB] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___, ___RGB_HUE_SAT_INT_UP___, ___5___, ___5___, - ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___4___, ___RGB_P_B_R_SW_SN___, - ___5___, ___5___, ___RGB_KXGT___, ___, + ___ORTHO_15_FUNC_1_12___, + ___15_RGB_1___, + ___15_RGB_2___, + ___15_RGB_3___, ___15___ - ), + ), }; diff --git a/users/ericgebhart/base_layers.h b/users/ericgebhart/base_layers.h new file mode 100644 index 000000000000..882b78f12111 --- /dev/null +++ b/users/ericgebhart/base_layers.h @@ -0,0 +1,280 @@ +/* + 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 . +*/ + +#include "core_keysets.h" + +/******************************************************************/ +/* These are the keys for the middle and bottom edge of any layout*/ +/* That way we only need to set them once and use them everywhere */ +/* The thumb keys, the bottom rows, etc. */ +/******************************************************************/ +/******************************************************************/ +/* Middle Keysets for the XD75 */ +/******************************************************************/ + +// For the middle keys of an xd75. It's got one more column in the middle than +// the ergodox, or the viterbi. And the Ergodox is missing a key in column 7 +// counting from either end. Which is the first and 3rd columns of these sets. + +// it's all an experient. I'm not sure what make sense here. +// stealing what I can from the ergodox layout. +/* The XD75 has 3 keys inbetween the usual left and right hand */ +#define ___ORTHO_15_MIDDLE_T___ OSL(LAYERS), LCTL(KC_A), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_15_MIDDLE_1___ LCTL(KC_C), LCTL(KC_X), LCTL(KC_V) +#define ___ORTHO_15_MIDDLE_2___ TO(SYMB), TO(_RGB), TO(KEYPAD) +#define ___ORTHO_15_MIDDLE_3___ OSL(SYMB), TO(MDIA), OSL(KEYPAD) +#define ___ORTHO_15_MIDDLE_4___ CTL_BSPC, ALT_DEL, XMONAD_ESC, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___ORTHO_15_MIDDLE_T_BP___ OSL(LAYERS), LCTL(BP_A), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_15_MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_X), LCTL(BP_V) +#define ___ORTHO_15_MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) +#define ___ORTHO_15_MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) + +// The Viterbi only has 2 keys in the middle. +#define ___ORTHO_14_MIDDLE_T___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_14_MIDDLE_1___ LCTL(KC_C), LCTL(KC_V) +#define ___ORTHO_14_MIDDLE_2___ TO(SYMB), TO(KEYPAD) +#define ___ORTHO_14_MIDDLE_3___ OSL(SYMB), OSL(KEYPAD) + +// becomes the upper thumbs, the real 4th row if we throw away +// the number row at the top +#define ___ORTHO_14_MIDDLE_4___ XXX, HOME_END, KC_PGDN, XXX +// basically the thumb keys like on the ergodox. +#define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC, KC_PGDN, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___ORTHO_14_MIDDLE_T_BP___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_14_MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_V) +#define ___ORTHO_14_MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___ORTHO_14_MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO) + +#define ___ORTHO_14_MIDDLE_4_BP___ XXX, HOME_END, KC_PGUP, XXX + + +/********************************************************************/ +/** The top rows for numbers, symbols and Fkeys. **/ +/********************************************************************/ +#define ___ORTHO_15_N___ ___NUMBER_L___, ___ORTHO_15_MIDDLE_T___, ___NUMBER_R___ +#define ___ORTHO_15_B_N___ ___NUMBER_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___NUMBER_BEPO_R___ +// the full bepo symbol row. +#define ___ORTHO_15_B_SYMB___ BP_DLR, ___SYMBOL_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___SYMBOL_BEPO_R___, BP_EQL + +// transparent in the middle because I only put this on transient layers. +#define ___ORTHO_15_FUNC_1_12___ ___FUNC_1_6___, ___3___, ___FUNC_7_12___ + + +/********************************************************************/ +/** The bottom row and thumbs as needed. **/ +/********************************************************************/ +#define ___BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT +#define ___BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) + +// the bottom rows for keyboards on bepo. +// bepo on bepo - not enough space to go around.... +#define ___BOTTOM_LEFT_BP___ LCTL(BP_C), BP_ECRC, LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___BOTTOM_RIGHT_BP___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC + +// for dvorak on bepo +#define ___BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_C), LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC + +#define ___ORTHO_15_BOTTOM___ ___BOTTOM_LEFT___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT___ +#define ___ORTHO_15_BOTTOM_FR___ ___BOTTOM_LEFT_FR___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT_FR___ +#define ___ORTHO_15_BOTTOM_BP___ ___BOTTOM_LEFT_BP___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT_BP___ + +#define ___ORTHO_14_BOTTOM___ ___BOTTOM_LEFT___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT___ +#define ___ORTHO_14_BOTTOM_FR___ ___BOTTOM_LEFT_FR___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT_FR___ +#define ___ORTHO_14_BOTTOM_BP___ ___BOTTOM_LEFT_BP___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT_BP___ +#define ___ORTHO_14_THUMBS_BOTTOM___ ___4___, ___MIDDLE_THUMBS___, ___4___ + + +#define ___ERGODOX_THUMB_LEFT___ \ + OS_RALT, TG(MDIA), \ + HOME_END, \ + CTL_BSPC, ALT_DEL, XMONAD_ESC + +#define ___ERGODOX_THUMB_RIGHT___ \ + TG(SYMB), OS_RALT, \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC + +#define ___ERGODOX_THUMB_RIGHT_BP___ \ + TG(SYMB_ON_BEPO), OS_RALT, \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC + +#define ___ERGODOX_TRANS_THUMBS___ ___6___ +#define ___TRANS_BOTTOM___ ___5___ + +/********************************************************************************/ +/* the interior rows for ortholinear keyboards. the first number is the length */ +/* So you can put what you want on the outside ends, make new middles as needed */ +/* It would be nice to make this a little more dynamic. There is little */ +/* differenc between them. */ +/********************************************************************************/ + +//// ortho15 core rows. used with my xd75. +/***********************************************************/ +/* ORTHO15 interior rows. used with my xd75 */ +/***********************************************************/ +#define ___13_DVORAK_1___ ___DVORAK_L1___, ___ORTHO_15_MIDDLE_1___, ___DVORAK_R1___ +#define ___13_DVORAK_2___ ___DVORAK_L2___, ___ORTHO_15_MIDDLE_2___, ___DVORAK_R2___ +#define ___13_DVORAK_3___ ___DVORAK_L3___, ___ORTHO_15_MIDDLE_3___, ___DVORAK_R3___ + +#define ___13_QWERTY_1___ ___QWERTY_L1___, ___ORTHO_15_MIDDLE_1___, ___QWERTY_R1___ +#define ___13_QWERTY_2___ ___QWERTY_L2___, ___ORTHO_15_MIDDLE_2___, ___QWERTY_R2___ +#define ___13_QWERTY_3___ ___QWERTY_L3___, ___ORTHO_15_MIDDLE_3___, ___QWERTY_R3___ + +#define ___13_COLEMAK_1___ ___COLEMAK_L1___, ___ORTHO_15_MIDDLE_1___, ___COLEMAK_R1___ +#define ___13_COLEMAK_2___ ___COLEMAK_L2___, ___ORTHO_15_MIDDLE_2___, ___COLEMAK_R2___ +#define ___13_COLEMAK_3___ ___COLEMAK_L3___, ___ORTHO_15_MIDDLE_3___, ___COLEMAK_R3___ + +#define ___13_WORKMAN_1___ ___WORKMAN_L1___, ___ORTHO_15_MIDDLE_1___, ___WORKMAN_R1___ +#define ___13_WORKMAN_2___ ___WORKMAN_L2___, ___ORTHO_15_MIDDLE_2___, ___WORKMAN_R2___ +#define ___13_WORKMAN_3___ ___WORKMAN_L3___, ___ORTHO_15_MIDDLE_3___, ___WORKMAN_R3___ + +#define ___13_NORMAN_1___ ___NORMAN_L1___, ___ORTHO_15_MIDDLE_1___, ___NORMAN_R1___ +#define ___13_NORMAN_2___ ___NORMAN_L2___, ___ORTHO_15_MIDDLE_2___, ___NORMAN_R2___ +#define ___13_NORMAN_3___ ___NORMAN_L3___, ___ORTHO_15_MIDDLE_3___, ___NORMAN_R3___ + +#define ___13_DVORAK_B_1___ ___DVORAK_FR_L1___, ___ORTHO_15_MIDDLE_1_BP___, ___DVORAK_FR_R1___ +#define ___13_DVORAK_B_2___ ___DVORAK_FR_L2___, ___ORTHO_15_MIDDLE_2_BP___, ___DVORAK_FR_R2___ +#define ___13_DVORAK_B_3___ ___DVORAK_FR_L3___, ___ORTHO_15_MIDDLE_3_BP___, ___DVORAK_FR_R3___ + +#define ___13_BEPO_1___ ___BEPO_FR_L1___, ___ORTHO_15_MIDDLE_1_BP___, ___BEPO_FR_R1___ +#define ___13_BEPO_2___ ___BEPO_FR_L2___, ___ORTHO_15_MIDDLE_2_BP___, ___BEPO_FR_R2___ +#define ___13_BEPO_3___ ___BEPO_FR_L3___, ___ORTHO_15_MIDDLE_3_BP___, ___BEPO_FR_R3___ + +// transparent xmonad/dvorak layer +#define ___15_XMONAD_1___ ___, ___DVORAK_L1___, ___3___, ___DVORAK_R1___, ___ +#define ___15_XMONAD_2___ ___, ___DVORAK_L2___, ___3___, ___DVORAK_R2___, ___ +#define ___15_XMONAD_3___ ___, ___DVORAK_L3___, ___3___, ___DVORAK_R3___, ___ + +// transparent xmonad/dvorak layer in bepo +#define ___15_XMONAD_B_1___ ___, ___DVORAK_FR_L1___, ___3___, ___DVORAK_FR_R1___, ___ +#define ___15_XMONAD_B_2___ ___, ___DVORAK_FR_L2___, ___3___, ___DVORAK_FR_R2___, ___ +#define ___15_XMONAD_B_3___ ___, ___DVORAK_FR_L3___, ___3___, ___DVORAK_FR_R3___, ___ + +#define ___15_SYMB_1___ ___SYMBOLS6_1___, ___3___, ___SYMPAD_1___ +#define ___15_SYMB_2___ ___SYMBOLS6_2___, ___3___, ___SYMPAD_2___ +#define ___15_SYMB_3___ ___SYMBOLS6_3___, ___3___, ___SYMPAD_3___ +#define ___15_SYMB_4___ ___SYMBOLS6_4___, ___3___, ___SYMPAD_4___ + +#define ___15_KP_1___ ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1___, ___ +#define ___15_KP_2___ ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2___, ___ +#define ___15_KP_3___ ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3___, KC_PENT +#define ___15_KP_4___ ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4___, ___ + +#define ___15_KP_B_1___ ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1_BP___, ___ +#define ___15_KP_B_2___ ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2_BP___, ___ +#define ___15_KP_B_3___ ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3_BP___, KC_PENT +#define ___15_KP_B_4___ ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4_BP___, ___ + +#define ___15_SYMB_B_1___ ___SYMBOLS6_1_BP___, ___3___, ___SYMPAD_1_BP___ +#define ___15_SYMB_B_2___ ___SYMBOLS6_2_BP___, ___3___, ___SYMPAD_2_BP___ +#define ___15_SYMB_B_3___ ___SYMBOLS6_3_BP___, ___3___, ___SYMPAD_3_BP___ +#define ___15_SYMB_B_4___ ___SYMBOLS6_4_BP___, ___3___, ___SYMPAD_4_BP___ + +#define ___15_MDIA_1___ ___MOUSE_BTNS_L___, ___4___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___ +#define ___15_MDIA_2___ ___, ___MOUSE_LDUR___, ___4___, KC_VOLD, ___VI_ARROWS___, ___ +#define ___15_MDIA_3___ ___, ___MWHEEL_LDUR___, ___4___, KC_PGUP, ___MOUSE_BTNS_R___ +#define ___15_MDIA_4___ ___2___, ___MACCL___, ___4___, KC_PGDN, ___5___ + +#define ___15_LAYERS_1___ ___X3___, ___2_LAYERS_B1___, ___5___, ___3_LAYERS_T_BP___, ___X2___ +#define ___15_LAYERS_2___ ___X3___, ___2_LAYERS_B2___, ___5___, ___3_LAYERS_T___, ___X2___ +#define ___15_LAYERS_3___ ___X2___, ___3_LAYERS_B3___, ___5___, ___3_LAYERS_T_CTL___, ___X2___ + +#define ___15_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___, ___5___, ___5___ +#define ___15_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___4___, ___RGB_P_B_R_SW_SN___ +#define ___15_RGB_3___ ___5___, ___5___, ___RGB_KXGT___, ___ + + + +/***********************************************************/ +/* ORTHO14 base layer interior rows. used with my viterbi */ +/***********************************************************/ +#define ___12_DVORAK_1___ ___DVORAK_L1___, ___ORTHO_14_MIDDLE_1___, ___DVORAK_R1___ +#define ___12_DVORAK_2___ ___DVORAK_L2___, ___ORTHO_14_MIDDLE_2___, ___DVORAK_R2___ +#define ___12_DVORAK_3___ ___DVORAK_L3___, ___ORTHO_14_MIDDLE_3___, ___DVORAK_R3___ + +#define ___12_QWERTY_1___ ___QWERTY_L1___, ___ORTHO_14_MIDDLE_1___, ___QWERTY_R1___ +#define ___12_QWERTY_2___ ___QWERTY_L2___, ___ORTHO_14_MIDDLE_2___, ___QWERTY_R2___ +#define ___12_QWERTY_3___ ___QWERTY_L3___, ___ORTHO_14_MIDDLE_3___, ___QWERTY_R3___ + +#define ___12_COLEMAK_1___ ___COLEMAK_L1___, ___ORTHO_14_MIDDLE_1___, ___COLEMAK_R1___ +#define ___12_COLEMAK_2___ ___COLEMAK_L2___, ___ORTHO_14_MIDDLE_2___, ___COLEMAK_R2___ +#define ___12_COLEMAK_3___ ___COLEMAK_L3___, ___ORTHO_14_MIDDLE_3___, ___COLEMAK_R3___ + +#define ___12_WORKMAN_1___ ___WORKMAN_L1___, ___ORTHO_14_MIDDLE_1___, ___WORKMAN_R1___ +#define ___12_WORKMAN_2___ ___WORKMAN_L2___, ___ORTHO_14_MIDDLE_2___, ___WORKMAN_R2___ +#define ___12_WORKMAN_3___ ___WORKMAN_L3___, ___ORTHO_14_MIDDLE_3___, ___WORKMAN_R3___ + +#define ___12_NORMAN_1___ ___NORMAN_L1___, ___ORTHO_14_MIDDLE_1___, ___NORMAN_R1___ +#define ___12_NORMAN_2___ ___NORMAN_L2___, ___ORTHO_14_MIDDLE_2___, ___NORMAN_R2___ +#define ___12_NORMAN_3___ ___NORMAN_L3___, ___ORTHO_14_MIDDLE_3___, ___NORMAN_R3___ + +#define ___12_DVORAK_B_1___ ___DVORAK_FR_L1___, ___ORTHO_14_MIDDLE_1_BP___, ___DVORAK_FR_R1___ +#define ___12_DVORAK_B_2___ ___DVORAK_FR_L2___, ___ORTHO_14_MIDDLE_2_BP___, ___DVORAK_FR_R2___ +#define ___12_DVORAK_B_3___ ___DVORAK_FR_L3___, ___ORTHO_14_MIDDLE_3_BP___, ___DVORAK_FR_R3___ + +#define ___12_BEPO_2___ ___BEPO_FR_L1___, ___ORTHO_14_MIDDLE_1_BP___, ___BEPO_FR_R1___ +#define ___12_BEPO_3___ ___BEPO_FR_L2___, ___ORTHO_14_MIDDLE_2_BP___, ___BEPO_FR_R2___ +#define ___12_BEPO_4___ ___BEPO_FR_L3___, ___ORTHO_14_MIDDLE_3_BP___, ___BEPO_FR_R3___ + + +// transparent layers. +#define ___14_XMONAD_1___ ___, ___DVORAK_L1___, ___2___, ___DVORAK_R1___, ___ +#define ___14_XMONAD_2___ ___, ___DVORAK_L2___, ___2___, ___DVORAK_R2___, ___ +#define ___14_XMONAD_3___ ___, ___DVORAK_L3___, ___2___, ___DVORAK_R3___, ___ + +#define ___14_XMONAD_B_1___ ___, ___DVORAK_FR_L1___, ___2___, ___DVORAK_FR_R1___, ___ +#define ___14_XMONAD_B_2___ ___, ___DVORAK_FR_L2___, ___2___, ___DVORAK_FR_R2___, ___ +#define ___14_XMONAD_B_3___ ___, ___DVORAK_FR_L3___, ___2___, ___DVORAK_FR_R3___, ___ + +#define ___14_SYMB_1___ ___SYMBOLS6_1___, ___2___, ___SYMPAD_1___ +#define ___14_SYMB_2___ ___SYMBOLS6_2___, ___2___, ___SYMPAD_2___ +#define ___14_SYMB_3___ ___SYMBOLS6_3___, ___2___, ___SYMPAD_3___ +#define ___14_SYMB_4___ ___SYMBOLS6_4___, ___2___, ___SYMPAD_4___ + +#define ___14_KP_1___ ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1___, ___ +#define ___14_KP_2___ ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2___, ___ +#define ___14_KP_3___ ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3___, KC_PENT +#define ___14_KP_4___ ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4___, ___ + +#define ___14_KP_B_1___ ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1_BP___, ___ +#define ___14_KP_B_2___ ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2_BP___, ___ +#define ___14_KP_B_3___ ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3_BP___, KC_PENT +#define ___14_KP_B_4___ ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4_BP___, ___ + +#define ___14_SYMB_B_1___ ___SYMBOLS6_1_BP___, ___2___, ___SYMPAD_1_BP___ +#define ___14_SYMB_B_2___ ___SYMBOLS6_2_BP___, ___2___, ___SYMPAD_2_BP___ +#define ___14_SYMB_B_3___ ___SYMBOLS6_3_BP___, ___2___, ___SYMPAD_3_BP___ +#define ___14_SYMB_B_4___ ___SYMBOLS6_4_BP___, ___2___, ___SYMPAD_4_BP___ + +#define ___14_MDIA_1___ ___MOUSE_BTNS_L___, ___3___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___ +#define ___14_MDIA_2___ ___, ___MOUSE_LDUR___, ___3___, KC_VOLD, ___VI_ARROWS___, ___ +#define ___14_MDIA_3___ ___, ___MWHEEL_LDUR___, ___3___, KC_PGUP, ___MOUSE_BTNS_R___ +#define ___14_MDIA_4___ ___2___, ___MACCL___, ___3___, KC_PGDN, ___5___ + +#define ___14_LAYERS_1___ ___X3___, ___2_LAYERS_B1___, ___4___, ___3_LAYERS_T_BP___, ___X2___ +#define ___14_LAYERS_2___ ___X3___, ___2_LAYERS_B2___, ___4___, ___3_LAYERS_T___, ___X2___ +#define ___14_LAYERS_3___ ___X2___, ___3_LAYERS_B3___, ___4___, ___3_LAYERS_T_CTL___, ___X2___ + +#define ___14_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___, ___4___, ___5___ +#define ___14_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___3___, ___RGB_P_B_R_SW_SN___ +#define ___14_RGB_3___ ___5___, ___4___, ___RGB_KXGT___, ___ diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h new file mode 100644 index 000000000000..955020bd0dc9 --- /dev/null +++ b/users/ericgebhart/core_keys.h @@ -0,0 +1,293 @@ +/* + 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 . +*/ + +#include "quantum.h" +#include "process_keycode/process_tap_dance.h" + +//#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ + +void tap(uint16_t keycode); +bool process_record_secrets(uint16_t keycode, keyrecord_t *record); + + +#define EECONFIG_USERSPACE (uint8_t *)19 + +typedef union { + uint8_t raw; + struct { + bool clicky_enable :1; + bool rgb_layer_change :1; + bool is_overwatch :1; + bool nuke_switch :1; + }; +} userspace_config_t; + + +// for the creation of dvorak keys on an Bepo keyboard at the OS layer. +// so we can create an array of reasonable size +// for our translation keys. We have to create a +// good range of numbers +#define GR(x) (x-SAFE_RANGE) + +uint8_t gr(uint8_t); +void send_keycode(uint8_t); + +#define MOD_NONE 0x00 + +// indexs for the keycode translation table. +#define UNSHIFTED_KEY(key) key_translations[gr(key)][0][0] +#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1] +#define SHIFTED_KEY(key) key_translations[gr(key)][1][0] +#define SHIFTED_MODS(key) key_translations[gr(key)][1][1] + + +enum userspace_custom_keycodes { + // keep the keycodes using the send_key function close to SAFE_RANGE + // so the array of keycodes remains a reasonbale size. + DB_1 = SAFE_RANGE, // can always be here + DB_2, + DB_3, + DB_4, + DB_5, + DB_6, + DB_7, + DB_8, + DB_9, + DB_0, + DB_GRV, + DB_SCOLON, + DB_SLASH, + DB_BACKSLASH, + DB_EQL, + DB_DOT, + DB_COMM, + DB_QUOT, + DB_MINUS, + DB_RPRN, + DB_LPRN, + DB_RBRC, + DB_LBRC, + // for symbols layer + DB_HASH, + DB_LCBR, + DB_RCBR, + DB_PIPE, + DB_TILD, + DB_CIRC, + DB_LESS, + DB_GRTR, + // End of dvorak on bepo translation keys. + + EPRM, + VRSN, + KC_DVORAK_ON_BEPO, + KC_BEPO, + KC_NORMAN, + KC_QWERTY, + KC_COLEMAK, + KC_DVORAK, + KC_WORKMAN, + KC_MAKE, + KC_RESET, + KC_RGB_T, + KC_SECRET_1, + KC_SECRET_2, + KC_SECRET_3, + KC_SECRET_4, + KC_SECRET_5, + KC_CCCV +}; + +#define SFTGUI_T(kc) { MT(MOD_LGUI | MOD_LSFT, kc) } +#define SFT_GUI_ESC MT(MOD_LSFT | MOD_LGUI, KC_PGDN) // shift LGUI or Escape. +#define ALT_ENT ALT_T(KC_ENT) // Alt or enter +#define CTL_SPC CTL_T(KC_SPC) // ctrl or space +#define CTL_BSPC CTL_T(KC_BSPC) // ctrl or backspace +#define ALT_DEL ALT_T(KC_DEL) // Alt or delete +#define GUI_ESC GUI_T(KC_ESC) // Gui or escape +#define ALGR_SYMB ALGR_T(TG(SYMB)) // Alt gre or toggle symbol layer + + + +// OSM keycodes, to keep things clean and easy to change +#define KC_MLSF OSM(MOD_LSFT) +#define KC_MRSF OSM(MOD_RSFT) +#define OS_LGUI OSM(MOD_LGUI) +#define OS_RGUI OSM(MOD_RGUI) +#define OS_LSFT OSM(MOD_LSFT) +#define OS_RSFT OSM(MOD_RSFT) +#define OS_LCTL OSM(MOD_LCTL) +#define OS_RCTL OSM(MOD_RCTL) +#define OS_LALT OSM(MOD_LALT) +#define OS_RALT OSM(MOD_RALT) +#define ALT_APP ALT_T(KC_APP) + +#define MG_NKRO MAGIC_TOGGLE_NKRO + + +//// TAP DANCE + + typedef struct { + bool is_press_action; + int state; + } tdtap; + +enum { + SINGLE_TAP = 1, + SINGLE_HOLD = 2, + DOUBLE_TAP = 3, + DOUBLE_HOLD = 4, + DOUBLE_SINGLE_TAP = 5, //send two single taps + TRIPLE_TAP = 6, + TRIPLE_HOLD = 7 +}; + +//Tap Dance Declarations +enum { + TD_ESC_CAPS = 0, + TD_TAB_BKTAB = 1, + TD_MDIA_SYMB = 2, + TD_HOME_END = 3, + TD_XMONAD_ESC = 4, + TD_DEF_LAYER_SW = 5, + TD_DEF_OS_LAYER_SW = 6, + TD_MOUSE_BTNS = 7, + TD_DVORAK_BEPO = 8 +}; + + +// Tap dance +#define TAB_BKTAB TD(TD_TAB_BKTAB) // Tab or backtab tapdance. +#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB) // MDIA, symb, keypad, layouts layer tapdance toggle. +#define DEF_LAYER_SW TD(TD_DEF_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer +#define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer +#define HOME_END TD(TD_HOME_END) // home or end tapdance. +#define XMONAD_ESC TD(TD_XMONAD_ESC) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 +#define DVORAK_ET_BEPO TD(TD_DVORAK_BEPO) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 +#define TDMOUSE_BTNS TD(TD_MOUSE_BTNS) // hmmm. 1-5 + +// HOME ROW LAYER TOGGLE (LT) and Shift. +// both sides of the home row have "shift, ___, media , symb, ___" and "___, symb, media, ___, shift". +// so pinky fingers are shift when held and the index and second fingers are symbol and +// media layers when held. + +// Dvorak +// shift and layer switch on hold on the home row. +#define KC_SFT_T_A SFT_T(KC_A) +#define KC_SFT_T_S SFT_T(KC_S) + +#define KC_LT_SYMB_U LT(SYMB, KC_U) +#define KC_LT_SYMB_H LT(SYMB, KC_H) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_MDIA_T LT(MDIA, KC_T) + +// Need to add this to the others. +#define KC_LT_KP_N LT(KEYPAD, KC_N) +#define KC_LT_KP_O LT(KEYPAD, KC_O) + +// for dvorak on bepo +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) + +#define BP_LT_SYMB_U LT(SYMB, BP_U) +#define BP_LT_SYMB_H LT(MDIA, BP_H) + +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_MDIA_T LT(MDIA, BP_T) + +// Need to add this to the others. +#define BP_LT_KP_N LT(KEYPAD, BP_N) +#define BP_LT_KP_O LT(KEYPAD, BP_O) + +// for bepo on bepo +#define BP_SFT_T_T SFT_T(BP_T) +#define BP_SFT_T_W SFT_T(BP_W) + +#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_KP_U LT(KEYPAD, BP_U) + +#define BP_LT_SYMB_S LT(SYMB_ON_BEPO, BP_S) +#define BP_LT_MDIA_R LT(MDIA, BP_R) +#define BP_LT_KP_N LT(KEYPAD, BP_N) + +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) +#define BP_SFT_T_E SFT_T(BP_E) +#define BP_SFT_T_M SFT_T(BP_M) + +#define BP_SFT_T_ECRC SFT_T(BP_ECRC) +#define BP_SFT_T_CCED SFT_T(BP_CCED) +#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) + +//QWERTY +#define KC_SFT_T_SCLN SFT_T(KC_SCLN) + +#define KC_LT_MDIA_D LT(MDIA, KC_D) +#define KC_LT_MDIA_K LT(MDIA, KC_K) +#define KC_LT_SYMB_F LT(SYMB, KC_F) +#define KC_LT_SYMB_J LT(SYMB, KC_J) + +//COLEMAK +#define KC_SFT_T_O SFT_T(KC_O) +#define KC_LT_MDIA_S LT(MDIA, KC_S) +#define KC_LT_SYMB_T LT(SYMB, KC_T) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_SYMB_N LT(SYMB, KC_N) + +//WORKMAN +#define KC_SFT_T_I SFT_T(KC_I) +#define KC_LT_MDIA_H LT(MDIA, KC_H) + +//NORMAN +// For keys on the homerow. Hold for shift, keypad,mouse,and smbol layers +#define KC_SFT_T_U SFT_T(KC_U) +#define KC_LT_MDIA_I LT(MDIA, KC_I) + +// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). +#define MK_CUT LSFT(KC_DEL) // shift + delete +#define MK_COPY LCTL(KC_INS) // ctrl + insert +#define MK_PASTE LSFT(KC_INS) // shift + insert + +#define ___ KC_TRNS +#define XXX KC_NO + +// Blocking keys +#define ___X___ XXX +#define ___X2___ XXX, XXX +#define ___X3___ ___X2___, XXX +#define ___X5___ ___X3___, XXX, XXX +#define ___X15___ ___X5___, ___X5___, ___X5___ + +// Transparent keys +#define ___2___ ___, ___ +#define ___3___ ___2___, ___ +#define ___4___ ___3___, ___ +#define ___5___ ___4___, ___ +#define ___6___ ___5___, ___ +#define ___14___ ___5___, ___4___, ___5___ +#define ___15___ ___5___, ___5___, ___5___ + +int on_qwerty(void); +int get_xmonad_layer(void); +int cur_dance (qk_tap_dance_state_t *state); + +//for the x tap dance. Put it here so it can be used in any keymap +void x_finished (qk_tap_dance_state_t *state, void *user_data); +void x_reset (qk_tap_dance_state_t *state, void *user_data); diff --git a/users/ericgebhart/core_keysets.h b/users/ericgebhart/core_keysets.h new file mode 100644 index 000000000000..6596e2121d0d --- /dev/null +++ b/users/ericgebhart/core_keysets.h @@ -0,0 +1,292 @@ +/* + 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 . +*/ + +#include "core_keys.h" + +/********************************************************************/ +/** Parts are parts, pieces of keysets so we have some decent **/ +/** building blocks to make keymaps with. **/ +/********************************************************************/ + + +// Since our quirky block definitions are basically a list of comma separated +// arguments, we need a wrapper in order for these definitions to be +// expanded before being used as arguments to the LAYOUT_xxx macro. +#if (!defined(LAYOUT) && defined(KEYMAP)) +#define LAYOUT KEYMAP +#endif + +#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) +#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__) +#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) +#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) + +#define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) +#define LAYOUT_ortho_5x14_wrapper(...) LAYOUT_ortho_5x14(__VA_ARGS__) + + +/********************************************************************/ +/** The Core rows of each given layout. **/ +/********************************************************************/ +//Dvorak on a qwerty software layer in the OS +#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y +#define ___DVORAK_L2___ KC_SFT_T_A, KC_LT_KP_O, KC_LT_MDIA_E, KC_LT_SYMB_U, KC_I +#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X + +#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L +#define ___DVORAK_R2___ KC_D, KC_LT_SYMB_H, KC_LT_MDIA_T, KC_LT_KP_N, KC_SFT_T_S +#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z + +// Qwerty based layers that I don't really use. +#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T +#define ___QWERTY_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_D, KC_LT_SYMB_F, KC_G +#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P +#define ___QWERTY_R2___ KC_H, KC_LT_SYMB_J, KC_LT_MDIA_K, KC_L, KC_SFT_T_SCLN +#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK +#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G +#define ___COLEMAK_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_D +#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_R2___ KC_H, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK-DH +#define ___COLEMAK_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B +#define ___COLEMAK_DH_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_G +#define ___COLEMAK_DH_L3___ KC_Z, KC_X, KC_C, KC_D, KC_V + +#define ___COLEMAK_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_DH_R2___ KC_M, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH + +// WORKMAN +#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B +#define ___WORKMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_H, KC_LT_SYMB_T, KC_G +#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V + +#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN +#define ___WORKMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_O, KC_SFT_T_I +#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH + +// NORMAN +#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K +#define ___NORMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_E, KC_LT_SYMB_T, KC_G +#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN +#define ___NORMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_I, KC_O, KC_SFT_T_U +#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// BEPO MAPS +// Dvorak on fr-bepo software layer in the OS. +// for dvorak and all the other qwerty like keyboards on bepo +#define ___DVORAK_FR_L1___ DB_QUOT, DB_COMM, DB_DOT, BP_P, BP_Y +#define ___DVORAK_FR_L2___ BP_SFT_T_A, BP_LT_KP_O, BP_LT_MDIA_E, BP_LT_SYMB_U, BP_I +#define ___DVORAK_FR_L3___ DB_SCOLON, BP_Q, BP_J, BP_K, BP_X + +#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L +#define ___DVORAK_FR_R2___ BP_D, BP_LT_SYMB_H, BP_LT_MDIA_T, BP_LT_KP_N, BP_SFT_T_S +#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z + + +// Bepo on fr-bepo software layer +// for bepo on bepo +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ +#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ + +#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV +#define ___BEPO_FR_L2___ BP_SFT_T_A, BP_LT_KP_U, BP_LT_SYMB_I, BP_LT_MDIA_E, BP_COMM +#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K + +#define ___BEPO_FR_R1___ /* BP_DCRC,*/ BP_V, BP_D, BP_L, BP_J, BP_Z +#define ___BEPO_FR_R2___ /* BP_C, */ BP_T, BP_LT_SYMB_S, BP_LT_MDIA_R, BP_LT_KP_N, BP_SFT_T_M //BP_CCED +#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F //BP_SFT_T_W + +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ +/* KC_TAB, BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV, KC_BSPC, */ +/* KC_LSFT, BP_A, BP_U, BP_I, BP_E, BP_COMM, */ +/* KC_LCTRL, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_ENT, */ +/* ESC_FN, BP_ECRC, KC_LGUI, KC_LALT, SPC_RALT, */ +/* TT(SWAP), KC_MNXT, */ +/* KC_MPLY, */ +/* TT(FN), TT(NUMS), KC_MPRV, */ + +/* /\* right hand *\/ */ +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +/* KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, */ +/* BP_C, BP_T, BP_S, BP_R, BP_N, M_RSFT, */ +/* KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, W_RCTL, */ + + +/*******************************************************************/ +/** For the top rows. Numbers for most things, symbols for Bepo. **/ +/*******************************************************************/ + +// for everything on qwerty. +#define ___NUMBER_L___ KC_1, KC_2, KC_3, KC_4, KC_5 +#define ___NUMBER_R___ KC_6, KC_7, KC_8, KC_9, KC_0 + +// function key rows, works for everyone. +#define ___FUNC_L___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 +#define ___FUNC_R___ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 + +#define ___FUNC_1_6___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 +#define ___FUNC_7_12___ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 + +// a top symbol row if someone wants it. +#define ___SYMB_L___ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC +#define ___SYMB_R___ KC_CIRC, KC_AMPR, KC_AST, KC_LPRN, KC_RPRN + +// For numbers on bepo. Bepo has numbers on shifted keys, the +// reverse of most keyboard layouts. +#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 +#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 + + +/*******************************************************************/ +/* keysets for the auxillary layers. */ +/* the KC_P? codes don't work for me. I don't use those shifted */ +/* values anyway. */ +/*******************************************************************/ +// Keypads +#define ___KEYPAD_1___ KC_7, KC_8, KC_9, KC_PSLS +#define ___KEYPAD_2___ KC_4, KC_5, KC_6, KC_PAST +#define ___KEYPAD_3___ KC_1, KC_2, KC_3, KC_PMNS +#define ___KEYPAD_4___ KC_0, KC_DOT, KC_PEQL, KC_PPLS + +// Keypad from the default keymap.c of the xd75 +#define ___KEYPAD_1_ALT___ KC_P7, KC_P8, KC_P9, KC_MINS +#define ___KEYPAD_2_ALT___ KC_P4, KC_P5, KC_P6, KC_PLUS +#define ___KEYPAD_3_ALT___ KC_P1, KC_P2, KC_P3, KC_PENT +#define ___KEYPAD_4_ALT___ KC_P0, KC_DOT, KC_PENT, KC_PENT + +// For Bepo +#define ___KEYPAD_1_BP___ DB_7, DB_8, DB_9, BP_SLASH +#define ___KEYPAD_2_BP___ DB_4, DB_5, DB_6, BP_ASTR +#define ___KEYPAD_3_BP___ DB_1, DB_2, DB_3, DB_MINUS +#define ___KEYPAD_4_BP___ DB_0, DB_DOT, DB_EQL, BP_PLUS + + +// SYMBOLS +// An arrangement for the left hand with a focus on the ()[]{}s. +#define ___SYMBOLS_1___ KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE +#define ___SYMBOLS_2___ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV +#define ___SYMBOLS_3___ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD + +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1___ KC_GRV, KC_LT, KC_GT, KC_LCBR, KC_RCBR, KC_HASH +#define ___SYMBOLS6_2___ KC_AMPR, KC_AT, KC_ASTR, KC_LPRN, KC_RPRN, KC_PERC +#define ___SYMBOLS6_3___ KC_DLR, KC_DQT, KC_QUOT, KC_LBRC, KC_RBRC, KC_COLON +#define ___SYMBOLS6_4___ ___2___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN + +#define ___SYMBOLS5_4___ ___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN + + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1___ KC_GRV, KC_AMPR, KC_ASTR, KC_LCBR, KC_PLUS, KC_PIPE +#define ___SYMPAD_2___ KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_ASTR, KC_GRV +#define ___SYMPAD_3___ ___, KC_EXLM, KC_AT, KC_HASH, KC_MINUS, KC_SLASH +#define ___SYMPAD_4___ ___, KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH + +#define ___5_SYMPAD_4___ KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH + +// Function pad. Same idea as above, but for function keys. +#define ___FUNCPAD_T___ KC_F10, KC_F11, KC_F12 +#define ___FUNCPAD_1___ KC_F7, KC_F8, KC_F9 +#define ___FUNCPAD_2___ KC_F4, KC_F5, KC_F6 +#define ___FUNCPAD_3___ KC_F1, KC_F2, KC_F3 + + +//--- all over again for BEPO + +// SYMBOLS FOR BEPO +// The top row. Bepo has symbols not numbers. Numbers are the shifted values. +#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ + +// An arrangement for the left hand with a focus on the ()[]{}s. +#define ___SYMBOLS_1_BP___ KC_EXLM, BP_AT, DB_LCBR, DB_RCBR, DB_PIPE +#define ___SYMBOLS_2_BP___ DB_HASH, BP_DLR, DB_LPRN, DB_RPRN, DB_GRV +#define ___SYMBOLS_3_BP___ BP_PERC, DB_CIRC, DB_LBRC, DB_RBRC, DB_TILD + +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1_BP___ DB_GRV, DB_LESS, DB_GRTR, DB_LCBR, DB_RCBR, DB_HASH +#define ___SYMBOLS6_2_BP___ KC_AMPR, BP_AT, BP_ASTR, DB_LPRN, DB_RPRN, BP_PERC +#define ___SYMBOLS6_3_BP___ BP_DLR, BP_DQOT, DB_QUOT, DB_LBRC, DB_RBRC, KC_COLON +#define ___SYMBOLS6_4_BP___ ___2___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON + +#define ___SYMBOLS5_4_BP___ ___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1_BP___ DB_GRV, BP_AMPR, BP_ASTR, DB_LCBR, BP_PLUS, DB_PIPE +#define ___SYMPAD_2_BP___ DB_TILD, BP_DLR, BP_PERC, DB_CIRC, BP_ASTR, DB_GRV +#define ___SYMPAD_3_BP___ ___, BP_EXLM, BP_AT, DB_HASH, BP_MINS, BP_SLSH +#define ___SYMPAD_4_BP___ ___, DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH + +#define ___5_SYMPAD_4_BP___ DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH + +// Parts are parts. +// MOUSE, ARROW and MEDIA KEY SETS +#define ___MOUSE_LDUR___ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R +#define ___MWHEEL_LDUR___ KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R +#define ___MOUSE_BTNS_R___ KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5 +#define ___MOUSE_BTNS_L___ KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1 +#define ___MOUSE_ACCL_012___ KC_ACL0, KC_ACL1, KC_ACL2 +#define ___MACCL___ ___MOUSE_ACCL_012___ + +#define ___PRV_PLAY_NXT_STOP KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP +#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU + +#define ___MUTE_PRV_PLAY_NXT_STOP___ KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP +#define ___MUTE_PLAY_STOP___ KC_MUTE, KC_MPLY, KC_MSTP +#define ___VI_ARROWS___ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + +// RGB FUNCTION Keysets +// RGB row for the _FN layer from the redo of the default keymap.c +#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD +#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD +#define ___RGB_MODE_PRV_NXT___ RGB_RMOD, RGB_MOD +#define ___RGB_TOGGLE___ RGB_TOG +#define ___RGB_P_B_R_SW_SN___ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN +#define ___RGB_KXGT___ RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T + +// Print screen, screen lock, pause +#define ___PSCR_SLCK_PAUS___ KC_PSCR, KC_SLCK, KC_PAUS + +// LAYER Keyset rows. Changing the Default base layer or the transient layers. +// Some are full length. The baselayers leave the ends open. hence a 13. +// for an ORtho 15. +#define ___2_LAYERS_B1___ DF(BEPO), DF(DVORAK_ON_BEPO) +#define ___2_LAYERS_B2___ DF(COLEMAK), DF(DVORAK) +#define ___3_LAYERS_B3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) +#define ___3_LAYERS_B4___ ___X3___ +// transient layers. +#define ___3_LAYERS_T_BP___ TO(MDIA), TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___3_LAYERS_T___ TO(MDIA), TO(SYMB), TO(KEYPAD) +#define ___3_LAYERS_T_CTL___ TO(_RGB), ___X2___ diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index 57acbd1bc791..275c76f4894f 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -15,33 +15,13 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H +#include "base_layers.h" #ifndef ericgebhart #define ericgebhart -#include "quantum.h" -#include "process_keycode/process_tap_dance.h" - //#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ -void tap(uint16_t keycode); -bool process_record_secrets(uint16_t keycode, keyrecord_t *record); - - -#define EECONFIG_USERSPACE (uint8_t *)19 - -typedef union { - uint8_t raw; - struct { - bool clicky_enable :1; - bool rgb_layer_change :1; - bool is_overwatch :1; - bool nuke_switch :1; - }; -} userspace_config_t; - - - #define DVORAK 0 // dvorak layout (default) #define QWERTY 1 #define COLEMAK 2 @@ -62,628 +42,4 @@ typedef union { #define _RGB 16 // RGB stuff. -// for the creation of dvorak keys on an Bepo keyboard at the OS layer. - -// so we can create an array of reasonable size -// for our translation keys. We have to create a -// good range of numbers -#define GR(x) (x-SAFE_RANGE) - -uint8_t gr(uint8_t); -void send_keycode(uint8_t); - -#define MOD_NONE 0x00 - -// indexs for the keycode translation table. -#define UNSHIFTED_KEY(key) key_translations[gr(key)][0][0] -#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1] -#define SHIFTED_KEY(key) key_translations[gr(key)][1][0] -#define SHIFTED_MODS(key) key_translations[gr(key)][1][1] - - -enum userspace_custom_keycodes { - // keep the keycodes using the send_key function close to SAFE_RANGE - // so the array of keycodes remains a reasonbale size. - DB_1 = SAFE_RANGE, // can always be here - DB_2, - DB_3, - DB_4, - DB_5, - DB_6, - DB_7, - DB_8, - DB_9, - DB_0, - DB_GRV, - DB_SCOLON, - DB_SLASH, - DB_BACKSLASH, - DB_EQL, - DB_DOT, - DB_COMM, - DB_QUOT, - DB_MINUS, - DB_RPRN, - DB_LPRN, - DB_RBRC, - DB_LBRC, - // for symbols layer - DB_HASH, - DB_LCBR, - DB_RCBR, - DB_PIPE, - DB_TILD, - DB_CIRC, - DB_LESS, - DB_GRTR, - // End of dvorak on bepo translation keys. - - EPRM, - VRSN, - KC_DVORAK_ON_BEPO, - KC_BEPO, - KC_NORMAN, - KC_QWERTY, - KC_COLEMAK, - KC_DVORAK, - KC_WORKMAN, - KC_MAKE, - KC_RESET, - KC_RGB_T, - KC_SECRET_1, - KC_SECRET_2, - KC_SECRET_3, - KC_SECRET_4, - KC_SECRET_5, - KC_CCCV -}; - -#define SFTGUI_T(kc) { MT(MOD_LGUI | MOD_LSFT, kc) } -#define SFT_GUI_ESC MT(MOD_LSFT | MOD_LGUI, KC_PGDN) // shift LGUI or Escape. -#define ALT_ENT ALT_T(KC_ENT) // Alt or enter -#define CTL_SPC CTL_T(KC_SPC) // ctrl or space -#define CTL_BSPC CTL_T(KC_BSPC) // ctrl or backspace -#define ALT_DEL ALT_T(KC_DEL) // Alt or delete -#define GUI_ESC GUI_T(KC_ESC) // Gui or escape -#define ALGR_SYMB ALGR_T(TG(SYMB)) // Alt gre or toggle symbol layer - - - -// OSM keycodes, to keep things clean and easy to change -#define KC_MLSF OSM(MOD_LSFT) -#define KC_MRSF OSM(MOD_RSFT) -#define OS_LGUI OSM(MOD_LGUI) -#define OS_RGUI OSM(MOD_RGUI) -#define OS_LSFT OSM(MOD_LSFT) -#define OS_RSFT OSM(MOD_RSFT) -#define OS_LCTL OSM(MOD_LCTL) -#define OS_RCTL OSM(MOD_RCTL) -#define OS_LALT OSM(MOD_LALT) -#define OS_RALT OSM(MOD_RALT) -#define ALT_APP ALT_T(KC_APP) - -#define MG_NKRO MAGIC_TOGGLE_NKRO - - -//// TAP DANCE - - typedef struct { - bool is_press_action; - int state; - } tdtap; - -enum { - SINGLE_TAP = 1, - SINGLE_HOLD = 2, - DOUBLE_TAP = 3, - DOUBLE_HOLD = 4, - DOUBLE_SINGLE_TAP = 5, //send two single taps - TRIPLE_TAP = 6, - TRIPLE_HOLD = 7 -}; - -//Tap Dance Declarations -enum { - TD_ESC_CAPS = 0, - TD_TAB_BKTAB = 1, - TD_MDIA_SYMB = 2, - TD_HOME_END = 3, - TD_XMONAD_ESC = 4, - TD_DEF_LAYER_SW = 5, - TD_DEF_OS_LAYER_SW = 6, - TD_MOUSE_BTNS = 7, - TD_DVORAK_BEPO = 8 -}; - - -// Tap dance -#define TAB_BKTAB TD(TD_TAB_BKTAB) // Tab or backtab tapdance. -#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB) // MDIA, symb, keypad, layouts layer tapdance toggle. -#define DEF_LAYER_SW TD(TD_DEF_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer -#define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer -#define HOME_END TD(TD_HOME_END) // home or end tapdance. -#define XMONAD_ESC TD(TD_XMONAD_ESC) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 -#define DVORAK_ET_BEPO TD(TD_DVORAK_BEPO) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 -#define TDMOUSE_BTNS TD(TD_MOUSE_BTNS) // hmmm. 1-5 - -// HOME ROW LAYER TOGGLE (LT) and Shift. -// both sides of the home row have "shift, ___, media , symb, ___" and "___, symb, media, ___, shift". -// so pinky fingers are shift when held and the index and second fingers are symbol and -// media layers when held. - -// Dvorak -// shift and layer switch on hold on the home row. -#define KC_SFT_T_A SFT_T(KC_A) -#define KC_SFT_T_S SFT_T(KC_S) - -#define KC_LT_SYMB_U LT(SYMB, KC_U) -#define KC_LT_SYMB_H LT(SYMB, KC_H) - -#define KC_LT_MDIA_E LT(MDIA, KC_E) -#define KC_LT_MDIA_T LT(MDIA, KC_T) - -// Need to add this to the others. -#define KC_LT_KP_N LT(KEYPAD, KC_N) -#define KC_LT_KP_O LT(KEYPAD, KC_O) - -// for dvorak on bepo -#define BP_SFT_T_A SFT_T(BP_A) -#define BP_SFT_T_S SFT_T(BP_S) - -#define BP_LT_SYMB_U LT(SYMB, BP_U) -#define BP_LT_SYMB_H LT(MDIA, BP_H) - -#define BP_LT_MDIA_E LT(MDIA, BP_E) -#define BP_LT_MDIA_T LT(MDIA, BP_T) - -// Need to add this to the others. -#define BP_LT_KP_N LT(KEYPAD, BP_N) -#define BP_LT_KP_O LT(KEYPAD, BP_O) - -// for bepo on bepo -#define BP_SFT_T_T SFT_T(BP_T) -#define BP_SFT_T_W SFT_T(BP_W) - -#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) -#define BP_LT_MDIA_E LT(MDIA, BP_E) -#define BP_LT_KP_U LT(KEYPAD, BP_U) - -#define BP_LT_SYMB_S LT(SYMB_ON_BEPO, BP_S) -#define BP_LT_MDIA_R LT(MDIA, BP_R) -#define BP_LT_KP_N LT(KEYPAD, BP_N) - -#define BP_SFT_T_A SFT_T(BP_A) -#define BP_SFT_T_S SFT_T(BP_S) -#define BP_SFT_T_E SFT_T(BP_E) -#define BP_SFT_T_M SFT_T(BP_M) - -#define BP_SFT_T_ECRC SFT_T(BP_ECRC) -#define BP_SFT_T_CCED SFT_T(BP_CCED) -#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) - -//QWERTY -#define KC_SFT_T_SCLN SFT_T(KC_SCLN) - -#define KC_LT_MDIA_D LT(MDIA, KC_D) -#define KC_LT_MDIA_K LT(MDIA, KC_K) -#define KC_LT_SYMB_F LT(SYMB, KC_F) -#define KC_LT_SYMB_J LT(SYMB, KC_J) - -//COLEMAK -#define KC_SFT_T_O SFT_T(KC_O) -#define KC_LT_MDIA_S LT(MDIA, KC_S) -#define KC_LT_SYMB_T LT(SYMB, KC_T) - -#define KC_LT_MDIA_E LT(MDIA, KC_E) -#define KC_LT_SYMB_N LT(SYMB, KC_N) - -//WORKMAN -#define KC_SFT_T_I SFT_T(KC_I) -#define KC_LT_MDIA_H LT(MDIA, KC_H) - -//NORMAN -// For keys on the homerow. Hold for shift, keypad,mouse,and smbol layers -#define KC_SFT_T_U SFT_T(KC_U) -#define KC_LT_MDIA_I LT(MDIA, KC_I) - -// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). -#define MK_CUT LSFT(KC_DEL) // shift + delete -#define MK_COPY LCTL(KC_INS) // ctrl + insert -#define MK_PASTE LSFT(KC_INS) // shift + insert - -#define ___ KC_TRNS -#define XXX KC_NO - -// Blocking keys -#define ___X___ XXX -#define ___X2___ XXX, XXX -#define ___X3___ ___X2___, XXX -#define ___X5___ ___X3___, XXX, XXX -#define ___X15___ ___X5___, ___X5___, ___X5___ - -// Transparent keys -#define ___2___ ___, ___ -#define ___3___ ___2___, ___ -#define ___4___ ___3___, ___ -#define ___5___ ___4___, ___ -#define ___6___ ___5___, ___ -#define ___14___ ___5___, ___4___, ___5___ -#define ___15___ ___5___, ___5___, ___5___ - -int on_qwerty(void); -int get_xmonad_layer(void); -int cur_dance (qk_tap_dance_state_t *state); - -//for the x tap dance. Put it here so it can be used in any keymap -void x_finished (qk_tap_dance_state_t *state, void *user_data); -void x_reset (qk_tap_dance_state_t *state, void *user_data); - - -// Blocks for each of the four major keyboard layouts -// Organized so we can quickly adapt and modify all of them -// at once, rather than for each keyboard, one at a time. -// And this allows for much cleaner blocks in the keymaps. -// For instance Tap/Hold for Control on all of the layouts - -// NOTE: These are all the same length. If you do a search/replace -// then you need to add/remove underscores to keep the -// lengths consistent. - -// Since our quirky block definitions are basically a list of comma separated -// arguments, we need a wrapper in order for these definitions to be -// expanded before being used as arguments to the LAYOUT_xxx macro. -#if (!defined(LAYOUT) && defined(KEYMAP)) -#define LAYOUT KEYMAP -#endif - -#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) -#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__) -#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) -#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) - -#define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) -#define LAYOUT_ortho_5x14_wrapper(...) LAYOUT_ortho_5x14(__VA_ARGS__) - -/********************************************************************/ -/** The Core rows of each given layout. **/ -/********************************************************************/ -//Dvorak on a qwerty software layer in the OS -#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y -#define ___DVORAK_L2___ KC_SFT_T_A, KC_LT_KP_O, KC_LT_MDIA_E, KC_LT_SYMB_U, KC_I -#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X - -#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L -#define ___DVORAK_R2___ KC_D, KC_LT_SYMB_H, KC_LT_MDIA_T, KC_LT_KP_N, KC_SFT_T_S -#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z - -// Qwerty based layers that I don't really use. -#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T -#define ___QWERTY_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_D, KC_LT_SYMB_F, KC_G -#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P -#define ___QWERTY_R2___ KC_H, KC_LT_SYMB_J, KC_LT_MDIA_K, KC_L, KC_SFT_T_SCLN -#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH - -// COLEMAK -#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G -#define ___COLEMAK_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_D -#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_R2___ KC_H, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O -#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH - -// COLEMAK-DH -#define ___COLEMAK_MOD_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B -#define ___COLEMAK_MOD_DH_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_G -#define ___COLEMAK_MOD_DH_L3___ KC_Z, KC_X, KC_C, KC_D, KC_V - -#define ___COLEMAK_MOD_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_MOD_DH_R2___ KC_M, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O -#define ___COLEMAK_MOD_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH - -// WORKMAN -#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B -#define ___WORKMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_H, KC_LT_SYMB_T, KC_G -#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V - -#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN -#define ___WORKMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_O, KC_SFT_T_I -#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH - -// NORMAN -#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K -#define ___NORMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_E, KC_LT_SYMB_T, KC_G -#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN -#define ___NORMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_I, KC_O, KC_SFT_T_U -#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH - -// BEPO MAPS -// Dvorak on fr-bepo software layer in the OS. -// for dvorak and all the other qwerty like keyboards on bepo -#define ___DVORAK_FR_L1___ DB_QUOT, DB_COMM, DB_DOT, BP_P, BP_Y -#define ___DVORAK_FR_L2___ BP_SFT_T_A, BP_LT_KP_O, BP_LT_MDIA_E, BP_LT_SYMB_U, BP_I -#define ___DVORAK_FR_L3___ DB_SCOLON, BP_Q, BP_J, BP_K, BP_X - -#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L -#define ___DVORAK_FR_R2___ BP_D, BP_LT_SYMB_H, BP_LT_MDIA_T, BP_LT_KP_N, BP_SFT_T_S -#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z - - -// Bepo on fr-bepo software layer -// for bepo on bepo -/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ -#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN -/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ -#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ - -#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV -#define ___BEPO_FR_L2___ BP_SFT_T_A, BP_LT_KP_U, BP_LT_SYMB_I, BP_LT_MDIA_E, BP_COMM -#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K - -#define ___BEPO_FR_R1___ /* BP_DCRC,*/ BP_V, BP_D, BP_L, BP_J, BP_Z -#define ___BEPO_FR_R2___ /* BP_C, */ BP_T, BP_LT_SYMB_S, BP_LT_MDIA_R, BP_LT_KP_N, BP_SFT_T_M //BP_CCED -#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F //BP_SFT_T_W - -/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ -/* KC_TAB, BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV, KC_BSPC, */ -/* KC_LSFT, BP_A, BP_U, BP_I, BP_E, BP_COMM, */ -/* KC_LCTRL, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_ENT, */ -/* ESC_FN, BP_ECRC, KC_LGUI, KC_LALT, SPC_RALT, */ -/* TT(SWAP), KC_MNXT, */ -/* KC_MPLY, */ -/* TT(FN), TT(NUMS), KC_MPRV, */ - -/* /\* right hand *\/ */ -/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ -/* KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, */ -/* BP_C, BP_T, BP_S, BP_R, BP_N, M_RSFT, */ -/* KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, W_RCTL, */ - - -/******************************************************************/ -/* Middle Keysets for the XD75 */ -/******************************************************************/ -// For the middle keys of an xd75. It's got one more column in the middle than -// the ergodox, or the viterbi. And the Ergodox is missing a key in column 7 -// counting from either end. Which is the first and 3rd columns of these sets. - -// it's all an experient. I'm not sure what make sense here. -// stealing what I can from the ergodox layout. -/* The XD75 has 3 keys inbetween the usual left and right hand */ -#define ___MIDDLE_T___ OSL(LAYERS), LCTL(KC_A), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE_1___ LCTL(KC_C), LCTL(KC_X), LCTL(KC_V) -#define ___MIDDLE_2___ TO(SYMB), TO(_RGB), TO(KEYPAD) -#define ___MIDDLE_3___ OSL(SYMB), TO(MDIA), OSL(KEYPAD) -#define ___MIDDLE_4___ CTL_BSPC, ALT_DEL, XMONAD_ESC, ALT_ENT, CTL_SPC - -// The same, for BEPO -#define ___MIDDLE_T_BP___ OSL(LAYERS), LCTL(BP_A), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_X), LCTL(BP_V) -#define ___MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) -#define ___MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) - -// The Viterbi only has 2 keys in the middle. -#define ___MIDDLE2_T___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE2_1___ LCTL(KC_C), LCTL(KC_V) -#define ___MIDDLE2_2___ TO(SYMB), TO(KEYPAD) -#define ___MIDDLE2_3___ OSL(SYMB), OSL(KEYPAD) - -// becomes the upper thumbs, the real 4th row if we throw away -// the number row at the top -#define ___MIDDLE2_4___ XXX, HOME_END, KC_PGDN, XXX -// basically the thumb keys like on the ergodox. -#define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC, KC_PGDN, ALT_ENT, CTL_SPC - -// The same, for BEPO -#define ___MIDDLE2_T_BP___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE2_1_BP___ LCTL(BP_C), LCTL(BP_V) -#define ___MIDDLE2_2_BP___ TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) -#define ___MIDDLE2_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO) - -#define ___MIDDLE2_4_BP___ XXX, HOME_END, KC_PGUP, XXX - - -/********************************************************************/ -/** The bottom row and thumbs as needed. **/ -/********************************************************************/ -// the bottom rows for keyboards on bepo. -// bepo on bepo - not enough space to go around.... -#define ___ERGODOX_BOTTOM_LEFT_BP___ LCTL(BP_C), BP_ECRC, LCTL(BP_V), KC_LEFT, KC_RIGHT -#define ___ERGODOX_BOTTOM_RIGHT_BP___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC - -// for dvorak on bepo -#define ___ERGODOX_BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_C), LCTL(BP_V), KC_LEFT, KC_RIGHT -#define ___ERGODOX_BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC - -// Since we have 7 default layouts (QWERTY, DVORAK, COLEMAK and WORKMAN, NORMAN, -// 2 of them based on a Bepo software keyboard, --- DVORAK_ON_BEPO and BEPO), -// this allows us to quickly modify the bottom row for all of the layouts -// so we don't have to alter it 4 times and hope that we haven't missed -// anything -#define ___ERGODOX_BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT -#define ___ERGODOX_BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) - -#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT___ -#define ___XD75_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ - -#define ___VITERBI_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT___ -#define ___VITERBI_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ -#define ___VITERBI_BOTTOM_BP___ ___ERGODOX_BOTTOM_LEFT_BP___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_BP___ -#define ___VITERBI_THUMBS_BOTTOM___ ___4___, ___MIDDLE_THUMBS___, ___4___ - - -#define ___ERGODOX_THUMB_LEFT___ \ - OS_RALT, TG(MDIA), \ - HOME_END, \ - CTL_BSPC, ALT_DEL, XMONAD_ESC - -#define ___ERGODOX_THUMB_RIGHT___ \ - TG(SYMB), OS_RALT, \ - KC_PGUP, \ - KC_PGDN, ALT_ENT, CTL_SPC - -#define ___ERGODOX_THUMB_RIGHT_BP___ \ - TG(SYMB_ON_BEPO), OS_RALT, \ - KC_PGUP, \ - KC_PGDN, ALT_ENT, CTL_SPC - -#define ___ERGODOX_TRANS_THUMBS___ ___6___ -#define ___ERGODOX_TRANS_BOTTOM___ ___5___ -#define ___ERGODOX_TRANS_6_ROW___ ___6___ -#define ___TRANS_6_COL___ ___6___ - -/*******************************************************************/ -/** For the top rows. Numbers for most things, symbols for Bepo. **/ -/*******************************************************************/ - -// for everything on qwerty. -#define ___NUMBER_L___ KC_1, KC_2, KC_3, KC_4, KC_5 -#define ___NUMBER_R___ KC_6, KC_7, KC_8, KC_9, KC_0 - -// function key rows, works for everyone. -#define ___FUNC_L___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 -#define ___FUNC_R___ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 - -#define ___FUNC_1_6___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 -#define ___FUNC_7_12___ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 - -// a top symbol row if someone wants it. -#define ___SYMB_L___ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC -#define ___SYMB_R___ KC_CIRC, KC_AMPR, KC_AST, KC_LPRN, KC_RPRN - -// For numbers on bepo. Bepo has numbers on shifted keys, the -// reverse of most keyboard layouts. -#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 -#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 - - -/*******************************************************************/ -/* Rows for the auxillary layers. */ -/* the KC_P? codes don't work for me. I don't use those shifted */ -/* values anyway. */ -/*******************************************************************/ - -// Keypads -#define ___KEYPAD_1___ KC_7, KC_8, KC_9, KC_PSLS -#define ___KEYPAD_2___ KC_4, KC_5, KC_6, KC_PAST -#define ___KEYPAD_3___ KC_1, KC_2, KC_3, KC_PMNS -#define ___KEYPAD_4___ KC_0, KC_DOT, KC_PEQL, KC_PPLS - -// Keypad from the default keymap.c of the xd75 -#define ___KEYPAD_1_ALT___ KC_P7, KC_P8, KC_P9, KC_MINS -#define ___KEYPAD_2_ALT___ KC_P4, KC_P5, KC_P6, KC_PLUS -#define ___KEYPAD_3_ALT___ KC_P1, KC_P2, KC_P3, KC_PENT -#define ___KEYPAD_4_ALT___ KC_P0, KC_DOT, KC_PENT, KC_PENT - -// For Bepo -#define ___KEYPAD_1_BP___ DB_7, DB_8, DB_9, BP_SLASH -#define ___KEYPAD_2_BP___ DB_4, DB_5, DB_6, BP_ASTR -#define ___KEYPAD_3_BP___ DB_1, DB_2, DB_3, DB_MINUS -#define ___KEYPAD_4_BP___ DB_0, DB_DOT, DB_EQL, BP_PLUS - - - -// SYMBOLS - -// An arrangement for the left hand with a focus on the ()[]{}s. -#define ___SYMBOLS_1___ KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE -#define ___SYMBOLS_2___ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV -#define ___SYMBOLS_3___ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD - -// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. -#define ___SYMBOLS6_1___ KC_GRV, KC_LT, KC_GT, KC_LCBR, KC_RCBR, KC_HASH -#define ___SYMBOLS6_2___ KC_AMPR, KC_AT, KC_ASTR, KC_LPRN, KC_RPRN, KC_PERC -#define ___SYMBOLS6_3___ KC_DLR, KC_DQT, KC_QUOT, KC_LBRC, KC_RBRC, KC_COLON -#define ___SYMBOLS6_4___ ___2___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN - -// A symbol pad. Basically the same layout as a number pad with the symbols -// instead of the numbers with some extras around it, in familiar places for the -// right hand. -#define ___SYMPAD_1___ KC_GRV, KC_AMPR, KC_ASTR, KC_LCBR, KC_PLUS, KC_PIPE -#define ___SYMPAD_2___ KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_ASTR, KC_GRV -#define ___SYMPAD_3___ ___, KC_EXLM, KC_AT, KC_HASH, KC_MINUS, KC_SLASH -#define ___SYMPAD_4___ ___, KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH - -// Function pad. Same idea as above, but for function keys. -#define ___FUNCPAD_T___ KC_F10, KC_F11, KC_F12 -#define ___FUNCPAD_1___ KC_F7, KC_F8, KC_F9 -#define ___FUNCPAD_2___ KC_F4, KC_F5, KC_F6 -#define ___FUNCPAD_3___ KC_F1, KC_F2, KC_F3 - - -//--- all over again for BEPO - -// SYMBOLS FOR BEPO -// The top row. Bepo has symbols not numbers. Numbers are the shifted values. -#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN -/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ -#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ - -// An arrangement for the left hand with a focus on the ()[]{}s. -#define ___SYMBOLS_1_BP___ KC_EXLM, BP_AT, DB_LCBR, DB_RCBR, DB_PIPE -#define ___SYMBOLS_2_BP___ DB_HASH, BP_DLR, DB_LPRN, DB_RPRN, DB_GRV -#define ___SYMBOLS_3_BP___ BP_PERC, DB_CIRC, DB_LBRC, DB_RBRC, DB_TILD - -// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. -#define ___SYMBOLS6_1_BP___ DB_GRV, DB_LESS, DB_GRTR, DB_LCBR, DB_RCBR, DB_HASH -#define ___SYMBOLS6_2_BP___ KC_AMPR, BP_AT, BP_ASTR, DB_LPRN, DB_RPRN, BP_PERC -#define ___SYMBOLS6_3_BP___ BP_DLR, BP_DQOT, DB_QUOT, DB_LBRC, DB_RBRC, KC_COLON - -#define ___SYMBOLS6_4_BP___ ___2___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON - -// A symbol pad. Basically the same layout as a number pad with the symbols -// instead of the numbers with some extras around it, in familiar places for the -// right hand. -#define ___SYMPAD_1_BP___ DB_GRV, BP_AMPR, BP_ASTR, DB_LCBR, BP_PLUS, DB_PIPE -#define ___SYMPAD_2_BP___ DB_TILD, BP_DLR, BP_PERC, DB_CIRC, BP_ASTR, DB_GRV -#define ___SYMPAD_3_BP___ ___, BP_EXLM, BP_AT, DB_HASH, BP_MINS, BP_SLSH -#define ___SYMPAD_4_BP___ ___, DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH - - - -// MOUSE, ARROW and MEDIA KEY SETS - -#define ___MOUSE_LDUR___ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R -#define ___MWHEEL_LDUR___ KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R -#define ___MOUSE_BTNS_R___ KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5 -#define ___MOUSE_BTNS_L___ KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1 -#define ___MOUSE_ACCL_012___ KC_ACL0, KC_ACL1, KC_ACL2 -#define ___MACCL___ ___MOUSE_ACCL_012___ - -#define ___PRV_PLAY_NXT_STOP KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP -#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU - -#define ___MUTE_PRV_PLAY_NXT_STOP___ KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP -#define ___MUTE_PLAY_STOP___ KC_MUTE, KC_MPLY, KC_MSTP -#define ___VI_ARROWS___ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT - -// RGB FUNCTION Keysets -// RGB row for the _FN layer from the redo of the default keymap.c -#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD -#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD -#define ___RGB_MODE_PRV_NXT___ RGB_RMOD, RGB_MOD -#define ___RGB_TOGGLE___ RGB_TOG -#define ___RGB_P_B_R_SW_SN___ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN -#define ___RGB_KXGT___ RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T - -// Print screen, screen lock, pause -#define ___PSCR_SLCK_PAUS___ KC_PSCR, KC_SLCK, KC_PAUS - - -// LAYER Keysets. Changing the Default base layer or the transient layers. -#define ___LAYERS_B1_2___ DF(BEPO), DF(DVORAK_ON_BEPO) -#define ___LAYERS_B2_2___ DF(COLEMAK), DF(DVORAK) -#define ___LAYERS_B3_3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) -#define ___LAYERS_B4_3___ ___X3___ - -// transient layers. -#define ___LAYERS_T_BP_3___ TO(MDIA), TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) -#define ___LAYERS_T_3___ TO(MDIA), TO(SYMB), TO(KEYPAD) -#define ___LAYERS_T_DEF___ TO(_RGB), ___X2___ - - #endif From 51ef03e96b9f19e8a9c2705b2fa29ec333bee1aa Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sat, 11 Apr 2020 07:37:52 +0200 Subject: [PATCH 07/23] new xd75 keymap --- .../ergodox_ez/keymaps}/ericgebhart/rules.mk | 10 +- keyboards/xd75/keymaps/ericgebhart/config.h | 28 + keyboards/xd75/keymaps/ericgebhart/keymap.c | 242 +++++++++ keyboards/xd75/keymaps/ericgebhart/readme.md | 1 + keyboards/xd75/keymaps/ericgebhart/rules.mk | 32 ++ keyboards/xd75/keymaps/ericgebhart/rules2.mk | 18 + users/ericgebhart/ericgebhart.c | 12 +- users/ericgebhart/ericgebhart.h | 512 +++++++++++++----- 8 files changed, 707 insertions(+), 148 deletions(-) rename {users => keyboards/ergodox_ez/keymaps}/ericgebhart/rules.mk (56%) create mode 100644 keyboards/xd75/keymaps/ericgebhart/config.h create mode 100644 keyboards/xd75/keymaps/ericgebhart/keymap.c create mode 100644 keyboards/xd75/keymaps/ericgebhart/readme.md create mode 100644 keyboards/xd75/keymaps/ericgebhart/rules.mk create mode 100755 keyboards/xd75/keymaps/ericgebhart/rules2.mk diff --git a/users/ericgebhart/rules.mk b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk similarity index 56% rename from users/ericgebhart/rules.mk rename to keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk index 2572d21118f6..373760c77bd0 100755 --- a/users/ericgebhart/rules.mk +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk @@ -3,16 +3,16 @@ SRC += ericgebhart.c MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key TAP_DANCE_ENABLE = yes # Enable the tap dance feature. -CONSOLE_ENABLE = yes # Console for debug +CONSOLE_ENABLE = no # Console for debug BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration UNICODE_ENABLE = no SLEEP_LED_ENABLE = no API_SYSEX_ENABLE = no -RGBLIGHT_ENABLE = no +RGBLIGHT_ENABLE = yes RGBLIGHT_ANIMATION = no diff --git a/keyboards/xd75/keymaps/ericgebhart/config.h b/keyboards/xd75/keymaps/ericgebhart/config.h new file mode 100644 index 000000000000..22a2c75ddfa6 --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/config.h @@ -0,0 +1,28 @@ +/* Copyright 2017 Benjamin Kesselring + * + * 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 . + */ + +#pragma once + +#undef RGBLED_NUM +#define RGBLED_NUM 6 +#define RGBLIGHT_LAYERS + +#undef RGBLIGHT_ANIMATIONS +//#define RGBLIGHT_HUE_STEP 8 +//#define RGBLIGHT_SAT_STEP 8 + + +// place overrides here diff --git a/keyboards/xd75/keymaps/ericgebhart/keymap.c b/keyboards/xd75/keymaps/ericgebhart/keymap.c new file mode 100644 index 000000000000..efc809bba79e --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/keymap.c @@ -0,0 +1,242 @@ +/* + 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 . +*/ + +#include "keymap_bepo.h" +#include "ericgebhart.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [DVORAK] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___DVORAK_L1___, ___MIDDLE_1___, ___DVORAK_R1___, KC_SLASH, + TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE_2___, ___DVORAK_R2___, KC_MINUS, + KC_LSFT, ___DVORAK_L3___, ___MIDDLE_3___, ___DVORAK_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [QWERTY] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___QWERTY_L1___, ___MIDDLE_1___, ___QWERTY_R1___, KC_SLASH, + TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE_2___, ___QWERTY_R2___, KC_MINUS, + KC_LSFT, ___QWERTY_L3___, ___MIDDLE_3___, ___QWERTY_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [COLEMAK] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___COLEMAK_L1___, ___MIDDLE_1___, ___COLEMAK_R1___, KC_SLASH, + TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE_2___, ___COLEMAK_R2___, KC_MINUS, + KC_LSFT, ___COLEMAK_L3___, ___MIDDLE_3___, ___COLEMAK_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [WORKMAN] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___WORKMAN_L1___, ___MIDDLE_1___, ___WORKMAN_R1___, KC_SLASH, + TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE_2___, ___WORKMAN_R2___, KC_MINUS, + KC_LSFT, ___WORKMAN_L3___, ___MIDDLE_3___, ___WORKMAN_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [NORMAN] = LAYOUT_ortho_5x15_wrapper( + KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, + KC_LOCK, ___NORMAN_L1___, ___MIDDLE_1___, ___NORMAN_R1___, KC_SLASH, + TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE_1___, ___NORMAN_R2___, KC_MINUS, + KC_LSFT, ___NORMAN_L3___, ___MIDDLE_1___, ___NORMAN_R3___, KC_RSFT, + ___XD75_BOTTOM___ + ), + + [DVORAK_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( + DB_GRV, ___NUMBER_BEPO_L___, ___MIDDLE_T_BP___, ___NUMBER_BEPO_R___, DB_EQL, + KC_LOCK, ___DVORAK_FR_L1___, ___MIDDLE_1_BP___, ___DVORAK_FR_R1___, DB_SLASH, + TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, + KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, + ___XD75_BOTTOM_FR___ + ), + + [XMONAD] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___, ___DVORAK_L1___, ___3___, ___DVORAK_R1___, ___, + ___, ___DVORAK_L2___, ___3___, ___DVORAK_R2___, ___, + ___, ___DVORAK_L3___, ___3___, ___DVORAK_R3___, ___, + ___15___ + ), + + [XMONAD_FR] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___, ___DVORAK_FR_L1___, ___3___, ___DVORAK_FR_R1___, ___, + ___, ___DVORAK_FR_L2___, ___3___, ___DVORAK_FR_R2___, ___, + ___, ___DVORAK_FR_L3___, ___3___, ___DVORAK_FR_R3___, ___, + ___15___ + ), + + [BEPO] = LAYOUT_ortho_5x15_wrapper( + BP_DLR, ___SYMBOL_BEPO_L___, ___MIDDLE_T_BP___, ___SYMBOL_BEPO_R___, BP_EQL, + KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE_1_BP___, ___BEPO_FR_R1___, BP_W, + TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE_2_BP___, ___BEPO_FR_R2___, BP_CCED, + BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, + ___XD75_BOTTOM_FR___ + ), + + // SYMBOLS + [SYMB] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___SYMBOLS6_1___, ___3___, ___SYMPAD_1___, + ___SYMBOLS6_2___, ___3___, ___SYMPAD_2___, + ___SYMBOLS6_3___, ___3___, ___SYMPAD_3___, + ___SYMBOLS6_4___, ___3___, ___SYMPAD_4___ + ), + + [KEYPAD] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1___, ___, + ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2___, ___, + ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4___, ___ + ), + + [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1_BP___, ___, + ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2_BP___, ___, + ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3_BP___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4_BP___, ___ + ), + + [SYMB_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___SYMBOLS6_1_BP___, ___3___, ___SYMPAD_1_BP___, + ___SYMBOLS6_2_BP___, ___3___, ___SYMPAD_2_BP___, + ___SYMBOLS6_3_BP___, ___3___, ___SYMPAD_3_BP___, + ___SYMBOLS6_4_BP___, ___3___, ___SYMPAD_4_BP___ + ), + + // MEDIA AND MOUSE + [MDIA] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___MOUSE_BTNS_L___, ___4___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, + ___, ___MOUSE_LDUR___, ___4___, KC_VOLD, ___VI_ARROWS___, ___, + ___, ___MWHEEL_LDUR___, ___4___, KC_PGUP, ___MOUSE_BTNS_R___, + ___2___, ___MACCL___, ___4___, KC_PGDN, ___5___ + ), + + [LAYERS] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___X3___, ___LAYERS_B1_2___, ___5___, ___LAYERS_T_BP_3___, ___X2___, + ___X3___, ___LAYERS_B2_2___, ___5___, ___LAYERS_T_3___, ___X2___, + ___X2___, ___LAYERS_B3_3___, ___5___, ___LAYERS_T_DEF___, ___X2___, + ___5___, ___5___, ___5___ + ), + + [_RGB] = LAYOUT_ortho_5x15_wrapper( + ___FUNC_1_6___, ___3___, ___FUNC_7_12___, + ___, ___RGB_HUE_SAT_INT_UP___, ___5___, ___5___, + ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___4___, ___RGB_P_B_R_SW_SN___, + ___5___, ___5___, ___RGB_KXGT___, ___, + ___15___ + ), +}; + + +/********************************************************************************/ +/* Using layers to do RGB underlighting */ +/********************************************************************************/ + +const rgblight_segment_t PROGMEM on_bepo[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 2, HSV_AZURE} + ); + +const rgblight_segment_t PROGMEM bepo[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 2, HSV_MAGENTA} + ); + +const rgblight_segment_t PROGMEM dvorak[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 2, HSV_AZURE} + ); + +const rgblight_segment_t PROGMEM media[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_GREEN} + ); + +const rgblight_segment_t PROGMEM symbol[] = RGBLIGHT_LAYER_SEGMENTS( + {4, 2, HSV_GOLD} + ); + +const rgblight_segment_t PROGMEM keypad[] = RGBLIGHT_LAYER_SEGMENTS( + {4, 2, HSV_BLUE} + ); + +const rgblight_segment_t PROGMEM layers[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_RED} + ); + +const rgblight_segment_t PROGMEM rgb[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_ORANGE} + ); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(on_bepo, bepo, dvorak, media, symbol, + keypad, layers, rgb); + +void keyboard_post_init_user(void) { + rgblight_sethsv_noeeprom(HSV_PURPLE); + rgblight_layers = rgb_layers; +} + +layer_state_t layer_state_set_user(layer_state_t state) { + // rgblight_set_layer_state(0, !on_qwerty()); + rgblight_set_layer_state(0, layer_state_cmp(state, DVORAK)); + + rgblight_set_layer_state(1, layer_state_cmp(state, BEPO)); + rgblight_set_layer_state(2, layer_state_cmp(state, DVORAK)); + //|| layer_state_cmp(state, DVORAK_ON_BEPO))); + rgblight_set_layer_state(3, layer_state_cmp(state, MDIA)); + rgblight_set_layer_state(4, layer_state_cmp(state, SYMB) ); + + //(layer_state_cmp(state, SYMB) || (layer_state_cmp(state, SYMB_ON_BEPO)))); + rgblight_set_layer_state(5, layer_state_cmp(state, KEYPAD) ); + ///(layer_state_cmp(state, KEYPAD) || (layer_state_cmp(state, KEYPAD_ON_BEPO)))); + rgblight_set_layer_state(6, layer_state_cmp(state, LAYERS)); + rgblight_set_layer_state(7, layer_state_cmp(state, _RGB)); + return state; +} + +/* void suspend_power_down_user(void) { */ +/* rgblight_disable(); */ +/* } */ + +/* void suspend_wakeup_init_user(void) { */ +/* rgblight_enable(); */ +/* } */ + +/* bool is_shift_pressed = false; */ + +/* bool led_update_user(led_t led_state) { */ +/* rgblight_set_layer_state(2, is_shift_pressed != led_state.caps_lock); */ +/* return true; */ +/* } */ + +/* bool process_record_user(uint16_t keycode, keyrecord_t* record) { */ +/* switch (keycode) { */ +/* case KC_LSFT: */ +/* case KC_RSFT: */ +/* is_shift_pressed = record->event.pressed; */ +/* rgblight_set_layer_state(2, is_shift_pressed != host_keyboard_led_state().caps_lock); */ +/* default: */ +/* return true; */ +/* } */ +/* } */ diff --git a/keyboards/xd75/keymaps/ericgebhart/readme.md b/keyboards/xd75/keymaps/ericgebhart/readme.md new file mode 100644 index 000000000000..a1c0236ed9cd --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/readme.md @@ -0,0 +1 @@ +# The default keymap for xd75, with led controls \ No newline at end of file diff --git a/keyboards/xd75/keymaps/ericgebhart/rules.mk b/keyboards/xd75/keymaps/ericgebhart/rules.mk new file mode 100644 index 000000000000..2fed81b89609 --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/rules.mk @@ -0,0 +1,32 @@ +USER_NAME := ericgebhart +SRC += ericgebhart.c +# 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 3 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 . + +RGBLIGHT_ENABLE = yes +RGBLIGHT_ANIMATION = yes +# BACKLIGHT_ENABLE = yes + +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. +CONSOLE_ENABLE = no # Console for debug + +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +UNICODE_ENABLE = no +SLEEP_LED_ENABLE = no +API_SYSEX_ENABLE = no diff --git a/keyboards/xd75/keymaps/ericgebhart/rules2.mk b/keyboards/xd75/keymaps/ericgebhart/rules2.mk new file mode 100755 index 000000000000..373760c77bd0 --- /dev/null +++ b/keyboards/xd75/keymaps/ericgebhart/rules2.mk @@ -0,0 +1,18 @@ +USER_NAME := ericgebhart +SRC += ericgebhart.c + +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. +CONSOLE_ENABLE = no # Console for debug + +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +UNICODE_ENABLE = no +SLEEP_LED_ENABLE = no +API_SYSEX_ENABLE = no +RGBLIGHT_ENABLE = yes +RGBLIGHT_ANIMATION = no diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c index 69aa450e0a91..e59ea93d3ea6 100644 --- a/users/ericgebhart/ericgebhart.c +++ b/users/ericgebhart/ericgebhart.c @@ -14,6 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + #include "ericgebhart.h" #include "quantum.h" @@ -122,8 +123,6 @@ const uint8_t key_translations[][2][2] = { [GR(DB_CIRC)] = {{BP_AT, MOD_BIT(KC_RALT)}, {BP_AT, MOD_BIT(KC_RALT)}}, [GR(DB_LESS)] = {{BP_LGIL, MOD_BIT(KC_RALT)}, {BP_LGIL, MOD_BIT(KC_RALT)}}, [GR(DB_GRTR)] = {{BP_RGIL, MOD_BIT(KC_RALT)}, {BP_RGIL, MOD_BIT(KC_RALT)}}, - - }; @@ -390,13 +389,20 @@ void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) { if(on_qwerty()) layer_invert(SYMB); else - layer_invert(SYMB_ON_BEPO); + layer_invert(SYMB_ON_BEPO); break; case 2: layer_invert(MDIA); break; case 3: layer_invert(LAYERS); + break; + case 4: + if(on_qwerty()) + layer_invert(KEYPAD); + else + layer_invert(KEYPAD_ON_BEPO); + break; default: break; } diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index 6eb11ddfc078..fa381fd1fbe6 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -22,6 +22,7 @@ #include "quantum.h" #include "process_keycode/process_tap_dance.h" +//#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ void tap(uint16_t keycode); bool process_record_secrets(uint16_t keycode, keyrecord_t *record); @@ -39,13 +40,6 @@ typedef union { }; } userspace_config_t; -#define ___ KC_TRNS -#define XXX KC_NO - -// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). -#define MK_CUT LSFT(KC_DEL) // shift + delete -#define MK_COPY LCTL(KC_INS) // ctrl + insert -#define MK_PASTE LSFT(KC_INS) // shift + insert #define DVORAK 0 // dvorak layout (default) @@ -63,6 +57,9 @@ typedef union { #define LAYERS 11 // layers and right mousekeys. #define XMONAD 12 // xmonad ie. dvorak. #define XMONAD_FR 13 // xmonad ie. dvorak. +#define KEYPAD 14 // number and Fkey pads +#define KEYPAD_ON_BEPO 15 // number and Fkey pads. +#define _RGB 16 // RGB stuff. // for the creation of dvorak keys on an Bepo keyboard at the OS layer. @@ -150,26 +147,8 @@ enum userspace_custom_keycodes { #define GUI_ESC GUI_T(KC_ESC) // Gui or escape #define ALGR_SYMB ALGR_T(TG(SYMB)) // Alt gre or toggle symbol layer -#define KC_SFT_T_U SFT_T(KC_U) -#define KC_SFT_T_H SFT_T(KC_H) -#define KC_LT_SYMB_I LT(SYMB, KC_I) -#define KC_LT_SYMB_D LT(SYMB, KC_D) - -// for dvorak on bepo -#define BP_SFT_T_U SFT_T(BP_U) -#define BP_SFT_T_H SFT_T(BP_H) -#define BP_LT_SYMB_D LT(SYMB, BP_D) -// for bepo on bepo -#define BP_SFT_T_T SFT_T(BP_T) -#define BP_LT_SYMB_C LT(SYMB_ON_BEPO, BP_C) -#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) -#define BP_SFT_T_E SFT_T(BP_E) -#define BP_SFT_T_ECRC SFT_T(BP_ECRC) -#define BP_SFT_T_CCED SFT_T(BP_CCED) -#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) - // OSM keycodes, to keep things clean and easy to change #define KC_MLSF OSM(MOD_LSFT) #define KC_MRSF OSM(MOD_RSFT) @@ -188,38 +167,38 @@ enum userspace_custom_keycodes { //// TAP DANCE -typedef struct { - bool is_press_action; + typedef struct { + bool is_press_action; int state; -} tdtap; + } tdtap; enum { - SINGLE_TAP = 1, - SINGLE_HOLD = 2, - DOUBLE_TAP = 3, - DOUBLE_HOLD = 4, - DOUBLE_SINGLE_TAP = 5, //send two single taps - TRIPLE_TAP = 6, - TRIPLE_HOLD = 7 - }; + SINGLE_TAP = 1, + SINGLE_HOLD = 2, + DOUBLE_TAP = 3, + DOUBLE_HOLD = 4, + DOUBLE_SINGLE_TAP = 5, //send two single taps + TRIPLE_TAP = 6, + TRIPLE_HOLD = 7 +}; - //Tap Dance Declarations - enum { - TD_ESC_CAPS = 0, - TD_TAB_BKTAB = 1, - TD_MDIA_SYMB = 2, - TD_HOME_END = 3, - TD_XMONAD_ESC = 4, - TD_DEF_LAYER_SW = 5, - TD_DEF_OS_LAYER_SW = 6, - TD_MOUSE_BTNS = 7, - TD_DVORAK_BEPO = 8 - }; +//Tap Dance Declarations +enum { + TD_ESC_CAPS = 0, + TD_TAB_BKTAB = 1, + TD_MDIA_SYMB = 2, + TD_HOME_END = 3, + TD_XMONAD_ESC = 4, + TD_DEF_LAYER_SW = 5, + TD_DEF_OS_LAYER_SW = 6, + TD_MOUSE_BTNS = 7, + TD_DVORAK_BEPO = 8 +}; // Tap dance #define TAB_BKTAB TD(TD_TAB_BKTAB) // Tab or backtab tapdance. -#define MDIA_SYMB TD(TD_MDIA_SYMB) // MDIA or Symb layer tapdance toggle. +#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB) // MDIA, symb, keypad, layouts layer tapdance toggle. #define DEF_LAYER_SW TD(TD_DEF_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer #define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer #define HOME_END TD(TD_HOME_END) // home or end tapdance. @@ -227,6 +206,108 @@ enum { #define DVORAK_ET_BEPO TD(TD_DVORAK_BEPO) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 #define TDMOUSE_BTNS TD(TD_MOUSE_BTNS) // hmmm. 1-5 +// HOME ROW LAYER TOGGLE (LT) and Shift. +// both sides of the home row have "shift, ___, media , symb, ___" and "___, symb, media, ___, shift". +// so pinky fingers are shift when held and the index and second fingers are symbol and +// media layers when held. + +// Dvorak +// shift and layer switch on hold on the home row. +#define KC_SFT_T_A SFT_T(KC_A) +#define KC_SFT_T_S SFT_T(KC_S) + +#define KC_LT_SYMB_U LT(SYMB, KC_U) +#define KC_LT_SYMB_H LT(SYMB, KC_H) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_MDIA_T LT(MDIA, KC_T) + +// Need to add this to the others. +#define KC_LT_KP_N LT(KEYPAD, KC_N) +#define KC_LT_KP_O LT(KEYPAD, KC_O) + +// for dvorak on bepo +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) + +#define BP_LT_SYMB_U LT(SYMB, BP_U) +#define BP_LT_SYMB_H LT(MDIA, BP_H) + +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_MDIA_T LT(MDIA, BP_T) + +// Need to add this to the others. +#define BP_LT_KP_N LT(KEYPAD, BP_N) +#define BP_LT_KP_O LT(KEYPAD, BP_O) + +// for bepo on bepo +#define BP_SFT_T_T SFT_T(BP_T) +#define BP_SFT_T_W SFT_T(BP_W) + +#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_KP_U LT(KEYPAD, BP_U) + +#define BP_LT_SYMB_S LT(SYMB_ON_BEPO, BP_S) +#define BP_LT_MDIA_R LT(MDIA, BP_R) +#define BP_LT_KP_N LT(KEYPAD, BP_N) + +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) +#define BP_SFT_T_E SFT_T(BP_E) +#define BP_SFT_T_M SFT_T(BP_M) + +#define BP_SFT_T_ECRC SFT_T(BP_ECRC) +#define BP_SFT_T_CCED SFT_T(BP_CCED) +#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) + +//QWERTY +#define KC_SFT_T_SCLN SFT_T(KC_SCLN) + +#define KC_LT_MDIA_D LT(MDIA, KC_D) +#define KC_LT_MDIA_K LT(MDIA, KC_K) +#define KC_LT_SYMB_F LT(SYMB, KC_F) +#define KC_LT_SYMB_J LT(SYMB, KC_J) + +//COLEMAK +#define KC_SFT_T_O SFT_T(KC_O) +#define KC_LT_MDIA_S LT(MDIA, KC_S) +#define KC_LT_SYMB_T LT(SYMB, KC_T) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_SYMB_N LT(SYMB, KC_N) + +//WORKMAN +#define KC_SFT_T_I SFT_T(KC_I) +#define KC_LT_MDIA_H LT(MDIA, KC_H) + +//NORMAN +// For keys on the homerow. Hold for shift, keypad,mouse,and smbol layers +#define KC_SFT_T_U SFT_T(KC_U) +#define KC_LT_MDIA_I LT(MDIA, KC_I) + +// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). +#define MK_CUT LSFT(KC_DEL) // shift + delete +#define MK_COPY LCTL(KC_INS) // ctrl + insert +#define MK_PASTE LSFT(KC_INS) // shift + insert + +#define ___ KC_TRNS +#define XXX KC_NO + +// Blocking keys +#define ___X___ XXX +#define ___X2___ XXX, XXX +#define ___X3___ ___X2___, XXX +#define ___X5___ ___X3___, XXX, XXX +#define ___X15___ ___X5___, ___X5___, ___X5___ + +// Transparent keys +#define ___2___ ___, ___ +#define ___3___ ___2___, ___ +#define ___4___ ___3___, ___ +#define ___5___ ___4___, ___ +#define ___6___ ___5___, ___ +#define ___15___ ___5___, ___5___, ___5___ int on_qwerty(void); int get_xmonad_layer(void); @@ -259,46 +340,141 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) -//Dvorak on a qwerty software layer in the OS -#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y -#define ___DVORAK_L2___ KC_A, KC_O, KC_E, KC_SFT_T_U, KC_LT_SYMB_I -#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X +#define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) -#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L -#define ___DVORAK_R2___ KC_LT_SYMB_D, KC_SFT_T_H, KC_T, KC_N, KC_S -#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z +/********************************************************************/ +/** The Core rows of each given layout. **/ +/********************************************************************/ +//Dvorak on a qwerty software layer in the OS +#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y +#define ___DVORAK_L2___ KC_SFT_T_A, KC_LT_KP_O, KC_LT_MDIA_E, KC_LT_SYMB_U, KC_I +#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X +#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L +#define ___DVORAK_R2___ KC_D, KC_LT_SYMB_H, KC_LT_MDIA_T, KC_LT_KP_N, KC_SFT_T_S +#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z +// Qwerty based layers that I don't really use. +#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T +#define ___QWERTY_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_D, KC_LT_SYMB_F, KC_G +#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P +#define ___QWERTY_R2___ KC_H, KC_LT_SYMB_J, KC_LT_MDIA_K, KC_L, KC_SFT_T_SCLN +#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK +#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G +#define ___COLEMAK_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_D +#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_R2___ KC_H, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK-DH +#define ___COLEMAK_MOD_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B +#define ___COLEMAK_MOD_DH_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_G +#define ___COLEMAK_MOD_DH_L3___ KC_Z, KC_X, KC_C, KC_D, KC_V + +#define ___COLEMAK_MOD_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_MOD_DH_R2___ KC_M, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_MOD_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH + +// WORKMAN +#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B +#define ___WORKMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_H, KC_LT_SYMB_T, KC_G +#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V + +#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN +#define ___WORKMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_O, KC_SFT_T_I +#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH + +// NORMAN +#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K +#define ___NORMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_E, KC_LT_SYMB_T, KC_G +#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN +#define ___NORMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_I, KC_O, KC_SFT_T_U +#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// BEPO MAPS // Dvorak on fr-bepo software layer in the OS. // for dvorak and all the other qwerty like keyboards on bepo -#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 -#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 - #define ___DVORAK_FR_L1___ DB_QUOT, DB_COMM, DB_DOT, BP_P, BP_Y -#define ___DVORAK_FR_L2___ BP_A, BP_O, BP_E, BP_SFT_T_U, BP_LT_SYMB_I +#define ___DVORAK_FR_L2___ BP_SFT_T_A, BP_LT_KP_O, BP_LT_MDIA_E, BP_LT_SYMB_U, BP_I #define ___DVORAK_FR_L3___ DB_SCOLON, BP_Q, BP_J, BP_K, BP_X -#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L -#define ___DVORAK_FR_R2___ BP_LT_SYMB_D, BP_SFT_T_H, BP_T, BP_N, BP_S -#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z +#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L +#define ___DVORAK_FR_R2___ BP_D, BP_LT_SYMB_H, BP_LT_MDIA_T, BP_LT_KP_N, BP_SFT_T_S +#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z // Bepo on fr-bepo software layer // for bepo on bepo +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ #define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ #define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ -#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV -#define ___BEPO_FR_L2___ BP_A, BP_U, BP_I, BP_SFT_T_E, BP_LT_SYMB_COMM -#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K - -#define ___BEPO_FR_R1___ /* BP_DCRC*/ BP_V, BP_D, BP_L, BP_J, BP_Z //, BP_W -#define ___BEPO_FR_R2___ /* BP_C */ BP_SFT_T_T, BP_S, BP_R, BP_N, BP_M //BP_CCED -#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F - +#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV +#define ___BEPO_FR_L2___ BP_SFT_T_A, BP_LT_KP_U, BP_LT_SYMB_I, BP_LT_MDIA_E, BP_COMM +#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K + +#define ___BEPO_FR_R1___ /* BP_DCRC,*/ BP_V, BP_D, BP_L, BP_J, BP_Z +#define ___BEPO_FR_R2___ /* BP_C, */ BP_T, BP_LT_SYMB_S, BP_LT_MDIA_R, BP_LT_KP_N, BP_SFT_T_M //BP_CCED +#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F //BP_SFT_T_W + +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ +/* KC_TAB, BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV, KC_BSPC, */ +/* KC_LSFT, BP_A, BP_U, BP_I, BP_E, BP_COMM, */ +/* KC_LCTRL, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_ENT, */ +/* ESC_FN, BP_ECRC, KC_LGUI, KC_LALT, SPC_RALT, */ +/* TT(SWAP), KC_MNXT, */ +/* KC_MPLY, */ +/* TT(FN), TT(NUMS), KC_MPRV, */ + +/* /\* right hand *\/ */ +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +/* KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, */ +/* BP_C, BP_T, BP_S, BP_R, BP_N, M_RSFT, */ +/* KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, W_RCTL, */ + + +/******************************************************************/ +/* Middle Keysets for the XD75 */ +/******************************************************************/ +// For the middle keys of an xd75. It's got one more column in the middle than +// the ergodox, or the viterbi. And the Ergodox is missing a key in column 7 +// counting from either end. Which is the first and 3rd columns of these sets. + +// it's all an experient. I'm not sure what make sense here. +// stealing what I can from the ergodox layout. +/* The XD75 has 3 keys inbetween the usual left and right hand */ +#define ___MIDDLE_T___ OSL(LAYERS), LCTL(KC_A), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE_1___ LCTL(KC_C), LCTL(KC_X), LCTL(KC_V) +#define ___MIDDLE_2___ TO(SYMB), TO(_RGB), TO(KEYPAD) +#define ___MIDDLE_3___ OSL(SYMB), TO(MDIA), OSL(KEYPAD) +#define ___MIDDLE_4___ CTL_BSPC, ALT_DEL, XMONAD_ESC, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___MIDDLE_T_BP___ OSL(LAYERS), LCTL(BP_A), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_X), LCTL(BP_V) +#define ___MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) +#define ___MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) + +/********************************************************************/ +/** The bottom row and thumbs as needed. **/ +/********************************************************************/ // the bottom rows for keyboards on bepo. -#define ___ERGODOX_BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, LCTL(BP_V), LCTL(BP_C) -#define ___ERGODOX_BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_V), KC_INS, KC_LEFT, KC_RIGHT +// bepo on bepo - not enough space to go around.... +#define ___ERGODOX_BOTTOM_LEFT_BP___ LCTL(BP_C), BP_ECRC, LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___ERGODOX_BOTTOM_RIGHT_BP___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC + +// for dvorak on bepo +#define ___ERGODOX_BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_C), LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___ERGODOX_BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC // Since we have 7 default layouts (QWERTY, DVORAK, COLEMAK and WORKMAN, NORMAN, // 2 of them based on a Bepo software keyboard, --- DVORAK_ON_BEPO and BEPO), @@ -308,76 +484,33 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___ERGODOX_BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT #define ___ERGODOX_BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) +#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___XD75_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ + + #define ___ERGODOX_THUMB_LEFT___ \ - KC_RALT, ALGR_SYMB, \ + OS_RALT, TG(MDIA), \ HOME_END, \ CTL_BSPC, ALT_DEL, XMONAD_ESC #define ___ERGODOX_THUMB_RIGHT___ \ - ALGR_SYMB, TD_MOUSE_BTNS, \ + TG(SYMB), OS_RALT, \ KC_PGUP, \ KC_PGDN, ALT_ENT, CTL_SPC -#define ___ERGODOX_TRANS_THUMBS___ \ - ___, ___, \ - ___, \ - ___, ___, ___ \ - -#define ___ERGODOX_TRANS_BOTTOM___ \ - ___,___,___,___,___ - -#define ___ERGODOX_TRANS_6_ROW___ \ - ___,___,___,___,___,___ - - - -// Qwerty based layers that I don't really use. -#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T -#define ___QWERTY_L2___ KC_A, KC_S, KC_D, KC_F, KC_G -#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P -#define ___QWERTY_R2___ KC_H, KC_J, KC_K, KC_L, KC_SCLN -#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH - - -#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G -#define ___COLEMAK_L2___ KC_A, KC_R, KC_S, KC_T, KC_D -#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_R2___ KC_H, KC_N, KC_E, KC_I, KC_O -#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH - - -#define ___COLEMAK_MOD_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B -#define ___COLEMAK_MOD_DH_L2___ KC_A, KC_R, KC_S, KC_T, KC_G -#define ___COLEMAK_MOD_DH_L3___ CTL_T(KC_Z), KC_X, KC_C, KC_D, KC_V - -#define ___COLEMAK_MOD_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_MOD_DH_R2___ KC_M, KC_N, KC_E, KC_I, KC_O -#define ___COLEMAK_MOD_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH - - -#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B -#define ___WORKMAN_L2___ KC_A, KC_S, KC_H, KC_T, KC_G -#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V - -#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN -#define ___WORKMAN_R2___ KC_Y, KC_N, KC_E, KC_O, KC_I -#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH - - -#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K -#define ___NORMAN_L2___ KC_A, KC_S, KC_E, KC_T, KC_G -#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN -#define ___NORMAN_R2___ KC_Y, KC_N, KC_I, KC_O, KC_U -#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH +#define ___ERGODOX_THUMB_RIGHT_BP___ \ + TG(SYMB_ON_BEPO), OS_RALT, \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC +#define ___ERGODOX_TRANS_THUMBS___ ___6___ +#define ___ERGODOX_TRANS_BOTTOM___ ___5___ +#define ___ERGODOX_TRANS_6_ROW___ ___6___ +#define ___TRANS_6_COL___ ___6___ -// For the top rows. Numbers for most things, symbols for Bepo. +/*******************************************************************/ +/** For the top rows. Numbers for most things, symbols for Bepo. **/ +/*******************************************************************/ // for everything on qwerty. #define ___NUMBER_L___ KC_1, KC_2, KC_3, KC_4, KC_5 @@ -387,43 +520,142 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___FUNC_L___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 #define ___FUNC_R___ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 +#define ___FUNC_1_6___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 +#define ___FUNC_7_12___ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 -// Rows for the auxillary layers. +// a top symbol row if someone wants it. +#define ___SYMB_L___ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC +#define ___SYMB_R___ KC_CIRC, KC_AMPR, KC_AST, KC_LPRN, KC_RPRN -// The symbol layer is for qwerty. I need another one for Bepo... +// For numbers on bepo. Bepo has numbers on shifted keys, the +// reverse of most keyboard layouts. +#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 +#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 -// the KC_P? codes don't work for me. I don't use those shifted values anyway. + +/*******************************************************************/ +/* Rows for the auxillary layers. */ +/* the KC_P? codes don't work for me. I don't use those shifted */ +/* values anyway. */ +/*******************************************************************/ + +// Keypads #define ___KEYPAD_1___ KC_7, KC_8, KC_9, KC_PSLS #define ___KEYPAD_2___ KC_4, KC_5, KC_6, KC_PAST #define ___KEYPAD_3___ KC_1, KC_2, KC_3, KC_PMNS #define ___KEYPAD_4___ KC_0, KC_DOT, KC_PEQL, KC_PPLS +// Keypad from the default keymap.c of the xd75 +#define ___KEYPAD_1_ALT___ KC_P7, KC_P8, KC_P9, KC_MINS +#define ___KEYPAD_2_ALT___ KC_P4, KC_P5, KC_P6, KC_PLUS +#define ___KEYPAD_3_ALT___ KC_P1, KC_P2, KC_P3, KC_PENT +#define ___KEYPAD_4_ALT___ KC_P0, KC_DOT, KC_PENT, KC_PENT + +// For Bepo #define ___KEYPAD_1_BP___ DB_7, DB_8, DB_9, BP_SLASH #define ___KEYPAD_2_BP___ DB_4, DB_5, DB_6, BP_ASTR #define ___KEYPAD_3_BP___ DB_1, DB_2, DB_3, DB_MINUS #define ___KEYPAD_4_BP___ DB_0, DB_DOT, DB_EQL, BP_PLUS + + +// SYMBOLS + +// An arrangement for the left hand with a focus on the ()[]{}s. #define ___SYMBOLS_1___ KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE #define ___SYMBOLS_2___ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV #define ___SYMBOLS_3___ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1___ KC_GRV, KC_LT, KC_GT, KC_LCBR, KC_RCBR, KC_HASH +#define ___SYMBOLS6_2___ KC_AMPR, KC_AT, KC_ASTR, KC_LPRN, KC_RPRN, KC_PERC +#define ___SYMBOLS6_3___ KC_DLR, KC_DQT, KC_QUOT, KC_LBRC, KC_RBRC, KC_COLON +#define ___SYMBOLS6_4___ ___2___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1___ KC_GRV, KC_AMPR, KC_ASTR, KC_LCBR, KC_PLUS, KC_PIPE +#define ___SYMPAD_2___ KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_ASTR, KC_GRV +#define ___SYMPAD_3___ ___, KC_EXLM, KC_AT, KC_HASH, KC_MINUS, KC_SLASH +#define ___SYMPAD_4___ ___, KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH + +// Function pad. Same idea as above, but for function keys. +#define ___FUNCPAD_T___ KC_F10, KC_F11, KC_F12 +#define ___FUNCPAD_1___ KC_F7, KC_F8, KC_F9 +#define ___FUNCPAD_2___ KC_F4, KC_F5, KC_F6 +#define ___FUNCPAD_3___ KC_F1, KC_F2, KC_F3 + + +//--- all over again for BEPO + +// SYMBOLS FOR BEPO +// The top row. Bepo has symbols not numbers. Numbers are the shifted values. +#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ + +// An arrangement for the left hand with a focus on the ()[]{}s. #define ___SYMBOLS_1_BP___ KC_EXLM, BP_AT, DB_LCBR, DB_RCBR, DB_PIPE #define ___SYMBOLS_2_BP___ DB_HASH, BP_DLR, DB_LPRN, DB_RPRN, DB_GRV #define ___SYMBOLS_3_BP___ BP_PERC, DB_CIRC, DB_LBRC, DB_RBRC, DB_TILD +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1_BP___ DB_GRV, DB_LESS, DB_GRTR, DB_LCBR, DB_RCBR, DB_HASH +#define ___SYMBOLS6_2_BP___ KC_AMPR, BP_AT, BP_ASTR, DB_LPRN, DB_RPRN, BP_PERC +#define ___SYMBOLS6_3_BP___ BP_DLR, BP_DQOT, DB_QUOT, DB_LBRC, DB_RBRC, KC_COLON + +#define ___SYMBOLS6_4_BP___ ___2___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1_BP___ DB_GRV, BP_AMPR, BP_ASTR, DB_LCBR, BP_PLUS, DB_PIPE +#define ___SYMPAD_2_BP___ DB_TILD, BP_DLR, BP_PERC, DB_CIRC, BP_ASTR, DB_GRV +#define ___SYMPAD_3_BP___ ___, BP_EXLM, BP_AT, DB_HASH, BP_MINS, BP_SLSH +#define ___SYMPAD_4_BP___ ___, DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH + + + +// MOUSE, ARROW and MEDIA KEY SETS + #define ___MOUSE_LDUR___ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R #define ___MWHEEL_LDUR___ KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R #define ___MOUSE_BTNS_R___ KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5 #define ___MOUSE_BTNS_L___ KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1 #define ___MOUSE_ACCL_012___ KC_ACL0, KC_ACL1, KC_ACL2 +#define ___MACCL___ ___MOUSE_ACCL_012___ + +#define ___PRV_PLAY_NXT_STOP KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP +#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU +#define ___MUTE_PRV_PLAY_NXT_STOP___ KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP #define ___MUTE_PLAY_STOP___ KC_MUTE, KC_MPLY, KC_MSTP #define ___VI_ARROWS___ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT -#define ___LAYERS_L1___ DF(BEPO), DF(DVORAK_ON_BEPO) -#define ___LAYERS_L2___ DF(COLEMAK), DF(DVORAK) -#define ___LAYERS_L3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) -#define ___LAYERS_L4___ TO(MDIA), TO(SYMB_ON_BEPO), TO(SYMB) +// RGB FUNCTION Keysets +// RGB row for the _FN layer from the redo of the default keymap.c +#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD +#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD +#define ___RGB_MODE_PRV_NXT___ RGB_RMOD, RGB_MOD +#define ___RGB_TOGGLE___ RGB_TOG +#define ___RGB_P_B_R_SW_SN___ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN +#define ___RGB_KXGT___ RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T + +// Print screen, screen lock, pause +#define ___PSCR_SLCK_PAUS___ KC_PSCR, KC_SLCK, KC_PAUS + + +// LAYER Keysets. Changing the Default base layer or the transient layers. +#define ___LAYERS_B1_2___ DF(BEPO), DF(DVORAK_ON_BEPO) +#define ___LAYERS_B2_2___ DF(COLEMAK), DF(DVORAK) +#define ___LAYERS_B3_3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) +#define ___LAYERS_B4_3___ ___X3___ + +// transient layers. +#define ___LAYERS_T_BP_3___ TO(MDIA), TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___LAYERS_T_3___ TO(MDIA), TO(SYMB), TO(KEYPAD) +#define ___LAYERS_T_DEF___ TO(_RGB), ___X2___ #endif From dfb2e0dcc8b266b42c267d11a14b20a21c1faf1a Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sun, 12 Apr 2020 01:20:24 +0200 Subject: [PATCH 08/23] Revert "Improve naming" This reverts commit f62426cc358e742d68061cc4842c90344ec464e0. --- quantum/quantum.c | 12 ++++++------ quantum/quantum.h | 4 ++-- tmk_core/common/action_tapping.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 2053a1a5f479..55cdaa3b023e 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -149,21 +149,21 @@ void reset_keyboard(void) { } /* Convert record into usable keycode via the contained event. */ -uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) { return get_event_keycode(record->event, update_layer_cache); } +uint16_t get_record_keycode(keyrecord_t *record, bool do_update) { return get_event_keycode(record->event, do_update); } /* Convert event into usable keycode. Checks the layer cache to ensure that it * retains the correct keycode after a layer change, if the key is still pressed. - * "update_layer_cache" is to ensure that it only updates the layer cache when - * appropriate, otherwise, it will update it and cause layer tap (and other keys) - * from triggering properly. + * "do_update" is to ensure that it only updates the layer cache when appropriate, + * otherwise, it will update it and cause layer tap (and other keys) from + * triggering properly. */ -uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache) { +uint16_t get_event_keycode(keyevent_t event, bool do_update) { #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) /* TODO: Use store_or_get_action() or a similar function. */ if (!disable_action_cache) { uint8_t layer; - if (event.pressed && update_layer_cache) { + if (event.pressed && do_update) { layer = layer_switch_get_layer(event.key); update_source_layers_cache(event.key, layer); } else { diff --git a/quantum/quantum.h b/quantum/quantum.h index 45f44f49a1a7..9fdd36e788ec 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -252,8 +252,8 @@ void matrix_init_kb(void); void matrix_scan_kb(void); void matrix_init_user(void); void matrix_scan_user(void); -uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache); -uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); +uint16_t get_record_keycode(keyrecord_t *record, bool do_update); +uint16_t get_event_keycode(keyevent_t event, bool do_update); bool process_action_kb(keyrecord_t *record); bool process_record_kb(uint16_t keycode, keyrecord_t *record); bool process_record_user(uint16_t keycode, keyrecord_t *record); diff --git a/tmk_core/common/action_tapping.h b/tmk_core/common/action_tapping.h index 5eaef1c5f09a..ffba830cf020 100644 --- a/tmk_core/common/action_tapping.h +++ b/tmk_core/common/action_tapping.h @@ -32,7 +32,7 @@ along with this program. If not, see . #define WAITING_BUFFER_SIZE 8 #ifndef NO_ACTION_TAPPING -uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); +uint16_t get_event_keycode(keyevent_t event, bool do_update); uint16_t get_tapping_term(uint16_t keycode); void action_tapping_process(keyrecord_t record); #endif From b92952bd07c89efa7c1af255a7ed516839a3b582 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sun, 12 Apr 2020 01:30:43 +0200 Subject: [PATCH 09/23] Added a viterbi keymap --- .../ergodox_ez/keymaps/ericgebhart/rules.mk | 2 +- keyboards/keebio/viterbi/config.h | 2 +- .../viterbi/keymaps/ericgebhart/config.h | 32 +++ .../viterbi/keymaps/ericgebhart/keymap.c | 192 ++++++++++++++++++ .../viterbi/keymaps/ericgebhart/rules.mk | 18 ++ keyboards/keebio/viterbi/rules.mk | 7 +- users/ericgebhart/ericgebhart.h | 30 ++- 7 files changed, 279 insertions(+), 4 deletions(-) create mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/config.h create mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c create mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk index 373760c77bd0..3b5ab2d6d639 100755 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk @@ -14,5 +14,5 @@ BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration UNICODE_ENABLE = no SLEEP_LED_ENABLE = no API_SYSEX_ENABLE = no -RGBLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = no RGBLIGHT_ANIMATION = no diff --git a/keyboards/keebio/viterbi/config.h b/keyboards/keebio/viterbi/config.h index b628c83c8553..9976f0e86836 100644 --- a/keyboards/keebio/viterbi/config.h +++ b/keyboards/keebio/viterbi/config.h @@ -17,4 +17,4 @@ along with this program. If not, see . #pragma once -#include "config_common.h" +//#include "config_common.h" diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h new file mode 100644 index 000000000000..a841066f4d0b --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h @@ -0,0 +1,32 @@ +/* +Copyright 2017 Danny Nguyen + +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 . +*/ + +#pragma once + +// #define USE_I2C + +/* Select hand configuration */ + +// #define MASTER_RIGHT +// #define EE_HANDS + +#undef RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 12 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c new file mode 100644 index 000000000000..59f8511dc116 --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c @@ -0,0 +1,192 @@ +/* + 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 . +*/ + +#include "keymap_bepo.h" +#include "ericgebhart.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [DVORAK] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___DVORAK_L1___, ___MIDDLE2_T___, ___DVORAK_R1___, KC_SLASH, + TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE2_2___, ___DVORAK_R2___, KC_MINUS, + KC_LSFT, ___DVORAK_L3___, ___MIDDLE2_3___, ___DVORAK_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [QWERTY] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___QWERTY_L1___, ___MIDDLE2_T___, ___QWERTY_R1___, KC_SLASH, + TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE2_2___, ___QWERTY_R2___, KC_MINUS, + KC_LSFT, ___QWERTY_L3___, ___MIDDLE2_3___, ___QWERTY_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [COLEMAK] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___COLEMAK_L1___, ___MIDDLE2_T___, ___COLEMAK_R1___, KC_SLASH, + TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE2_2___, ___COLEMAK_R2___, KC_MINUS, + KC_LSFT, ___COLEMAK_L3___, ___MIDDLE2_3___, ___COLEMAK_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [WORKMAN] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___WORKMAN_L1___, ___MIDDLE2_T___, ___WORKMAN_R1___, KC_SLASH, + TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE2_2___, ___WORKMAN_R2___, KC_MINUS, + KC_LSFT, ___WORKMAN_L3___, ___MIDDLE2_3___, ___WORKMAN_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [NORMAN] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___NORMAN_L1___, ___MIDDLE2_T___, ___NORMAN_R1___, KC_SLASH, + TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE2_2___, ___NORMAN_R2___, KC_MINUS, + KC_LSFT, ___NORMAN_L3___, ___MIDDLE2_3___, ___NORMAN_R3___, KC_RSFT, + ___VITERBI_BOTTOM___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [DVORAK_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___DVORAK_FR_L1___, ___MIDDLE2_T_BP___, ___DVORAK_FR_R1___, DB_SLASH, + TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE2_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, + KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE2_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, + ___VITERBI_BOTTOM_FR___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + [XMONAD] = LAYOUT_ortho_5x14_wrapper( + ___FUNC_1_6___, ___2___, ___FUNC_7_12___, + ___, ___DVORAK_L1___, ___2___, ___DVORAK_R1___, ___, + ___, ___DVORAK_L2___, ___2___, ___DVORAK_R2___, ___, + ___, ___DVORAK_L3___, ___2___, ___DVORAK_R3___, ___, + ___14___ + ), + + [XMONAD_FR] = LAYOUT_ortho_5x14_wrapper( + ___FUNC_1_6___, ___2___, ___FUNC_7_12___, + ___, ___DVORAK_FR_L1___, ___2___, ___DVORAK_FR_R1___, ___, + ___, ___DVORAK_FR_L2___, ___2___, ___DVORAK_FR_R2___, ___, + ___, ___DVORAK_FR_L3___, ___2___, ___DVORAK_FR_R3___, ___, + ___14___ + ), + + [BEPO] = LAYOUT_ortho_5x14_wrapper( + KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE2_T_BP___, ___BEPO_FR_R1___, BP_W, + TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE2_2_BP___, ___BEPO_FR_R2___, BP_CCED, + BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE2_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, + ___VITERBI_BOTTOM_BP___, + ___VITERBI_THUMBS_BOTTOM___ + ), + + // SYMBOLS + [SYMB] = LAYOUT_ortho_5x14_wrapper( + ___SYMBOLS6_1___, ___2___, ___SYMPAD_1___, + ___SYMBOLS6_2___, ___2___, ___SYMPAD_2___, + ___SYMBOLS6_3___, ___2___, ___SYMPAD_3___, + ___SYMBOLS6_4___, ___2___, ___SYMPAD_4___, + ___14___ + ), + + [KEYPAD] = LAYOUT_ortho_5x14_wrapper( + ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1___, ___, + ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2___, ___, + ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4___, ___, + ___14___ + ), + + [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( + ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1_BP___, ___, + ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2_BP___, ___, + ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3_BP___, KC_PENT, + ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4_BP___, ___, + ___14___ + ), + + [SYMB_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( + ___SYMBOLS6_1_BP___, ___2___, ___SYMPAD_1_BP___, + ___SYMBOLS6_2_BP___, ___2___, ___SYMPAD_2_BP___, + ___SYMBOLS6_3_BP___, ___2___, ___SYMPAD_3_BP___, + ___SYMBOLS6_4_BP___, ___2___, ___SYMPAD_4_BP___, + ___14___ + ), + + // MEDIA AND MOUSE + [MDIA] = LAYOUT_ortho_5x14_wrapper( + ___MOUSE_BTNS_L___, ___3___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, + ___, ___MOUSE_LDUR___, ___3___, KC_VOLD, ___VI_ARROWS___, ___, + ___, ___MWHEEL_LDUR___, ___3___, KC_PGUP, ___MOUSE_BTNS_R___, + ___2___, ___MACCL___, ___3___, KC_PGDN, ___5___, + ___14___ + ), + + [LAYERS] = LAYOUT_ortho_5x14_wrapper( + ___X3___, ___LAYERS_B1_2___, ___4___, ___LAYERS_T_BP_3___, ___X2___, + ___X3___, ___LAYERS_B2_2___, ___4___, ___LAYERS_T_3___, ___X2___, + ___X2___, ___LAYERS_B3_3___, ___4___, ___LAYERS_T_DEF___, ___X2___, + ___14___, + ___14___ + ), + + [_RGB] = LAYOUT_ortho_5x14_wrapper( + ___, ___RGB_HUE_SAT_INT_UP___, ___4___, ___5___, + ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___3___, ___RGB_P_B_R_SW_SN___, + ___5___, ___4___, ___RGB_KXGT___, ___, + ___14___, + ___14___ + ), +}; + +/* bool process_record_user(uint16_t keycode, keyrecord_t *record) { */ +/* switch (keycode) { */ +/* case QWERTY: */ +/* if (record->event.pressed) { */ +/* set_single_persistent_default_layer(_QWERTY); */ +/* } */ +/* return false; */ +/* break; */ +/* case LOWER: */ +/* if (record->event.pressed) { */ +/* layer_on(_LOWER); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } else { */ +/* layer_off(_LOWER); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } */ +/* return false; */ +/* break; */ +/* case RAISE: */ +/* if (record->event.pressed) { */ +/* layer_on(_RAISE); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } else { */ +/* layer_off(_RAISE); */ +/* update_tri_layer(_LOWER, _RAISE, _ADJUST); */ +/* } */ +/* return false; */ +/* break; */ +/* case ADJUST: */ +/* if (record->event.pressed) { */ +/* layer_on(_ADJUST); */ +/* } else { */ +/* layer_off(_ADJUST); */ +/* } */ +/* return false; */ +/* break; */ +/* } */ +/* return true; */ +/* } */ diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk new file mode 100644 index 000000000000..3b5ab2d6d639 --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk @@ -0,0 +1,18 @@ +USER_NAME := ericgebhart +SRC += ericgebhart.c + +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. +CONSOLE_ENABLE = no # Console for debug + +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +UNICODE_ENABLE = no +SLEEP_LED_ENABLE = no +API_SYSEX_ENABLE = no +RGBLIGHT_ENABLE = no +RGBLIGHT_ANIMATION = no diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index 0b746d17207f..02ee008ce8dc 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/rules.mk @@ -30,7 +30,12 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard +KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key +TAP_DANCE_ENABLE = yes # Enable the tap dance feature. + + SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = keebio/viterbi/rev2 +DEFAULT_FOLDER = keebio/viterbi/rev1 LAYOUTS = ortho_5x14 diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index fa381fd1fbe6..57acbd1bc791 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -307,6 +307,7 @@ enum { #define ___4___ ___3___, ___ #define ___5___ ___4___, ___ #define ___6___ ___5___, ___ +#define ___14___ ___5___, ___4___, ___5___ #define ___15___ ___5___, ___5___, ___5___ int on_qwerty(void); @@ -341,6 +342,7 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) #define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) +#define LAYOUT_ortho_5x14_wrapper(...) LAYOUT_ortho_5x14(__VA_ARGS__) /********************************************************************/ /** The Core rows of each given layout. **/ @@ -464,6 +466,27 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) #define ___MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) +// The Viterbi only has 2 keys in the middle. +#define ___MIDDLE2_T___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE2_1___ LCTL(KC_C), LCTL(KC_V) +#define ___MIDDLE2_2___ TO(SYMB), TO(KEYPAD) +#define ___MIDDLE2_3___ OSL(SYMB), OSL(KEYPAD) + +// becomes the upper thumbs, the real 4th row if we throw away +// the number row at the top +#define ___MIDDLE2_4___ XXX, HOME_END, KC_PGDN, XXX +// basically the thumb keys like on the ergodox. +#define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC, KC_PGDN, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___MIDDLE2_T_BP___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___MIDDLE2_1_BP___ LCTL(BP_C), LCTL(BP_V) +#define ___MIDDLE2_2_BP___ TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___MIDDLE2_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO) + +#define ___MIDDLE2_4_BP___ XXX, HOME_END, KC_PGUP, XXX + + /********************************************************************/ /** The bottom row and thumbs as needed. **/ /********************************************************************/ @@ -484,9 +507,14 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data); #define ___ERGODOX_BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT #define ___ERGODOX_BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) -#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT___ #define ___XD75_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___VITERBI_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT___ +#define ___VITERBI_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ +#define ___VITERBI_BOTTOM_BP___ ___ERGODOX_BOTTOM_LEFT_BP___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_BP___ +#define ___VITERBI_THUMBS_BOTTOM___ ___4___, ___MIDDLE_THUMBS___, ___4___ + #define ___ERGODOX_THUMB_LEFT___ \ OS_RALT, TG(MDIA), \ From 12bc1321e8dec3775c71fe4454fbc3f93028d27e Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Mon, 13 Apr 2020 02:30:07 +0200 Subject: [PATCH 10/23] refactor --- .../ergodox_ez/keymaps/ericgebhart/keymap.c | 432 ++++++------ .../viterbi/keymaps/ericgebhart/keymap.c | 187 ++--- keyboards/xd75/keymaps/ericgebhart/keymap.c | 182 ++--- users/ericgebhart/base_layers.h | 280 ++++++++ users/ericgebhart/core_keys.h | 293 ++++++++ users/ericgebhart/core_keysets.h | 292 ++++++++ users/ericgebhart/ericgebhart.h | 646 +----------------- 7 files changed, 1282 insertions(+), 1030 deletions(-) create mode 100644 users/ericgebhart/base_layers.h create mode 100644 users/ericgebhart/core_keys.h create mode 100644 users/ericgebhart/core_keysets.h diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c index 3b1bdb6fb15e..80907c4210d9 100644 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c @@ -21,268 +21,298 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DVORAK] = LAYOUT_ergodox_wrapper( - // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___DVORAK_L1___, KC_LBRC, - TAB_BKTAB, ___DVORAK_L2___, - KC_LSFT, ___DVORAK_L3___, KC_LPRN, + // 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), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___DVORAK_R1___, KC_SLASH, - /* */ ___DVORAK_R2___, KC_MINUS, - KC_RPRN, ___DVORAK_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [XMONAD] = LAYOUT_ergodox_wrapper( - // left hand - ___, ___FUNC_L___, ___, - ___, ___DVORAK_L1___, ___, - ___, ___DVORAK_L2___, - ___, ___DVORAK_L3___, ___, + // left hand + ___, ___FUNC_L___, ___, + ___, ___DVORAK_L1___, ___, + ___, ___DVORAK_L2___, + ___, ___DVORAK_L3___, ___, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - ___, ___FUNC_R___, ___, - ___, ___DVORAK_R1___, ___, - /**/ ___DVORAK_R2___, ___, - ___, ___DVORAK_R3___, ___, + // right hand + ___, ___FUNC_R___, ___, + ___, ___DVORAK_R1___, ___, + /**/ ___DVORAK_R2___, ___, + ___, ___DVORAK_R3___, ___, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [QWERTY] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___QWERTY_L1___, KC_LBRC, - TAB_BKTAB, ___QWERTY_L2___, - KC_LSFT, ___QWERTY_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___QWERTY_L1___, LCTL(KC_C), + TAB_BKTAB, ___QWERTY_L2___, + KC_LSFT, ___QWERTY_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___QWERTY_R1___, KC_SLASH, - /* */ ___QWERTY_R2___, KC_MINUS, - KC_RPRN, ___QWERTY_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [COLEMAK] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___COLEMAK_L1___, KC_LBRC, - TAB_BKTAB, ___COLEMAK_L2___, - KC_LSFT, ___COLEMAK_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___COLEMAK_L1___, LCTL(KC_C), + TAB_BKTAB, ___COLEMAK_L2___, + KC_LSFT, ___COLEMAK_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___COLEMAK_R1___, KC_SLASH, - /* */ ___COLEMAK_R2___, KC_MINUS, - KC_RPRN, ___COLEMAK_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [WORKMAN] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___WORKMAN_L1___, KC_LBRC, - TAB_BKTAB, ___WORKMAN_L2___, - KC_LSFT, ___WORKMAN_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___WORKMAN_L1___, LCTL(KC_C), + TAB_BKTAB, ___WORKMAN_L2___, + KC_LSFT, ___WORKMAN_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___WORKMAN_R1___, KC_SLASH, - /* */ ___WORKMAN_R2___, KC_MINUS, - KC_RPRN, ___WORKMAN_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [NORMAN] = LAYOUT_ergodox_wrapper( // left hand - KC_GRV, ___NUMBER_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___NORMAN_L1___, KC_LBRC, - TAB_BKTAB, ___NORMAN_L2___, - KC_LSFT, ___NORMAN_L3___, KC_LPRN, + KC_GRV, ___NUMBER_L___, OSL(LAYERS), + KC_LOCK, ___NORMAN_L1___, LCTL(KC_C), + TAB_BKTAB, ___NORMAN_L2___, + KC_LSFT, ___NORMAN_L3___, TO(MDIA), - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_R___, KC_EQL, - KC_RBRC, ___NORMAN_R1___, KC_SLASH, - /* */ ___NORMAN_R2___, KC_MINUS, - KC_RPRN, ___NORMAN_R3___, KC_RSFT, + // 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, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), [DVORAK_ON_BEPO] = LAYOUT_ergodox_wrapper( // left hand - DB_GRV, ___NUMBER_BEPO_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___DVORAK_FR_L1___, DB_LBRC, - TAB_BKTAB, ___DVORAK_FR_L2___, - KC_LSFT, ___DVORAK_FR_L3___, DB_LPRN, + 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, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - MDIA_SYMB, ___NUMBER_BEPO_R___, DB_EQL, - DB_RBRC, ___DVORAK_FR_R1___, DB_SLASH, + // 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, + /* */ ___DVORAK_FR_R2___, DB_MINUS, + DB_RPRN, ___DVORAK_FR_R3___, KC_RSFT, - ___ERGODOX_BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT_FR___, + ___ERGODOX_THUMB_RIGHT___ + ), - [XMONAD_FR] = LAYOUT_ergodox_wrapper( - // left hand - ___, ___FUNC_L___, ___, - ___, ___DVORAK_FR_L1___, ___, - ___, ___DVORAK_FR_L2___, - ___, ___DVORAK_FR_L3___, ___, + [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, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // right hand - ___, ___FUNC_R___, ___, - ___, ___DVORAK_FR_R1___, ___, - /**/ ___DVORAK_FR_R2___, ___, - ___, ___DVORAK_FR_R3___, ___, + // Right hand + MDIA_SYMB_KP_LAYERS, ___SYMBOL_BEPO_R___, BP_EQL, + BP_DCRC, ___BEPO_FR_R1___, BP_W, + /* */ ___BEPO_FR_R2___, BP_CCED, + BP_C, ___BEPO_FR_R3___, KC_RSFT, - ___ERGODOX_BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT___, + ___ERGODOX_THUMB_RIGHT___ + ), - [BEPO] = LAYOUT_ergodox_wrapper( - // Left hand - BP_DLR, ___SYMBOL_BEPO_L___, DEF_OS_LAYER_SW, - KC_LOCK, ___BEPO_FR_L1___, DB_LBRC, - TAB_BKTAB, ___BEPO_FR_L2___, - BP_SFT_T_ECRC, ___BEPO_FR_L3___, DB_RBRC, + [XMONAD_FR] = LAYOUT_ergodox_wrapper( + // left hand + ___, ___FUNC_L___, ___, + ___, ___DVORAK_FR_L1___, ___, + ___, ___DVORAK_FR_L2___, + ___, ___DVORAK_FR_L3___, ___, - ___ERGODOX_BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT___, + ___ERGODOX_THUMB_LEFT___, - // Right hand - MDIA_SYMB, ___SYMBOL_BEPO_R___, BP_EQL, - BP_DCRC, ___BEPO_FR_R1___, BP_W, - /* */ ___BEPO_FR_R2___, BP_CCED, - BP_C, ___BEPO_FR_R3___, KC_RSFT, + // right hand + ___, ___FUNC_R___, ___, + ___, ___DVORAK_FR_R1___, ___, + /**/ ___DVORAK_FR_R2___, ___, + ___, ___DVORAK_FR_R3___, ___, - ___ERGODOX_BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ - ), + ___BOTTOM_RIGHT_FR___, + ___ERGODOX_THUMB_RIGHT___ + ), // SYMBOLS [SYMB] = LAYOUT_ergodox_wrapper( // left hand - ___, ___FUNC_L___, ___, - ___, ___SYMBOLS_1___, ___, - ___, ___SYMBOLS_2___, - ___, ___SYMBOLS_3___, ___, - - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___, - - - // right hand - ___, ___FUNC_R___, KC_F11, - ___, KC_UP, ___KEYPAD_1___, KC_F12, - /**/ KC_DOWN, ___KEYPAD_2___, KC_TRNS, - ___, KC_AMPR, ___KEYPAD_3___, KC_PENT, - /* */ ___KEYPAD_4___, ___, - - ___ERGODOX_TRANS_THUMBS___ - ), + ___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_L___, ___, - ___, ___SYMBOLS_1_BP___, ___, - ___, ___SYMBOLS_2_BP___, - ___, ___SYMBOLS_3_BP___, ___, - - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___, - - - // right hand - ___, ___FUNC_R___, KC_F11, - ___, KC_UP, ___KEYPAD_1_BP___, KC_F12, - /**/ KC_DOWN, ___KEYPAD_2_BP___, KC_TRNS, - ___, KC_AMPR, ___KEYPAD_3_BP___, KC_PENT, - /* */ ___KEYPAD_4_BP___, ___, - - ___ERGODOX_TRANS_THUMBS___ - ), + // 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_L___, ___, - ___MOUSE_BTNS_L___, ___, ___, - ___, ___MOUSE_LDUR___, ___, - ___, ___MWHEEL_LDUR___, XXX, ___, - ___, ___, ___MOUSE_ACCL_012___, - ___ERGODOX_TRANS_THUMBS___, - - // right hand - ___, ___FUNC_R___, KC_F11, - KC_VOLU, ___, ___MUTE_PLAY_STOP___, ___, KC_F12, - /* */ KC_PGUP, ___VI_ARROWS___, ___, - KC_VOLD, KC_PGDN, ___MOUSE_BTNS_R___, - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___ - ), + // 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_L___, ___, - XXX, XXX, XXX, ___LAYERS_L1___, XXX, XXX, - XXX, XXX, XXX, ___LAYERS_L2___, XXX, - XXX, XXX, ___LAYERS_L3___, XXX, XXX, - ___, ___, ___LAYERS_L4___, - ___ERGODOX_TRANS_THUMBS___, - - // right hand - ___, ___FUNC_R___, KC_F11, - KC_VOLU, ___, ___MUTE_PLAY_STOP___, ___, KC_F12, - /* */ KC_PGUP, ___VI_ARROWS___, ___, - KC_VOLD, KC_PGDN, ___MOUSE_BTNS_R___, - ___ERGODOX_TRANS_BOTTOM___, - ___ERGODOX_TRANS_THUMBS___ - ), + // 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___ + ), }; diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c index 59f8511dc116..baf6637eaa9c 100644 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c @@ -21,134 +21,135 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DVORAK] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___DVORAK_L1___, ___MIDDLE2_T___, ___DVORAK_R1___, KC_SLASH, - TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE2_2___, ___DVORAK_R2___, KC_MINUS, - KC_LSFT, ___DVORAK_L3___, ___MIDDLE2_3___, ___DVORAK_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_DVORAK_1___, KC_SLASH, + TAB_BKTAB, ___12_DVORAK_2___, KC_MINUS, + KC_LSFT, ___12_DVORAK_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [QWERTY] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___QWERTY_L1___, ___MIDDLE2_T___, ___QWERTY_R1___, KC_SLASH, - TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE2_2___, ___QWERTY_R2___, KC_MINUS, - KC_LSFT, ___QWERTY_L3___, ___MIDDLE2_3___, ___QWERTY_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_QWERTY_1___, KC_SLASH, + TAB_BKTAB, ___12_QWERTY_2___, KC_MINUS, + KC_LSFT, ___12_QWERTY_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [COLEMAK] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___COLEMAK_L1___, ___MIDDLE2_T___, ___COLEMAK_R1___, KC_SLASH, - TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE2_2___, ___COLEMAK_R2___, KC_MINUS, - KC_LSFT, ___COLEMAK_L3___, ___MIDDLE2_3___, ___COLEMAK_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_COLEMAK_1___, KC_SLASH, + TAB_BKTAB, ___12_COLEMAK_2___, KC_MINUS, + KC_LSFT, ___12_COLEMAK_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [WORKMAN] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___WORKMAN_L1___, ___MIDDLE2_T___, ___WORKMAN_R1___, KC_SLASH, - TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE2_2___, ___WORKMAN_R2___, KC_MINUS, - KC_LSFT, ___WORKMAN_L3___, ___MIDDLE2_3___, ___WORKMAN_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_WORKMAN_1___, KC_SLASH, + TAB_BKTAB, ___12_WORKMAN_2___, KC_MINUS, + KC_LSFT, ___12_WORKMAN_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [NORMAN] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___NORMAN_L1___, ___MIDDLE2_T___, ___NORMAN_R1___, KC_SLASH, - TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE2_2___, ___NORMAN_R2___, KC_MINUS, - KC_LSFT, ___NORMAN_L3___, ___MIDDLE2_3___, ___NORMAN_R3___, KC_RSFT, - ___VITERBI_BOTTOM___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_NORMAN_1___, KC_SLASH, + TAB_BKTAB, ___12_NORMAN_2___, KC_MINUS, + KC_LSFT, ___12_NORMAN_3___, KC_RSFT, + ___ORTHO_14_BOTTOM___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [DVORAK_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( - KC_GRV, ___DVORAK_FR_L1___, ___MIDDLE2_T_BP___, ___DVORAK_FR_R1___, DB_SLASH, - TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE2_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, - KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE2_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, - ___VITERBI_BOTTOM_FR___, - ___VITERBI_THUMBS_BOTTOM___ - ), + KC_GRV, ___12_DVORAK_B_1___, KC_SLASH, + TAB_BKTAB, ___12_DVORAK_B_2___, KC_MINUS, + KC_LSFT, ___12_DVORAK_B_3___, KC_RSFT, + ___ORTHO_14_BOTTOM_FR___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), + + [BEPO] = LAYOUT_ortho_5x14_wrapper( + KC_GRV, ___12_DVORAK_B_1___, KC_SLASH, + TAB_BKTAB, ___12_DVORAK_B_2___, KC_MINUS, + KC_LSFT, ___12_DVORAK_B_3___, KC_RSFT, + ___ORTHO_14_BOTTOM_BP___, + ___ORTHO_14_THUMBS_BOTTOM___ + ), [XMONAD] = LAYOUT_ortho_5x14_wrapper( - ___FUNC_1_6___, ___2___, ___FUNC_7_12___, - ___, ___DVORAK_L1___, ___2___, ___DVORAK_R1___, ___, - ___, ___DVORAK_L2___, ___2___, ___DVORAK_R2___, ___, - ___, ___DVORAK_L3___, ___2___, ___DVORAK_R3___, ___, + ___, ___12_DVORAK_1___, ___, + ___, ___12_DVORAK_2___, ___, + ___, ___12_DVORAK_3___, ___, + ___14___, ___14___ - ), + ), [XMONAD_FR] = LAYOUT_ortho_5x14_wrapper( - ___FUNC_1_6___, ___2___, ___FUNC_7_12___, - ___, ___DVORAK_FR_L1___, ___2___, ___DVORAK_FR_R1___, ___, - ___, ___DVORAK_FR_L2___, ___2___, ___DVORAK_FR_R2___, ___, - ___, ___DVORAK_FR_L3___, ___2___, ___DVORAK_FR_R3___, ___, + ___, ___12_DVORAK_B_1___, ___, + ___, ___12_DVORAK_B_2___, ___, + ___, ___12_DVORAK_B_3___, ___, + ___14___, ___14___ - ), + ), - [BEPO] = LAYOUT_ortho_5x14_wrapper( - KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE2_T_BP___, ___BEPO_FR_R1___, BP_W, - TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE2_2_BP___, ___BEPO_FR_R2___, BP_CCED, - BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE2_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, - ___VITERBI_BOTTOM_BP___, - ___VITERBI_THUMBS_BOTTOM___ - ), // SYMBOLS [SYMB] = LAYOUT_ortho_5x14_wrapper( - ___SYMBOLS6_1___, ___2___, ___SYMPAD_1___, - ___SYMBOLS6_2___, ___2___, ___SYMPAD_2___, - ___SYMBOLS6_3___, ___2___, ___SYMPAD_3___, - ___SYMBOLS6_4___, ___2___, ___SYMPAD_4___, - ___14___ + ___14_SYMB_1___, + ___14_SYMB_2___, + ___14_SYMB_3___, + ___14_SYMB_4___, + ___14___ ), [KEYPAD] = LAYOUT_ortho_5x14_wrapper( - ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1___, ___, - ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2___, ___, - ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4___, ___, - ___14___ - ), + ___14_KP_1___, + ___14_KP_2___, + ___14_KP_3___, + ___14_KP_4___, + ___14___ + ), [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( - ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1_BP___, ___, - ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2_BP___, ___, - ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3_BP___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4_BP___, ___, - ___14___ - ), + ___14_KP_B_1___, + ___14_KP_B_2___, + ___14_KP_B_3___, + ___14_KP_B_4___, + ___14___ + ), [SYMB_ON_BEPO] = LAYOUT_ortho_5x14_wrapper( - ___SYMBOLS6_1_BP___, ___2___, ___SYMPAD_1_BP___, - ___SYMBOLS6_2_BP___, ___2___, ___SYMPAD_2_BP___, - ___SYMBOLS6_3_BP___, ___2___, ___SYMPAD_3_BP___, - ___SYMBOLS6_4_BP___, ___2___, ___SYMPAD_4_BP___, - ___14___ - ), + ___14_SYMB_B_1___, + ___14_SYMB_B_2___, + ___14_SYMB_B_3___, + ___14_SYMB_B_4___, + ___14___ + ), // MEDIA AND MOUSE [MDIA] = LAYOUT_ortho_5x14_wrapper( - ___MOUSE_BTNS_L___, ___3___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, - ___, ___MOUSE_LDUR___, ___3___, KC_VOLD, ___VI_ARROWS___, ___, - ___, ___MWHEEL_LDUR___, ___3___, KC_PGUP, ___MOUSE_BTNS_R___, - ___2___, ___MACCL___, ___3___, KC_PGDN, ___5___, - ___14___ - ), + ___14_MDIA_1___, + ___14_MDIA_2___, + ___14_MDIA_3___, + ___14_MDIA_4___, + ___14___ + ), [LAYERS] = LAYOUT_ortho_5x14_wrapper( - ___X3___, ___LAYERS_B1_2___, ___4___, ___LAYERS_T_BP_3___, ___X2___, - ___X3___, ___LAYERS_B2_2___, ___4___, ___LAYERS_T_3___, ___X2___, - ___X2___, ___LAYERS_B3_3___, ___4___, ___LAYERS_T_DEF___, ___X2___, - ___14___, - ___14___ + ___14_LAYERS_1___, + ___14_LAYERS_2___, + ___14_LAYERS_3___, + ___14___, + ___14___ ), [_RGB] = LAYOUT_ortho_5x14_wrapper( - ___, ___RGB_HUE_SAT_INT_UP___, ___4___, ___5___, - ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___3___, ___RGB_P_B_R_SW_SN___, - ___5___, ___4___, ___RGB_KXGT___, ___, - ___14___, - ___14___ - ), + ___14_RGB_1___, + ___14_RGB_2___, + ___14_RGB_3___, + ___14___, + ___14___ + ), }; /* bool process_record_user(uint16_t keycode, keyrecord_t *record) { */ diff --git a/keyboards/xd75/keymaps/ericgebhart/keymap.c b/keyboards/xd75/keymaps/ericgebhart/keymap.c index efc809bba79e..9661972bfac6 100644 --- a/keyboards/xd75/keymaps/ericgebhart/keymap.c +++ b/keyboards/xd75/keymaps/ericgebhart/keymap.c @@ -22,134 +22,134 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DVORAK] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___DVORAK_L1___, ___MIDDLE_1___, ___DVORAK_R1___, KC_SLASH, - TAB_BKTAB, ___DVORAK_L2___, ___MIDDLE_2___, ___DVORAK_R2___, KC_MINUS, - KC_LSFT, ___DVORAK_L3___, ___MIDDLE_3___, ___DVORAK_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_DVORAK_1___, KC_SLASH, + TAB_BKTAB, ___13_DVORAK_2___, KC_MINUS, + KC_LSFT, ___13_DVORAK_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [QWERTY] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___QWERTY_L1___, ___MIDDLE_1___, ___QWERTY_R1___, KC_SLASH, - TAB_BKTAB, ___QWERTY_L2___, ___MIDDLE_2___, ___QWERTY_R2___, KC_MINUS, - KC_LSFT, ___QWERTY_L3___, ___MIDDLE_3___, ___QWERTY_R3___, KC_RSFT, - ___XD75_BOTTOM___ + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_QWERTY_1___, KC_SLASH, + TAB_BKTAB, ___13_QWERTY_2___, KC_MINUS, + KC_LSFT, ___13_QWERTY_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ ), [COLEMAK] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___COLEMAK_L1___, ___MIDDLE_1___, ___COLEMAK_R1___, KC_SLASH, - TAB_BKTAB, ___COLEMAK_L2___, ___MIDDLE_2___, ___COLEMAK_R2___, KC_MINUS, - KC_LSFT, ___COLEMAK_L3___, ___MIDDLE_3___, ___COLEMAK_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_COLEMAK_1___, KC_SLASH, + TAB_BKTAB, ___13_COLEMAK_2___, KC_MINUS, + KC_LSFT, ___13_COLEMAK_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [WORKMAN] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___WORKMAN_L1___, ___MIDDLE_1___, ___WORKMAN_R1___, KC_SLASH, - TAB_BKTAB, ___WORKMAN_L2___, ___MIDDLE_2___, ___WORKMAN_R2___, KC_MINUS, - KC_LSFT, ___WORKMAN_L3___, ___MIDDLE_3___, ___WORKMAN_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_WORKMAN_1___, KC_SLASH, + TAB_BKTAB, ___13_WORKMAN_2___, KC_MINUS, + KC_LSFT, ___13_WORKMAN_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [NORMAN] = LAYOUT_ortho_5x15_wrapper( - KC_GRV, ___NUMBER_L___, ___MIDDLE_T___, ___NUMBER_R___, KC_EQL, - KC_LOCK, ___NORMAN_L1___, ___MIDDLE_1___, ___NORMAN_R1___, KC_SLASH, - TAB_BKTAB, ___NORMAN_L2___, ___MIDDLE_1___, ___NORMAN_R2___, KC_MINUS, - KC_LSFT, ___NORMAN_L3___, ___MIDDLE_1___, ___NORMAN_R3___, KC_RSFT, - ___XD75_BOTTOM___ - ), + KC_GRV, ___ORTHO_15_N___, KC_EQL, + KC_LOCK, ___13_NORMAN_1___, KC_SLASH, + TAB_BKTAB, ___13_NORMAN_2___, KC_MINUS, + KC_LSFT, ___13_NORMAN_3___, KC_RSFT, + ___ORTHO_15_BOTTOM___ + ), [DVORAK_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( - DB_GRV, ___NUMBER_BEPO_L___, ___MIDDLE_T_BP___, ___NUMBER_BEPO_R___, DB_EQL, - KC_LOCK, ___DVORAK_FR_L1___, ___MIDDLE_1_BP___, ___DVORAK_FR_R1___, DB_SLASH, - TAB_BKTAB, ___DVORAK_FR_L2___, ___MIDDLE_2_BP___, ___DVORAK_FR_R2___, DB_MINUS, - KC_LSFT, ___DVORAK_FR_L3___, ___MIDDLE_3_BP___, ___DVORAK_FR_R3___, KC_RSFT, - ___XD75_BOTTOM_FR___ - ), + DB_GRV, ___ORTHO_15_B_N___, DB_EQL, + KC_LOCK, ___13_DVORAK_B_1___, DB_SLASH, + TAB_BKTAB, ___13_DVORAK_B_2___, DB_MINUS, + KC_LSFT, ___13_DVORAK_B_3___, KC_RSFT, + ___ORTHO_15_BOTTOM_FR___ + ), [XMONAD] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___, ___DVORAK_L1___, ___3___, ___DVORAK_R1___, ___, - ___, ___DVORAK_L2___, ___3___, ___DVORAK_R2___, ___, - ___, ___DVORAK_L3___, ___3___, ___DVORAK_R3___, ___, + ___ORTHO_15_FUNC_1_12___, + ___, ___13_DVORAK_1___, ___, + ___, ___13_DVORAK_2___, ___, + ___, ___13_DVORAK_3___, ___, ___15___ - ), + ), [XMONAD_FR] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___, ___DVORAK_FR_L1___, ___3___, ___DVORAK_FR_R1___, ___, - ___, ___DVORAK_FR_L2___, ___3___, ___DVORAK_FR_R2___, ___, - ___, ___DVORAK_FR_L3___, ___3___, ___DVORAK_FR_R3___, ___, + ___ORTHO_15_FUNC_1_12___, + ___, ___13_DVORAK_B_1___, ___, + ___, ___13_DVORAK_B_2___, ___, + ___, ___13_DVORAK_B_3___, ___, ___15___ - ), + ), [BEPO] = LAYOUT_ortho_5x15_wrapper( - BP_DLR, ___SYMBOL_BEPO_L___, ___MIDDLE_T_BP___, ___SYMBOL_BEPO_R___, BP_EQL, - KC_LOCK, ___BEPO_FR_L1___, ___MIDDLE_1_BP___, ___BEPO_FR_R1___, BP_W, - TAB_BKTAB, ___BEPO_FR_L2___, ___MIDDLE_2_BP___, ___BEPO_FR_R2___, BP_CCED, - BP_SFT_T_ECRC, ___BEPO_FR_L3___, ___MIDDLE_3_BP___, ___BEPO_FR_R3___, BP_SFT_T_W, - ___XD75_BOTTOM_FR___ + ___ORTHO_15_B_SYMB___, + KC_LOCK, ___13_BEPO_1___, BP_W, + TAB_BKTAB, ___13_BEPO_2___, BP_CCED, + BP_SFT_T_ECRC, ___13_BEPO_3___, BP_SFT_T_W, + ___ORTHO_15_BOTTOM_BP___ ), // SYMBOLS [SYMB] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___SYMBOLS6_1___, ___3___, ___SYMPAD_1___, - ___SYMBOLS6_2___, ___3___, ___SYMPAD_2___, - ___SYMBOLS6_3___, ___3___, ___SYMPAD_3___, - ___SYMBOLS6_4___, ___3___, ___SYMPAD_4___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_SYMB_1___, + ___15_SYMB_2___, + ___15_SYMB_3___, + ___15_SYMB_4___ + ), [KEYPAD] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1___, ___, - ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2___, ___, - ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4___, ___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_KP_1___, + ___15_KP_2___, + ___15_KP_3___, + ___15_KP_4___ + ), [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1_BP___, ___, - ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2_BP___, ___, - ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3_BP___, KC_PENT, - ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4_BP___, ___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_KP_B_1___, + ___15_KP_B_2___, + ___15_KP_B_3___, + ___15_KP_B_4___ + ), [SYMB_ON_BEPO] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___SYMBOLS6_1_BP___, ___3___, ___SYMPAD_1_BP___, - ___SYMBOLS6_2_BP___, ___3___, ___SYMPAD_2_BP___, - ___SYMBOLS6_3_BP___, ___3___, ___SYMPAD_3_BP___, - ___SYMBOLS6_4_BP___, ___3___, ___SYMPAD_4_BP___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_SYMB_B_1___, + ___15_SYMB_B_2___, + ___15_SYMB_B_3___, + ___15_SYMB_B_4___ + ), // MEDIA AND MOUSE [MDIA] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___MOUSE_BTNS_L___, ___4___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___, - ___, ___MOUSE_LDUR___, ___4___, KC_VOLD, ___VI_ARROWS___, ___, - ___, ___MWHEEL_LDUR___, ___4___, KC_PGUP, ___MOUSE_BTNS_R___, - ___2___, ___MACCL___, ___4___, KC_PGDN, ___5___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_MDIA_1___, + ___15_MDIA_2___, + ___15_MDIA_3___, + ___15_MDIA_4___ + ), [LAYERS] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___X3___, ___LAYERS_B1_2___, ___5___, ___LAYERS_T_BP_3___, ___X2___, - ___X3___, ___LAYERS_B2_2___, ___5___, ___LAYERS_T_3___, ___X2___, - ___X2___, ___LAYERS_B3_3___, ___5___, ___LAYERS_T_DEF___, ___X2___, - ___5___, ___5___, ___5___ - ), + ___ORTHO_15_FUNC_1_12___, + ___15_LAYERS_1___, + ___15_LAYERS_2___, + ___15_LAYERS_3___, + ___15___ + ), [_RGB] = LAYOUT_ortho_5x15_wrapper( - ___FUNC_1_6___, ___3___, ___FUNC_7_12___, - ___, ___RGB_HUE_SAT_INT_UP___, ___5___, ___5___, - ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___4___, ___RGB_P_B_R_SW_SN___, - ___5___, ___5___, ___RGB_KXGT___, ___, + ___ORTHO_15_FUNC_1_12___, + ___15_RGB_1___, + ___15_RGB_2___, + ___15_RGB_3___, ___15___ - ), + ), }; diff --git a/users/ericgebhart/base_layers.h b/users/ericgebhart/base_layers.h new file mode 100644 index 000000000000..882b78f12111 --- /dev/null +++ b/users/ericgebhart/base_layers.h @@ -0,0 +1,280 @@ +/* + 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 . +*/ + +#include "core_keysets.h" + +/******************************************************************/ +/* These are the keys for the middle and bottom edge of any layout*/ +/* That way we only need to set them once and use them everywhere */ +/* The thumb keys, the bottom rows, etc. */ +/******************************************************************/ +/******************************************************************/ +/* Middle Keysets for the XD75 */ +/******************************************************************/ + +// For the middle keys of an xd75. It's got one more column in the middle than +// the ergodox, or the viterbi. And the Ergodox is missing a key in column 7 +// counting from either end. Which is the first and 3rd columns of these sets. + +// it's all an experient. I'm not sure what make sense here. +// stealing what I can from the ergodox layout. +/* The XD75 has 3 keys inbetween the usual left and right hand */ +#define ___ORTHO_15_MIDDLE_T___ OSL(LAYERS), LCTL(KC_A), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_15_MIDDLE_1___ LCTL(KC_C), LCTL(KC_X), LCTL(KC_V) +#define ___ORTHO_15_MIDDLE_2___ TO(SYMB), TO(_RGB), TO(KEYPAD) +#define ___ORTHO_15_MIDDLE_3___ OSL(SYMB), TO(MDIA), OSL(KEYPAD) +#define ___ORTHO_15_MIDDLE_4___ CTL_BSPC, ALT_DEL, XMONAD_ESC, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___ORTHO_15_MIDDLE_T_BP___ OSL(LAYERS), LCTL(BP_A), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_15_MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_X), LCTL(BP_V) +#define ___ORTHO_15_MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) +#define ___ORTHO_15_MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) + +// The Viterbi only has 2 keys in the middle. +#define ___ORTHO_14_MIDDLE_T___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_14_MIDDLE_1___ LCTL(KC_C), LCTL(KC_V) +#define ___ORTHO_14_MIDDLE_2___ TO(SYMB), TO(KEYPAD) +#define ___ORTHO_14_MIDDLE_3___ OSL(SYMB), OSL(KEYPAD) + +// becomes the upper thumbs, the real 4th row if we throw away +// the number row at the top +#define ___ORTHO_14_MIDDLE_4___ XXX, HOME_END, KC_PGDN, XXX +// basically the thumb keys like on the ergodox. +#define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC, KC_PGDN, ALT_ENT, CTL_SPC + +// The same, for BEPO +#define ___ORTHO_14_MIDDLE_T_BP___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS +#define ___ORTHO_14_MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_V) +#define ___ORTHO_14_MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___ORTHO_14_MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO) + +#define ___ORTHO_14_MIDDLE_4_BP___ XXX, HOME_END, KC_PGUP, XXX + + +/********************************************************************/ +/** The top rows for numbers, symbols and Fkeys. **/ +/********************************************************************/ +#define ___ORTHO_15_N___ ___NUMBER_L___, ___ORTHO_15_MIDDLE_T___, ___NUMBER_R___ +#define ___ORTHO_15_B_N___ ___NUMBER_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___NUMBER_BEPO_R___ +// the full bepo symbol row. +#define ___ORTHO_15_B_SYMB___ BP_DLR, ___SYMBOL_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___SYMBOL_BEPO_R___, BP_EQL + +// transparent in the middle because I only put this on transient layers. +#define ___ORTHO_15_FUNC_1_12___ ___FUNC_1_6___, ___3___, ___FUNC_7_12___ + + +/********************************************************************/ +/** The bottom row and thumbs as needed. **/ +/********************************************************************/ +#define ___BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT +#define ___BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) + +// the bottom rows for keyboards on bepo. +// bepo on bepo - not enough space to go around.... +#define ___BOTTOM_LEFT_BP___ LCTL(BP_C), BP_ECRC, LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___BOTTOM_RIGHT_BP___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC + +// for dvorak on bepo +#define ___BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_C), LCTL(BP_V), KC_LEFT, KC_RIGHT +#define ___BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC + +#define ___ORTHO_15_BOTTOM___ ___BOTTOM_LEFT___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT___ +#define ___ORTHO_15_BOTTOM_FR___ ___BOTTOM_LEFT_FR___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT_FR___ +#define ___ORTHO_15_BOTTOM_BP___ ___BOTTOM_LEFT_BP___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT_BP___ + +#define ___ORTHO_14_BOTTOM___ ___BOTTOM_LEFT___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT___ +#define ___ORTHO_14_BOTTOM_FR___ ___BOTTOM_LEFT_FR___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT_FR___ +#define ___ORTHO_14_BOTTOM_BP___ ___BOTTOM_LEFT_BP___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT_BP___ +#define ___ORTHO_14_THUMBS_BOTTOM___ ___4___, ___MIDDLE_THUMBS___, ___4___ + + +#define ___ERGODOX_THUMB_LEFT___ \ + OS_RALT, TG(MDIA), \ + HOME_END, \ + CTL_BSPC, ALT_DEL, XMONAD_ESC + +#define ___ERGODOX_THUMB_RIGHT___ \ + TG(SYMB), OS_RALT, \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC + +#define ___ERGODOX_THUMB_RIGHT_BP___ \ + TG(SYMB_ON_BEPO), OS_RALT, \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC + +#define ___ERGODOX_TRANS_THUMBS___ ___6___ +#define ___TRANS_BOTTOM___ ___5___ + +/********************************************************************************/ +/* the interior rows for ortholinear keyboards. the first number is the length */ +/* So you can put what you want on the outside ends, make new middles as needed */ +/* It would be nice to make this a little more dynamic. There is little */ +/* differenc between them. */ +/********************************************************************************/ + +//// ortho15 core rows. used with my xd75. +/***********************************************************/ +/* ORTHO15 interior rows. used with my xd75 */ +/***********************************************************/ +#define ___13_DVORAK_1___ ___DVORAK_L1___, ___ORTHO_15_MIDDLE_1___, ___DVORAK_R1___ +#define ___13_DVORAK_2___ ___DVORAK_L2___, ___ORTHO_15_MIDDLE_2___, ___DVORAK_R2___ +#define ___13_DVORAK_3___ ___DVORAK_L3___, ___ORTHO_15_MIDDLE_3___, ___DVORAK_R3___ + +#define ___13_QWERTY_1___ ___QWERTY_L1___, ___ORTHO_15_MIDDLE_1___, ___QWERTY_R1___ +#define ___13_QWERTY_2___ ___QWERTY_L2___, ___ORTHO_15_MIDDLE_2___, ___QWERTY_R2___ +#define ___13_QWERTY_3___ ___QWERTY_L3___, ___ORTHO_15_MIDDLE_3___, ___QWERTY_R3___ + +#define ___13_COLEMAK_1___ ___COLEMAK_L1___, ___ORTHO_15_MIDDLE_1___, ___COLEMAK_R1___ +#define ___13_COLEMAK_2___ ___COLEMAK_L2___, ___ORTHO_15_MIDDLE_2___, ___COLEMAK_R2___ +#define ___13_COLEMAK_3___ ___COLEMAK_L3___, ___ORTHO_15_MIDDLE_3___, ___COLEMAK_R3___ + +#define ___13_WORKMAN_1___ ___WORKMAN_L1___, ___ORTHO_15_MIDDLE_1___, ___WORKMAN_R1___ +#define ___13_WORKMAN_2___ ___WORKMAN_L2___, ___ORTHO_15_MIDDLE_2___, ___WORKMAN_R2___ +#define ___13_WORKMAN_3___ ___WORKMAN_L3___, ___ORTHO_15_MIDDLE_3___, ___WORKMAN_R3___ + +#define ___13_NORMAN_1___ ___NORMAN_L1___, ___ORTHO_15_MIDDLE_1___, ___NORMAN_R1___ +#define ___13_NORMAN_2___ ___NORMAN_L2___, ___ORTHO_15_MIDDLE_2___, ___NORMAN_R2___ +#define ___13_NORMAN_3___ ___NORMAN_L3___, ___ORTHO_15_MIDDLE_3___, ___NORMAN_R3___ + +#define ___13_DVORAK_B_1___ ___DVORAK_FR_L1___, ___ORTHO_15_MIDDLE_1_BP___, ___DVORAK_FR_R1___ +#define ___13_DVORAK_B_2___ ___DVORAK_FR_L2___, ___ORTHO_15_MIDDLE_2_BP___, ___DVORAK_FR_R2___ +#define ___13_DVORAK_B_3___ ___DVORAK_FR_L3___, ___ORTHO_15_MIDDLE_3_BP___, ___DVORAK_FR_R3___ + +#define ___13_BEPO_1___ ___BEPO_FR_L1___, ___ORTHO_15_MIDDLE_1_BP___, ___BEPO_FR_R1___ +#define ___13_BEPO_2___ ___BEPO_FR_L2___, ___ORTHO_15_MIDDLE_2_BP___, ___BEPO_FR_R2___ +#define ___13_BEPO_3___ ___BEPO_FR_L3___, ___ORTHO_15_MIDDLE_3_BP___, ___BEPO_FR_R3___ + +// transparent xmonad/dvorak layer +#define ___15_XMONAD_1___ ___, ___DVORAK_L1___, ___3___, ___DVORAK_R1___, ___ +#define ___15_XMONAD_2___ ___, ___DVORAK_L2___, ___3___, ___DVORAK_R2___, ___ +#define ___15_XMONAD_3___ ___, ___DVORAK_L3___, ___3___, ___DVORAK_R3___, ___ + +// transparent xmonad/dvorak layer in bepo +#define ___15_XMONAD_B_1___ ___, ___DVORAK_FR_L1___, ___3___, ___DVORAK_FR_R1___, ___ +#define ___15_XMONAD_B_2___ ___, ___DVORAK_FR_L2___, ___3___, ___DVORAK_FR_R2___, ___ +#define ___15_XMONAD_B_3___ ___, ___DVORAK_FR_L3___, ___3___, ___DVORAK_FR_R3___, ___ + +#define ___15_SYMB_1___ ___SYMBOLS6_1___, ___3___, ___SYMPAD_1___ +#define ___15_SYMB_2___ ___SYMBOLS6_2___, ___3___, ___SYMPAD_2___ +#define ___15_SYMB_3___ ___SYMBOLS6_3___, ___3___, ___SYMPAD_3___ +#define ___15_SYMB_4___ ___SYMBOLS6_4___, ___3___, ___SYMPAD_4___ + +#define ___15_KP_1___ ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1___, ___ +#define ___15_KP_2___ ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2___, ___ +#define ___15_KP_3___ ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3___, KC_PENT +#define ___15_KP_4___ ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4___, ___ + +#define ___15_KP_B_1___ ___2___, ___FUNCPAD_T___, ___5___, ___KEYPAD_1_BP___, ___ +#define ___15_KP_B_2___ ___2___, ___FUNCPAD_1___, ___5___, ___KEYPAD_2_BP___, ___ +#define ___15_KP_B_3___ ___2___, ___FUNCPAD_2___, ___5___, ___KEYPAD_3_BP___, KC_PENT +#define ___15_KP_B_4___ ___2___, ___FUNCPAD_3___, ___5___, ___KEYPAD_4_BP___, ___ + +#define ___15_SYMB_B_1___ ___SYMBOLS6_1_BP___, ___3___, ___SYMPAD_1_BP___ +#define ___15_SYMB_B_2___ ___SYMBOLS6_2_BP___, ___3___, ___SYMPAD_2_BP___ +#define ___15_SYMB_B_3___ ___SYMBOLS6_3_BP___, ___3___, ___SYMPAD_3_BP___ +#define ___15_SYMB_B_4___ ___SYMBOLS6_4_BP___, ___3___, ___SYMPAD_4_BP___ + +#define ___15_MDIA_1___ ___MOUSE_BTNS_L___, ___4___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___ +#define ___15_MDIA_2___ ___, ___MOUSE_LDUR___, ___4___, KC_VOLD, ___VI_ARROWS___, ___ +#define ___15_MDIA_3___ ___, ___MWHEEL_LDUR___, ___4___, KC_PGUP, ___MOUSE_BTNS_R___ +#define ___15_MDIA_4___ ___2___, ___MACCL___, ___4___, KC_PGDN, ___5___ + +#define ___15_LAYERS_1___ ___X3___, ___2_LAYERS_B1___, ___5___, ___3_LAYERS_T_BP___, ___X2___ +#define ___15_LAYERS_2___ ___X3___, ___2_LAYERS_B2___, ___5___, ___3_LAYERS_T___, ___X2___ +#define ___15_LAYERS_3___ ___X2___, ___3_LAYERS_B3___, ___5___, ___3_LAYERS_T_CTL___, ___X2___ + +#define ___15_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___, ___5___, ___5___ +#define ___15_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___4___, ___RGB_P_B_R_SW_SN___ +#define ___15_RGB_3___ ___5___, ___5___, ___RGB_KXGT___, ___ + + + +/***********************************************************/ +/* ORTHO14 base layer interior rows. used with my viterbi */ +/***********************************************************/ +#define ___12_DVORAK_1___ ___DVORAK_L1___, ___ORTHO_14_MIDDLE_1___, ___DVORAK_R1___ +#define ___12_DVORAK_2___ ___DVORAK_L2___, ___ORTHO_14_MIDDLE_2___, ___DVORAK_R2___ +#define ___12_DVORAK_3___ ___DVORAK_L3___, ___ORTHO_14_MIDDLE_3___, ___DVORAK_R3___ + +#define ___12_QWERTY_1___ ___QWERTY_L1___, ___ORTHO_14_MIDDLE_1___, ___QWERTY_R1___ +#define ___12_QWERTY_2___ ___QWERTY_L2___, ___ORTHO_14_MIDDLE_2___, ___QWERTY_R2___ +#define ___12_QWERTY_3___ ___QWERTY_L3___, ___ORTHO_14_MIDDLE_3___, ___QWERTY_R3___ + +#define ___12_COLEMAK_1___ ___COLEMAK_L1___, ___ORTHO_14_MIDDLE_1___, ___COLEMAK_R1___ +#define ___12_COLEMAK_2___ ___COLEMAK_L2___, ___ORTHO_14_MIDDLE_2___, ___COLEMAK_R2___ +#define ___12_COLEMAK_3___ ___COLEMAK_L3___, ___ORTHO_14_MIDDLE_3___, ___COLEMAK_R3___ + +#define ___12_WORKMAN_1___ ___WORKMAN_L1___, ___ORTHO_14_MIDDLE_1___, ___WORKMAN_R1___ +#define ___12_WORKMAN_2___ ___WORKMAN_L2___, ___ORTHO_14_MIDDLE_2___, ___WORKMAN_R2___ +#define ___12_WORKMAN_3___ ___WORKMAN_L3___, ___ORTHO_14_MIDDLE_3___, ___WORKMAN_R3___ + +#define ___12_NORMAN_1___ ___NORMAN_L1___, ___ORTHO_14_MIDDLE_1___, ___NORMAN_R1___ +#define ___12_NORMAN_2___ ___NORMAN_L2___, ___ORTHO_14_MIDDLE_2___, ___NORMAN_R2___ +#define ___12_NORMAN_3___ ___NORMAN_L3___, ___ORTHO_14_MIDDLE_3___, ___NORMAN_R3___ + +#define ___12_DVORAK_B_1___ ___DVORAK_FR_L1___, ___ORTHO_14_MIDDLE_1_BP___, ___DVORAK_FR_R1___ +#define ___12_DVORAK_B_2___ ___DVORAK_FR_L2___, ___ORTHO_14_MIDDLE_2_BP___, ___DVORAK_FR_R2___ +#define ___12_DVORAK_B_3___ ___DVORAK_FR_L3___, ___ORTHO_14_MIDDLE_3_BP___, ___DVORAK_FR_R3___ + +#define ___12_BEPO_2___ ___BEPO_FR_L1___, ___ORTHO_14_MIDDLE_1_BP___, ___BEPO_FR_R1___ +#define ___12_BEPO_3___ ___BEPO_FR_L2___, ___ORTHO_14_MIDDLE_2_BP___, ___BEPO_FR_R2___ +#define ___12_BEPO_4___ ___BEPO_FR_L3___, ___ORTHO_14_MIDDLE_3_BP___, ___BEPO_FR_R3___ + + +// transparent layers. +#define ___14_XMONAD_1___ ___, ___DVORAK_L1___, ___2___, ___DVORAK_R1___, ___ +#define ___14_XMONAD_2___ ___, ___DVORAK_L2___, ___2___, ___DVORAK_R2___, ___ +#define ___14_XMONAD_3___ ___, ___DVORAK_L3___, ___2___, ___DVORAK_R3___, ___ + +#define ___14_XMONAD_B_1___ ___, ___DVORAK_FR_L1___, ___2___, ___DVORAK_FR_R1___, ___ +#define ___14_XMONAD_B_2___ ___, ___DVORAK_FR_L2___, ___2___, ___DVORAK_FR_R2___, ___ +#define ___14_XMONAD_B_3___ ___, ___DVORAK_FR_L3___, ___2___, ___DVORAK_FR_R3___, ___ + +#define ___14_SYMB_1___ ___SYMBOLS6_1___, ___2___, ___SYMPAD_1___ +#define ___14_SYMB_2___ ___SYMBOLS6_2___, ___2___, ___SYMPAD_2___ +#define ___14_SYMB_3___ ___SYMBOLS6_3___, ___2___, ___SYMPAD_3___ +#define ___14_SYMB_4___ ___SYMBOLS6_4___, ___2___, ___SYMPAD_4___ + +#define ___14_KP_1___ ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1___, ___ +#define ___14_KP_2___ ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2___, ___ +#define ___14_KP_3___ ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3___, KC_PENT +#define ___14_KP_4___ ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4___, ___ + +#define ___14_KP_B_1___ ___2___, ___FUNCPAD_T___, ___4___, ___KEYPAD_1_BP___, ___ +#define ___14_KP_B_2___ ___2___, ___FUNCPAD_1___, ___4___, ___KEYPAD_2_BP___, ___ +#define ___14_KP_B_3___ ___2___, ___FUNCPAD_2___, ___4___, ___KEYPAD_3_BP___, KC_PENT +#define ___14_KP_B_4___ ___2___, ___FUNCPAD_3___, ___4___, ___KEYPAD_4_BP___, ___ + +#define ___14_SYMB_B_1___ ___SYMBOLS6_1_BP___, ___2___, ___SYMPAD_1_BP___ +#define ___14_SYMB_B_2___ ___SYMBOLS6_2_BP___, ___2___, ___SYMPAD_2_BP___ +#define ___14_SYMB_B_3___ ___SYMBOLS6_3_BP___, ___2___, ___SYMPAD_3_BP___ +#define ___14_SYMB_B_4___ ___SYMBOLS6_4_BP___, ___2___, ___SYMPAD_4_BP___ + +#define ___14_MDIA_1___ ___MOUSE_BTNS_L___, ___3___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___ +#define ___14_MDIA_2___ ___, ___MOUSE_LDUR___, ___3___, KC_VOLD, ___VI_ARROWS___, ___ +#define ___14_MDIA_3___ ___, ___MWHEEL_LDUR___, ___3___, KC_PGUP, ___MOUSE_BTNS_R___ +#define ___14_MDIA_4___ ___2___, ___MACCL___, ___3___, KC_PGDN, ___5___ + +#define ___14_LAYERS_1___ ___X3___, ___2_LAYERS_B1___, ___4___, ___3_LAYERS_T_BP___, ___X2___ +#define ___14_LAYERS_2___ ___X3___, ___2_LAYERS_B2___, ___4___, ___3_LAYERS_T___, ___X2___ +#define ___14_LAYERS_3___ ___X2___, ___3_LAYERS_B3___, ___4___, ___3_LAYERS_T_CTL___, ___X2___ + +#define ___14_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___, ___4___, ___5___ +#define ___14_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___3___, ___RGB_P_B_R_SW_SN___ +#define ___14_RGB_3___ ___5___, ___4___, ___RGB_KXGT___, ___ diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h new file mode 100644 index 000000000000..955020bd0dc9 --- /dev/null +++ b/users/ericgebhart/core_keys.h @@ -0,0 +1,293 @@ +/* + 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 . +*/ + +#include "quantum.h" +#include "process_keycode/process_tap_dance.h" + +//#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ + +void tap(uint16_t keycode); +bool process_record_secrets(uint16_t keycode, keyrecord_t *record); + + +#define EECONFIG_USERSPACE (uint8_t *)19 + +typedef union { + uint8_t raw; + struct { + bool clicky_enable :1; + bool rgb_layer_change :1; + bool is_overwatch :1; + bool nuke_switch :1; + }; +} userspace_config_t; + + +// for the creation of dvorak keys on an Bepo keyboard at the OS layer. +// so we can create an array of reasonable size +// for our translation keys. We have to create a +// good range of numbers +#define GR(x) (x-SAFE_RANGE) + +uint8_t gr(uint8_t); +void send_keycode(uint8_t); + +#define MOD_NONE 0x00 + +// indexs for the keycode translation table. +#define UNSHIFTED_KEY(key) key_translations[gr(key)][0][0] +#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1] +#define SHIFTED_KEY(key) key_translations[gr(key)][1][0] +#define SHIFTED_MODS(key) key_translations[gr(key)][1][1] + + +enum userspace_custom_keycodes { + // keep the keycodes using the send_key function close to SAFE_RANGE + // so the array of keycodes remains a reasonbale size. + DB_1 = SAFE_RANGE, // can always be here + DB_2, + DB_3, + DB_4, + DB_5, + DB_6, + DB_7, + DB_8, + DB_9, + DB_0, + DB_GRV, + DB_SCOLON, + DB_SLASH, + DB_BACKSLASH, + DB_EQL, + DB_DOT, + DB_COMM, + DB_QUOT, + DB_MINUS, + DB_RPRN, + DB_LPRN, + DB_RBRC, + DB_LBRC, + // for symbols layer + DB_HASH, + DB_LCBR, + DB_RCBR, + DB_PIPE, + DB_TILD, + DB_CIRC, + DB_LESS, + DB_GRTR, + // End of dvorak on bepo translation keys. + + EPRM, + VRSN, + KC_DVORAK_ON_BEPO, + KC_BEPO, + KC_NORMAN, + KC_QWERTY, + KC_COLEMAK, + KC_DVORAK, + KC_WORKMAN, + KC_MAKE, + KC_RESET, + KC_RGB_T, + KC_SECRET_1, + KC_SECRET_2, + KC_SECRET_3, + KC_SECRET_4, + KC_SECRET_5, + KC_CCCV +}; + +#define SFTGUI_T(kc) { MT(MOD_LGUI | MOD_LSFT, kc) } +#define SFT_GUI_ESC MT(MOD_LSFT | MOD_LGUI, KC_PGDN) // shift LGUI or Escape. +#define ALT_ENT ALT_T(KC_ENT) // Alt or enter +#define CTL_SPC CTL_T(KC_SPC) // ctrl or space +#define CTL_BSPC CTL_T(KC_BSPC) // ctrl or backspace +#define ALT_DEL ALT_T(KC_DEL) // Alt or delete +#define GUI_ESC GUI_T(KC_ESC) // Gui or escape +#define ALGR_SYMB ALGR_T(TG(SYMB)) // Alt gre or toggle symbol layer + + + +// OSM keycodes, to keep things clean and easy to change +#define KC_MLSF OSM(MOD_LSFT) +#define KC_MRSF OSM(MOD_RSFT) +#define OS_LGUI OSM(MOD_LGUI) +#define OS_RGUI OSM(MOD_RGUI) +#define OS_LSFT OSM(MOD_LSFT) +#define OS_RSFT OSM(MOD_RSFT) +#define OS_LCTL OSM(MOD_LCTL) +#define OS_RCTL OSM(MOD_RCTL) +#define OS_LALT OSM(MOD_LALT) +#define OS_RALT OSM(MOD_RALT) +#define ALT_APP ALT_T(KC_APP) + +#define MG_NKRO MAGIC_TOGGLE_NKRO + + +//// TAP DANCE + + typedef struct { + bool is_press_action; + int state; + } tdtap; + +enum { + SINGLE_TAP = 1, + SINGLE_HOLD = 2, + DOUBLE_TAP = 3, + DOUBLE_HOLD = 4, + DOUBLE_SINGLE_TAP = 5, //send two single taps + TRIPLE_TAP = 6, + TRIPLE_HOLD = 7 +}; + +//Tap Dance Declarations +enum { + TD_ESC_CAPS = 0, + TD_TAB_BKTAB = 1, + TD_MDIA_SYMB = 2, + TD_HOME_END = 3, + TD_XMONAD_ESC = 4, + TD_DEF_LAYER_SW = 5, + TD_DEF_OS_LAYER_SW = 6, + TD_MOUSE_BTNS = 7, + TD_DVORAK_BEPO = 8 +}; + + +// Tap dance +#define TAB_BKTAB TD(TD_TAB_BKTAB) // Tab or backtab tapdance. +#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB) // MDIA, symb, keypad, layouts layer tapdance toggle. +#define DEF_LAYER_SW TD(TD_DEF_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer +#define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer +#define HOME_END TD(TD_HOME_END) // home or end tapdance. +#define XMONAD_ESC TD(TD_XMONAD_ESC) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 +#define DVORAK_ET_BEPO TD(TD_DVORAK_BEPO) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 +#define TDMOUSE_BTNS TD(TD_MOUSE_BTNS) // hmmm. 1-5 + +// HOME ROW LAYER TOGGLE (LT) and Shift. +// both sides of the home row have "shift, ___, media , symb, ___" and "___, symb, media, ___, shift". +// so pinky fingers are shift when held and the index and second fingers are symbol and +// media layers when held. + +// Dvorak +// shift and layer switch on hold on the home row. +#define KC_SFT_T_A SFT_T(KC_A) +#define KC_SFT_T_S SFT_T(KC_S) + +#define KC_LT_SYMB_U LT(SYMB, KC_U) +#define KC_LT_SYMB_H LT(SYMB, KC_H) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_MDIA_T LT(MDIA, KC_T) + +// Need to add this to the others. +#define KC_LT_KP_N LT(KEYPAD, KC_N) +#define KC_LT_KP_O LT(KEYPAD, KC_O) + +// for dvorak on bepo +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) + +#define BP_LT_SYMB_U LT(SYMB, BP_U) +#define BP_LT_SYMB_H LT(MDIA, BP_H) + +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_MDIA_T LT(MDIA, BP_T) + +// Need to add this to the others. +#define BP_LT_KP_N LT(KEYPAD, BP_N) +#define BP_LT_KP_O LT(KEYPAD, BP_O) + +// for bepo on bepo +#define BP_SFT_T_T SFT_T(BP_T) +#define BP_SFT_T_W SFT_T(BP_W) + +#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) +#define BP_LT_MDIA_E LT(MDIA, BP_E) +#define BP_LT_KP_U LT(KEYPAD, BP_U) + +#define BP_LT_SYMB_S LT(SYMB_ON_BEPO, BP_S) +#define BP_LT_MDIA_R LT(MDIA, BP_R) +#define BP_LT_KP_N LT(KEYPAD, BP_N) + +#define BP_SFT_T_A SFT_T(BP_A) +#define BP_SFT_T_S SFT_T(BP_S) +#define BP_SFT_T_E SFT_T(BP_E) +#define BP_SFT_T_M SFT_T(BP_M) + +#define BP_SFT_T_ECRC SFT_T(BP_ECRC) +#define BP_SFT_T_CCED SFT_T(BP_CCED) +#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) + +//QWERTY +#define KC_SFT_T_SCLN SFT_T(KC_SCLN) + +#define KC_LT_MDIA_D LT(MDIA, KC_D) +#define KC_LT_MDIA_K LT(MDIA, KC_K) +#define KC_LT_SYMB_F LT(SYMB, KC_F) +#define KC_LT_SYMB_J LT(SYMB, KC_J) + +//COLEMAK +#define KC_SFT_T_O SFT_T(KC_O) +#define KC_LT_MDIA_S LT(MDIA, KC_S) +#define KC_LT_SYMB_T LT(SYMB, KC_T) + +#define KC_LT_MDIA_E LT(MDIA, KC_E) +#define KC_LT_SYMB_N LT(SYMB, KC_N) + +//WORKMAN +#define KC_SFT_T_I SFT_T(KC_I) +#define KC_LT_MDIA_H LT(MDIA, KC_H) + +//NORMAN +// For keys on the homerow. Hold for shift, keypad,mouse,and smbol layers +#define KC_SFT_T_U SFT_T(KC_U) +#define KC_LT_MDIA_I LT(MDIA, KC_I) + +// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). +#define MK_CUT LSFT(KC_DEL) // shift + delete +#define MK_COPY LCTL(KC_INS) // ctrl + insert +#define MK_PASTE LSFT(KC_INS) // shift + insert + +#define ___ KC_TRNS +#define XXX KC_NO + +// Blocking keys +#define ___X___ XXX +#define ___X2___ XXX, XXX +#define ___X3___ ___X2___, XXX +#define ___X5___ ___X3___, XXX, XXX +#define ___X15___ ___X5___, ___X5___, ___X5___ + +// Transparent keys +#define ___2___ ___, ___ +#define ___3___ ___2___, ___ +#define ___4___ ___3___, ___ +#define ___5___ ___4___, ___ +#define ___6___ ___5___, ___ +#define ___14___ ___5___, ___4___, ___5___ +#define ___15___ ___5___, ___5___, ___5___ + +int on_qwerty(void); +int get_xmonad_layer(void); +int cur_dance (qk_tap_dance_state_t *state); + +//for the x tap dance. Put it here so it can be used in any keymap +void x_finished (qk_tap_dance_state_t *state, void *user_data); +void x_reset (qk_tap_dance_state_t *state, void *user_data); diff --git a/users/ericgebhart/core_keysets.h b/users/ericgebhart/core_keysets.h new file mode 100644 index 000000000000..6596e2121d0d --- /dev/null +++ b/users/ericgebhart/core_keysets.h @@ -0,0 +1,292 @@ +/* + 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 . +*/ + +#include "core_keys.h" + +/********************************************************************/ +/** Parts are parts, pieces of keysets so we have some decent **/ +/** building blocks to make keymaps with. **/ +/********************************************************************/ + + +// Since our quirky block definitions are basically a list of comma separated +// arguments, we need a wrapper in order for these definitions to be +// expanded before being used as arguments to the LAYOUT_xxx macro. +#if (!defined(LAYOUT) && defined(KEYMAP)) +#define LAYOUT KEYMAP +#endif + +#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) +#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__) +#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) +#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) + +#define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) +#define LAYOUT_ortho_5x14_wrapper(...) LAYOUT_ortho_5x14(__VA_ARGS__) + + +/********************************************************************/ +/** The Core rows of each given layout. **/ +/********************************************************************/ +//Dvorak on a qwerty software layer in the OS +#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y +#define ___DVORAK_L2___ KC_SFT_T_A, KC_LT_KP_O, KC_LT_MDIA_E, KC_LT_SYMB_U, KC_I +#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X + +#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L +#define ___DVORAK_R2___ KC_D, KC_LT_SYMB_H, KC_LT_MDIA_T, KC_LT_KP_N, KC_SFT_T_S +#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z + +// Qwerty based layers that I don't really use. +#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T +#define ___QWERTY_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_D, KC_LT_SYMB_F, KC_G +#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P +#define ___QWERTY_R2___ KC_H, KC_LT_SYMB_J, KC_LT_MDIA_K, KC_L, KC_SFT_T_SCLN +#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK +#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G +#define ___COLEMAK_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_D +#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_R2___ KC_H, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// COLEMAK-DH +#define ___COLEMAK_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B +#define ___COLEMAK_DH_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_G +#define ___COLEMAK_DH_L3___ KC_Z, KC_X, KC_C, KC_D, KC_V + +#define ___COLEMAK_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN +#define ___COLEMAK_DH_R2___ KC_M, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O +#define ___COLEMAK_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH + +// WORKMAN +#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B +#define ___WORKMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_H, KC_LT_SYMB_T, KC_G +#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V + +#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN +#define ___WORKMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_O, KC_SFT_T_I +#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH + +// NORMAN +#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K +#define ___NORMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_E, KC_LT_SYMB_T, KC_G +#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B + +#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN +#define ___NORMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_I, KC_O, KC_SFT_T_U +#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH + +// BEPO MAPS +// Dvorak on fr-bepo software layer in the OS. +// for dvorak and all the other qwerty like keyboards on bepo +#define ___DVORAK_FR_L1___ DB_QUOT, DB_COMM, DB_DOT, BP_P, BP_Y +#define ___DVORAK_FR_L2___ BP_SFT_T_A, BP_LT_KP_O, BP_LT_MDIA_E, BP_LT_SYMB_U, BP_I +#define ___DVORAK_FR_L3___ DB_SCOLON, BP_Q, BP_J, BP_K, BP_X + +#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L +#define ___DVORAK_FR_R2___ BP_D, BP_LT_SYMB_H, BP_LT_MDIA_T, BP_LT_KP_N, BP_SFT_T_S +#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z + + +// Bepo on fr-bepo software layer +// for bepo on bepo +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ +#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ + +#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV +#define ___BEPO_FR_L2___ BP_SFT_T_A, BP_LT_KP_U, BP_LT_SYMB_I, BP_LT_MDIA_E, BP_COMM +#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K + +#define ___BEPO_FR_R1___ /* BP_DCRC,*/ BP_V, BP_D, BP_L, BP_J, BP_Z +#define ___BEPO_FR_R2___ /* BP_C, */ BP_T, BP_LT_SYMB_S, BP_LT_MDIA_R, BP_LT_KP_N, BP_SFT_T_M //BP_CCED +#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F //BP_SFT_T_W + +/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ +/* KC_TAB, BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV, KC_BSPC, */ +/* KC_LSFT, BP_A, BP_U, BP_I, BP_E, BP_COMM, */ +/* KC_LCTRL, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_ENT, */ +/* ESC_FN, BP_ECRC, KC_LGUI, KC_LALT, SPC_RALT, */ +/* TT(SWAP), KC_MNXT, */ +/* KC_MPLY, */ +/* TT(FN), TT(NUMS), KC_MPRV, */ + +/* /\* right hand *\/ */ +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +/* KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, */ +/* BP_C, BP_T, BP_S, BP_R, BP_N, M_RSFT, */ +/* KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, W_RCTL, */ + + +/*******************************************************************/ +/** For the top rows. Numbers for most things, symbols for Bepo. **/ +/*******************************************************************/ + +// for everything on qwerty. +#define ___NUMBER_L___ KC_1, KC_2, KC_3, KC_4, KC_5 +#define ___NUMBER_R___ KC_6, KC_7, KC_8, KC_9, KC_0 + +// function key rows, works for everyone. +#define ___FUNC_L___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 +#define ___FUNC_R___ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 + +#define ___FUNC_1_6___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 +#define ___FUNC_7_12___ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 + +// a top symbol row if someone wants it. +#define ___SYMB_L___ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC +#define ___SYMB_R___ KC_CIRC, KC_AMPR, KC_AST, KC_LPRN, KC_RPRN + +// For numbers on bepo. Bepo has numbers on shifted keys, the +// reverse of most keyboard layouts. +#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 +#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 + + +/*******************************************************************/ +/* keysets for the auxillary layers. */ +/* the KC_P? codes don't work for me. I don't use those shifted */ +/* values anyway. */ +/*******************************************************************/ +// Keypads +#define ___KEYPAD_1___ KC_7, KC_8, KC_9, KC_PSLS +#define ___KEYPAD_2___ KC_4, KC_5, KC_6, KC_PAST +#define ___KEYPAD_3___ KC_1, KC_2, KC_3, KC_PMNS +#define ___KEYPAD_4___ KC_0, KC_DOT, KC_PEQL, KC_PPLS + +// Keypad from the default keymap.c of the xd75 +#define ___KEYPAD_1_ALT___ KC_P7, KC_P8, KC_P9, KC_MINS +#define ___KEYPAD_2_ALT___ KC_P4, KC_P5, KC_P6, KC_PLUS +#define ___KEYPAD_3_ALT___ KC_P1, KC_P2, KC_P3, KC_PENT +#define ___KEYPAD_4_ALT___ KC_P0, KC_DOT, KC_PENT, KC_PENT + +// For Bepo +#define ___KEYPAD_1_BP___ DB_7, DB_8, DB_9, BP_SLASH +#define ___KEYPAD_2_BP___ DB_4, DB_5, DB_6, BP_ASTR +#define ___KEYPAD_3_BP___ DB_1, DB_2, DB_3, DB_MINUS +#define ___KEYPAD_4_BP___ DB_0, DB_DOT, DB_EQL, BP_PLUS + + +// SYMBOLS +// An arrangement for the left hand with a focus on the ()[]{}s. +#define ___SYMBOLS_1___ KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE +#define ___SYMBOLS_2___ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV +#define ___SYMBOLS_3___ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD + +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1___ KC_GRV, KC_LT, KC_GT, KC_LCBR, KC_RCBR, KC_HASH +#define ___SYMBOLS6_2___ KC_AMPR, KC_AT, KC_ASTR, KC_LPRN, KC_RPRN, KC_PERC +#define ___SYMBOLS6_3___ KC_DLR, KC_DQT, KC_QUOT, KC_LBRC, KC_RBRC, KC_COLON +#define ___SYMBOLS6_4___ ___2___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN + +#define ___SYMBOLS5_4___ ___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN + + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1___ KC_GRV, KC_AMPR, KC_ASTR, KC_LCBR, KC_PLUS, KC_PIPE +#define ___SYMPAD_2___ KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_ASTR, KC_GRV +#define ___SYMPAD_3___ ___, KC_EXLM, KC_AT, KC_HASH, KC_MINUS, KC_SLASH +#define ___SYMPAD_4___ ___, KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH + +#define ___5_SYMPAD_4___ KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH + +// Function pad. Same idea as above, but for function keys. +#define ___FUNCPAD_T___ KC_F10, KC_F11, KC_F12 +#define ___FUNCPAD_1___ KC_F7, KC_F8, KC_F9 +#define ___FUNCPAD_2___ KC_F4, KC_F5, KC_F6 +#define ___FUNCPAD_3___ KC_F1, KC_F2, KC_F3 + + +//--- all over again for BEPO + +// SYMBOLS FOR BEPO +// The top row. Bepo has symbols not numbers. Numbers are the shifted values. +#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN +/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ +#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ + +// An arrangement for the left hand with a focus on the ()[]{}s. +#define ___SYMBOLS_1_BP___ KC_EXLM, BP_AT, DB_LCBR, DB_RCBR, DB_PIPE +#define ___SYMBOLS_2_BP___ DB_HASH, BP_DLR, DB_LPRN, DB_RPRN, DB_GRV +#define ___SYMBOLS_3_BP___ BP_PERC, DB_CIRC, DB_LBRC, DB_RBRC, DB_TILD + +// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. +#define ___SYMBOLS6_1_BP___ DB_GRV, DB_LESS, DB_GRTR, DB_LCBR, DB_RCBR, DB_HASH +#define ___SYMBOLS6_2_BP___ KC_AMPR, BP_AT, BP_ASTR, DB_LPRN, DB_RPRN, BP_PERC +#define ___SYMBOLS6_3_BP___ BP_DLR, BP_DQOT, DB_QUOT, DB_LBRC, DB_RBRC, KC_COLON +#define ___SYMBOLS6_4_BP___ ___2___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON + +#define ___SYMBOLS5_4_BP___ ___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON + +// A symbol pad. Basically the same layout as a number pad with the symbols +// instead of the numbers with some extras around it, in familiar places for the +// right hand. +#define ___SYMPAD_1_BP___ DB_GRV, BP_AMPR, BP_ASTR, DB_LCBR, BP_PLUS, DB_PIPE +#define ___SYMPAD_2_BP___ DB_TILD, BP_DLR, BP_PERC, DB_CIRC, BP_ASTR, DB_GRV +#define ___SYMPAD_3_BP___ ___, BP_EXLM, BP_AT, DB_HASH, BP_MINS, BP_SLSH +#define ___SYMPAD_4_BP___ ___, DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH + +#define ___5_SYMPAD_4_BP___ DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH + +// Parts are parts. +// MOUSE, ARROW and MEDIA KEY SETS +#define ___MOUSE_LDUR___ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R +#define ___MWHEEL_LDUR___ KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R +#define ___MOUSE_BTNS_R___ KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5 +#define ___MOUSE_BTNS_L___ KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1 +#define ___MOUSE_ACCL_012___ KC_ACL0, KC_ACL1, KC_ACL2 +#define ___MACCL___ ___MOUSE_ACCL_012___ + +#define ___PRV_PLAY_NXT_STOP KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP +#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU + +#define ___MUTE_PRV_PLAY_NXT_STOP___ KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP +#define ___MUTE_PLAY_STOP___ KC_MUTE, KC_MPLY, KC_MSTP +#define ___VI_ARROWS___ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + +// RGB FUNCTION Keysets +// RGB row for the _FN layer from the redo of the default keymap.c +#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD +#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD +#define ___RGB_MODE_PRV_NXT___ RGB_RMOD, RGB_MOD +#define ___RGB_TOGGLE___ RGB_TOG +#define ___RGB_P_B_R_SW_SN___ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN +#define ___RGB_KXGT___ RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T + +// Print screen, screen lock, pause +#define ___PSCR_SLCK_PAUS___ KC_PSCR, KC_SLCK, KC_PAUS + +// LAYER Keyset rows. Changing the Default base layer or the transient layers. +// Some are full length. The baselayers leave the ends open. hence a 13. +// for an ORtho 15. +#define ___2_LAYERS_B1___ DF(BEPO), DF(DVORAK_ON_BEPO) +#define ___2_LAYERS_B2___ DF(COLEMAK), DF(DVORAK) +#define ___3_LAYERS_B3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) +#define ___3_LAYERS_B4___ ___X3___ +// transient layers. +#define ___3_LAYERS_T_BP___ TO(MDIA), TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) +#define ___3_LAYERS_T___ TO(MDIA), TO(SYMB), TO(KEYPAD) +#define ___3_LAYERS_T_CTL___ TO(_RGB), ___X2___ diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index 57acbd1bc791..275c76f4894f 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -15,33 +15,13 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H +#include "base_layers.h" #ifndef ericgebhart #define ericgebhart -#include "quantum.h" -#include "process_keycode/process_tap_dance.h" - //#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ -void tap(uint16_t keycode); -bool process_record_secrets(uint16_t keycode, keyrecord_t *record); - - -#define EECONFIG_USERSPACE (uint8_t *)19 - -typedef union { - uint8_t raw; - struct { - bool clicky_enable :1; - bool rgb_layer_change :1; - bool is_overwatch :1; - bool nuke_switch :1; - }; -} userspace_config_t; - - - #define DVORAK 0 // dvorak layout (default) #define QWERTY 1 #define COLEMAK 2 @@ -62,628 +42,4 @@ typedef union { #define _RGB 16 // RGB stuff. -// for the creation of dvorak keys on an Bepo keyboard at the OS layer. - -// so we can create an array of reasonable size -// for our translation keys. We have to create a -// good range of numbers -#define GR(x) (x-SAFE_RANGE) - -uint8_t gr(uint8_t); -void send_keycode(uint8_t); - -#define MOD_NONE 0x00 - -// indexs for the keycode translation table. -#define UNSHIFTED_KEY(key) key_translations[gr(key)][0][0] -#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1] -#define SHIFTED_KEY(key) key_translations[gr(key)][1][0] -#define SHIFTED_MODS(key) key_translations[gr(key)][1][1] - - -enum userspace_custom_keycodes { - // keep the keycodes using the send_key function close to SAFE_RANGE - // so the array of keycodes remains a reasonbale size. - DB_1 = SAFE_RANGE, // can always be here - DB_2, - DB_3, - DB_4, - DB_5, - DB_6, - DB_7, - DB_8, - DB_9, - DB_0, - DB_GRV, - DB_SCOLON, - DB_SLASH, - DB_BACKSLASH, - DB_EQL, - DB_DOT, - DB_COMM, - DB_QUOT, - DB_MINUS, - DB_RPRN, - DB_LPRN, - DB_RBRC, - DB_LBRC, - // for symbols layer - DB_HASH, - DB_LCBR, - DB_RCBR, - DB_PIPE, - DB_TILD, - DB_CIRC, - DB_LESS, - DB_GRTR, - // End of dvorak on bepo translation keys. - - EPRM, - VRSN, - KC_DVORAK_ON_BEPO, - KC_BEPO, - KC_NORMAN, - KC_QWERTY, - KC_COLEMAK, - KC_DVORAK, - KC_WORKMAN, - KC_MAKE, - KC_RESET, - KC_RGB_T, - KC_SECRET_1, - KC_SECRET_2, - KC_SECRET_3, - KC_SECRET_4, - KC_SECRET_5, - KC_CCCV -}; - -#define SFTGUI_T(kc) { MT(MOD_LGUI | MOD_LSFT, kc) } -#define SFT_GUI_ESC MT(MOD_LSFT | MOD_LGUI, KC_PGDN) // shift LGUI or Escape. -#define ALT_ENT ALT_T(KC_ENT) // Alt or enter -#define CTL_SPC CTL_T(KC_SPC) // ctrl or space -#define CTL_BSPC CTL_T(KC_BSPC) // ctrl or backspace -#define ALT_DEL ALT_T(KC_DEL) // Alt or delete -#define GUI_ESC GUI_T(KC_ESC) // Gui or escape -#define ALGR_SYMB ALGR_T(TG(SYMB)) // Alt gre or toggle symbol layer - - - -// OSM keycodes, to keep things clean and easy to change -#define KC_MLSF OSM(MOD_LSFT) -#define KC_MRSF OSM(MOD_RSFT) -#define OS_LGUI OSM(MOD_LGUI) -#define OS_RGUI OSM(MOD_RGUI) -#define OS_LSFT OSM(MOD_LSFT) -#define OS_RSFT OSM(MOD_RSFT) -#define OS_LCTL OSM(MOD_LCTL) -#define OS_RCTL OSM(MOD_RCTL) -#define OS_LALT OSM(MOD_LALT) -#define OS_RALT OSM(MOD_RALT) -#define ALT_APP ALT_T(KC_APP) - -#define MG_NKRO MAGIC_TOGGLE_NKRO - - -//// TAP DANCE - - typedef struct { - bool is_press_action; - int state; - } tdtap; - -enum { - SINGLE_TAP = 1, - SINGLE_HOLD = 2, - DOUBLE_TAP = 3, - DOUBLE_HOLD = 4, - DOUBLE_SINGLE_TAP = 5, //send two single taps - TRIPLE_TAP = 6, - TRIPLE_HOLD = 7 -}; - -//Tap Dance Declarations -enum { - TD_ESC_CAPS = 0, - TD_TAB_BKTAB = 1, - TD_MDIA_SYMB = 2, - TD_HOME_END = 3, - TD_XMONAD_ESC = 4, - TD_DEF_LAYER_SW = 5, - TD_DEF_OS_LAYER_SW = 6, - TD_MOUSE_BTNS = 7, - TD_DVORAK_BEPO = 8 -}; - - -// Tap dance -#define TAB_BKTAB TD(TD_TAB_BKTAB) // Tab or backtab tapdance. -#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB) // MDIA, symb, keypad, layouts layer tapdance toggle. -#define DEF_LAYER_SW TD(TD_DEF_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer -#define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW) // dvorak, dvorak_on_bepo, bepo default layer -#define HOME_END TD(TD_HOME_END) // home or end tapdance. -#define XMONAD_ESC TD(TD_XMONAD_ESC) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 -#define DVORAK_ET_BEPO TD(TD_DVORAK_BEPO) // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4 -#define TDMOUSE_BTNS TD(TD_MOUSE_BTNS) // hmmm. 1-5 - -// HOME ROW LAYER TOGGLE (LT) and Shift. -// both sides of the home row have "shift, ___, media , symb, ___" and "___, symb, media, ___, shift". -// so pinky fingers are shift when held and the index and second fingers are symbol and -// media layers when held. - -// Dvorak -// shift and layer switch on hold on the home row. -#define KC_SFT_T_A SFT_T(KC_A) -#define KC_SFT_T_S SFT_T(KC_S) - -#define KC_LT_SYMB_U LT(SYMB, KC_U) -#define KC_LT_SYMB_H LT(SYMB, KC_H) - -#define KC_LT_MDIA_E LT(MDIA, KC_E) -#define KC_LT_MDIA_T LT(MDIA, KC_T) - -// Need to add this to the others. -#define KC_LT_KP_N LT(KEYPAD, KC_N) -#define KC_LT_KP_O LT(KEYPAD, KC_O) - -// for dvorak on bepo -#define BP_SFT_T_A SFT_T(BP_A) -#define BP_SFT_T_S SFT_T(BP_S) - -#define BP_LT_SYMB_U LT(SYMB, BP_U) -#define BP_LT_SYMB_H LT(MDIA, BP_H) - -#define BP_LT_MDIA_E LT(MDIA, BP_E) -#define BP_LT_MDIA_T LT(MDIA, BP_T) - -// Need to add this to the others. -#define BP_LT_KP_N LT(KEYPAD, BP_N) -#define BP_LT_KP_O LT(KEYPAD, BP_O) - -// for bepo on bepo -#define BP_SFT_T_T SFT_T(BP_T) -#define BP_SFT_T_W SFT_T(BP_W) - -#define BP_LT_SYMB_I LT(SYMB_ON_BEPO, BP_I) -#define BP_LT_MDIA_E LT(MDIA, BP_E) -#define BP_LT_KP_U LT(KEYPAD, BP_U) - -#define BP_LT_SYMB_S LT(SYMB_ON_BEPO, BP_S) -#define BP_LT_MDIA_R LT(MDIA, BP_R) -#define BP_LT_KP_N LT(KEYPAD, BP_N) - -#define BP_SFT_T_A SFT_T(BP_A) -#define BP_SFT_T_S SFT_T(BP_S) -#define BP_SFT_T_E SFT_T(BP_E) -#define BP_SFT_T_M SFT_T(BP_M) - -#define BP_SFT_T_ECRC SFT_T(BP_ECRC) -#define BP_SFT_T_CCED SFT_T(BP_CCED) -#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM) - -//QWERTY -#define KC_SFT_T_SCLN SFT_T(KC_SCLN) - -#define KC_LT_MDIA_D LT(MDIA, KC_D) -#define KC_LT_MDIA_K LT(MDIA, KC_K) -#define KC_LT_SYMB_F LT(SYMB, KC_F) -#define KC_LT_SYMB_J LT(SYMB, KC_J) - -//COLEMAK -#define KC_SFT_T_O SFT_T(KC_O) -#define KC_LT_MDIA_S LT(MDIA, KC_S) -#define KC_LT_SYMB_T LT(SYMB, KC_T) - -#define KC_LT_MDIA_E LT(MDIA, KC_E) -#define KC_LT_SYMB_N LT(SYMB, KC_N) - -//WORKMAN -#define KC_SFT_T_I SFT_T(KC_I) -#define KC_LT_MDIA_H LT(MDIA, KC_H) - -//NORMAN -// For keys on the homerow. Hold for shift, keypad,mouse,and smbol layers -#define KC_SFT_T_U SFT_T(KC_U) -#define KC_LT_MDIA_I LT(MDIA, KC_I) - -// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators). -#define MK_CUT LSFT(KC_DEL) // shift + delete -#define MK_COPY LCTL(KC_INS) // ctrl + insert -#define MK_PASTE LSFT(KC_INS) // shift + insert - -#define ___ KC_TRNS -#define XXX KC_NO - -// Blocking keys -#define ___X___ XXX -#define ___X2___ XXX, XXX -#define ___X3___ ___X2___, XXX -#define ___X5___ ___X3___, XXX, XXX -#define ___X15___ ___X5___, ___X5___, ___X5___ - -// Transparent keys -#define ___2___ ___, ___ -#define ___3___ ___2___, ___ -#define ___4___ ___3___, ___ -#define ___5___ ___4___, ___ -#define ___6___ ___5___, ___ -#define ___14___ ___5___, ___4___, ___5___ -#define ___15___ ___5___, ___5___, ___5___ - -int on_qwerty(void); -int get_xmonad_layer(void); -int cur_dance (qk_tap_dance_state_t *state); - -//for the x tap dance. Put it here so it can be used in any keymap -void x_finished (qk_tap_dance_state_t *state, void *user_data); -void x_reset (qk_tap_dance_state_t *state, void *user_data); - - -// Blocks for each of the four major keyboard layouts -// Organized so we can quickly adapt and modify all of them -// at once, rather than for each keyboard, one at a time. -// And this allows for much cleaner blocks in the keymaps. -// For instance Tap/Hold for Control on all of the layouts - -// NOTE: These are all the same length. If you do a search/replace -// then you need to add/remove underscores to keep the -// lengths consistent. - -// Since our quirky block definitions are basically a list of comma separated -// arguments, we need a wrapper in order for these definitions to be -// expanded before being used as arguments to the LAYOUT_xxx macro. -#if (!defined(LAYOUT) && defined(KEYMAP)) -#define LAYOUT KEYMAP -#endif - -#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) -#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__) -#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) -#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) - -#define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) -#define LAYOUT_ortho_5x14_wrapper(...) LAYOUT_ortho_5x14(__VA_ARGS__) - -/********************************************************************/ -/** The Core rows of each given layout. **/ -/********************************************************************/ -//Dvorak on a qwerty software layer in the OS -#define ___DVORAK_L1___ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y -#define ___DVORAK_L2___ KC_SFT_T_A, KC_LT_KP_O, KC_LT_MDIA_E, KC_LT_SYMB_U, KC_I -#define ___DVORAK_L3___ KC_SCLN, KC_Q, KC_J, KC_K, KC_X - -#define ___DVORAK_R1___ KC_F, KC_G, KC_C, KC_R, KC_L -#define ___DVORAK_R2___ KC_D, KC_LT_SYMB_H, KC_LT_MDIA_T, KC_LT_KP_N, KC_SFT_T_S -#define ___DVORAK_R3___ KC_B, KC_M, KC_W, KC_V, KC_Z - -// Qwerty based layers that I don't really use. -#define ___QWERTY_L1___ KC_Q, KC_W, KC_E, KC_R, KC_T -#define ___QWERTY_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_D, KC_LT_SYMB_F, KC_G -#define ___QWERTY_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___QWERTY_R1___ KC_Y, KC_U, KC_I, KC_O, KC_P -#define ___QWERTY_R2___ KC_H, KC_LT_SYMB_J, KC_LT_MDIA_K, KC_L, KC_SFT_T_SCLN -#define ___QWERTY_R3___ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH - -// COLEMAK -#define ___COLEMAK_L1___ KC_Q, KC_W, KC_F, KC_P, KC_G -#define ___COLEMAK_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_D -#define ___COLEMAK_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___COLEMAK_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_R2___ KC_H, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O -#define ___COLEMAK_R3___ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH - -// COLEMAK-DH -#define ___COLEMAK_MOD_DH_L1___ KC_Q, KC_W, KC_F, KC_P, KC_B -#define ___COLEMAK_MOD_DH_L2___ KC_SFT_T_A, KC_R, KC_LT_MDIA_S, KC_LT_SYMB_T, KC_G -#define ___COLEMAK_MOD_DH_L3___ KC_Z, KC_X, KC_C, KC_D, KC_V - -#define ___COLEMAK_MOD_DH_R1___ KC_J, KC_L, KC_U, KC_Y, KC_SCLN -#define ___COLEMAK_MOD_DH_R2___ KC_M, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_I, KC_SFT_T_O -#define ___COLEMAK_MOD_DH_R3___ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH - -// WORKMAN -#define ___WORKMAN_L1___ KC_Q, KC_D, KC_R, KC_W, KC_B -#define ___WORKMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_H, KC_LT_SYMB_T, KC_G -#define ___WORKMAN_L3___ KC_Z, KC_X, KC_M, KC_C, KC_V - -#define ___WORKMAN_R1___ KC_J, KC_F, KC_U, KC_P, KC_SCLN -#define ___WORKMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_E, KC_O, KC_SFT_T_I -#define ___WORKMAN_R3___ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH - -// NORMAN -#define ___NORMAN_L1___ KC_Q, KC_W, KC_D, KC_F, KC_K -#define ___NORMAN_L2___ KC_SFT_T_A, KC_S, KC_LT_MDIA_E, KC_LT_SYMB_T, KC_G -#define ___NORMAN_L3___ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define ___NORMAN_R1___ KC_J, KC_U, KC_R, KC_L, KC_SCLN -#define ___NORMAN_R2___ KC_Y, KC_LT_SYMB_N, KC_LT_MDIA_I, KC_O, KC_SFT_T_U -#define ___NORMAN_R3___ KC_P, KC_M, KC_COMM, KC_DOT, KC_SLASH - -// BEPO MAPS -// Dvorak on fr-bepo software layer in the OS. -// for dvorak and all the other qwerty like keyboards on bepo -#define ___DVORAK_FR_L1___ DB_QUOT, DB_COMM, DB_DOT, BP_P, BP_Y -#define ___DVORAK_FR_L2___ BP_SFT_T_A, BP_LT_KP_O, BP_LT_MDIA_E, BP_LT_SYMB_U, BP_I -#define ___DVORAK_FR_L3___ DB_SCOLON, BP_Q, BP_J, BP_K, BP_X - -#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C, BP_R, BP_L -#define ___DVORAK_FR_R2___ BP_D, BP_LT_SYMB_H, BP_LT_MDIA_T, BP_LT_KP_N, BP_SFT_T_S -#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W, BP_V, BP_Z - - -// Bepo on fr-bepo software layer -// for bepo on bepo -/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ -#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN -/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ -#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ - -#define ___BEPO_FR_L1___ BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV -#define ___BEPO_FR_L2___ BP_SFT_T_A, BP_LT_KP_U, BP_LT_SYMB_I, BP_LT_MDIA_E, BP_COMM -#define ___BEPO_FR_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K - -#define ___BEPO_FR_R1___ /* BP_DCRC,*/ BP_V, BP_D, BP_L, BP_J, BP_Z -#define ___BEPO_FR_R2___ /* BP_C, */ BP_T, BP_LT_SYMB_S, BP_LT_MDIA_R, BP_LT_KP_N, BP_SFT_T_M //BP_CCED -#define ___BEPO_FR_R3___ BP_APOS, BP_Q, BP_G, BP_H, BP_F //BP_SFT_T_W - -/* BP_DLR, BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, */ -/* KC_TAB, BP_B, BP_ECUT, BP_P, BP_O, BP_EGRV, KC_BSPC, */ -/* KC_LSFT, BP_A, BP_U, BP_I, BP_E, BP_COMM, */ -/* KC_LCTRL, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_ENT, */ -/* ESC_FN, BP_ECRC, KC_LGUI, KC_LALT, SPC_RALT, */ -/* TT(SWAP), KC_MNXT, */ -/* KC_MPLY, */ -/* TT(FN), TT(NUMS), KC_MPRV, */ - -/* /\* right hand *\/ */ -/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ -/* KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, */ -/* BP_C, BP_T, BP_S, BP_R, BP_N, M_RSFT, */ -/* KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, W_RCTL, */ - - -/******************************************************************/ -/* Middle Keysets for the XD75 */ -/******************************************************************/ -// For the middle keys of an xd75. It's got one more column in the middle than -// the ergodox, or the viterbi. And the Ergodox is missing a key in column 7 -// counting from either end. Which is the first and 3rd columns of these sets. - -// it's all an experient. I'm not sure what make sense here. -// stealing what I can from the ergodox layout. -/* The XD75 has 3 keys inbetween the usual left and right hand */ -#define ___MIDDLE_T___ OSL(LAYERS), LCTL(KC_A), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE_1___ LCTL(KC_C), LCTL(KC_X), LCTL(KC_V) -#define ___MIDDLE_2___ TO(SYMB), TO(_RGB), TO(KEYPAD) -#define ___MIDDLE_3___ OSL(SYMB), TO(MDIA), OSL(KEYPAD) -#define ___MIDDLE_4___ CTL_BSPC, ALT_DEL, XMONAD_ESC, ALT_ENT, CTL_SPC - -// The same, for BEPO -#define ___MIDDLE_T_BP___ OSL(LAYERS), LCTL(BP_A), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE_1_BP___ LCTL(BP_C), LCTL(BP_X), LCTL(BP_V) -#define ___MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(_RGB), TO(KEYPAD_ON_BEPO) -#define ___MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA), OSL(KEYPAD_ON_BEPO) - -// The Viterbi only has 2 keys in the middle. -#define ___MIDDLE2_T___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE2_1___ LCTL(KC_C), LCTL(KC_V) -#define ___MIDDLE2_2___ TO(SYMB), TO(KEYPAD) -#define ___MIDDLE2_3___ OSL(SYMB), OSL(KEYPAD) - -// becomes the upper thumbs, the real 4th row if we throw away -// the number row at the top -#define ___MIDDLE2_4___ XXX, HOME_END, KC_PGDN, XXX -// basically the thumb keys like on the ergodox. -#define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC, KC_PGDN, ALT_ENT, CTL_SPC - -// The same, for BEPO -#define ___MIDDLE2_T_BP___ OSL(LAYERS), MDIA_SYMB_KP_LAYERS -#define ___MIDDLE2_1_BP___ LCTL(BP_C), LCTL(BP_V) -#define ___MIDDLE2_2_BP___ TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) -#define ___MIDDLE2_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO) - -#define ___MIDDLE2_4_BP___ XXX, HOME_END, KC_PGUP, XXX - - -/********************************************************************/ -/** The bottom row and thumbs as needed. **/ -/********************************************************************/ -// the bottom rows for keyboards on bepo. -// bepo on bepo - not enough space to go around.... -#define ___ERGODOX_BOTTOM_LEFT_BP___ LCTL(BP_C), BP_ECRC, LCTL(BP_V), KC_LEFT, KC_RIGHT -#define ___ERGODOX_BOTTOM_RIGHT_BP___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC - -// for dvorak on bepo -#define ___ERGODOX_BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_C), LCTL(BP_V), KC_LEFT, KC_RIGHT -#define ___ERGODOX_BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC - -// Since we have 7 default layouts (QWERTY, DVORAK, COLEMAK and WORKMAN, NORMAN, -// 2 of them based on a Bepo software keyboard, --- DVORAK_ON_BEPO and BEPO), -// this allows us to quickly modify the bottom row for all of the layouts -// so we don't have to alter it 4 times and hope that we haven't missed -// anything -#define ___ERGODOX_BOTTOM_LEFT___ LCTL(KC_C), LCTL(KC_V), KC_INS, KC_LEFT, KC_RIGHT -#define ___ERGODOX_BOTTOM_RIGHT___ KC_UP, KC_DOWN, KC_BSLASH, LCTL(KC_V), LCTL(KC_C) - -#define ___XD75_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT___ -#define ___XD75_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ - -#define ___VITERBI_BOTTOM___ ___ERGODOX_BOTTOM_LEFT___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT___ -#define ___VITERBI_BOTTOM_FR___ ___ERGODOX_BOTTOM_LEFT_FR___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_FR___ -#define ___VITERBI_BOTTOM_BP___ ___ERGODOX_BOTTOM_LEFT_BP___, ___MIDDLE2_4___, ___ERGODOX_BOTTOM_RIGHT_BP___ -#define ___VITERBI_THUMBS_BOTTOM___ ___4___, ___MIDDLE_THUMBS___, ___4___ - - -#define ___ERGODOX_THUMB_LEFT___ \ - OS_RALT, TG(MDIA), \ - HOME_END, \ - CTL_BSPC, ALT_DEL, XMONAD_ESC - -#define ___ERGODOX_THUMB_RIGHT___ \ - TG(SYMB), OS_RALT, \ - KC_PGUP, \ - KC_PGDN, ALT_ENT, CTL_SPC - -#define ___ERGODOX_THUMB_RIGHT_BP___ \ - TG(SYMB_ON_BEPO), OS_RALT, \ - KC_PGUP, \ - KC_PGDN, ALT_ENT, CTL_SPC - -#define ___ERGODOX_TRANS_THUMBS___ ___6___ -#define ___ERGODOX_TRANS_BOTTOM___ ___5___ -#define ___ERGODOX_TRANS_6_ROW___ ___6___ -#define ___TRANS_6_COL___ ___6___ - -/*******************************************************************/ -/** For the top rows. Numbers for most things, symbols for Bepo. **/ -/*******************************************************************/ - -// for everything on qwerty. -#define ___NUMBER_L___ KC_1, KC_2, KC_3, KC_4, KC_5 -#define ___NUMBER_R___ KC_6, KC_7, KC_8, KC_9, KC_0 - -// function key rows, works for everyone. -#define ___FUNC_L___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 -#define ___FUNC_R___ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 - -#define ___FUNC_1_6___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 -#define ___FUNC_7_12___ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 - -// a top symbol row if someone wants it. -#define ___SYMB_L___ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC -#define ___SYMB_R___ KC_CIRC, KC_AMPR, KC_AST, KC_LPRN, KC_RPRN - -// For numbers on bepo. Bepo has numbers on shifted keys, the -// reverse of most keyboard layouts. -#define ___NUMBER_BEPO_L___ DB_1, DB_2, DB_3, DB_4, DB_5 -#define ___NUMBER_BEPO_R___ DB_6, DB_7, DB_8, DB_9, DB_0 - - -/*******************************************************************/ -/* Rows for the auxillary layers. */ -/* the KC_P? codes don't work for me. I don't use those shifted */ -/* values anyway. */ -/*******************************************************************/ - -// Keypads -#define ___KEYPAD_1___ KC_7, KC_8, KC_9, KC_PSLS -#define ___KEYPAD_2___ KC_4, KC_5, KC_6, KC_PAST -#define ___KEYPAD_3___ KC_1, KC_2, KC_3, KC_PMNS -#define ___KEYPAD_4___ KC_0, KC_DOT, KC_PEQL, KC_PPLS - -// Keypad from the default keymap.c of the xd75 -#define ___KEYPAD_1_ALT___ KC_P7, KC_P8, KC_P9, KC_MINS -#define ___KEYPAD_2_ALT___ KC_P4, KC_P5, KC_P6, KC_PLUS -#define ___KEYPAD_3_ALT___ KC_P1, KC_P2, KC_P3, KC_PENT -#define ___KEYPAD_4_ALT___ KC_P0, KC_DOT, KC_PENT, KC_PENT - -// For Bepo -#define ___KEYPAD_1_BP___ DB_7, DB_8, DB_9, BP_SLASH -#define ___KEYPAD_2_BP___ DB_4, DB_5, DB_6, BP_ASTR -#define ___KEYPAD_3_BP___ DB_1, DB_2, DB_3, DB_MINUS -#define ___KEYPAD_4_BP___ DB_0, DB_DOT, DB_EQL, BP_PLUS - - - -// SYMBOLS - -// An arrangement for the left hand with a focus on the ()[]{}s. -#define ___SYMBOLS_1___ KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE -#define ___SYMBOLS_2___ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV -#define ___SYMBOLS_3___ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD - -// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. -#define ___SYMBOLS6_1___ KC_GRV, KC_LT, KC_GT, KC_LCBR, KC_RCBR, KC_HASH -#define ___SYMBOLS6_2___ KC_AMPR, KC_AT, KC_ASTR, KC_LPRN, KC_RPRN, KC_PERC -#define ___SYMBOLS6_3___ KC_DLR, KC_DQT, KC_QUOT, KC_LBRC, KC_RBRC, KC_COLON -#define ___SYMBOLS6_4___ ___2___, KC_TILD, KC_DOT, KC_EXLM, KC_SCLN - -// A symbol pad. Basically the same layout as a number pad with the symbols -// instead of the numbers with some extras around it, in familiar places for the -// right hand. -#define ___SYMPAD_1___ KC_GRV, KC_AMPR, KC_ASTR, KC_LCBR, KC_PLUS, KC_PIPE -#define ___SYMPAD_2___ KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_ASTR, KC_GRV -#define ___SYMPAD_3___ ___, KC_EXLM, KC_AT, KC_HASH, KC_MINUS, KC_SLASH -#define ___SYMPAD_4___ ___, KC_RCBR, KC_DOT, KC_EQUAL, KC_UNDS, KC_BSLASH - -// Function pad. Same idea as above, but for function keys. -#define ___FUNCPAD_T___ KC_F10, KC_F11, KC_F12 -#define ___FUNCPAD_1___ KC_F7, KC_F8, KC_F9 -#define ___FUNCPAD_2___ KC_F4, KC_F5, KC_F6 -#define ___FUNCPAD_3___ KC_F1, KC_F2, KC_F3 - - -//--- all over again for BEPO - -// SYMBOLS FOR BEPO -// The top row. Bepo has symbols not numbers. Numbers are the shifted values. -#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN -/* KC_DEL, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, */ -#define ___SYMBOL_BEPO_R___ BP_AT, BP_PLUS, BP_MINS, BP_SLASH, BP_ASTR /* BP_EQL, BP_PERC */ - -// An arrangement for the left hand with a focus on the ()[]{}s. -#define ___SYMBOLS_1_BP___ KC_EXLM, BP_AT, DB_LCBR, DB_RCBR, DB_PIPE -#define ___SYMBOLS_2_BP___ DB_HASH, BP_DLR, DB_LPRN, DB_RPRN, DB_GRV -#define ___SYMBOLS_3_BP___ BP_PERC, DB_CIRC, DB_LBRC, DB_RBRC, DB_TILD - -// A larger 6 column arrangement for the left hand, A merge of dvorak and the above. -#define ___SYMBOLS6_1_BP___ DB_GRV, DB_LESS, DB_GRTR, DB_LCBR, DB_RCBR, DB_HASH -#define ___SYMBOLS6_2_BP___ KC_AMPR, BP_AT, BP_ASTR, DB_LPRN, DB_RPRN, BP_PERC -#define ___SYMBOLS6_3_BP___ BP_DLR, BP_DQOT, DB_QUOT, DB_LBRC, DB_RBRC, KC_COLON - -#define ___SYMBOLS6_4_BP___ ___2___, DB_TILD, DB_DOT, KC_EXLM, DB_SCOLON - -// A symbol pad. Basically the same layout as a number pad with the symbols -// instead of the numbers with some extras around it, in familiar places for the -// right hand. -#define ___SYMPAD_1_BP___ DB_GRV, BP_AMPR, BP_ASTR, DB_LCBR, BP_PLUS, DB_PIPE -#define ___SYMPAD_2_BP___ DB_TILD, BP_DLR, BP_PERC, DB_CIRC, BP_ASTR, DB_GRV -#define ___SYMPAD_3_BP___ ___, BP_EXLM, BP_AT, DB_HASH, BP_MINS, BP_SLSH -#define ___SYMPAD_4_BP___ ___, DB_RCBR, DB_DOT, BP_EQL, BP_MINUS, DB_BACKSLASH - - - -// MOUSE, ARROW and MEDIA KEY SETS - -#define ___MOUSE_LDUR___ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R -#define ___MWHEEL_LDUR___ KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R -#define ___MOUSE_BTNS_R___ KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5 -#define ___MOUSE_BTNS_L___ KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1 -#define ___MOUSE_ACCL_012___ KC_ACL0, KC_ACL1, KC_ACL2 -#define ___MACCL___ ___MOUSE_ACCL_012___ - -#define ___PRV_PLAY_NXT_STOP KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP -#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU - -#define ___MUTE_PRV_PLAY_NXT_STOP___ KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP -#define ___MUTE_PLAY_STOP___ KC_MUTE, KC_MPLY, KC_MSTP -#define ___VI_ARROWS___ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT - -// RGB FUNCTION Keysets -// RGB row for the _FN layer from the redo of the default keymap.c -#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD -#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD -#define ___RGB_MODE_PRV_NXT___ RGB_RMOD, RGB_MOD -#define ___RGB_TOGGLE___ RGB_TOG -#define ___RGB_P_B_R_SW_SN___ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN -#define ___RGB_KXGT___ RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T - -// Print screen, screen lock, pause -#define ___PSCR_SLCK_PAUS___ KC_PSCR, KC_SLCK, KC_PAUS - - -// LAYER Keysets. Changing the Default base layer or the transient layers. -#define ___LAYERS_B1_2___ DF(BEPO), DF(DVORAK_ON_BEPO) -#define ___LAYERS_B2_2___ DF(COLEMAK), DF(DVORAK) -#define ___LAYERS_B3_3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN) -#define ___LAYERS_B4_3___ ___X3___ - -// transient layers. -#define ___LAYERS_T_BP_3___ TO(MDIA), TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) -#define ___LAYERS_T_3___ TO(MDIA), TO(SYMB), TO(KEYPAD) -#define ___LAYERS_T_DEF___ TO(_RGB), ___X2___ - - #endif From ce8f1a6e646eb5791e5b6964b5509005b8bde78c Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Mon, 13 Apr 2020 21:27:18 +0200 Subject: [PATCH 11/23] remerge again. --- quantum/quantum.c | 12 ++++++------ quantum/quantum.h | 4 ++-- tmk_core/common/action_tapping.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 55cdaa3b023e..2053a1a5f479 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -149,21 +149,21 @@ void reset_keyboard(void) { } /* Convert record into usable keycode via the contained event. */ -uint16_t get_record_keycode(keyrecord_t *record, bool do_update) { return get_event_keycode(record->event, do_update); } +uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) { return get_event_keycode(record->event, update_layer_cache); } /* Convert event into usable keycode. Checks the layer cache to ensure that it * retains the correct keycode after a layer change, if the key is still pressed. - * "do_update" is to ensure that it only updates the layer cache when appropriate, - * otherwise, it will update it and cause layer tap (and other keys) from - * triggering properly. + * "update_layer_cache" is to ensure that it only updates the layer cache when + * appropriate, otherwise, it will update it and cause layer tap (and other keys) + * from triggering properly. */ -uint16_t get_event_keycode(keyevent_t event, bool do_update) { +uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache) { #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) /* TODO: Use store_or_get_action() or a similar function. */ if (!disable_action_cache) { uint8_t layer; - if (event.pressed && do_update) { + if (event.pressed && update_layer_cache) { layer = layer_switch_get_layer(event.key); update_source_layers_cache(event.key, layer); } else { diff --git a/quantum/quantum.h b/quantum/quantum.h index 9fdd36e788ec..45f44f49a1a7 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -252,8 +252,8 @@ void matrix_init_kb(void); void matrix_scan_kb(void); void matrix_init_user(void); void matrix_scan_user(void); -uint16_t get_record_keycode(keyrecord_t *record, bool do_update); -uint16_t get_event_keycode(keyevent_t event, bool do_update); +uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache); +uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); bool process_action_kb(keyrecord_t *record); bool process_record_kb(uint16_t keycode, keyrecord_t *record); bool process_record_user(uint16_t keycode, keyrecord_t *record); diff --git a/tmk_core/common/action_tapping.h b/tmk_core/common/action_tapping.h index ffba830cf020..5eaef1c5f09a 100644 --- a/tmk_core/common/action_tapping.h +++ b/tmk_core/common/action_tapping.h @@ -32,7 +32,7 @@ along with this program. If not, see . #define WAITING_BUFFER_SIZE 8 #ifndef NO_ACTION_TAPPING -uint16_t get_event_keycode(keyevent_t event, bool do_update); +uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); uint16_t get_tapping_term(uint16_t keycode); void action_tapping_process(keyrecord_t record); #endif From a4155c524ee4228d14f84babc8cb53085144f535 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Mon, 13 Apr 2020 21:34:20 +0200 Subject: [PATCH 12/23] And again, revert accidental changes. --- keyboards/keebio/viterbi/config.h | 2 +- keyboards/keebio/viterbi/rules.mk | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/keyboards/keebio/viterbi/config.h b/keyboards/keebio/viterbi/config.h index 9976f0e86836..b628c83c8553 100644 --- a/keyboards/keebio/viterbi/config.h +++ b/keyboards/keebio/viterbi/config.h @@ -17,4 +17,4 @@ along with this program. If not, see . #pragma once -//#include "config_common.h" +#include "config_common.h" diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index 02ee008ce8dc..0b746d17207f 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/rules.mk @@ -30,12 +30,7 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard -KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key -TAP_DANCE_ENABLE = yes # Enable the tap dance feature. - - SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = keebio/viterbi/rev1 +DEFAULT_FOLDER = keebio/viterbi/rev2 LAYOUTS = ortho_5x14 From 20ef71d06750c8101a85cd93d7f96195e72b794c Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Tue, 14 Apr 2020 02:56:40 +0200 Subject: [PATCH 13/23] pragma once, remove user name --- .../ergodox_ez/keymaps/ericgebhart/rules.mk | 3 --- .../viterbi/keymaps/ericgebhart/rules.mk | 3 --- keyboards/xd75/keymaps/ericgebhart/config.h | 16 ---------------- keyboards/xd75/keymaps/ericgebhart/rules.mk | 15 --------------- keyboards/xd75/keymaps/ericgebhart/rules2.mk | 18 ------------------ users/ericgebhart/base_layers.h | 1 + users/ericgebhart/core_keys.h | 17 +---------------- users/ericgebhart/core_keysets.h | 1 + users/ericgebhart/ericgebhart.h | 1 + 9 files changed, 4 insertions(+), 71 deletions(-) delete mode 100755 keyboards/xd75/keymaps/ericgebhart/rules2.mk diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk index 3b5ab2d6d639..3b1f3989d505 100755 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk @@ -1,6 +1,3 @@ -USER_NAME := ericgebhart -SRC += ericgebhart.c - MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk index 3b5ab2d6d639..3b1f3989d505 100644 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk @@ -1,6 +1,3 @@ -USER_NAME := ericgebhart -SRC += ericgebhart.c - MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/xd75/keymaps/ericgebhart/config.h b/keyboards/xd75/keymaps/ericgebhart/config.h index 22a2c75ddfa6..77f83e83fd41 100644 --- a/keyboards/xd75/keymaps/ericgebhart/config.h +++ b/keyboards/xd75/keymaps/ericgebhart/config.h @@ -1,19 +1,3 @@ -/* Copyright 2017 Benjamin Kesselring - * - * 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 . - */ - #pragma once #undef RGBLED_NUM diff --git a/keyboards/xd75/keymaps/ericgebhart/rules.mk b/keyboards/xd75/keymaps/ericgebhart/rules.mk index 2fed81b89609..9c351857dafb 100644 --- a/keyboards/xd75/keymaps/ericgebhart/rules.mk +++ b/keyboards/xd75/keymaps/ericgebhart/rules.mk @@ -1,18 +1,3 @@ -USER_NAME := ericgebhart -SRC += ericgebhart.c -# 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 3 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 . - RGBLIGHT_ENABLE = yes RGBLIGHT_ANIMATION = yes # BACKLIGHT_ENABLE = yes diff --git a/keyboards/xd75/keymaps/ericgebhart/rules2.mk b/keyboards/xd75/keymaps/ericgebhart/rules2.mk deleted file mode 100755 index 373760c77bd0..000000000000 --- a/keyboards/xd75/keymaps/ericgebhart/rules2.mk +++ /dev/null @@ -1,18 +0,0 @@ -USER_NAME := ericgebhart -SRC += ericgebhart.c - -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard -KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key -TAP_DANCE_ENABLE = yes # Enable the tap dance feature. -CONSOLE_ENABLE = no # Console for debug - -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -UNICODE_ENABLE = no -SLEEP_LED_ENABLE = no -API_SYSEX_ENABLE = no -RGBLIGHT_ENABLE = yes -RGBLIGHT_ANIMATION = no diff --git a/users/ericgebhart/base_layers.h b/users/ericgebhart/base_layers.h index 882b78f12111..fbc4b5de138d 100644 --- a/users/ericgebhart/base_layers.h +++ b/users/ericgebhart/base_layers.h @@ -1,3 +1,4 @@ +#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h index 955020bd0dc9..ce608cc3ce60 100644 --- a/users/ericgebhart/core_keys.h +++ b/users/ericgebhart/core_keys.h @@ -1,19 +1,4 @@ -/* - 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 . -*/ +#pragma once #include "quantum.h" #include "process_keycode/process_tap_dance.h" diff --git a/users/ericgebhart/core_keysets.h b/users/ericgebhart/core_keysets.h index 6596e2121d0d..ffe02192f6b5 100644 --- a/users/ericgebhart/core_keysets.h +++ b/users/ericgebhart/core_keysets.h @@ -1,3 +1,4 @@ +#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index 275c76f4894f..b14243b24ae1 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -1,3 +1,4 @@ +#pragma once /* Copyright 2018 Eric Gebhart From c7991964452b27ef99caac43aca6514b92fdc96a Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Tue, 14 Apr 2020 18:46:07 +0200 Subject: [PATCH 14/23] reset and rebase. --- .../ergodox_ez/keymaps/ericgebhart/rules.mk | 2 ++ .../viterbi/keymaps/ericgebhart/config.h | 17 --------------- .../viterbi/keymaps/ericgebhart/rules.mk | 2 ++ keyboards/xd75/keymaps/ericgebhart/config.h | 16 ++++++++++++++ keyboards/xd75/keymaps/ericgebhart/rules.mk | 2 ++ keyboards/xd75/rules.mk | 5 +++-- users/ericgebhart/core_keys.h | 21 ++++++++++++++++--- users/ericgebhart/ericgebhart.c | 4 ++-- users/ericgebhart/ericgebhart.h | 15 ------------- 9 files changed, 45 insertions(+), 39 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk index 3b1f3989d505..a4d834f37640 100755 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk @@ -1,3 +1,5 @@ +SRC += ericgebhart.c + MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h index a841066f4d0b..7ad7f5a4cf41 100644 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h @@ -1,20 +1,3 @@ -/* -Copyright 2017 Danny Nguyen - -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 . -*/ - #pragma once // #define USE_I2C diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk index 3b1f3989d505..a4d834f37640 100644 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk @@ -1,3 +1,5 @@ +SRC += ericgebhart.c + MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/xd75/keymaps/ericgebhart/config.h b/keyboards/xd75/keymaps/ericgebhart/config.h index 77f83e83fd41..22a2c75ddfa6 100644 --- a/keyboards/xd75/keymaps/ericgebhart/config.h +++ b/keyboards/xd75/keymaps/ericgebhart/config.h @@ -1,3 +1,19 @@ +/* Copyright 2017 Benjamin Kesselring + * + * 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 . + */ + #pragma once #undef RGBLED_NUM diff --git a/keyboards/xd75/keymaps/ericgebhart/rules.mk b/keyboards/xd75/keymaps/ericgebhart/rules.mk index 9c351857dafb..c11297143cb3 100644 --- a/keyboards/xd75/keymaps/ericgebhart/rules.mk +++ b/keyboards/xd75/keymaps/ericgebhart/rules.mk @@ -1,3 +1,5 @@ +SRC += ericgebhart.c + RGBLIGHT_ENABLE = yes RGBLIGHT_ANIMATION = yes # BACKLIGHT_ENABLE = yes diff --git a/keyboards/xd75/rules.mk b/keyboards/xd75/rules.mk index e822f37eacf8..aa30f2f5765a 100644 --- a/keyboards/xd75/rules.mk +++ b/keyboards/xd75/rules.mk @@ -12,7 +12,7 @@ MCU = atmega32u4 BOOTLOADER = atmel-dfu # QMK Build Options -# change to "no" to disable the options, or define them in the Makefile in +# change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration @@ -26,7 +26,8 @@ MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +TAP_DANCE_ENABLE = yes LAYOUTS = ortho_5x15 diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h index ce608cc3ce60..035f740016e4 100644 --- a/users/ericgebhart/core_keys.h +++ b/users/ericgebhart/core_keys.h @@ -1,7 +1,24 @@ #pragma once +/* + 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 . +*/ #include "quantum.h" #include "process_keycode/process_tap_dance.h" +#include "eeconfig.h" //#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ @@ -9,10 +26,8 @@ void tap(uint16_t keycode); bool process_record_secrets(uint16_t keycode, keyrecord_t *record); -#define EECONFIG_USERSPACE (uint8_t *)19 - typedef union { - uint8_t raw; + uint8_t raw; struct { bool clicky_enable :1; bool rgb_layer_change :1; diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c index e59ea93d3ea6..76143c6ed1fc 100644 --- a/users/ericgebhart/ericgebhart.c +++ b/users/ericgebhart/ericgebhart.c @@ -274,7 +274,7 @@ xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record- // to save on firmware space, since it's limited. #ifdef MACROS_ENABLED case KC_OVERWATCH: // Toggle's if we hit "ENTER" or "BACKSPACE" to input macros - if (record->event.pressed) { userspace_config.is_overwatch ^= 1; eeprom_update_byte(EECONFIG_USERSPACE, userspace_config.raw); } + if (record->event.pressed) { userspace_config.is_overwatch ^= 1; eeprom_update_byte(EECONFIG_USER, userspace_config.raw); } return false; break; #endif // MACROS_ENABLED @@ -303,7 +303,7 @@ xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record- case CLICKY_TOGGLE: #ifdef AUDIO_CLICKY userspace_config.clicky_enable = clicky_enable; - eeprom_update_byte(EECONFIG_USERSPACE, userspace_config.raw); + eeprom_update_byte(EECONFIG_USER, userspace_config.raw); #endif break; #ifdef UNICODE_ENABLE diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index b14243b24ae1..617bcdcae710 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -1,20 +1,5 @@ #pragma once -/* - 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 . -*/ #include QMK_KEYBOARD_H #include "base_layers.h" From 244ec3dffc1d30ee7caf63fd908e10f43f922740 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Tue, 14 Apr 2020 22:34:52 +0200 Subject: [PATCH 15/23] cleaned up copyright --- keyboards/xd75/keymaps/ericgebhart/config.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/xd75/keymaps/ericgebhart/config.h b/keyboards/xd75/keymaps/ericgebhart/config.h index 22a2c75ddfa6..77f83e83fd41 100644 --- a/keyboards/xd75/keymaps/ericgebhart/config.h +++ b/keyboards/xd75/keymaps/ericgebhart/config.h @@ -1,19 +1,3 @@ -/* Copyright 2017 Benjamin Kesselring - * - * 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 . - */ - #pragma once #undef RGBLED_NUM From 9765ff3c890995f6f42d83cdcd59fcd17ff64065 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Wed, 15 Apr 2020 00:13:47 +0200 Subject: [PATCH 16/23] Making the ergodox consistent with the the others. --- .../ergodox_ez/keymaps/ericgebhart/keymap.c | 54 +++++++++---------- users/ericgebhart/base_layers.h | 36 +++++++------ 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c index 80907c4210d9..dc33e4e0a9b1 100644 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c +++ b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c @@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___DVORAK_R1___, KC_SLASH, + LCTL(KC_V), ___DVORAK_R1___, KC_SLASH, /* */ ___DVORAK_R2___, KC_MINUS, - TO(KEYPAD), ___DVORAK_R3___, KC_RSFT, + TO(KEYPAD), ___DVORAK_R3___, KC_RSFT, ___BOTTOM_RIGHT___, ___ERGODOX_THUMB_RIGHT___ @@ -72,16 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___QWERTY_R1___, KC_SLASH, + LCTL(KC_V), ___QWERTY_R1___, KC_SLASH, /* */ ___QWERTY_R2___, KC_MINUS, - TO(KEYPAD), ___QWERTY_R3___, KC_RSFT, + TO(KEYPAD), ___QWERTY_R3___, KC_RSFT, ___BOTTOM_RIGHT___, ___ERGODOX_THUMB_RIGHT___ ), [COLEMAK] = LAYOUT_ergodox_wrapper( - // left hand + // left hand KC_GRV, ___NUMBER_L___, OSL(LAYERS), KC_LOCK, ___COLEMAK_L1___, LCTL(KC_C), TAB_BKTAB, ___COLEMAK_L2___, @@ -92,16 +92,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___COLEMAK_R1___, KC_SLASH, + LCTL(KC_V), ___COLEMAK_R1___, KC_SLASH, /* */ ___COLEMAK_R2___, KC_MINUS, - TO(KEYPAD), ___COLEMAK_R3___, KC_RSFT, + TO(KEYPAD), ___COLEMAK_R3___, KC_RSFT, ___BOTTOM_RIGHT___, ___ERGODOX_THUMB_RIGHT___ ), [WORKMAN] = LAYOUT_ergodox_wrapper( - // left hand + // left hand KC_GRV, ___NUMBER_L___, OSL(LAYERS), KC_LOCK, ___WORKMAN_L1___, LCTL(KC_C), TAB_BKTAB, ___WORKMAN_L2___, @@ -112,16 +112,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___WORKMAN_R1___, KC_SLASH, + LCTL(KC_V), ___WORKMAN_R1___, KC_SLASH, /* */ ___WORKMAN_R2___, KC_MINUS, - TO(KEYPAD), ___WORKMAN_R3___, KC_RSFT, + TO(KEYPAD), ___WORKMAN_R3___, KC_RSFT, ___BOTTOM_RIGHT___, ___ERGODOX_THUMB_RIGHT___ ), [NORMAN] = LAYOUT_ergodox_wrapper( - // left hand + // left hand KC_GRV, ___NUMBER_L___, OSL(LAYERS), KC_LOCK, ___NORMAN_L1___, LCTL(KC_C), TAB_BKTAB, ___NORMAN_L2___, @@ -132,23 +132,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand MDIA_SYMB_KP_LAYERS, ___NUMBER_R___, KC_EQL, - LCTL(KC_V), ___NORMAN_R1___, KC_SLASH, + LCTL(KC_V), ___NORMAN_R1___, KC_SLASH, /* */ ___NORMAN_R2___, KC_MINUS, - TO(KEYPAD), ___NORMAN_R3___, KC_RSFT, + TO(KEYPAD), ___NORMAN_R3___, KC_RSFT, ___BOTTOM_RIGHT___, ___ERGODOX_THUMB_RIGHT___ ), [DVORAK_ON_BEPO] = LAYOUT_ergodox_wrapper( - // left hand + // 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___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT_FR___, + ___ERGODOX_THUMB_LEFT_BP___, // right hand @@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { DB_RPRN, ___DVORAK_FR_R3___, KC_RSFT, ___BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT___ + ___ERGODOX_THUMB_RIGHT_BP___ ), [BEPO] = LAYOUT_ergodox_wrapper( @@ -169,18 +169,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TAB_BKTAB, ___BEPO_FR_L2___, BP_SFT_T_ECRC, ___BEPO_FR_L3___, DB_RBRC, - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___5___, + ___6___, // Right hand MDIA_SYMB_KP_LAYERS, ___SYMBOL_BEPO_R___, BP_EQL, - BP_DCRC, ___BEPO_FR_R1___, BP_W, - /* */ ___BEPO_FR_R2___, BP_CCED, - BP_C, ___BEPO_FR_R3___, KC_RSFT, + BP_DCRC, ___BEPO_FR_R1___, BP_W, + /* */ ___BEPO_FR_R2___, BP_CCED, + BP_C, ___BEPO_FR_R3___, KC_RSFT, - ___BOTTOM_RIGHT___, - ___ERGODOX_THUMB_RIGHT___ + ___5___, + ___6___ ), [XMONAD_FR] = LAYOUT_ergodox_wrapper( @@ -190,8 +190,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___, ___DVORAK_FR_L2___, ___, ___DVORAK_FR_L3___, ___, - ___BOTTOM_LEFT___, - ___ERGODOX_THUMB_LEFT___, + ___BOTTOM_LEFT_FR___, + ___ERGODOX_THUMB_LEFT_BP___, // right hand @@ -201,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___, ___DVORAK_FR_R3___, ___, ___BOTTOM_RIGHT_FR___, - ___ERGODOX_THUMB_RIGHT___ + ___ERGODOX_THUMB_RIGHT_BP___ ), // SYMBOLS diff --git a/users/ericgebhart/base_layers.h b/users/ericgebhart/base_layers.h index fbc4b5de138d..caf08105747c 100644 --- a/users/ericgebhart/base_layers.h +++ b/users/ericgebhart/base_layers.h @@ -54,7 +54,7 @@ // becomes the upper thumbs, the real 4th row if we throw away // the number row at the top -#define ___ORTHO_14_MIDDLE_4___ XXX, HOME_END, KC_PGDN, XXX +#define ___ORTHO_14_MIDDLE_4___ LSFT(KC_TAB), HOME_END, KC_PGDN, KC_TAB // basically the thumb keys like on the ergodox. #define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC, KC_PGDN, ALT_ENT, CTL_SPC @@ -64,14 +64,14 @@ #define ___ORTHO_14_MIDDLE_2_BP___ TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO) #define ___ORTHO_14_MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO) -#define ___ORTHO_14_MIDDLE_4_BP___ XXX, HOME_END, KC_PGUP, XXX +#define ___ORTHO_14_MIDDLE_4_BP___ LSFT(KC_TAB), HOME_END, KC_PGUP, KC_TAB /********************************************************************/ /** The top rows for numbers, symbols and Fkeys. **/ /********************************************************************/ -#define ___ORTHO_15_N___ ___NUMBER_L___, ___ORTHO_15_MIDDLE_T___, ___NUMBER_R___ -#define ___ORTHO_15_B_N___ ___NUMBER_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___NUMBER_BEPO_R___ +#define ___ORTHO_15_N___ ___NUMBER_L___, ___ORTHO_15_MIDDLE_T___, ___NUMBER_R___ +#define ___ORTHO_15_B_N___ ___NUMBER_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___NUMBER_BEPO_R___ // the full bepo symbol row. #define ___ORTHO_15_B_SYMB___ BP_DLR, ___SYMBOL_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___SYMBOL_BEPO_R___, BP_EQL @@ -92,7 +92,7 @@ // for dvorak on bepo #define ___BOTTOM_LEFT_FR___ LCTL(BP_C), LCTL(BP_C), LCTL(BP_V), KC_LEFT, KC_RIGHT -#define ___BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, BP_CCED, BP_PERC +#define ___BOTTOM_RIGHT_FR___ KC_UP, KC_DOWN, DB_BACKSLASH, LCTL(KC_V), LCTL(KC_C) #define ___ORTHO_15_BOTTOM___ ___BOTTOM_LEFT___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT___ #define ___ORTHO_15_BOTTOM_FR___ ___BOTTOM_LEFT_FR___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT_FR___ @@ -105,22 +105,24 @@ #define ___ERGODOX_THUMB_LEFT___ \ - OS_RALT, TG(MDIA), \ - HOME_END, \ - CTL_BSPC, ALT_DEL, XMONAD_ESC + OSL(SYMB), OSM(KC_LGUI), \ + HOME_END, \ + CTL_BSPC, ALT_DEL, XMONAD_ESC #define ___ERGODOX_THUMB_RIGHT___ \ - TG(SYMB), OS_RALT, \ - KC_PGUP, \ - KC_PGDN, ALT_ENT, CTL_SPC + XXX, OSL(KEYPAD), \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC #define ___ERGODOX_THUMB_RIGHT_BP___ \ - TG(SYMB_ON_BEPO), OS_RALT, \ - KC_PGUP, \ - KC_PGDN, ALT_ENT, CTL_SPC - -#define ___ERGODOX_TRANS_THUMBS___ ___6___ -#define ___TRANS_BOTTOM___ ___5___ + XXX, OSL(KEYPAD_ON_BEPO), \ + KC_PGUP, \ + KC_PGDN, ALT_ENT, CTL_SPC + +#define ___ERGODOX_THUMB_LEFT_BP___ \ + OSL(SYMB_ON_BEPO), OSM(KC_LGUI), \ + HOME_END, \ + CTL_BSPC, ALT_DEL, XMONAD_ESC /********************************************************************************/ /* the interior rows for ortholinear keyboards. the first number is the length */ From 8c9cfe545e5274fe1bb1d4f7b15593412bf77cb6 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Thu, 16 Apr 2020 01:40:28 +0200 Subject: [PATCH 17/23] remove pragma once where it is unecessary to see if Travis likes it. --- users/ericgebhart/base_layers.h | 1 - users/ericgebhart/core_keys.h | 1 - users/ericgebhart/core_keysets.h | 1 - users/ericgebhart/ericgebhart.h | 5 ++--- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/users/ericgebhart/base_layers.h b/users/ericgebhart/base_layers.h index caf08105747c..aba7273a8333 100644 --- a/users/ericgebhart/base_layers.h +++ b/users/ericgebhart/base_layers.h @@ -1,4 +1,3 @@ -#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h index 035f740016e4..11f6543f2235 100644 --- a/users/ericgebhart/core_keys.h +++ b/users/ericgebhart/core_keys.h @@ -1,4 +1,3 @@ -#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/core_keysets.h b/users/ericgebhart/core_keysets.h index ffe02192f6b5..6596e2121d0d 100644 --- a/users/ericgebhart/core_keysets.h +++ b/users/ericgebhart/core_keysets.h @@ -1,4 +1,3 @@ -#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index 617bcdcae710..3e74944c4208 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -1,10 +1,9 @@ -#pragma once +#ifndef ericgebhart +#define ericgebhart #include QMK_KEYBOARD_H #include "base_layers.h" -#ifndef ericgebhart -#define ericgebhart //#define ONESHOT_TAP_TOGGLE 2 /* Tapping this number of times holds the key until tapped once again. */ From 77d74b41d47272127f4f4054c299889fef01e586 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Thu, 16 Apr 2020 18:26:38 +0200 Subject: [PATCH 18/23] revert again. --- keyboards/xd75/rules.mk | 1 - users/ericgebhart/base_layers.h | 1 + users/ericgebhart/core_keys.h | 1 + users/ericgebhart/core_keysets.h | 1 + users/ericgebhart/ericgebhart.h | 2 ++ 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/keyboards/xd75/rules.mk b/keyboards/xd75/rules.mk index aa30f2f5765a..05a3ae64b3e0 100644 --- a/keyboards/xd75/rules.mk +++ b/keyboards/xd75/rules.mk @@ -28,6 +28,5 @@ UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -TAP_DANCE_ENABLE = yes LAYOUTS = ortho_5x15 diff --git a/users/ericgebhart/base_layers.h b/users/ericgebhart/base_layers.h index aba7273a8333..caf08105747c 100644 --- a/users/ericgebhart/base_layers.h +++ b/users/ericgebhart/base_layers.h @@ -1,3 +1,4 @@ +#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h index 11f6543f2235..035f740016e4 100644 --- a/users/ericgebhart/core_keys.h +++ b/users/ericgebhart/core_keys.h @@ -1,3 +1,4 @@ +#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/core_keysets.h b/users/ericgebhart/core_keysets.h index 6596e2121d0d..ffe02192f6b5 100644 --- a/users/ericgebhart/core_keysets.h +++ b/users/ericgebhart/core_keysets.h @@ -1,3 +1,4 @@ +#pragma once /* Copyright 2018 Eric Gebhart diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h index 3e74944c4208..ad66a636eaf1 100644 --- a/users/ericgebhart/ericgebhart.h +++ b/users/ericgebhart/ericgebhart.h @@ -1,3 +1,5 @@ +#pragma once + #ifndef ericgebhart #define ericgebhart From 80216a2b741f76fd01e44c1757dca9d0121c59d3 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Thu, 16 Apr 2020 23:25:40 +0200 Subject: [PATCH 19/23] replace unknown whitespace characters. --- keyboards/xd75/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/xd75/rules.mk b/keyboards/xd75/rules.mk index 05a3ae64b3e0..e822f37eacf8 100644 --- a/keyboards/xd75/rules.mk +++ b/keyboards/xd75/rules.mk @@ -12,7 +12,7 @@ MCU = atmega32u4 BOOTLOADER = atmel-dfu # QMK Build Options -# change to "no" to disable the options, or define them in the Makefile in +# change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration @@ -26,7 +26,7 @@ MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend LAYOUTS = ortho_5x15 From c3c329ccdebaa7cfac74124a8c3dc13c6098ff9d Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sun, 19 Apr 2020 18:27:09 +0200 Subject: [PATCH 20/23] Refactor of rules.mk --- .../keebio/viterbi/keymaps/ericgebhart/rules.mk | 17 ----------------- keyboards/xd75/keymaps/ericgebhart/rules.mk | 16 ---------------- .../keymaps => users}/ericgebhart/rules.mk | 2 -- 3 files changed, 35 deletions(-) delete mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk rename {keyboards/ergodox_ez/keymaps => users}/ericgebhart/rules.mk (93%) diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk deleted file mode 100644 index a4d834f37640..000000000000 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -SRC += ericgebhart.c - -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard -KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key -TAP_DANCE_ENABLE = yes # Enable the tap dance feature. -CONSOLE_ENABLE = no # Console for debug - -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -UNICODE_ENABLE = no -SLEEP_LED_ENABLE = no -API_SYSEX_ENABLE = no -RGBLIGHT_ENABLE = no -RGBLIGHT_ANIMATION = no diff --git a/keyboards/xd75/keymaps/ericgebhart/rules.mk b/keyboards/xd75/keymaps/ericgebhart/rules.mk index c11297143cb3..11871f9c9dab 100644 --- a/keyboards/xd75/keymaps/ericgebhart/rules.mk +++ b/keyboards/xd75/keymaps/ericgebhart/rules.mk @@ -1,19 +1,3 @@ -SRC += ericgebhart.c - RGBLIGHT_ENABLE = yes RGBLIGHT_ANIMATION = yes # BACKLIGHT_ENABLE = yes - -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard -KEY_LOCK_ENABLE = yes # Enable the KC_LOCK key -TAP_DANCE_ENABLE = yes # Enable the tap dance feature. -CONSOLE_ENABLE = no # Console for debug - -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -UNICODE_ENABLE = no -SLEEP_LED_ENABLE = no -API_SYSEX_ENABLE = no diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk b/users/ericgebhart/rules.mk similarity index 93% rename from keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk rename to users/ericgebhart/rules.mk index a4d834f37640..70017a5950e5 100755 --- a/keyboards/ergodox_ez/keymaps/ericgebhart/rules.mk +++ b/users/ericgebhart/rules.mk @@ -13,5 +13,3 @@ BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration UNICODE_ENABLE = no SLEEP_LED_ENABLE = no API_SYSEX_ENABLE = no -RGBLIGHT_ENABLE = no -RGBLIGHT_ANIMATION = no From dd5164907b877e4b90951198028c2214a2f658b9 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Sun, 19 Apr 2020 21:41:38 +0200 Subject: [PATCH 21/23] Added viterbi rules.mk back. --- .../viterbi/keymaps/ericgebhart/rules.mk | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk new file mode 100644 index 000000000000..d8dfbb53818b --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk @@ -0,0 +1,24 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +SPLIT_KEYBOARD = yes + +DEFAULT_FOLDER = keebio/viterbi/rev1 +LAYOUTS = ortho_5x14 From 2b2d8c7bd1a07abeb335e6e9eea6cf81ca596192 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Mon, 20 Apr 2020 06:32:12 +0200 Subject: [PATCH 22/23] removed all but revision folder. --- .../viterbi/keymaps/ericgebhart/rules.mk | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk index d8dfbb53818b..2d51aca78841 100644 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk +++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk @@ -1,24 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = caterina - -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/viterbi/rev1 -LAYOUTS = ortho_5x14 From 8eacafd2047a5acf6f533fa5d70d182bad8b4bf4 Mon Sep 17 00:00:00 2001 From: Eric Gebhart Date: Tue, 21 Apr 2020 09:15:13 +0200 Subject: [PATCH 23/23] removed rules.mk, default folder doesn't actually work. --- keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk b/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk deleted file mode 100644 index 2d51aca78841..000000000000 --- a/keyboards/keebio/viterbi/keymaps/ericgebhart/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = keebio/viterbi/rev1