Modified keymap and updated readme.

3 files changed, 36 insertions, 24 deletions

diff --git a/keyboards/dz60/keymaps/billiams/README.md b/keyboards/dz60/keymaps/billiams/README.md
index c1ea2127b2..84b441ac08 100644
--- a/keyboards/dz60/keymaps/billiams/README.md
+++ b/keyboards/dz60/keymaps/billiams/README.md
@@ -1,8 +1,30 @@
 ## Billiam's DZ60 layout
 
+This layout is optimized for MacOS is for a Build 4 DZ60 with a 2U left shift, 2U right shift and an arrow
+cluster in the bottom right. Don't use this layout if you didn't get Build 4, you will enter a world of pain Donny.
+
+Settings:
+
+* The capslock key is replaced with a second function key.
+* The Alt an Cmd keys are swapped to replicate the Mac layout.
+* Del is available as Fn+Backspace
+* / ? are available when you tap the right shift. Otherwise RShift is shift when held down
+* RESET is available as Fn+Esc
+* Underglow toggle and mode selection are available as Fn+A and Fn+S
+* Media play/pause doesn't seem to work with anything but iTunes at the moment. FML
+
+
 ### Initial Installation
 
-These are the steps if you've never done this before:
+I found the instructions to be longer than they had to be, and I ended up having to Google some steps anyway. These are the steps I took to get my keyboard setup, in case you are new to the process.
+
+1. Clone the qmk_firmware repo locally
+```
+# Choose one:
+git clone git@github.com:qmk/qmk_firmware.git # OR
+git clone https://github.com/qmk/qmk_firmware.git
+```
+2. Customize your layout by starting with a [keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps). I copied [StephenGrier](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps/stephengrier)'s and modified it for DZ60 Build 4 and changed a few things, like the `grave` key, `ESC` and `/`.
 
 1. Build your hex file
 ```
@@ -14,20 +36,9 @@ A hex file `dz60_billiams.hex` will be created in the base qmk_firmware director
 3. Plug the computer in, which will put the keyboard in bootlegger mode
 4. If you are using [QMK toolbox](https://github.com/qmk/qmk_toolbox/releases), upload the .hex file you made above, select it and hit the flash button. Don't hit the load button, that will load the default keymap and that's not what you want! Unless it is, in which case click away.
 
+Note: If you didn't follow my instructions in 4 and accidentally loaded the default keymap, then to `RESET` the keyboard and kick it into bootleg mode again, hold the `down arrow` key and `\`. The default layout is Build 1 and sets the `MENU` key on that build to `Fn`. `MENU` corresponds to `down arrow` in build 4. You don't have to unplug the keyboard. 
 
-### Notes
-
-This layout is for a Build 4 DZ60 with a 2U left shift, 2U right shift and an arrow
-cluster in the bottom right.
-
-Settings:
-
-* The capslock key is replaced with a second function key.
-* The Alt an Cmd keys are swapped to replicate the Mac layout.
-* Del is available as Fn+Backspace
-* / ? are available when you tap the right shift. Otherwise RShift is shift when held down
-* RESET is available as Fn+Esc
-* Underglow toggle and mode selection are available as Fn+A and Fn+S
+Hope this helps!
 
 ### 0 Qwerty
 ```
@@ -50,9 +61,9 @@ FN Layer
 ,-----------------------------------------------------------------------------------------.
 |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
 |-----------------------------------------------------------------------------------------+
-|        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      | Prev | Next |
+|        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+|     |     | MUTE | Vol- | Vol+ |
 |-----------------------------------------------------------------------------------------+
-|         | BL T| BL M| BL+ | BL- |     |     |     |     |     | Vol-| Vol+|  Play/Pause |
+|         |     |     |     |     |     |     |     |     |    | Prev | Next | Play/Pause |
 |-----------------------------------------------------------------------------------------+
 |           |     |     |     |     |     |     |     |Scr- |Scr+ |         | PG_UP |RESET|
 |-----------------------------------------------------------------------------------------+
diff --git a/keyboards/dz60/keymaps/billiams/build_flash.sh b/keyboards/dz60/keymaps/billiams/build_flash.sh
index d98b79c9de..e7a8111441 100644
--- a/keyboards/dz60/keymaps/billiams/build_flash.sh
+++ b/keyboards/dz60/keymaps/billiams/build_flash.sh
@@ -2,7 +2,8 @@
 # dfu-programmer atmega32u4 flash /path/to/firmware.hex
 # dfu-programmer atmega32u4 reset
 
+# run this in the qmk_firmware directory
 make dz60:billiams
 dfu-programmer atmega32u4 erase --force && \
-dfu-programmer atmega32u4 flash .build/dz60_billiams.hex && \
+dfu-programmer atmega32u4 flash dz60_billiams.hex && \
 dfu-programmer atmega32u4 reset
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/billiams/keymap.c b/keyboards/dz60/keymaps/billiams/keymap.c
index 7195639de1..596ec19dbf 100644
--- a/keyboards/dz60/keymaps/billiams/keymap.c
+++ b/keyboards/dz60/keymaps/billiams/keymap.c
@@ -30,21 +30,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,-----------------------------------------------------------------------------------------.
    * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
    * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |     | Prev | Next  |
+   * |        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+|     |     | MUTE | Vol- | Vol+ |
    * |-----------------------------------------------------------------------------------------+
-   * |         | BL T| BL M| BL- | BL+ |     |     |     |     |     | Vol-| Vol+|  Play/Pause |
+   * |         |     |     |     |     |     |     |     |    |     | Prev | Next | Play/Pause |
    * |-----------------------------------------------------------------------------------------+
    * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|RESET|
    * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |            Play/Pause             |     |      | HOME|PG_DN| END |
+   * |      |       |       |                                   |     |      | HOME|PG_DN| END |
    * `-----------------------------------------------------------------------------------------'
    */
 
   LAYOUT_directional(
       ______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, ______, KC_DEL,
-      ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, KC_MEDIA_REWIND, KC_MEDIA_FAST_FORWARD,
-      ______, BL_TOGG, BL_STEP, BL_DEC, BL_INC, ______, ______, ______, ______, ______, KC__VOLDOWN, KC__VOLUP,
-      KC_MEDIA_PLAY_PAUSE, ______, ______, ______, ______, ______, ______, ______, ______, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, ______, ______, KC_PGUP, RESET,
-      ______, ______, ______, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_PLAY_PAUSE, ______, ______, KC_HOME, KC_PGDOWN, KC_END
+      ______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, ______, ______, KC_MUTE, KC__VOLDOWN, KC__VOLUP,
+      ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MRWD, KC_MFFD,
+      KC_MPLY, ______, ______, ______, ______, ______, ______, ______, ______, KC_BRID, KC_BRIU, ______, ______, KC_PGUP, RESET,
+      ______, ______, ______, ______, ______, ______, ______, ______, KC_HOME, KC_PGDOWN, KC_END
       ),
 };