summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez/keymaps
diff options
context:
space:
mode:
authorErez Zukerman <ezuk@madmimi.com>2016-02-05 16:28:24 +0200
committerErez Zukerman <ezuk@madmimi.com>2016-02-05 16:28:24 +0200
commit3c683aa9f23288ddada760fb49abcc5fa7324f5e (patch)
tree6b8e68c000238bb5d72c1d1c08aec1600fd5caa0 /keyboard/ergodox_ez/keymaps
parent1b0d0c684872e0a2fbd0d8efaa1a156afee8a028 (diff)
Fixes CM_SCLN and updates docs for Colemak
Diffstat (limited to 'keyboard/ergodox_ez/keymaps')
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex4
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
index 9eadea20b9..a9f1942a6f 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
@@ -25,8 +25,8 @@
:100180002D0031003478E500C100000001000100BD
:1001900001000100010000003A001E0022002602BA
:1001A000010001003B001F002300270201000100A5
-:1001B0003C00200024002F004E0101003D002100E2
-:1001C000250030004B0101003E0001002600270001
+:1001B0003C00200024002F004B0101003D002100E5
+:1001C000250030004E0101003E00010026002700FE
:1001D000000001000100010000000100000001001A
:1001E0000100010000000100000001003F000100CB
:1001F0002402310200000100400001002D0026020F
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
index 6d757d132f..3dbefe9498 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
@@ -1,3 +1,4 @@
+#include <keymap_extras/keymap_colemak.h>
#include "ergodox_ez.h"
#include "debug.h"
#include "action_layer.h"
@@ -84,14 +85,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_TRNS, KC_TRNS,
KC_TRNS, KC_5, KC_6, KC_7, KC_8, KC_9,
KC_TRNS, KC_LPRN,KC_RPRN,KC_LBRC, KC_RBRC, KC_0, KC_TRNS,
- KC_TRNS, KC_TRNS,KC_TRNS,LCTL(KC_PGDN), LCTL(KC_PGUP),
+ KC_TRNS, KC_TRNS,KC_TRNS,LCTL(KC_PGUP), LCTL(KC_PGDN),
KC_TRNS,KC_TRNS,
KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand. Sending KC_P instead of Semicolon because I use Colemak in software.
+ // right hand
KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_TRNS, KC_TRNS, KC_TRNS,KC_EQL, KC_TRNS, KC_TRNS, KC_F12,
- KC_AMPR, KC_MINS,KC_UNDS, KC_P, KC_PLUS, KC_TRNS,
+ KC_AMPR, KC_MINS,KC_UNDS, CM_SCLN, KC_PLUS, KC_TRNS,
KC_TRNS, KC_PIPE, KC_LPRN,KC_RPRN, KC_3, KC_TRNS, KC_TRNS,
KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,