aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/atreus
diff options
context:
space:
mode:
authorIan Sterling <xyverz@gmail.com>2016-08-12 22:26:30 -0700
committerIan Sterling <xyverz@gmail.com>2016-08-12 22:26:30 -0700
commit458607ee5eafe1cc095b258cac014c334d8e7b72 (patch)
tree032e1e84f70e3b6c9b8c3d2648d28c2a84e78b38 /keyboards/atreus
parent71e1bb2e1cf5fd87cb9cc6f81b830763b38665d4 (diff)
downloadfirmware-458607ee5eafe1cc095b258cac014c334d8e7b72.tar.gz
firmware-458607ee5eafe1cc095b258cac014c334d8e7b72.tar.bz2
firmware-458607ee5eafe1cc095b258cac014c334d8e7b72.zip
Corrections to the Atreus Makefile and updates to my keymap
Diffstat (limited to 'keyboards/atreus')
-rw-r--r--keyboards/atreus/keymaps/xyverz/keymap.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
index 0238fdbd3..02a661c8e 100644
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -46,14 +46,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_L1] = { /* LAYER 1 */
{KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0 },
{KC_TAB, KC_INS, KC_UP, KC_DEL, KC_HOME, KC_NO, KC_PGUP, KC_MUTE, KC_VOLD, KC_VOLU, KC_EQL },
- {KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_BSLS},
+ {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_BSLS},
{KC_TRNS, KC_GRV, KC_LGUI, KC_TRNS, KC_DEL, KC_LALT, KC_SPC, KC_TRNS, KC_LBRC, KC_RBRC, KC_ENT }
},
[_L2] = { /* LAYER 2 */
{KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN},
{KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_PLUS},
{KC_TRNS, KC_TRNS, DVORAK, QWERTY, COLEMAK, KC_LCTL, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12 },
+<<<<<<< HEAD
{KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), RESET }
+=======
+ {KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), RESET}
+>>>>>>> e1abe4c... Corrections to the Atreus Makefile and updates to my keymap
}
};