Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.

2 files changed, 10 insertions, 17 deletions

diff --git a/keyboards/ergodox/keymaps/xyverz/keymap.c b/keyboards/ergodox/keymaps/xyverz/keymap.c
index 5927de33f..08ee5aeda 100644
--- a/keyboards/ergodox/keymaps/xyverz/keymap.c
+++ b/keyboards/ergodox/keymaps/xyverz/keymap.c
@@ -1,8 +1,4 @@
 /*
- * PLEASE NOTE: This keymap has been updated to work with the Infinity ErgoDox. To build for the Infinity,
- * simply append `SUBPROJECT=infinity` to the end of your `make` statement. This keymap file is untested
- * on the Infinity ErgoDox.
- * 
  * About this keymap:
  * 
  * The Dvorak layout shown herestems from my early Kinesis years, using the Contour PS/2 with a Dvorak
@@ -14,9 +10,6 @@
  *
  * I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck
  * layouts.
- * 
- * For a better explanation of the layout matrices shown below, take a look at ../../ez/ez.h where the
- * keymap is defined, beginning on line 81.
  *
  */
 
@@ -197,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
         _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, DVORAK,  QWERTY,  COLEMAK, _______, _______,
         _______, _______, _______, _______, _______,
                                             _______, _______,
                                                      _______,
@@ -224,7 +217,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|      | |      |------+------+------+------+------+--------|
  * |        |      |      |      |      |      |      | |      |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
  * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                             | KP 0 |      |      |KP Ent|      |
+ *   |      |      |      |      |      |                             | KP 0 |      | KP . |KP Ent|      |
  *   `----------------------------------'                             `----------------------------------'
  *                                      ,-------------. ,-------------.
  *                                      |      |      | |      |      |
@@ -249,7 +242,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
                  _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
         _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-                          _______, _______, _______, _______, _______,
+                          KC_P0,   _______, KC_PDOT, KC_PENT, _______,
         _______, _______,
         _______,
         _______, _______, _______
diff --git a/keyboards/ergodox/keymaps/xyverz/readme.md b/keyboards/ergodox/keymaps/xyverz/readme.md
index e6cb582c5..6ecdabc9e 100644
--- a/keyboards/ergodox/keymaps/xyverz/readme.md
+++ b/keyboards/ergodox/keymaps/xyverz/readme.md
@@ -1,9 +1,5 @@
 # Xyverz's ErgoDox EZ Keymap
 
-## Please Note:
-
-This keymap has been updated to work with the Infinity ErgoDox. To build for the Infinity, simply append `SUBPROJECT=infinity` to the end of your `make` statement. This keymap file builds cleanly as is but as of this writing has not been tested on the Infinity ErgoDox. YMMV.
-
 ## About this keymap:
 
 The Dvorak layout shown herestems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my ErgoDox.
@@ -12,7 +8,11 @@ The QWERTY layout shown here is based entirely on the Kinesis Advantage layout,
 
 I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
 
-For a better explanation of the layout matrices shown below, take a look at ../../ez/ez.h where the keymap is defined beginning on line 81, or in ../../infinity/infinity.h beginning at line 72.
+## Still to do:
+
+ * Need to figure out a better position for the ESC key.
+ * Come up with a function for the empty keys shown in the alpha layers below.
+ * Fix the CapsLock, NumLock, and ScrLck LEDs.
 
 ### Layer 0: Dvorak layer
 
@@ -103,9 +103,9 @@ For a better explanation of the layout matrices shown below, take a look at ../.
 ### Keymap 4: Keypad layer
 
         ,--------------------------------------------------.,--------------------------------------------------.
-        | Power  |      |      |      |      |      |      ||      |      | NmLk | KP / | KP * | KP - |        |
+        | Power  |      |      |      |      |      |      ||      |      | NmLk | KP = | KP / | KP * |        |
         |--------+------+------+------+------+-------------||------+------+------+------+------+------+--------|
-        | Sleep  |      |      |      |      |      |      ||      |      | KP 7 | KP 8 | KP 9 | KP + |        |
+        | Sleep  |      |      |      |      |      |      ||      |      | KP 7 | KP 8 | KP 9 | KP - |        |
         |--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|
         | Wake   |      |      |      |      |      |------||------|      | KP 4 | KP 5 | KP 6 | KP + |        |
         |--------+------+------+------+------+------|      ||      |------+------+------+------+------+--------|