Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to Atreus and Ergodox EZ Dvorak 42key layout #1997

Merged
merged 28 commits into from
Nov 13, 2017
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
29aaf41
importing 42 key dvorak layout
Sep 10, 2017
832f6b9
added comment for build instructions
Sep 10, 2017
9f9282f
adding atreus dvorak 42 key layout
Sep 10, 2017
bcd0e3b
added readme
Sep 10, 2017
7c50181
add readme
Sep 10, 2017
cea7d35
build instructions
Sep 10, 2017
f1dd0b5
additional MEH shortcuts
Sep 10, 2017
52878af
resolve conflicts
Nov 4, 2017
c7d2ae5
added shifted symbols on symbols layer
Nov 4, 2017
a2f4079
working extra symbols on COMBINED layer
Nov 4, 2017
7970441
bring atreus layout inline with the ergodox one
Nov 4, 2017
aed5dc7
add necessary macros
Nov 5, 2017
235455a
working ls macro
Nov 5, 2017
6d76fe5
added more shell macros
Nov 5, 2017
62835b3
added screen rename / screen number macros
Nov 5, 2017
e0f3cbf
add ctrl-a key in shell-nav to use screen more easily
Nov 5, 2017
3cc1f1d
added shell screen layer
Nov 5, 2017
29d7321
assign screen switching macros to screen layer
Nov 5, 2017
fc35fee
define all screen switching macros
Nov 5, 2017
d349516
more screen-related shortcuts added on shell screen layer
Nov 5, 2017
30b5b4e
change shell nav bottom right row to match base layer (backspace / de…
Nov 5, 2017
09ed816
remove some mappings on SHELL_NAV layer as they are now in the screen…
Nov 5, 2017
ececf5c
added more screen macros
Nov 5, 2017
eda76c8
changes to COMBINED layer (pipe on the right) and modified shell nav
luc-vocab Nov 8, 2017
d985721
moved pipe/backslash to then right
luc-vocab Nov 11, 2017
e7c1487
documented SHELL_SCREEN layer
luc-vocab Nov 11, 2017
4bcd2e2
Merge branch 'master' of https://github.com/qmk/qmk_firmware
luc-vocab Nov 11, 2017
9251e0a
put backspace/delete on SHELL_NAV layer
luc-vocab Nov 11, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove some mappings on SHELL_NAV layer as they are now in the screen…
… layer
  • Loading branch information
luc wastiaux committed Nov 5, 2017
commit 09ed816c010f5177e3a8cc18b140e0f355bea509
10 changes: 5 additions & 5 deletions keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,
// right hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(SWITCH_NDS),
RCTL(KC_L), RCTL(KC_W), KC_HOME, KC_UP, KC_END, LALT(KC_D), RCTL(KC_R),
LALT(KC_B), KC_LEFT, KC_DOWN, KC_RIGHT, LALT(KC_F), LALT(KC_DOT),
RCTL(KC_C), RCTL(KC_U), M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V), RCTL(KC_K), M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(SWITCH_NDS),
RCTL(KC_L), KC_TRNS, KC_HOME, KC_UP, KC_END, KC_TRNS, RCTL(KC_R),
LALT(KC_B), KC_LEFT, KC_DOWN, KC_RIGHT, LALT(KC_F), LALT(KC_DOT),
RCTL(KC_C), KC_TRNS, M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V), RCTL(KC_K), M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
// bottom row (match functionality of base layer)
KC_TRNS, RCTL(KC_W), KC_TRNS, LALT(KC_D), RCTL(KC_U),
KC_TRNS, RCTL(KC_W), KC_TRNS, LALT(KC_D), RCTL(KC_U),
// thumb cluster
KC_TRNS, KC_TRNS,
KC_TRNS,
Expand Down