summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorFredric Silberberg <frsilb@microsoft.com>2017-06-10 00:01:01 +0200
committerFredric Silberberg <frsilb@microsoft.com>2017-06-23 20:07:28 +0200
commit7389beb18c557403939e60ae36b0a51b481d80a9 (patch)
tree7aaa55ff798ab6a2f639686d648c05622cb7bc99 /keyboards/ergodox
parent2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff)
downloadqmk_firmware-7389beb18c557403939e60ae36b0a51b481d80a9.tar.gz
qmk_firmware-7389beb18c557403939e60ae36b0a51b481d80a9.tar.xz
Small keymap layout updates
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/keymaps/333fred/README.md14
-rw-r--r--keyboards/ergodox/keymaps/333fred/config.h9
-rw-r--r--keyboards/ergodox/keymaps/333fred/keymap.c34
3 files changed, 39 insertions, 18 deletions
diff --git a/keyboards/ergodox/keymaps/333fred/README.md b/keyboards/ergodox/keymaps/333fred/README.md
index af8042d85..d3f591361 100644
--- a/keyboards/ergodox/keymaps/333fred/README.md
+++ b/keyboards/ergodox/keymaps/333fred/README.md
@@ -38,7 +38,7 @@
| | | | | | | | | | | |
`----------------------------------' `----------------------------------'
,-------------. ,---------------.
- |Format| | | Test | DTest |
+ |Format|Build | | Test | DTest |
,------|------|------| |------+--------+------.
| | |Refact| | | | |
| | |------| |------| | |
@@ -49,6 +49,7 @@
* Refact - Visual Studio Refactor. Sends `CTRL + R, R`
* Test - Visual Studio Run Test. Sends `CTRL + R, T`
* DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T`
+* Build - Visualt Studio Build Solution. Sends `CTRL + SHFT + B`
### Keymap 2: Symbol Layer
```
@@ -100,11 +101,11 @@
,--------------------------------------------------. ,--------------------------------------------------.
| | | | | | | | | | | | | | | |
|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| | | | | | | | | | | | | | | |
+| |KOpen |KType | | | | | | | | | | | | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
| |DLeft |DRight|LShift| | |------| |------| Left | Down | Up | Right| | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| |KOpen |KType | | | | | | | | | | | | |
+| |SFT_TB| Tab | | | | | | | | | | | | |
`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
| | | | | | | | | | | |
`----------------------------------' `----------------------------------'
@@ -116,7 +117,8 @@
| | | | | | | |
`--------------------' `--------------------'
```
-* 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 000000000..32d190de7
--- /dev/null
+++ b/keyboards/ergodox/keymaps/333fred/config.h
@@ -0,0 +1,9 @@
+#ifndef CONFIG_H_
+#define CONFIG_H_
+
+#include "../../config.h"
+
+#undef TAPPING_TERM
+#define TAPPING_TERM 150
+
+#endif
diff --git a/keyboards/ergodox/keymaps/333fred/keymap.c b/keyboards/ergodox/keymaps/333fred/keymap.c
index 070ad1f72..893ba12ea 100644
--- a/keyboards/ergodox/keymaps/333fred/keymap.c
+++ b/keyboards/ergodox/keymaps/333fred/keymap.c
@@ -23,12 +23,14 @@ enum custom_macros {
DLEFT,
DRIGHT,
PSCREEN_APP,
+ LSFT_TAB,
// VS Macros
REFACTOR,
TEST,
DEBUG_TEST,
FORMAT,
+ BUILD,
// KeePass macros
KEEPASS_OPEN,
@@ -104,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,---------------.
- * |Format| | | Test | DTest |
+ * |Format|Build | | Test | DTest |
* ,------|------|------| |------+--------+------.
* | | |Refact| | | | |
* | | |------| |------| | |
@@ -120,9 +122,9 @@ 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_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,
@@ -222,11 +224,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,--------------------------------------------------. ,--------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
+ * | |KOpen |KType | | | | | | | | | | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | |DLeft |DRight|LShift|ACCESS| |------| |------| Left | Down | Up | Right| | |
+ * | |DLeft |DRight|LCTRL |ACCESS| |------| |------| Left | Down | Up | Right| | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | |KOpen |KType | | | | | | | | | | | | |
+ * | |SFT_TB| TAB | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
@@ -234,20 +236,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | |
* ,------|------|------| |------+------+------.
* | | | | | | | |
- * | | 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,
@@ -291,9 +293,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 +320,10 @@ 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) {
+ return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END);
+ }
case KEEPASS_OPEN:
if (record->event.pressed) { // Keepass open application
return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END);