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

layout(infinity ergodox): dudeofawesome's layout #1932

Merged
merged 38 commits into from
Oct 31, 2017
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
909daa3
🎉 Building simple flasher
dudeofawesome Sep 11, 2017
2c2f38d
🎉 Flashing works
dudeofawesome Sep 11, 2017
8b0461a
🎨 Cleaning up
dudeofawesome Sep 11, 2017
76d7d9b
🐛 Being more specific with board identity
dudeofawesome Sep 11, 2017
3a67d20
🐛 Flashing correct keymap
dudeofawesome Sep 11, 2017
f81c9f4
🎉 Adding keymap
dudeofawesome Sep 11, 2017
0aa853a
✨ Updating keymap
dudeofawesome Sep 11, 2017
9ceabfb
🚨 RGB
dudeofawesome Sep 11, 2017
47ad8cb
⏪ Revert "🚨 RGB"
dudeofawesome Sep 12, 2017
cf1fecc
✨ Improvements to flasher
dudeofawesome Sep 12, 2017
7aba645
✨ Layout tweaks
dudeofawesome Sep 12, 2017
fdd9acd
💄 Messing around with LCD
dudeofawesome Sep 12, 2017
5157790
💄 Enabling LCD backlight matching
dudeofawesome Sep 12, 2017
4307250
🔧 Updating layout
dudeofawesome Sep 13, 2017
0cd08b8
🐛 Fixing console logging
dudeofawesome Sep 13, 2017
9fbdd4e
🎨 Cleaning up indentation
dudeofawesome Sep 18, 2017
73e5811
🔧 Adding editorconfig
dudeofawesome Sep 18, 2017
5a880ce
✨ Adding game layer
dudeofawesome Sep 18, 2017
2a8c804
💄 Changing numpad layout
dudeofawesome Sep 18, 2017
efa50a5
Merge remote-tracking branch 'qmk/master' into board/infinity-ergodox
dudeofawesome Oct 12, 2017
9f84afe
✨🔥 redoing entire layout
dudeofawesome Oct 14, 2017
2842085
✨ add workman and dvorak layouts
dudeofawesome Oct 14, 2017
c8793c3
🐛 fix numpad
dudeofawesome Oct 14, 2017
8e26c24
🐛 fix layer orders
dudeofawesome Oct 17, 2017
6034735
🐛 fix layer toggling
dudeofawesome Oct 17, 2017
b77a4fa
🐛 fix tri-layer switching
dudeofawesome Oct 17, 2017
4d3b2ee
🐛 fix LCD colors for adjustment layers
dudeofawesome Oct 17, 2017
8fc7781
🔥 remove old flasher project
dudeofawesome Oct 17, 2017
a9a6bdf
🔥 remove simple_visualizer
dudeofawesome Oct 17, 2017
875615f
💄 update LCD colors
dudeofawesome Oct 17, 2017
cd480fc
📝 fix layout comments
dudeofawesome Oct 17, 2017
1f46ef2
💄 swapping 2u buttons
dudeofawesome Oct 23, 2017
2143b85
🔀 Merge remote-tracking branch 'qmk/master' into board/infinity-ergodox
dudeofawesome Oct 30, 2017
ebc7d97
🔥🔧 removing editorconfig
dudeofawesome Oct 30, 2017
9503dca
🚨 using 2 spaces
dudeofawesome Oct 30, 2017
90f6317
📝 add README
dudeofawesome Oct 31, 2017
54546e0
⏪ Revert "💄 Enabling LCD backlight matching"
dudeofawesome Oct 31, 2017
9ffbfc0
⏪ Revert "💄 Messing around with LCD"
dudeofawesome Oct 31, 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
🎨 Cleaning up indentation
  • Loading branch information
dudeofawesome committed Sep 18, 2017
commit 9fbdd4e9ab022571d6895e72e28d0b334edeba71
130 changes: 66 additions & 64 deletions keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
// Otherwise, it needs KC_*
[BASE] = LAYOUT_ergodox( // layer 0 : default
// left hand
KC_MINUS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, LT(MDIA,KC_LBRACKET),
CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_FN1,
LT(SYMB,KC_MUTE), KC_VOLD, KC_VOLU, KC_GRV, KC_QUOT,

KC_MPLY, TG(MDIA),
KC_LCTRL,
KC_LGUI, MO(SYMB), KC_LALT,

// right hand
KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL,
LT(MDIA,KC_RBRACKET), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENTER,
KC_FN1, KC_N, KC_M, KC_COMM, KC_DOT, LT(MDIA, KC_SLSH), KC_RSPC,
KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TO(SYMB),

TG(MDIA), TG(SYMB),
KC_RCTRL,
KC_RALT, KC_BSPACE, KC_SPACE
),
// left hand
KC_MINUS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, LT(MDIA,KC_LBRACKET),
CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_FN1,
LT(SYMB,KC_MUTE), KC_VOLD, KC_VOLU, KC_GRV, KC_QUOT,

KC_MPLY, TG(MDIA),
KC_LCTRL,
KC_LGUI, MO(SYMB), KC_LALT,

// right hand
KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL,
LT(MDIA,KC_RBRACKET), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENTER,
KC_FN1, KC_N, KC_M, KC_COMM, KC_DOT, LT(MDIA, KC_SLSH), KC_RSPC,
KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TO(SYMB),

TG(MDIA), TG(SYMB),
KC_RCTRL,
KC_RALT, KC_BSPACE, KC_SPACE
),
/* Keymap 1: Symbol Layer
*
* ,---------------------------------------------------. ,--------------------------------------------------.
Expand All @@ -84,28 +84,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
// SYMBOLS
[SYMB] = LAYOUT_ergodox(
// left hand
VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
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_TRNS, KC_TRNS,
RGB_MOD,
KC_TRNS, KC_TRNS, KC_TRNS,

// right hand
KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
KC_TRNS, KC_DOT, KC_0, KC_EQL, TO(MDIA),

KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_DEL, KC_TRNS
// left hand
VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
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_TRNS, KC_TRNS,
RGB_MOD,
KC_TRNS, KC_TRNS, KC_TRNS,

// right hand
KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
KC_TRNS, KC_DOT, KC_0, KC_EQL, TO(MDIA),

KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_DEL, KC_TRNS
),

/* Keymap 2: Media and mouse keys
*
* ,--------------------------------------------------. ,--------------------------------------------------.
Expand All @@ -129,28 +130,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
// MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox(
// left hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_D, KC_TRNS,
KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U,
KC_TRNS, KC_TRNS, KC_WH_L, KC_BTN3, KC_WH_R, KC_TRNS, KC_TRNS,
KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,

KC_TRNS, KC_TRNS,
KC_WH_D,
KC_BTN1, KC_BTN2, KC_WH_U,

// right hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, TO(BASE),

KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_WBAK, KC_WFWD
// left hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_D, KC_TRNS,
KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U,
KC_TRNS, KC_TRNS, KC_WH_L, KC_BTN3, KC_WH_R, KC_TRNS, KC_TRNS,
KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,

KC_TRNS, KC_TRNS,
KC_WH_D,
KC_BTN1, KC_BTN2, KC_WH_U,

// right hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, TO(BASE),

KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_WBAK, KC_WFWD
),

};

const uint16_t PROGMEM fn_actions[] = {
Expand Down