Merge remote-tracking branch 'upstream/master'

6 files changed, 469 insertions, 97 deletions

diff --git a/keyboards/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c
index 0ec7b352c..daba6c300 100644
--- a/keyboards/hotdox/keymaps/default/keymap.c
+++ b/keyboards/hotdox/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
-        KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
+        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
         KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
         LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
diff --git a/keyboards/hotdox/keymaps/eozaki/keymap.c b/keyboards/hotdox/keymaps/eozaki/keymap.c
index dc80e7a34..3516f2030 100644
--- a/keyboards/hotdox/keymaps/eozaki/keymap.c
+++ b/keyboards/hotdox/keymaps/eozaki/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_GRV),
-        KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_GRV,
+        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_GRV,
         KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LALT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
         LT(SYMB, KC_F2),       KC_F4,        KC_F5,  KC_F6,  KC_F11,
diff --git a/keyboards/hotdox/keymaps/ninjonas/README.md b/keyboards/hotdox/keymaps/ninjonas/README.md
new file mode 100644
index 000000000..5cbfacf9f
--- /dev/null
+++ b/keyboards/hotdox/keymaps/ninjonas/README.md
@@ -0,0 +1,106 @@
+# ninjonas Keymap for [ErgoDox (HotDox)](https://www.alpacakeyboards.com/)
+
+## Setup
+- Ensure you've cloned the [qmk](https://github.com/qmk/qmk_firmware) repo
+- Create directory `ninjonas` on `/keyboards/hotdox/keymaps/`
+- Run `copy_keymap.sh`. This copies the contents of this repo into `%qmk_firmware%/ninjonas/` directory
+- To push your keymap to your keyboard run this command `make clean hotdox:ninjonas:dfu`
+    - this compiles your keymap and creates a `hotdox_ninjonas.hex` file and will atempt to flash your board
+    - if you get the following message:
+      ```
+      dfu-programmer: no device present.
+      Error: Bootloader not found. Trying again in 5s.
+      ```
+    - Press the reset button underneath your ErgoDox keyboard
+    - The following messages should show up and your board has successfuly been flashed
+      ```
+      Bootloader Version: 0x00 (0)
+      Erasing flash...  Success
+      Checking memory from 0x0 to 0x6FFF...  Empty.
+      Checking memory from 0x0 to 0x5D7F...  Empty.
+      0%                            100%  Programming 0x5D80 bytes...
+      [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
+      0%                            100%  Reading 0x7000 bytes...
+      [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
+      Validating...  Success
+      0x5D80 bytes written into 0x7000 bytes memory (83.48%).
+      ```
+    - The alterenative is follow the steps on [Hotdox flashing guide](https://www.alpacakeyboards.com/flash/hot-dox-ergodox-76-flashing-instructions)
+
+## Keymap
+This keymap is designed based off my typing habits and is subject to change. Information about custom user macros and tap dances can be found [here](https://github.com/ninjonas/qmk-yonas/tree/master/users/ninjonas).
+
+### QWERTY
+```c
+/* Keymap 0: QWERTY
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   `    |   1  |   2  |   3  |   4  |   5  | Play |           |K_LOCK |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+------+--------|
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |      |           |       |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+------+--------|
+ * | Esc    |   A  |   S  |   D  |   F  |   G  |------|           |-------|   H  |   J  |   K  |   L  |  ;   |   '    |
+ * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |       |   N  |   M  |   ,  |   .  |  /   |   =    |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
+ *   `----------------------------------'                                        `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |  Up  | Down |       | Left | Right|
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      | Home |       | PgUp |      |      |
+ *                                 | Space|Backsp|------|       |------| Del  |Enter |
+ *                                 |      |ace   | End  |       | PgDn |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+```
+
+### LOWER
+```c
+/* Keymap 1: LOWER
+ *
+ * ,--------------------------------------------------.           ,----------------------------------------------------.
+ * |  F11   |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |       |  F6  |  F7  |  F8  |  F9  |  F10  |  F12   |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+-------+--------|
+ * |        |      |      |KC_BRU| Play | Mute |      |           |       | PgUp | Home |  Up  | End  |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      |      |KC_BRD| Next |VolUp |------|           |-------| PgDn | Left | Down |Right |K_LOCK |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      |      |      | Prev |VolDn |      |           |       |      |      |      |      |       |        |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+-------+--------'
+ *   |      |      |      |      |      |                                        |      |      |      |M_CODE |      |
+ *   `----------------------------------'                                        `-----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+```
+
+### RAISE
+```c
+/* Keymap 2: RAISE
+ *
+ * ,--------------------------------------------------.           ,----------------------------------------------------.
+ * |        |      |      |      |K_CSCN|      |      |           |       |      |      |      |      |       |        |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+-------+--------|
+ * | M_MAKE |      | MS_1 | MS_U | MS_2 | WH_U |      |           |       |      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * | M_VRSN |      | MS_L | MS_D | MS_R | WH_D |------|           |-------|      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * | M_FLSH |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+-------+--------'
+ *   |      |      |      |      |      |                                        |      |      |      |       |      |
+ *   `----------------------------------'                                        `-----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+```
\ No newline at end of file
diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c
new file mode 100644
index 000000000..eea86200c
--- /dev/null
+++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c
@@ -0,0 +1,348 @@
+/* Copyright 2019 @ninjonas
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "ninjonas.h"     
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*  QWERTY
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   `    |   1  |   2  |   3  |   4  |   5  | Play |           |K_LOCK |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+------+--------|
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |      |           |       |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+------+--------|
+ * | Esc    |   A  |   S  |   D  |   F  |   G  |------|           |-------|   H  |   J  |   K  |   L  |  ;   |   '    |
+ * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |       |   N  |   M  |   ,  |   .  |  /   |   =    |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
+ *   `----------------------------------'                                        `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |  Up  | Down |       | Left | Right|
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      | Home |       | PgUp |      |      |
+ *                                 | Space|Backsp|------|       |------| Del  |Enter |
+ *                                 |      |ace   | End  |       | PgDn |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+    [_QWERTY] = LAYOUT_ergodox_wrapper(
+        // LEFT HAND
+        _____________________NUM_LEFT_______________________, KC_MPLY,
+        _____________________QWERTY_L1______________________, KC_NO,
+        _____________________QWERTY_L2______________________,
+        _____________________QWERTY_L3______________________, T_LBRC,
+        M_SHFT, KC_NO, ________MOD_LEFT_________,
+                                              // LEFT THUMB
+                                              KC_UP, KC_DOWN,
+                                                     KC_HOME,
+                                              LT_RAI, KC_BSPC,
+                                                      KC_END,
+
+        //RIGHT HAND
+        K_LOCK, _____________________NUM_RIGHT______________________,
+        KC_NO,  _____________________QWERTY_R1______________________,
+                _____________________QWERTY_R2______________________,
+        T_RBRC, _____________________QWERTY_R3______________________,
+                ________MOD_RIGHT________, M_XXX1, M_PYNV,
+                // RIGHT THUMB
+                KC_LEFT, KC_RGHT,
+                KC_PGUP,
+                KC_PGDN,
+                MT_DEL,  LT_LOW
+    ),
+
+/* DVORAK
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   `    |   1  |   2  |   3  |   4  |   5  | Play |           |K_LOCK |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+------+--------|
+ * | Tab    |   '  |   ,  |   .  |   P  |   Y  |      |           |       |   F  |   G  |   C  |   R  |   L  |   \    |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+------+--------|
+ * | Esc    |   A  |   O  |   E  |   U  |   I  |------|           |-------|   D  |   H  |   T  |   N  |  S   |   /    |
+ * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
+ * | LShift |   ;  |   Q  |   J  |   K  |   X  |      |           |       |   B  |   M  |   W  |   V  |  Z   |   =    |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
+ *   `----------------------------------'                                        `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |  Up  | Down |       | Left | Right|
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      | Home |       | PgUp |      |      |
+ *                                 | Space|Backsp|------|       |------| Del  |Enter |
+ *                                 |      |ace   | End  |       | PgDn |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+    [_DVORAK] = LAYOUT_ergodox_wrapper(
+        // LEFT HAND
+        _____________________NUM_LEFT_______________________, KC_MPLY,
+        _____________________DVORAK_L1______________________, KC_NO,
+        _____________________DVORAK_L2______________________,
+        _____________________DVORAK_L3______________________, T_LBRC,
+        M_SHFT, KC_NO, ________MOD_LEFT_________,
+                                              // LEFT THUMB
+                                              KC_UP, KC_DOWN,
+                                                     KC_HOME,
+                                              LT_RAI, KC_BSPC,
+                                                      KC_END,
+
+        //RIGHT HAND
+        K_LOCK, _____________________NUM_RIGHT______________________,
+        KC_NO,  _____________________DVORAK_R1______________________,
+                _____________________DVORAK_R2______________________,
+        T_RBRC, _____________________DVORAK_R3______________________,
+                ________MOD_RIGHT________, M_XXX1, M_PYNV,
+                // RIGHT THUMB
+                KC_LEFT, KC_RGHT,
+                KC_PGUP,
+                KC_PGDN,
+                MT_DEL,  LT_LOW
+    ),
+
+/* COLEMAK
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   `    |   1  |   2  |   3  |   4  |   5  | Play |           |K_LOCK |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+------+--------|
+ * | Tab    |   Q  |   W  |   F  |   P  |   G  |      |           |       |   J  |   L  |   U  |   Y  |   ;  |   \    |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+------+--------|
+ * | Esc    |   A  |   R  |   S  |   T  |   D  |------|           |-------|   H  |   N  |   E  |   I  |   O  |   '    |
+ * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |       |   K  |   M  |   ,  |   .  |   /  |   =    |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
+ *   `----------------------------------'                                        `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |  Up  | Down |       | Left | Right|
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      | Home |       | PgUp |      |      |
+ *                                 | Space|Backsp|------|       |------| Del  |Enter |
+ *                                 |      |ace   | End  |       | PgDn |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+    [_COLEMAK] = LAYOUT_ergodox_wrapper(
+        // LEFT HAND
+        _____________________NUM_LEFT_______________________, KC_MPLY,
+        _____________________COLEMAK_L1_____________________, KC_NO,
+        _____________________COLEMAK_L2_____________________,
+        _____________________COLEMAK_L3_____________________, T_LBRC,
+        M_SHFT, KC_NO, ________MOD_LEFT_________,
+                                              // LEFT THUMB
+                                              KC_UP, KC_DOWN,
+                                                     KC_HOME,
+                                              LT_RAI, KC_BSPC,
+                                                      KC_END,
+
+        //RIGHT HAND
+        K_LOCK, _____________________NUM_RIGHT______________________,
+        KC_NO,  _____________________COLEMAK_R1_____________________,
+                _____________________COLEMAK_R2_____________________,
+        T_RBRC, _____________________COLEMAK_R3_____________________,
+                ________MOD_RIGHT________, M_XXX1, M_PYNV,
+                // RIGHT THUMB
+                KC_LEFT, KC_RGHT,
+                KC_PGUP,
+                KC_PGDN,
+                MT_DEL,  LT_LOW
+    ),
+
+/* LOWER
+ *
+ * ,--------------------------------------------------.           ,----------------------------------------------------.
+ * |  F11   |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |       |  F6  |  F7  |  F8  |  F9  |  F10  |  F12   |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+-------+--------|
+ * |        |      |      |KC_BRU| Play | Mute |      |           |       | PgUp | Home |  Up  | End  |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      |      |KC_BRD| Next |VolUp |------|           |-------| PgDn | Left | Down |Right |K_LOCK |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      |      |      | Prev |VolDn |      |           |       |      |      |      |      |       |        |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+-------+--------'
+ *   |      |      |      |      |      |                                        |      |      |      |M_CODE |      |
+ *   `----------------------------------'                                        `-----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+    [_LOWER] = LAYOUT_ergodox_wrapper(
+        //LEFT HAND
+        _____________________FUNC_LEFT______________________, _______,
+        _______, _______, _______, _________MEDIA_1_________, _______,
+        _______, _______, _______, _________MEDIA_2_________,
+        _______, _______, _______, _________MEDIA_3_________, _______,
+        _______, _______, _______, _______, _______,
+                                            // LEFT THUMB
+                                            _______, _______,
+                                                     _______,
+                                            _______, _______,
+                                                     _______,
+
+        //RIGHT HAND
+        _______, _____________________FUNC_RIGHT_____________________,
+        _______, _______________NAV_1______________, _______, _______,
+                 _______________NAV_2______________, K_LOCK,  _______,
+        _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, M_CODE,  _______,
+                 // RIGHT THUMB
+                 _______, _______,
+                 _______,
+                 _______,
+                 _______, _______
+    ),
+
+/* RAISE
+ *
+ * ,--------------------------------------------------.           ,----------------------------------------------------.
+ * |        |      |      |      |K_CSCN|      |      |           |       |      |      |      |      |       |        |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+-------+--------|
+ * |        |      | MS_1 | MS_U | MS_2 | WH_U |      |           |       |      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      | MS_L | MS_D | MS_R | WH_D |------|           |-------|      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+-------+--------'
+ *   |      |      |      |      |      |                                        |      |      |      |       |      |
+ *   `----------------------------------'                                        `-----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+    [_RAISE] = LAYOUT_ergodox_wrapper(
+        //LEFT HAND
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, K_CSCN,  XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX,
+        XXXXXXX, XXXXXXX, _____________MOUSE_2______________,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                                                   // LEFT THUMB
+                                                   _______, _______,
+                                                            _______,
+                                                   _______, _______,
+                                                            _______,
+
+        //RIGHT HAND
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        // RIGHT THUMB
+        _______, _______,
+        _______,
+        _______,
+        _______, _______
+    ),
+
+/* ADJUST
+ *
+ * ,--------------------------------------------------.           ,----------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |       |      |      |      |COLMAK|DVORAK |QWERTY  |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+-------+--------|
+ * | M_MAKE |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * | M_VRSN |      |      |      |      |      |------|           |-------|      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * | M_FLSH |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+-------+--------'
+ *   |      |      |      |      |      |                                        |      |      |      |       |      |
+ *   `----------------------------------'                                        `-----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+    [_ADJUST] = LAYOUT_ergodox_wrapper(
+        //LEFT HAND
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        M_MAKE,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        M_VRSN,   M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        M_FLSH,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                                                   // LEFT THUMB
+                                                   _______, _______,
+                                                            _______,
+                                                   _______, _______,
+                                                            _______,
+
+        //RIGHT HAND
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK,  QWERTY,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        // RIGHT THUMB
+        _______, _______,
+        _______,
+        _______,
+        _______, _______
+    ),
+/* Keymap XX: TEMPLATE
+ *
+ * ,--------------------------------------------------.           ,----------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
+ * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+-------+--------|
+ * |        |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      |      |      |      |      |------|           |-------|      |      |      |      |       |        |
+ * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
+ * |        |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
+ * `--------+------+------+------+------+-------------'           `--------------+------+------+------+-------+--------'
+ *   |      |      |      |      |      |                                        |      |      |      |       |      |
+ *   `----------------------------------'                                        `-----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+[_XXLAYER] = LAYOUT_ergodox_wrapper(
+        //LEFT HAND
+        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,
+                                                   // LEFT THUMB
+                                                   _______, _______,
+                                                            _______,
+                                                   _______, _______,
+                                                            _______,
+
+        //RIGHT HAND
+        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,
+        // RIGHT THUMB
+        _______, _______,
+        _______,
+        _______,
+        _______, _______
+    ),
+
+ */
+};
\ No newline at end of file
diff --git a/keyboards/hotdox/matrix.c b/keyboards/hotdox/matrix.c
index 9d3a98db2..605be3022 100644
--- a/keyboards/hotdox/matrix.c
+++ b/keyboards/hotdox/matrix.c
@@ -9,9 +9,6 @@
 #include "matrix.h"
 #include "hotdox.h"
 #include "left.h"
-#ifdef DEBUG_MATRIX_SCAN_RATE
-#include  "timer.h"
-#endif
 
 /*
  * This constant define not debouncing time in msecs, but amount of matrix
@@ -41,12 +38,6 @@ static void init_cols(void);
 static void unselect_rows(void);
 static void select_row(uint8_t row);
 
-#ifdef DEBUG_MATRIX_SCAN_RATE
-uint32_t matrix_timer;
-uint32_t matrix_scan_count;
-#endif
-
-
 __attribute__ ((weak))
 void matrix_init_user(void) {}
 
@@ -77,10 +68,6 @@ uint8_t matrix_cols(void)
 
 void matrix_init(void)
 {
-  // disable JTAG
-  MCUCR = (1<<JTD);
-  MCUCR = (1<<JTD);
-
   unselect_rows();
   init_cols();
 
@@ -94,13 +81,7 @@ void matrix_init(void)
     }
   }
 
-#ifdef DEBUG_MATRIX_SCAN_RATE
-  matrix_timer = timer_read32();
-  matrix_scan_count = 0;
-#endif
-
   matrix_init_quantum();
-
 }
 
 void matrix_power_up(void) {
@@ -111,11 +92,6 @@ void matrix_power_up(void) {
   for (uint8_t i=0; i < MATRIX_ROWS; i++) {
     matrix[i] = 0;
   }
-
-#ifdef DEBUG_MATRIX_SCAN_RATE
-  matrix_timer = timer_read32();
-  matrix_scan_count = 0;
-#endif
 }
 
 // Returns a matrix_row_t whose bits are set if the corresponding key should be
@@ -146,20 +122,6 @@ uint8_t matrix_scan(void)
 {
   left_scan();
 
-#ifdef DEBUG_MATRIX_SCAN_RATE
-  matrix_scan_count++;
-
-  uint32_t timer_now = timer_read32();
-  if (TIMER_DIFF_32(timer_now, matrix_timer)>1000) {
-    print("matrix scan frequency: ");
-    pdec(matrix_scan_count);
-    print("\n");
-    matrix_print();
-
-    matrix_timer = timer_now;
-    matrix_scan_count = 0;
-  }
-#endif
   for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
     select_row(i);
     wait_us(30);  // without this wait read unstable value.
diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk
index f785cdd06..be2155205 100644
--- a/keyboards/hotdox/rules.mk
+++ b/keyboards/hotdox/rules.mk
@@ -1,63 +1,14 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make = Make software.
-#
-# make clean = Clean out built project files.
-#
-# That's pretty much all you need. To compile, always go make clean,
-# followed by make.
-#
-# For advanced users only:
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-#----------------------------------------------------------------------------
-
-# # project specific files
-SRC =  matrix.c     \
-	   i2c_master.c \
-       left.c
-
 # MCU name
 MCU = atmega32u4
 
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-# Boot Section
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
@@ -79,4 +30,9 @@ SWAP_HANDS_ENABLE       = no  # Disable Onehand
 RGBLIGHT_ENABLE         = no
 MIDI_ENABLE             = no
 
+# project specific files
+SRC =  matrix.c     \
+	   i2c_master.c \
+       left.c
+
 LAYOUTS = ergodox