summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorStick <nstickney@gmail.com>2017-06-23 16:02:44 -0500
committerStick <nstickney@gmail.com>2017-06-23 16:02:44 -0500
commitf4e4d6f8d046eff9a4d49ddbf6e499ba519c7182 (patch)
treef52082f66034617178172a6e5509257711ac1961 /keyboards/ergodox
parent37987837b18a758dffbed2b01ab34103f4f6f69f (diff)
parenta1ce43781ab1e9709c006435f62fd25876561a5b (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/keymaps/333fred/Makefile1
-rw-r--r--keyboards/ergodox/keymaps/333fred/README.md38
-rw-r--r--keyboards/ergodox/keymaps/333fred/config.h11
-rw-r--r--keyboards/ergodox/keymaps/333fred/keymap.c117
4 files changed, 106 insertions, 61 deletions
diff --git a/keyboards/ergodox/keymaps/333fred/Makefile b/keyboards/ergodox/keymaps/333fred/Makefile
index b977722a2f..17f736458c 100644
--- a/keyboards/ergodox/keymaps/333fred/Makefile
+++ b/keyboards/ergodox/keymaps/333fred/Makefile
@@ -2,7 +2,6 @@ SUBPROJECT_DEFAULT = infinity
LCD_BACKLIGHT_ENABLE = yes
LCD_ENABLE = yes
BACKLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
NKRO_ENABLE = yes
TAP_DANCE_ENABLE = yes
diff --git a/keyboards/ergodox/keymaps/333fred/README.md b/keyboards/ergodox/keymaps/333fred/README.md
index af8042d859..f7b4ca42f4 100644
--- a/keyboards/ergodox/keymaps/333fred/README.md
+++ b/keyboards/ergodox/keymaps/333fred/README.md
@@ -14,7 +14,7 @@
|LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI |
`----------------------------------' `----------------------------------'
,-------------. ,-------------.
- | Home | End | | Alt |Ctrl/Esc|
+ | Copy | Paste| | Alt |Ctrl/Esc|
,------|------|------| |------+--------+------.
| | | PgUp | | PgDn | | |
| Bcksp|OSL(2)|------| |------| Ent |Space |
@@ -32,23 +32,28 @@
| | | | | | | F10 | | F11 | | | | | | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
| | | | | | |------| |------| | | | | | |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+|--------+------+------+------+------+------| L2 | | |------+------+------+------+------+--------|
| | | | | | | | | | | | | | | |
`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | | | | | | | | |
+ | | | | | | | F12 |GoToIm| FAR | | |
`----------------------------------' `----------------------------------'
,-------------. ,---------------.
- |Format| | | Test | DTest |
+ |Format|Build | | Test | DTest |
,------|------|------| |------+--------+------.
- | | |Refact| | | | |
+ | | |Refact| |Sort U| | |
| | |------| |------| | |
| | | | | | | |
`--------------------' `----------------------'
```
+* Build - Visualt Studio Build Solution. Sends `CTRL + SHFT + B`
+* DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T`
+* FAR - Visual Studio Find All References. Sends `CTRL + K, R`
* Format - Visual Studio Format. Sends `CTRL + K, CTRL + D`
+* GoToIm - Visual Studio Go To Implementation. Sends `CTRL + F12`
* Refact - Visual Studio Refactor. Sends `CTRL + R, R`
+* Sort U - Visual Studio Sort Usings. Sends `CTRL + R, CTRL + G`
* Test - Visual Studio Run Test. Sends `CTRL + R, T`
-* DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T`
+
### Keymap 2: Symbol Layer
```
@@ -87,9 +92,9 @@
| | | | Lclk | Rclk | | | | | | |
`----------------------------------' `----------------------------------'
,-------------. ,-------------.
- | | | | Vol+ | |
+ | Back+| Back-| | Vol+ | |
,------|------|------| |------+------+------.
- | | | | | Vol- | | |
+ | | |BL_TOG| | Vol- | | |
| | |------| |------| PL/PS| Next |
| | | | | Back | | |
`--------------------' `--------------------'
@@ -100,23 +105,24 @@
,--------------------------------------------------. ,--------------------------------------------------.
| | | | | | | | | | | | | | | |
|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| | | | | | | | | | | | | | | |
+| |KOpen |KType | | | | | | | Copy | | | | Paste| |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| |DLeft |DRight|LShift| | |------| |------| Left | Down | Up | Right| | |
+| |DLeft |DRight| LCTL | | |------| |------| Left | Down | Up | Right| | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| |KOpen |KType | | | | | | | | | | | | |
+| |SFT_TB| Tab | | | | | | | | | | | | |
`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
| | | | | | | | | | | |
`----------------------------------' `----------------------------------'
,-------------. ,-------------.
- | | | | | |
+ | | | | Home | End |
,------|------|------| |------+------+------.
| | | | | | | |
- | | CTRL |------| |------| | |
+ | | LSFT |------| |------| | |
| | | | | | | |
`--------------------' `--------------------'
```
-* DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow`
+* DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow`
* DRight - Move to the right Desktop. Sends `Ctrl + Win + Right Arrow`
-* KOpen - Opens KeePass. Sends `Ctrl + Alt + k`
-* KType - Autotypes KeePass password. Sends `Ctrl + Alt + a`
+* KOpen - Opens KeePass. Sends `Ctrl + Alt + k`
+* KType - Autotypes KeePass password. Sends `Ctrl + Alt + a`
+* SFT_TB - Sends `CTRL + TAB`.
diff --git a/keyboards/ergodox/keymaps/333fred/config.h b/keyboards/ergodox/keymaps/333fred/config.h
new file mode 100644
index 0000000000..f19a52bca1
--- /dev/null
+++ b/keyboards/ergodox/keymaps/333fred/config.h
@@ -0,0 +1,11 @@
+#ifndef CONFIG_H_
+#define CONFIG_H_
+
+#include "../../config.h"
+
+#undef TAPPING_TERM
+#define TAPPING_TERM 150
+
+#define PERMISSIVE_HOLD
+
+#endif
diff --git a/keyboards/ergodox/keymaps/333fred/keymap.c b/keyboards/ergodox/keymaps/333fred/keymap.c
index 070ad1f72a..e3f95132d3 100644
--- a/keyboards/ergodox/keymaps/333fred/keymap.c
+++ b/keyboards/ergodox/keymaps/333fred/keymap.c
@@ -23,12 +23,17 @@ enum custom_macros {
DLEFT,
DRIGHT,
PSCREEN_APP,
+ LSFT_TAB,
// VS Macros
REFACTOR,
TEST,
DEBUG_TEST,
FORMAT,
+ BUILD,
+ GO_TO_IMPL,
+ FIND_ALL_REF,
+ REMOVE_SORT_USINGS,
// KeePass macros
KEEPASS_OPEN,
@@ -61,11 +66,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * | Home | End | | Alt |Ctrl/Esc|
+ * | Copy | Paste| | Alt |Ctrl/Esc|
* ,------|------|------| |------+--------+------.
* | | | PgUp | | PgDn | | |
* | Bcksp|OSL(2)|------| |------| Ent |Space |
- * | | | Del | |OSL(2)| | |
+ * | | | Del | | RCtrl| | |
* `--------------------' `----------------------'
*/
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
@@ -75,20 +80,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
KC_ESC, KC_A, KC_S, KC_D, LT(MOVE, KC_F),KC_G,
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(CODE),
- KC_LCTRL, KC_F4, KC_F5, KC_LGUI,KC_LALT,
- KC_HOME, KC_END,
- KC_PGUP,
- KC_BSPC,OSL(SYMB),KC_DEL,
+ OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(CODE),
+ OSM(MOD_LCTL), KC_F4, KC_F5, KC_LGUI,KC_LALT,
+ LCTL(KC_C),LCTL(KC_V),
+ KC_PGUP,
+ KC_BSPC,OSL(SYMB), KC_DEL,
// right hand
TG(CODE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_H, KC_J, KC_K, KC_L, TD(TD_SEMICOLON_COLON),KC_QUOT,
- MO(MDIA), KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
+ MO(MDIA), KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), OSM(MOD_RSFT),
KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, KC_RGUI,
- KC_RALT, CTL_T(KC_ESC),
+ KC_RALT, CTL_T(KC_ESC),
KC_PGDN,
- OSL(SYMB),KC_ENT, KC_SPC
+ KC_RCTL, KC_ENT, KC_SPC
),
/* Keymap 1: Code Layer
*
@@ -98,15 +103,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | F10 | | F11 | | | | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | |------| |------| | | | | | |
- * |--------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------| L2 | | |------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
+ * | | | | | | | F12 |GoToIm| FAR | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,---------------.
- * |Format| | | Test | DTest |
+ * |Format|Build | | Test | DTest |
* ,------|------|------| |------+--------+------.
- * | | |Refact| | | | |
+ * | | |Refact| |Sort U| | |
* | | |------| |------| | |
* | | | | | | | |
* `--------------------' `----------------------'
@@ -118,20 +123,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_F10,
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, TG(SYMB),
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- M(FORMAT), KC_TRNS,
- M(REFACTOR),
- KC_TRNS, KC_TRNS, KC_TRNS,
+ M(FORMAT),M(BUILD),
+ M(REFACTOR),
+ KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_F11, 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_F12, M(GO_TO_IMPL),M(FIND_ALL_REF),KC_TRNS, KC_TRNS,
M(TEST), M(DEBUG_TEST),
- KC_TRNS,
+ M(REMOVE_SORT_USINGS),
KC_TRNS, KC_TRNS, KC_TRNS
),
/* Keymap 2: Symbol Layer
@@ -142,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | ! | @ | ( | ) | | |ACCESS| |ACCESS| Up | 7 | 8 | 9 | * | F12 |
* |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | # | $ | { | } | ` |------| |------| Down | 4 | 5 | 6 | + | |
- * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * |---------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------|
* | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
* `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* | EPRM | | | | | | 0 | 0 | . | = | |
@@ -190,9 +195,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | Lclk | Rclk | | | | | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * | | | | Vol+ | |
+ * | Back+| Back-| | Vol+ | |
* ,------|------|------| |------+------+------.
- * | | | | | Vol- | | |
+ * | | |BackTg| | Vol- | | |
* | | |------| |------| PL/PS| Next |
* | | | | | Back | | |
* `--------------------' `--------------------'
@@ -204,8 +209,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
+ BL_INC, BL_DEC,
+ BL_TOGG,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -222,39 +227,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,--------------------------------------------------. ,--------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
+ * | |KOpen |KType | | | | | | | Copy | | | | Paste| |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | |DLeft |DRight|LShift|ACCESS| |------| |------| Left | Down | Up | Right| | |
+ * | |DLeft |DRight|LCTRL |ACCESS| |------| |------| Left | Down | Up | Right| | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | |KOpen |KType | | | | | | | | | | | | |
+ * | |SFT_TB| TAB | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * | | | | | |
+ * | | | | Home | End |
* ,------|------|------| |------+------+------.
* | | | | | | | |
- * | | CTRL |------| |------| | |
+ * | |LSHIFT|------| |------| | |
* | | | | | | | |
* `--------------------' `--------------------'
*/
// MEDIA AND MOUSE
[MOVE] = KEYMAP(
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, M(DLEFT), M(DRIGHT), KC_LSFT, KC_TRNS, KC_TRNS,
KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_TRNS, KC_TRNS,
+ KC_TRNS, M(LSFT_TAB), KC_TAB, 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_LCTRL,KC_TRNS,
+ KC_TRNS, KC_LSFT, KC_TRNS,
// right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LEFT, KC_DOWN, KC_UP, 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, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, LCTL(KC_C),KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_V),KC_TRNS,
+ KC_LEFT, KC_DOWN, KC_UP, 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_HOME, KC_END,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
@@ -291,9 +296,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
break;
case PSCREEN_APP:
if (record->event.pressed) {
- return MACRO(D(LALT), T(PSCR), U(LALT));
+ return MACRO(D(LALT), T(PSCR), U(LALT), END);
}
break;
+ case LSFT_TAB:
+ if (record->event.pressed) {
+ return MACRO(D(LSFT), T(TAB), U(LSFT), END);
+ }
case REFACTOR:
if (record->event.pressed) { // VS Refactor CTRL+R, R
return MACRO(D(LCTL), T(R), U(LCTL), T(R), END);
@@ -314,6 +323,26 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
return MACRO(D(LCTL), T(K), T(D), U(LCTL), END);
}
break;
+ case BUILD:
+ if (record->event.pressed) { // VS Build. Sends CTRL+SHFT+B
+ return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END);
+ }
+ break;
+ case GO_TO_IMPL:
+ if (record->event.pressed) { // VS Go To Implementation. Sends CTRL+F12
+ return MACRO(D(LCTL), T(F12), U(LCTL), END);
+ }
+ break;
+ case FIND_ALL_REF:
+ if (record->event.pressed) { // VS Find All References. Sends CTRL+K, R
+ return MACRO(D(LCTL), T(K), U(LCTL), T(R), END);
+ }
+ break;
+ case REMOVE_SORT_USINGS:
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), T(R), T(G), U(LCTL), END);
+ }
+ break;
case KEEPASS_OPEN:
if (record->event.pressed) { // Keepass open application
return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END);