summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2016-06-24 08:57:06 -0400
committerGitHub <noreply@github.com>2016-06-24 08:57:06 -0400
commit40bfc7231e87c883c840967fdbe42a7c711805be (patch)
tree3d0840097e6624316ed1d393abea4a8528fef2ce
parentd2fc24d2a05f8f1e8f8a5b7e391db1418c87a038 (diff)
parent512a68c0ecb16afda26a674b9bea83fa80d84a6e (diff)
Merge pull request #440 from abperiasamy/ergo-ab-swap-up-down
Swap up and down keys to match default layout
-rw-r--r--keyboards/ergodox_ez/keymaps/ab/Makefile9
-rw-r--r--keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json4
-rw-r--r--keyboards/ergodox_ez/keymaps/ab/keyboard-layout.pngbin79440 -> 79461 bytes
-rw-r--r--keyboards/ergodox_ez/keymaps/ab/keymap.c27
4 files changed, 26 insertions, 14 deletions
diff --git a/keyboards/ergodox_ez/keymaps/ab/Makefile b/keyboards/ergodox_ez/keymaps/ab/Makefile
new file mode 100644
index 0000000000..b673c5ce52
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/ab/Makefile
@@ -0,0 +1,9 @@
+# Having a file like this allows you to override Makefile definitions
+# for your own particular keymap
+
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+COMMAND_ENABLE = no # Commands for debug and configuration
+
+ifndef QUANTUM_DIR
+ include ../../../../Makefile
+endif
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json b/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json
index 4ade748732..e9475fe9f1 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json
+++ b/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json
@@ -211,12 +211,12 @@
"x": 6.5,
"h": 1.5
},
- "PgUp",
+ "PgDn",
{
"x": 4.5,
"h": 1.5
},
- "PgDn"
+ "PgUp"
],
[
{
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png b/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png
index 9a6546e357..d3ed928f6e 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png
+++ b/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png
Binary files differ
diff --git a/keyboards/ergodox_ez/keymaps/ab/keymap.c b/keyboards/ergodox_ez/keymaps/ab/keymap.c
index 9b5c93c1ee..c3114d9ffd 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/ab/keymap.c
@@ -5,6 +5,10 @@
#define BASE 0 // default layer
#define FN1 1 // media layer
+#define CAPS_CTL CTL_T(KC_CAPS) // Caps on tap, Ctrl on hold.
+#define COPY LCTL(KC_V) // C-c Copy
+#define PASTE LCTL(KC_V) // C-v Paste
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic layer
*
@@ -14,10 +18,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | Tab | Q | W | E | R | T | Fwd | | Back | Y | U | I | O | P | \ |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* |Caps/Ctl| A | S | D | F | G |------| |------| H | J | K | L | ; | Enter |
- * |--------+------+------+------+------+------| PgUp | | PgDn |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------| PgDn | | PgUp |------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | ' |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | Ctrl | Esc | LGui | Alt | Alt | | Left | Up | Dn | Right| Fn |
+ * | Ctrl | Esc | LGui | Alt | Alt | | Left | Dn | Up | Right| Fn |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | Copy | ( | | ) | Paste|
@@ -33,22 +37,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_WBAK,
- CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_PGUP,
- KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, KC_LALT,
- LCTL(KC_C), KC_LCBR,
+ CAPS_CTL, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_PGDN,
+ KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, KC_LALT,
+ COPY, KC_LCBR,
KC_LPRN,
KC_SPC, KC_DEL, KC_LBRC,
// right hand
KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_WFWD, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
- KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
- KC_UP, KC_LEFT, KC_RIGHT,KC_DOWN, TG(FN1),
- KC_RCBR, LCTL(KC_V),
+ KC_PGUP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
+ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(FN1),
+ KC_RCBR, PASTE,
KC_RPRN,
- KC_RBRC, KC_ENT, KC_BSPC
- ),
+ KC_RBRC, KC_ENT, KC_BSPC),
/* Keymap 1: Fn Keys, media and mouse keys
*
* ,--------------------------------------------------. ,--------------------------------------------------.
@@ -60,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |Teensy| | | Lclk | Rclk | | |VolUp |VolDn | Mute | |
+ * |Teensy| | | Lclk | Rclk | | |VolDn |VolUp | Mute | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | | | | | |