diff options
author | Twentylives <lior@dotcore.co.il> | 2018-06-13 00:42:11 +0300 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-06-12 14:42:11 -0700 |
commit | f535c9482948163a16407f43a7e4aac70f27e764 (patch) | |
tree | 0cf48fd6360caf956fdddb345761e69c8b73d580 /keyboards/handwired/dactyl_manuform/keymaps | |
parent | 06487daaddf923d635e8a528d1eb644b875a73f6 (diff) | |
download | qmk_firmware-f535c9482948163a16407f43a7e4aac70f27e764.tar.gz qmk_firmware-f535c9482948163a16407f43a7e4aac70f27e764.zip |
Modifications to Dactyl manuform keyboard (#3162)
* DactylManuform: Updating dvorak keymap
* Changed NAV and NUM layers to LOWER and RAISE
* Removed Mod+Key form RAISE and LOWER keys to be used as layer togglers exclusively
* Added missing keys to LOWER layers
* DactylManuform: fixed bugs in keyboard config file
* DactylManuform: Change default mouse config
The default mouse config parameters are slow and not very user friendly, this commit overrides the default
values.
wq
Signed-off-by: Sameeh Jubran <sameeh.j@gmail.com>
* Dactylmanuform: Update default keymap (qwerty) to match dvorak's
Recently devorak's layout went through some changes for changing layer toggles behavior,
adding missing keys, and fix minor bugs, this commit introduces these changes to the default keymap.
Signed-off-by: Sameeh Jubran <sameeh.j@gmail.com>
* Dactylmanuform: Add permissive hold support
Signed-off-by: Sameeh Jubran <sameeh.j@gmail.com>
* DactylManuform: Updating documentation
* Adding a picture of the keyboard
* Adding keymaps pictures
* Adding missing EEPROM files for EE_HANDS
flashing these before firmware will let the
user use either hand as master without reflashing
Signed-off-by: 20lives <lior@dotcore.co.il>
Diffstat (limited to 'keyboards/handwired/dactyl_manuform/keymaps')
-rw-r--r-- | keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c | 112 | ||||
-rw-r--r-- | keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c | 100 |
2 files changed, 116 insertions, 96 deletions
diff --git a/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c index 8847065f41..24c02215ee 100644 --- a/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c @@ -5,59 +5,68 @@ extern keymap_config_t keymap_config; #define _BASE 0 -#define _NAV 1 -#define _NUM 2 - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NAV, - NUM, -}; +#define _RAISE 1 +#define _LOWER 2 // Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO + +#define ____ KC_TRNS + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN1 + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base (qwerty) * ,----------------------------------, ,----------------------------------, - * | Q | W | E | R | T | | Y | U | I | O | P | + * | q | w | e | r | t | | y | u | i | o | p | * |------+------+------+------+------| |-------------+------+------+------| - * | A | S | D | F | G | | H | J | K | L | ; | + * | a | s | d | f | g | | h | j | k | l | ; | * |------+------+------+------+------| |------|------+------+------+------| - * | Z | X | C | V | B | | N | M | , | . | ' | + * | z | x | c | v | b | | n | m | , | . | ' | * |------+------+------+-------------, ,-------------+------+------+------, * | [ | ] | | - | = | * '------+------'-------------' '-------------'------+------' - * | esc | bs | | space|enter | + * | ESC | BS | | SPACE|ENTER | * | + | + | | + | + | - * | shift| ctrl | | alt |shift | + * | SHIFT| CTRL | | ALT |SHIFT | * '------+------' '------+------' * '------+------' '------+------' - * | tab | home | | end | del | - * |------+------' '------+------| - * |\(NAV)| ~ | | gui |/(NUM)| + * | TAB | HOME | | END | DEL | + * '------+------' '------+------' + * | Lower| ~ | | GUI | Raise| * '------+------' '------+------' */ [_BASE] = LAYOUT( \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, \ - KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, \ - SFT_T(KC_ESC), CTL_T(KC_BSPC), ALT_T(KC_SPC), SFT_T(KC_ENT), \ - KC_TAB, KC_HOME, KC_END, KC_DEL, \ - LT(_NAV, KC_BSLS), KC_GRV, KC_LGUI, LT(_NUM, KC_SLSH) \ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, \ + KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, \ + SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT, \ + KC_TAB, KC_HOME, KC_END, KC_DEL, \ + RAISE, KC_GRV, KC_LGUI, LOWER ), -/* Navigation layer +/* Raise * ,----------------------------------, ,----------------------------------, - * | | | mup | | | | | | up | | | + * | | | mup | | | | VOL+ | | up | | PgUp | * |------+------+------+------+------| |-------------+------+------+------| - * | | mleft| mdown|mright| | | | left | down |right | | + * | | mleft| mdown|mright| | | MUTE | left | down |right | PgDn | * |------+------+------+------+------| |------|------+------+------+------| - * | | | | | | | | | | | | + * | | | | | | | VOL- | / | \ | ? | | | * |------+------+------+-------------, ,-------------+------+------+------, * | | | | mbtn |mbtn2 | * '------+------'-------------' '-------------'------+------' @@ -66,22 +75,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | * '------+------' '------+------' * '------+------' '------+------' - * | tab | home | | end | del | + * | | | | | | * '------+------' '------+------' - * |\(NAV)| ~ | | gui |/(NUM)| + * | | | | | | * '------+------' '------+------' */ -[_NAV] = LAYOUT( \ - KC_TRNS, KC_TRNS, KC_MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_BTN2, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +[_RAISE] = LAYOUT( \ + ____, ____, KC_MU, ____, ____, KC_VOLU, ____, KC_UP, ____, KC_PGUP, \ + ____, KC_ML, KC_MD, KC_MR, ____, KC_MUTE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDOWN, \ + ____, ____, ____, ____, ____, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, \ + ____, ____, KC_MB1, KC_MB2, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____ \ ), -/* Numbers layer +/* Lower * ,----------------------------------, ,----------------------------------, * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | * |------+------+------+------+------| |-------------+------+------+------| @@ -89,26 +98,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------| |------|------+------+------+------| * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | * |------+------+------+-------------, ,-------------+------+------+------, - * | F11 | F12 | | | | + * | F11 | F12 | | - | = | * '------+------'-------------' '-------------'------+------' * | | | | | | * | | | | | | * | | | | | | * '------+------' '------+------' * '------+------' '------+------' - * | tab | home | | end | del | + * | | | | | | * '------+------' '------+------' - * |\(NAV)| ~ | | gui |/(NUM)| + * | | | | | | * '------+------' '------+------' */ -[_NUM] = LAYOUT( \ - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, \ - KC_F11, KC_F12, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + +[_LOWER] = LAYOUT( \ + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \ + KC_F11, KC_F12, ____, ____, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____ \ ) }; diff --git a/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c index bee15bfbe3..0a1c90b6bf 100644 --- a/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c +++ b/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c @@ -5,24 +5,33 @@ extern keymap_config_t keymap_config; #define _BASE 0 -#define _NAV 1 -#define _NUM 2 - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NAV, - NUM, -}; +#define _RAISE 1 +#define _LOWER 2 // Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO + +#define ____ KC_TRNS + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN1 + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base (dvorak) * ,----------------------------------, ,----------------------------------, - * | ' | , | . | p | y | | f | g | c | r | l | + * | ' | , | . | p | y | | f | g | c | r | l | * |------+------+------+------+------| |-------------+------+------+------| * | a | o | e | u | i | | d | h | t | n | s | * |------+------+------+------+------| |------|------+------+------+------| @@ -30,14 +39,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+-------------, ,-------------+------+------+------, * | [ | ] | | - | = | * '------+------'-------------' '-------------'------+------' - * | esc | bs | | space|enter | + * | ESC | BS | | SPACE|ENTER | * | + | + | | + | + | - * | shift| ctrl | | alt |shift | + * | SHIFT| CTRL | | ALT |SHIFT | * '------+------' '------+------' * '------+------' '------+------' - * | tab | home | | end | del | - * |------+------' '------+------| - * |\(NAV)| ~ | | gui |/(NUM)| + * | TAB | HOME | | END | DEL | + * '------+------' '------+------' + * | Lower| ~ | | GUI | Raise| * '------+------' '------+------' */ @@ -46,18 +55,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, \ KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, \ KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, \ - SFT_T(KC_ESC), CTL_T(KC_BSPC), ALT_T(KC_SPC), SFT_T(KC_ENT), \ - KC_TAB, KC_HOME, KC_END, KC_DEL, \ - LT(_NAV, KC_BSLS), KC_GRV, KC_LGUI, LT(_NUM, KC_SLSH) \ + SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT, \ + KC_TAB, KC_HOME, KC_END, KC_DEL, \ + RAISE, KC_GRV, KC_LGUI, LOWER ), -/* Navigation layer +/* Raise * ,----------------------------------, ,----------------------------------, - * | | | mup | | | | | | up | | | + * | | | mup | | | | VOL+ | | up | | PgUp | * |------+------+------+------+------| |-------------+------+------+------| - * | | mleft| mdown|mright| | | | left | down |right | | + * | | mleft| mdown|mright| | | MUTE | left | down |right | PgDn | * |------+------+------+------+------| |------|------+------+------+------| - * | | | | | | | | | | | | + * | | | | | | | VOL- | / | \ | ? | | | * |------+------+------+-------------, ,-------------+------+------+------, * | | | | mbtn |mbtn2 | * '------+------'-------------' '-------------'------+------' @@ -66,22 +75,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | * '------+------' '------+------' * '------+------' '------+------' - * | tab | home | | end | del | + * | | | | | | * '------+------' '------+------' - * |\(NAV)| ~ | | gui |/(NUM)| + * | | | | | | * '------+------' '------+------' */ -[_NAV] = LAYOUT( \ - KC_TRNS, KC_TRNS, KC_MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_BTN2, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +[_RAISE] = LAYOUT( \ + ____, ____, KC_MU, ____, ____, KC_VOLU, ____, KC_UP, ____, KC_PGUP, \ + ____, KC_ML, KC_MD, KC_MR, ____, KC_MUTE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDOWN, \ + ____, ____, ____, ____, ____, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, \ + ____, ____, KC_MB1, KC_MB2, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____ \ ), -/* Numbers layer +/* Lower * ,----------------------------------, ,----------------------------------, * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | * |------+------+------+------+------| |-------------+------+------+------| @@ -89,26 +98,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------| |------|------+------+------+------| * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | * |------+------+------+-------------, ,-------------+------+------+------, - * | F11 | F12 | | | | + * | F11 | F12 | | - | = | * '------+------'-------------' '-------------'------+------' * | | | | | | * | | | | | | * | | | | | | * '------+------' '------+------' * '------+------' '------+------' - * | tab | home | | end | del | + * | | | | | | * '------+------' '------+------' - * |\(NAV)| ~ | | gui |/(NUM)| + * | | | | | | * '------+------' '------+------' */ -[_NUM] = LAYOUT( \ - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, \ - KC_F11, KC_F12, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + +[_LOWER] = LAYOUT( \ + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \ + KC_F11, KC_F12, ____, ____, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____, \ + ____, ____, ____, ____ \ ) }; |