From 6280adbb6e077d9c73807788929158bf4a8ca493 Mon Sep 17 00:00:00 2001
From: Lucas Hecht <Lucas Hecht>
Date: Wed, 24 Feb 2016 22:54:39 +0100
Subject: Added keymap "lucas.c"

---
 keyboard/planck/dfu-programmer.exe         | Bin 0 -> 242280 bytes
 keyboard/planck/keymaps/dfu-programmer.exe | Bin 0 -> 242280 bytes
 keyboard/planck/keymaps/keymap_eigen.c     | 184 +++++++++++++++++++++++++++
 keyboard/planck/keymaps/lucas.c            | 198 +++++++++++++++++++++++++++++
 4 files changed, 382 insertions(+)
 create mode 100644 keyboard/planck/dfu-programmer.exe
 create mode 100644 keyboard/planck/keymaps/dfu-programmer.exe
 create mode 100644 keyboard/planck/keymaps/keymap_eigen.c
 create mode 100644 keyboard/planck/keymaps/lucas.c

diff --git a/keyboard/planck/dfu-programmer.exe b/keyboard/planck/dfu-programmer.exe
new file mode 100644
index 0000000000..a7d2ecbfc5
Binary files /dev/null and b/keyboard/planck/dfu-programmer.exe differ
diff --git a/keyboard/planck/keymaps/dfu-programmer.exe b/keyboard/planck/keymaps/dfu-programmer.exe
new file mode 100644
index 0000000000..a7d2ecbfc5
Binary files /dev/null and b/keyboard/planck/keymaps/dfu-programmer.exe differ
diff --git a/keyboard/planck/keymaps/keymap_eigen.c b/keyboard/planck/keymaps/keymap_eigen.c
new file mode 100644
index 0000000000..51b7720593
--- /dev/null
+++ b/keyboard/planck/keymaps/keymap_eigen.c
@@ -0,0 +1,184 @@
+#include "keymap_common.h"
+#include "backlight.h"
+#include "debug.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = { /* QWERTY    
+    * 0:Qwerty
+    * ,-----------------------------------------------------------------------.
+    * |Esc  | q   | w   | f   | p   | g   | j   | l   | u   | y   | ;   | BS  |
+    * |-----------------------------------------------------------------------|
+    * |BS   | a   | r   | s   | t   | d   | h   | n   | e   | i   | o   |  '  |
+    * |-----------------------------------------------------------------------|
+    * |Shift| z   | x   | c   | v   | b   | k   | m   |,   | .   | /   | Enter|
+    * |-----------------------------------------------------------------------|
+    * |FN4  | LCTL| LGUI| LALT|Lower|   Space   |Raise|Left |Down | Up  |Right|
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,   KC_BSPC},
+  {KC_TAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT},
+  {FUNC(8), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT},
+  {KC_LCTL, KC_LCTL, FUNC(5), KC_LALT, FUNC(2), FUNC(3), FUNC(3), FUNC(1),   KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT}
+                                                // Space is repeated to accommadate for both spacebar wiring positions
+},
+[1] = { /* Gaming
+    * 1: Gaming Layer
+    * ,-----------------------------------------------------------------------.
+    * | ESC |     |  1  |  2  |  3  |  4  |     |     |     | /RC |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |  5  |  6  |  7  |  W  |  8  |  9  |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |  0  |  -  |  A  |  S  |  D  |  =  |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |QWERT|     |LCTRL| LSFT| LALT|   Space   | TAB |     |     |Raise|     |
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_ESC, KC_NO, KC_1, KC_2, KC_3, KC_4, KC_NO, KC_NO, KC_NO,   M(1), KC_NO, KC_NO},
+  {KC_NO,   KC_5, KC_6, KC_7, KC_W, KC_8,  KC_9, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO},
+  {KC_NO,   KC_0, KC_MINS, KC_A, KC_S, KC_D,  KC_EQL, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO},
+  {FUNC(9), KC_NO, KC_LCTL, KC_LSFT, KC_LALT, KC_SPC, KC_SPC, KC_TAB, KC_NO, KC_NO, FUNC(1), KC_NO}
+},
+[2] = { /* Raise
+    * 2: fn Right/Raise layer
+    * The top row are standard numbers, 1-9, and minus and equals.
+    * Middle 2 rows add symbols back.
+	* Bottom row changes arrow to Home, Page Up, Page Down, and End.
+    * ,-----------------------------------------------------------------------.
+    * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  BS |
+    * |-----------------------------------------------------------------------|
+    * |     | Game|QWERT|     |     |     |     |  -  |  =  |  [  |  ]  |  \  |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |   Space   |     |Home |PgDn |PgUp | End |
+    * `-----------------------------------------------------------------------'
+    */
+  { KC_GRV,    KC_1,    KC_2,     KC_3,      KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
+  {KC_TRNS, FUNC(7), FUNC(6),    RESET,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
+  {KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
+  {KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_HOME, KC_PGDN, KC_PGUP, KC_END}
+},
+[3] = { /* Lower
+    * 3: Symbols Left/Lower layer
+	* Top row is number symbols.
+	* Adds alt symbbols for brackets, etc.
+	* Bottom row is media control.
+    * ,-----------------------------------------------------------------------.
+    * |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |  BS |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |  _  |  +  |  {  |  }  |  |  |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |PrevT|NextT|     |     |     |     |     |Mute |Vol- |Vol+ | P/P |
+    * `-----------------------------------------------------------------------'
+    */
+  {S(KC_GRV), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_BSPC},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS)},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
+  {KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, FUNC(2),   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY}
+},
+[4] = { /* TENKEY
+    * 4: Numpad layer
+    * ,-----------------------------------------------------------------------.
+    * |     | Num7| Num8| Num9|     |     |CALC |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     | Num4| Num5| Num6|     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     | Num1| Num2| Num3|     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     | Num0| Num0| Num.|     |     |     |     |     |     |     |     |
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9,   KC_TRNS, KC_TRNS,KC_CALC,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
+  {KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6,   KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
+  {KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3,   KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
+  {KC_TRNS, KC_KP_0, KC_KP_0, KC_KP_DOT, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
+},
+[5] = { /* Funtion Keys
+    * 5: Function
+	* Backlight control at Arrows
+    * ,-----------------------------------------------------------------------.
+    * | F1  | F2  | F3  | F4  |F5   | F6  | F7  | F8  | F9  | F10 | F11 | F12 |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |Light|BL DN|BL UP|
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_FN1,   KC_FN2,   KC_FN3,   KC_FN4,    KC_FN5,  KC_FN6,   KC_FN7,  KC_FN8,    KC_FN9,   KC_FN10,   KC_FN11, KC_FN12},
+	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
+	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
+	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   BL_TOGG,   BL_DEC, BL_INC},
+},
+[6] = { /* In-Game QWERTY    
+    * 0:Qwerty
+    * ,-----------------------------------------------------------------------.
+    * |     | q   | w   | e   | r   | t   | y   | u   | i   | o   | p   | BS  |
+    * |-----------------------------------------------------------------------|
+    * |     | a   | s   | d   | f   | g   | h   | j   | k   | l   |     |  "  |
+    * |-----------------------------------------------------------------------|
+    * |Shift| z   | x   | c   | v   | b   | n   | m   |  ,  |  .  |  /  |Enter|
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |   Space   |     |     |     |     |     |
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_TRNS,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_BSPC},
+  {KC_TRNS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_TRNS,  S(KC_QUOT)},
+  {FUNC(8), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS}
+                                                // Space is repeated to accommadate for both spacebar wiring positions
+},
+[7] = { /* More Functions
+    * 7: Function
+	* More Space Later
+    * ,-----------------------------------------------------------------------.
+    * | F13 | F14 | F15 | F16 |F17  | F18 | F19 | F20 | F21 | F22 | F23 | F24 |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |     |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |     |
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_FN13,   KC_FN14,   KC_FN15,   KC_FN16,    KC_FN17,  KC_FN18,   KC_FN19,  KC_FN20,    KC_FN21,   KC_FN22,   KC_FN23, KC_FN24},
+	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
+	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
+	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
+},
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+        [1] = ACTION_LAYER_MOMENTARY(2),               // to RAISE
+        [2] = ACTION_LAYER_MOMENTARY(3),               // to LOWER
+        [3] = ACTION_LAYER_TAP_KEY(4,KC_SPC),          // to TENKEY
+	[4] = ACTION_LAYER_MOMENTARY(5),               // to Function
+	[5] = ACTION_LAYER_TAP_KEY(7,KC_LGUI),         // to More Functions
+	
+        [6] = ACTION_DEFAULT_LAYER_SET(0),             // QWERTY
+        [7] = ACTION_DEFAULT_LAYER_SET(1),             // Gaming
+	[8] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_CAPS),  //Shift on press, Caps on tap
+	[9] = ACTION_LAYER_TAP_TOGGLE(6),              //QWERTY in game
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:   
+        if (record->event.pressed) {
+          register_code(KC_RSFT);
+          backlight_step();
+        } else {
+          unregister_code(KC_RSFT);
+        }
+        break;
+		case 1:
+        return MACRODOWN(TYPE(KC_SLSH), TYPE(KC_R), TYPE(KC_C), TYPE(KC_ENT) , END);
+      break;
+      } 
+    return MACRO_NONE;
+};
\ No newline at end of file
diff --git a/keyboard/planck/keymaps/lucas.c b/keyboard/planck/keymaps/lucas.c
new file mode 100644
index 0000000000..d8516302c7
--- /dev/null
+++ b/keyboard/planck/keymaps/lucas.c
@@ -0,0 +1,198 @@
+/* 
+This is the keymap of /u/deepshitgoeshere!
+Layer 1 exists so I can have the symbol positions of QWERTY while having my system in german.
+The second layer has all the german umlauts I need and with capital and small letters on the 
+same layer there is no need to press shift+lower.
+This keymap is made to work with software implemented QWERTZ.
+The "Gaming" layer is mainly customized for CS:GO.
+If you have any question about this keymap feel free to shoot me a message on reddit!
+*/
+
+#include "keymap_common.h"
+#include "keymap_extras/keymap_german.h"
+#include "backlight.h"
+#include "debug.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = { /* Colemak   
+    * ,-----------------------------------------------------------------------.
+    * | Esc | q   | w   | f   | p   | g   | j   | l   | u   | y   | ;   |  -  |
+    * |-----------------------------------------------------------------------|
+    * | BS  | a   | r   | s   | t   | d   | h   | n   | e   | i   | o   |  '  |
+    * |-----------------------------------------------------------------------|
+    * | SFT | z   | x   | c   | v   | b   | k   | m   |  ,  |  .  |  /  | Ent |
+    * |-----------------------------------------------------------------------|
+    * | CTL | GUI | Tab | ALT |Lower|   Space   |Raise|Left |Down | Up  |Right|
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_ESC,  KC_Q,    KC_W,   KC_F,    KC_P, KC_G, KC_J, KC_L, KC_U,    KC_Z,    DE_SCLN, DE_MINS},
+  {KC_BSPC, KC_A,    KC_R,   KC_S,    KC_T, KC_D, KC_H, KC_N, KC_E,    KC_I,    KC_O,    DE_QUOT},
+  {M(0),    KC_Y,    KC_X,   KC_C,    KC_V, KC_B, KC_K, KC_M, DE_COMM, DE_DOT,  DE_SLSH, KC_ENT},
+  {KC_LCTL, KC_LGUI, KC_TAB, KC_LALT, F(2), F(3), F(3), F(1), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
+},
+[1] = { /* Symbols
+    * ,-----------------------------------------------------------------------.
+    * |     |     |     |     |     |     |     |     |     |     |  :  |     |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |     |     |     |  "  |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |  <  |  >  |  ?  |     |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |           |     |     |     |     |     |
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_DOT,  KC_TRNS},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_DQOT},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(5),    DE_MORE, DE_QST,  KC_TRNS},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
+},
+[2] = { /* Raise
+    * ,-----------------------------------------------------------------------.
+    * |     |  Ä  |     |     |     |     |     |     |  Ü  |  Ö  |     |Game |
+    * |-----------------------------------------------------------------------|
+    * | Del |  ä  |     |  ß  |     |     |     |     |  ü  |  ö  |     |FVol+|
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     |     |     |     |Stop | Prv | Nxt |FVol-|
+    * |-----------------------------------------------------------------------|
+    * |LCTL |LGUI | Tab |LALT |Lower|   Space   |     |Mute |Vol- |Vol+ | P/P |
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_NO,   S(DE_AE), KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   S(DE_UE), S(DE_OE), KC_NO,   F(4)},
+  {KC_DEL,  DE_AE,    KC_NO,   DE_SS,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   DE_UE,    DE_OE,    KC_NO,   RALT(KC_F12)},
+  {KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_MSTP,  KC_MPRV,  KC_MNXT, RALT(KC_F11)},
+  {KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_MUTE,  KC_VOLD,  KC_VOLU, KC_MPLY}
+},
+[3] = { /* Lower 
+    * ,-----------------------------------------------------------------------.
+    * |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |  +  |
+    * |-----------------------------------------------------------------------| 
+    * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  =  |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |  |  |  [  |  ]  |  {  |  }  |  €  |     |  \  | Ent |
+    * |-----------------------------------------------------------------------|
+    * |LCTL |LGUI | Tab |LALT |     |   Space   |Raise|Home |PgDn |PgUp | End |
+    * `-----------------------------------------------------------------------'
+    */
+  {DE_TILD, DE_EXLM, DE_AT,   DE_HASH, DE_DLR,  DE_PERC, DE_CIRC,  DE_AMPR, DE_ASTR, DE_LPRN, DE_RPRN, DE_PLUS},
+  {DE_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    DE_EQL},
+  {KC_NO,   KC_NO,   KC_NO,   DE_PIPE, DE_LBRC, DE_RBRC, DE_LCBR,  DE_RCBR, DE_EURO, KC_NO,   DE_BSLS, KC_ENT},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END}
+},
+[4] = { /* Function
+    * ,-----------------------------------------------------------------------.
+    * | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 |
+    * |-----------------------------------------------------------------------|
+    * | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |
+    * |-----------------------------------------------------------------------|
+    * |     |     |     |     |     | KP- | KP+ |     |     |     |     |Reset| 
+    * |-----------------------------------------------------------------------|
+    * |     |Light|BL DN|BL UP|     |     |     |     |Mute |Vol- |Vol+ | P/P | 
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_F13, KC_F14,  KC_F15, KC_F16, KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24},
+  {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_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,   KC_PMNS, KC_PPLS, KC_NO,   KC_NO,   KC_NO,   RESET,   KC_NO},
+  {KC_NO,  BL_TOGG, BL_DEC, BL_INC, FUNC(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY}
+},
+[5] = { /* Gaming
+    * ,-----------------------------------------------------------------------.
+    * | Buy | ESC | q   | w   | e   | r   | t   | y   | u   | i   | o   |  p  |
+    * |-----------------------------------------------------------------------|
+    * | ENT | BS  | a   | s   | d   | f   | g   | h   | j   | k   | l   |  ;  |
+    * |-----------------------------------------------------------------------|
+    * | CTL | SFT | z   | x   | c   | v   | b   | n   |  m  |  ,  | Up  |  /  |
+    * |-----------------------------------------------------------------------|
+    * |     |     | Tab | ALT |     |   Space   |CrJmp| GUI |Left |Down |Right|
+    * `-----------------------------------------------------------------------'
+    */
+  {MO(6),   KC_ESC,  KC_Q,   KC_W,    KC_E,  KC_R,   KC_T,   KC_Z,         KC_U,    KC_I,    KC_O,    F(4)},
+  {KC_ENT,  KC_BSPC, KC_A,   KC_S,    KC_D,  KC_F,   KC_G,   KC_H,         KC_J,    KC_K,    KC_L,    DE_SCLN},
+  {KC_LCTL, KC_LSFT, KC_Y,   KC_X,    KC_C,  KC_V,   KC_B,   KC_N,         KC_M,    DE_DOT,  KC_UP,   DE_SLSH},
+  {KC_NO,   KC_NO,   KC_TAB, KC_LALT, KC_NO, KC_SPC, KC_SPC, LCTL(KC_SPC), KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT}
+},
+[6] = { /* Gaming 
+        /* CS:GO buy binds
+    * ,-----------------------------------------------------------------------.
+    * |     |     |     |     |     |     |     |     |  7  |  8  |  9  |     |
+    * |-----------------------------------------------------------------------|
+    * | BS  |     |     |     |     |     |     |     |  6  |  5  |  4  | End |
+    * |-----------------------------------------------------------------------|
+    * | CTL | SFT |     |     |     |     |     |     |  1  |  2  |  3  |Pgdn |
+    * |-----------------------------------------------------------------------|
+    * |     |     | Tab | ALT |     |   Space   |CrJmp|     |  0  | KP+ |PEnt |
+    * `-----------------------------------------------------------------------'
+    */
+  {KC_TRNS, KC_NO,   KC_Q,   KC_W,    KC_F,  KC_P,   KC_G,   KC_J,         KC_P7, KC_P8, KC_P9,   KC_NO},
+  {KC_BSPC, KC_NO,   KC_A,   KC_R,    KC_S,  KC_T,   KC_D,   KC_H,         KC_P4, KC_P5, KC_P6,   KC_END},
+  {KC_LCTL, KC_LSFT, KC_Y,   KC_X,    KC_C,  KC_V,   KC_B,   KC_K,         KC_P1, KC_P2, KC_P3,   KC_PGDN},
+  {KC_NO,   KC_NO,   KC_TAB, KC_LALT, KC_NO, KC_SPC, KC_SPC, LCTL(KC_SPC), KC_NO, KC_P0, KC_PDOT, KC_PENT}
+},
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [1] = ACTION_LAYER_MOMENTARY(2),              // to RAISE
+    [2] = ACTION_LAYER_MOMENTARY(3),              // to LOWER
+    [3] = ACTION_LAYER_TAP_KEY(4,KC_SPC),         // to Function
+    [4] = ACTION_LAYER_TOGGLE(5),                 // toggle Gaming
+	[5] = ACTION_MODS_TAP_KEY(KC_LSFT, KC_CAPS),  //Shift on press, Caps on tap
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 
+{
+  switch(id) {
+    case 0: // M(0)
+        if (record->event.pressed) {
+            register_code(KC_LSFT);
+            layer_on(1);
+        } else {
+            layer_off(1);
+            unregister_code(KC_LSFT);
+        }
+        break;
+    case 1: // M(1)
+        if (record->event.pressed) {
+            register_code(LSFT(DE_SCLN));
+        } else {
+            unregister_code(LSFT(DE_SCLN));
+        }
+        break;
+    case 2: // M(2)
+        if (record->event.pressed) {
+            register_code(DE_MINS);
+        } else {
+            unregister_code(DE_MINS);
+        }
+        break;
+    case 3: // M(3)
+        if (record->event.pressed) {
+            register_code(DE_COMM);
+        } else {
+            unregister_code(DE_COMM);
+        }
+        break;        
+    case 4: // M(4)
+        if (record->event.pressed) {
+            register_code(DE_DOT);
+        } else {
+            unregister_code(DE_DOT);
+        }
+        break;        
+    case 5: // M(5)
+        if (record->event.pressed) {
+            unregister_code(KC_LSFT);
+            register_code(DE_MORE);
+        } else {
+            unregister_code(DE_MORE);
+        }
+        break;    
+    case 6: // M(6)
+        if (record->event.pressed) {
+            register_code(DE_LESS);
+        } else {
+            unregister_code(DE_LESS);
+        }
+        break;
+  }
+  return MACRO_NONE;
+
+};          
\ No newline at end of file
-- 
cgit v1.2.3


From bbfdfdcc5f5f610371434c7f4d072c71f1526696 Mon Sep 17 00:00:00 2001
From: Lucas Hecht <Lucas Hecht>
Date: Thu, 25 Feb 2016 21:39:32 +0100
Subject: delete old keymap (keymap_eigen.c)

---
 keyboard/planck/keymaps/lucas.c | 39 ++-------------------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/keyboard/planck/keymaps/lucas.c b/keyboard/planck/keymaps/lucas.c
index d8516302c7..27672e1bbc 100644
--- a/keyboard/planck/keymaps/lucas.c
+++ b/keyboard/planck/keymaps/lucas.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
   {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_DOT,  KC_TRNS},
   {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_DQOT},
-  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(5),    DE_MORE, DE_QST,  KC_TRNS},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(1),    DE_MORE, DE_QST,  KC_TRNS},
   {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
 },
 [2] = { /* Raise
@@ -148,36 +148,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             layer_off(1);
             unregister_code(KC_LSFT);
         }
-        break;
+        break;       
     case 1: // M(1)
-        if (record->event.pressed) {
-            register_code(LSFT(DE_SCLN));
-        } else {
-            unregister_code(LSFT(DE_SCLN));
-        }
-        break;
-    case 2: // M(2)
-        if (record->event.pressed) {
-            register_code(DE_MINS);
-        } else {
-            unregister_code(DE_MINS);
-        }
-        break;
-    case 3: // M(3)
-        if (record->event.pressed) {
-            register_code(DE_COMM);
-        } else {
-            unregister_code(DE_COMM);
-        }
-        break;        
-    case 4: // M(4)
-        if (record->event.pressed) {
-            register_code(DE_DOT);
-        } else {
-            unregister_code(DE_DOT);
-        }
-        break;        
-    case 5: // M(5)
         if (record->event.pressed) {
             unregister_code(KC_LSFT);
             register_code(DE_MORE);
@@ -185,13 +157,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             unregister_code(DE_MORE);
         }
         break;    
-    case 6: // M(6)
-        if (record->event.pressed) {
-            register_code(DE_LESS);
-        } else {
-            unregister_code(DE_LESS);
-        }
-        break;
   }
   return MACRO_NONE;
 
-- 
cgit v1.2.3


From e8f17e51368fabdc9eb226212c7cfcec76f037e1 Mon Sep 17 00:00:00 2001
From: deepshitgoeshere <hechti98@gmail.com>
Date: Thu, 25 Feb 2016 22:26:44 +0100
Subject: Delete dfu-programmer.exe

---
 keyboard/planck/keymaps/dfu-programmer.exe | Bin 242280 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 keyboard/planck/keymaps/dfu-programmer.exe

diff --git a/keyboard/planck/keymaps/dfu-programmer.exe b/keyboard/planck/keymaps/dfu-programmer.exe
deleted file mode 100644
index a7d2ecbfc5..0000000000
Binary files a/keyboard/planck/keymaps/dfu-programmer.exe and /dev/null differ
-- 
cgit v1.2.3


From 8def502eee61cd137789c15842fad6ea881a929f Mon Sep 17 00:00:00 2001
From: deepshitgoeshere <hechti98@gmail.com>
Date: Thu, 25 Feb 2016 22:27:17 +0100
Subject: Delete dfu-programmer.exe

---
 keyboard/planck/dfu-programmer.exe | Bin 242280 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 keyboard/planck/dfu-programmer.exe

diff --git a/keyboard/planck/dfu-programmer.exe b/keyboard/planck/dfu-programmer.exe
deleted file mode 100644
index a7d2ecbfc5..0000000000
Binary files a/keyboard/planck/dfu-programmer.exe and /dev/null differ
-- 
cgit v1.2.3


From 92adbe416c81e6ec24e21cd531eb7e478218803f Mon Sep 17 00:00:00 2001
From: deepshitgoeshere <hechti98@gmail.com>
Date: Thu, 25 Feb 2016 22:27:59 +0100
Subject: Delete keymap_eigen.c

---
 keyboard/planck/keymaps/keymap_eigen.c | 184 ---------------------------------
 1 file changed, 184 deletions(-)
 delete mode 100644 keyboard/planck/keymaps/keymap_eigen.c

diff --git a/keyboard/planck/keymaps/keymap_eigen.c b/keyboard/planck/keymaps/keymap_eigen.c
deleted file mode 100644
index 51b7720593..0000000000
--- a/keyboard/planck/keymaps/keymap_eigen.c
+++ /dev/null
@@ -1,184 +0,0 @@
-#include "keymap_common.h"
-#include "backlight.h"
-#include "debug.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = { /* QWERTY    
-    * 0:Qwerty
-    * ,-----------------------------------------------------------------------.
-    * |Esc  | q   | w   | f   | p   | g   | j   | l   | u   | y   | ;   | BS  |
-    * |-----------------------------------------------------------------------|
-    * |BS   | a   | r   | s   | t   | d   | h   | n   | e   | i   | o   |  '  |
-    * |-----------------------------------------------------------------------|
-    * |Shift| z   | x   | c   | v   | b   | k   | m   |,   | .   | /   | Enter|
-    * |-----------------------------------------------------------------------|
-    * |FN4  | LCTL| LGUI| LALT|Lower|   Space   |Raise|Left |Down | Up  |Right|
-    * `-----------------------------------------------------------------------'
-    */
-  {KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,   KC_BSPC},
-  {KC_TAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT},
-  {FUNC(8), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT},
-  {KC_LCTL, KC_LCTL, FUNC(5), KC_LALT, FUNC(2), FUNC(3), FUNC(3), FUNC(1),   KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT}
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-},
-[1] = { /* Gaming
-    * 1: Gaming Layer
-    * ,-----------------------------------------------------------------------.
-    * | ESC |     |  1  |  2  |  3  |  4  |     |     |     | /RC |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |  5  |  6  |  7  |  W  |  8  |  9  |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |  0  |  -  |  A  |  S  |  D  |  =  |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |QWERT|     |LCTRL| LSFT| LALT|   Space   | TAB |     |     |Raise|     |
-    * `-----------------------------------------------------------------------'
-    */
-  {KC_ESC, KC_NO, KC_1, KC_2, KC_3, KC_4, KC_NO, KC_NO, KC_NO,   M(1), KC_NO, KC_NO},
-  {KC_NO,   KC_5, KC_6, KC_7, KC_W, KC_8,  KC_9, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO},
-  {KC_NO,   KC_0, KC_MINS, KC_A, KC_S, KC_D,  KC_EQL, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO},
-  {FUNC(9), KC_NO, KC_LCTL, KC_LSFT, KC_LALT, KC_SPC, KC_SPC, KC_TAB, KC_NO, KC_NO, FUNC(1), KC_NO}
-},
-[2] = { /* Raise
-    * 2: fn Right/Raise layer
-    * The top row are standard numbers, 1-9, and minus and equals.
-    * Middle 2 rows add symbols back.
-	* Bottom row changes arrow to Home, Page Up, Page Down, and End.
-    * ,-----------------------------------------------------------------------.
-    * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  BS |
-    * |-----------------------------------------------------------------------|
-    * |     | Game|QWERT|     |     |     |     |  -  |  =  |  [  |  ]  |  \  |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |   Space   |     |Home |PgDn |PgUp | End |
-    * `-----------------------------------------------------------------------'
-    */
-  { KC_GRV,    KC_1,    KC_2,     KC_3,      KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
-  {KC_TRNS, FUNC(7), FUNC(6),    RESET,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
-  {KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
-  {KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_HOME, KC_PGDN, KC_PGUP, KC_END}
-},
-[3] = { /* Lower
-    * 3: Symbols Left/Lower layer
-	* Top row is number symbols.
-	* Adds alt symbbols for brackets, etc.
-	* Bottom row is media control.
-    * ,-----------------------------------------------------------------------.
-    * |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |  BS |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |  _  |  +  |  {  |  }  |  |  |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |PrevT|NextT|     |     |     |     |     |Mute |Vol- |Vol+ | P/P |
-    * `-----------------------------------------------------------------------'
-    */
-  {S(KC_GRV), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_BSPC},
-  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS)},
-  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-  {KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, FUNC(2),   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY}
-},
-[4] = { /* TENKEY
-    * 4: Numpad layer
-    * ,-----------------------------------------------------------------------.
-    * |     | Num7| Num8| Num9|     |     |CALC |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     | Num4| Num5| Num6|     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     | Num1| Num2| Num3|     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     | Num0| Num0| Num.|     |     |     |     |     |     |     |     |
-    * `-----------------------------------------------------------------------'
-    */
-  {KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9,   KC_TRNS, KC_TRNS,KC_CALC,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
-  {KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6,   KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
-  {KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3,   KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
-  {KC_TRNS, KC_KP_0, KC_KP_0, KC_KP_DOT, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS},
-},
-[5] = { /* Funtion Keys
-    * 5: Function
-	* Backlight control at Arrows
-    * ,-----------------------------------------------------------------------.
-    * | F1  | F2  | F3  | F4  |F5   | F6  | F7  | F8  | F9  | F10 | F11 | F12 |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |Light|BL DN|BL UP|
-    * `-----------------------------------------------------------------------'
-    */
-  {KC_FN1,   KC_FN2,   KC_FN3,   KC_FN4,    KC_FN5,  KC_FN6,   KC_FN7,  KC_FN8,    KC_FN9,   KC_FN10,   KC_FN11, KC_FN12},
-	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
-	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
-	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   BL_TOGG,   BL_DEC, BL_INC},
-},
-[6] = { /* In-Game QWERTY    
-    * 0:Qwerty
-    * ,-----------------------------------------------------------------------.
-    * |     | q   | w   | e   | r   | t   | y   | u   | i   | o   | p   | BS  |
-    * |-----------------------------------------------------------------------|
-    * |     | a   | s   | d   | f   | g   | h   | j   | k   | l   |     |  "  |
-    * |-----------------------------------------------------------------------|
-    * |Shift| z   | x   | c   | v   | b   | n   | m   |  ,  |  .  |  /  |Enter|
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |   Space   |     |     |     |     |     |
-    * `-----------------------------------------------------------------------'
-    */
-  {KC_TRNS,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_BSPC},
-  {KC_TRNS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_TRNS,  S(KC_QUOT)},
-  {FUNC(8), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT},
-  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS}
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-},
-[7] = { /* More Functions
-    * 7: Function
-	* More Space Later
-    * ,-----------------------------------------------------------------------.
-    * | F13 | F14 | F15 | F16 |F17  | F18 | F19 | F20 | F21 | F22 | F23 | F24 |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |     |
-    * `-----------------------------------------------------------------------'
-    */
-  {KC_FN13,   KC_FN14,   KC_FN15,   KC_FN16,    KC_FN17,  KC_FN18,   KC_FN19,  KC_FN20,    KC_FN21,   KC_FN22,   KC_FN23, KC_FN24},
-	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
-	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
-	{KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS},
-},
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-        [1] = ACTION_LAYER_MOMENTARY(2),               // to RAISE
-        [2] = ACTION_LAYER_MOMENTARY(3),               // to LOWER
-        [3] = ACTION_LAYER_TAP_KEY(4,KC_SPC),          // to TENKEY
-	[4] = ACTION_LAYER_MOMENTARY(5),               // to Function
-	[5] = ACTION_LAYER_TAP_KEY(7,KC_LGUI),         // to More Functions
-	
-        [6] = ACTION_DEFAULT_LAYER_SET(0),             // QWERTY
-        [7] = ACTION_DEFAULT_LAYER_SET(1),             // Gaming
-	[8] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_CAPS),  //Shift on press, Caps on tap
-	[9] = ACTION_LAYER_TAP_TOGGLE(6),              //QWERTY in game
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:   
-        if (record->event.pressed) {
-          register_code(KC_RSFT);
-          backlight_step();
-        } else {
-          unregister_code(KC_RSFT);
-        }
-        break;
-		case 1:
-        return MACRODOWN(TYPE(KC_SLSH), TYPE(KC_R), TYPE(KC_C), TYPE(KC_ENT) , END);
-      break;
-      } 
-    return MACRO_NONE;
-};
\ No newline at end of file
-- 
cgit v1.2.3


From 4ad96c60abc4d9e0de983d38b8126bc902178782 Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Thu, 25 Feb 2016 23:53:44 -0500
Subject: Add script to setup the PATH variable on Windows

---
 setup-path-win.bat | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 setup-path-win.bat

diff --git a/setup-path-win.bat b/setup-path-win.bat
new file mode 100644
index 0000000000..4fbf9a870e
--- /dev/null
+++ b/setup-path-win.bat
@@ -0,0 +1,9 @@
+@echo off
+setx /M path "%PATH%;C:\MinGW\bin" > nul 2>&1
+if NOT ["%errorlevel%"]==["0"] (
+	echo FAILED. Rerun with administrator privileges.
+	pause
+) else (
+	echo Success!
+	pause
+)
-- 
cgit v1.2.3


From 37c8a232764d8c614d6e1183e80bab89d901cbee Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Fri, 26 Feb 2016 00:29:55 -0500
Subject: Include MSYS directory in Windows path

---
 setup-path-win.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup-path-win.bat b/setup-path-win.bat
index 4fbf9a870e..49fb00e149 100644
--- a/setup-path-win.bat
+++ b/setup-path-win.bat
@@ -1,5 +1,5 @@
 @echo off
-setx /M path "%PATH%;C:\MinGW\bin" > nul 2>&1
+setx /M path "%PATH%;C:\MinGW\bin;C:\MinGW\msys\1.0\bin" > nul 2>&1
 if NOT ["%errorlevel%"]==["0"] (
 	echo FAILED. Rerun with administrator privileges.
 	pause
-- 
cgit v1.2.3


From b7a94a1f0094649779559cc65fd2fe7b91061d0a Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Fri, 26 Feb 2016 01:53:18 -0500
Subject: Added Windows environment setup script

---
 setup-environment-win.bat | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 setup-environment-win.bat

diff --git a/setup-environment-win.bat b/setup-environment-win.bat
new file mode 100644
index 0000000000..ae803da6f8
--- /dev/null
+++ b/setup-environment-win.bat
@@ -0,0 +1,28 @@
+@echo off
+setx /M test test > nul 2>&1
+if NOT ["%errorlevel%"]==["0"] (
+	echo FAILED. Rerun with administrator privileges.
+	pause
+	exit
+) 
+
+mingw-get install mingw32-make-bin mingw32-gcc-bin msys-wget-bin msys-unzip-bin
+cd \MinGW\bin
+
+REM It would be somewhat better to use symlinks, but then it wouldn't work in XP or Vista.
+copy mingw32-make.exe make.exe
+
+mkdir temp
+cd temp 
+wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
+unzip dfu-programmer-win-0.7.2.zip
+copy dfu-programmer.exe ..
+
+wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
+unzip libusb-win32-bin-1.2.6.0.zip
+cp libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll
+
+pnputil -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf
+
+cd ..
+rm -rf temp
\ No newline at end of file
-- 
cgit v1.2.3


From 74761626f56476036246768f490a1389d4cc2fca Mon Sep 17 00:00:00 2001
From: Lucas Hecht <Lucas Hecht>
Date: Fri, 26 Feb 2016 20:03:19 +0100
Subject: ignore dfu-programme.exe in commits

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ae342167df..8b8c45169d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+keyboard/planck/dfu-programmer.exe
 .dep
 *.o
 *.eep
@@ -18,4 +19,5 @@ build/
 # Eclipse Settings
 .cproject
 .project
-.settings/
\ No newline at end of file
+.settings/
+
-- 
cgit v1.2.3


From bcf847e58a10b66cff3161dd3503bc839c9745f0 Mon Sep 17 00:00:00 2001
From: Lucas Hecht <Lucas Hecht>
Date: Sat, 27 Feb 2016 01:26:54 +0100
Subject: added "Troubleshooting" section to PCB guide

---
 keyboard/planck/PCB_GUIDE.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/keyboard/planck/PCB_GUIDE.md b/keyboard/planck/PCB_GUIDE.md
index 3daf0e0092..e676c44286 100644
--- a/keyboard/planck/PCB_GUIDE.md
+++ b/keyboard/planck/PCB_GUIDE.md
@@ -8,6 +8,7 @@
 2. Install [DFU-Programmer][dfu-prog] (the -win one).
 3. Start DFU bootloader on the chip first time you will see 'Found New Hardware Wizard' to install driver. If you install device driver properly you can find chip name like 'ATmega32U4' under 'LibUSB-Win32 Devices' tree on 'Device Manager'. If not you will need to update its driver on 'Device Manager' to the `dfu-programmer` driver.
 
+
 ### Mac
 
 If you're using homebrew, you can use the following commands:
@@ -52,6 +53,27 @@ Generally, the instructions to flash the PCB are as follows:
 4. Press the reset button on the PCB/press the key with the `RESET` keycode
 5. `make <arguments> dfu` - use the necessary `KEYMAP=<keymap>` and/or `COMMON=true` arguments here.
 
+### Troubleshooting
+If you see something like this
+
+          0 [main] sh 13384 sync_with_child: child 9716(0x178) died before initialization with status code 0xC0000142
+        440 [main] sh 13384 sync_with_child: *** child state waiting for longjmp
+    /usr/bin/sh: fork: Resource temporarily unavailable
+
+after running 'make' on Windows than you are encountering a very popular issue with WinAVR on Windows 8.1 and 10.
+You can easily fix this problem by replacing msys-1.0.dll in WinAVR/utils/bin with [this one](http://www.madwizard.org/download/electronics/msys-1.0-vista64.zip).
+Restart your system and everything should work fine!
+
+If you see this
+
+    dfu-programmer atmega32u4 erase
+    process_begin: CreateProcess(NULL, dfu-programmer atmega32u4 erase, ...) failed.
+    make (e=2): The system cannot find the file specified.
+    make: *** [dfu] Error 2
+
+when trying to 'make dfu' on Windows you need to copy the dfu-programmer.exe to qmk_firmware/keyboard/planck.
+
+
 ## Quantum MK Firmware
 
 ### Keymap
-- 
cgit v1.2.3


From 52b3ddb521ebe510a0674a69ce4f5ef208ea871f Mon Sep 17 00:00:00 2001
From: Lucas Hecht <lucas.hecht0@gmail.com>
Date: Sat, 27 Feb 2016 02:56:05 +0100
Subject: Update PCB_GUIDE.md

---
 keyboard/planck/PCB_GUIDE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboard/planck/PCB_GUIDE.md b/keyboard/planck/PCB_GUIDE.md
index e676c44286..28e8a4b084 100644
--- a/keyboard/planck/PCB_GUIDE.md
+++ b/keyboard/planck/PCB_GUIDE.md
@@ -53,7 +53,7 @@ Generally, the instructions to flash the PCB are as follows:
 4. Press the reset button on the PCB/press the key with the `RESET` keycode
 5. `make <arguments> dfu` - use the necessary `KEYMAP=<keymap>` and/or `COMMON=true` arguments here.
 
-### Troubleshooting
+## Troubleshooting
 If you see something like this
 
           0 [main] sh 13384 sync_with_child: child 9716(0x178) died before initialization with status code 0xC0000142
@@ -64,6 +64,7 @@ after running 'make' on Windows than you are encountering a very popular issue w
 You can easily fix this problem by replacing msys-1.0.dll in WinAVR/utils/bin with [this one](http://www.madwizard.org/download/electronics/msys-1.0-vista64.zip).
 Restart your system and everything should work fine!
 
+
 If you see this
 
     dfu-programmer atmega32u4 erase
-- 
cgit v1.2.3


From 06de9628be3ba17e1d6753b9af21c7072d4badd9 Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Wed, 2 Mar 2016 12:25:21 -0500
Subject: Removed unneeded lines from setup script

---
 keyboard/planck/PCB_GUIDE.md | 17 +++++++++++++++--
 setup-environment-win.bat    |  5 +----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/keyboard/planck/PCB_GUIDE.md b/keyboard/planck/PCB_GUIDE.md
index 3daf0e0092..d2ff703352 100644
--- a/keyboard/planck/PCB_GUIDE.md
+++ b/keyboard/planck/PCB_GUIDE.md
@@ -4,8 +4,21 @@
 
 ### Windows
 
-1. Install [WinAVR Tools](http://sourceforge.net/projects/winavr/) for AVR GCC compiler.
-2. Install [DFU-Programmer][dfu-prog] (the -win one).
+Options
+1. Vagrant (overkill, lack of trust, no driver concerns)
+2. Chocolatey / dfu-programmer (more dev work required)
+3. Chocolatey / flip
+4. Write a batch script that installs dfu-programmer on the path, installs make with MinGW, and uses pnputil to install the proper driver https://technet.microsoft.com/en-us/library/cc732377%28v=ws.10%29.aspx?f=255&MSPPError=-2147217396#BKMK_Anchor2
+4. Look up altenatives (
+
+* Install [MHV AVR Tools](https://github.com/jackhumbert/qmk_firmware). Disable smatch, but be sure to leave the option to add the tools to the PATH checked.
+* Install the latest version of [the Atmel AVR **8-bit** toolchain](http://www.atmel.com/tools/atmelavrtoolchainforwindows.aspx)
+* Install [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download). During installation, uncheck the option to install a graphical user interface. **DO NOT change the default installation folder.** The script depends on the default location.
+* Right-click on the setup-path-win batch script at the root of the project and select "Run as administrator". Press the spacebar to dismiss the success message.
+* 
+
+1. Install [Chocolatey](https://chocolatey.org/). It's a package manager for Windows that will make it easy to set up the complete build environment. To install Chocolatey, run the following command in a command line window with administrator privileges (search for command prompt, right-click on it, and select "Run as administrator"). `@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin`
+2. Install DFU-Programmer by running (the -win one).
 3. Start DFU bootloader on the chip first time you will see 'Found New Hardware Wizard' to install driver. If you install device driver properly you can find chip name like 'ATmega32U4' under 'LibUSB-Win32 Devices' tree on 'Device Manager'. If not you will need to update its driver on 'Device Manager' to the `dfu-programmer` driver.
 
 ### Mac
diff --git a/setup-environment-win.bat b/setup-environment-win.bat
index ae803da6f8..1fbd35a69a 100644
--- a/setup-environment-win.bat
+++ b/setup-environment-win.bat
@@ -6,12 +6,9 @@ if NOT ["%errorlevel%"]==["0"] (
 	exit
 ) 
 
-mingw-get install mingw32-make-bin mingw32-gcc-bin msys-wget-bin msys-unzip-bin
+mingw-get install msys-wget-bin msys-unzip-bin
 cd \MinGW\bin
 
-REM It would be somewhat better to use symlinks, but then it wouldn't work in XP or Vista.
-copy mingw32-make.exe make.exe
-
 mkdir temp
 cd temp 
 wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
-- 
cgit v1.2.3


From c03d10d676ebbeabf838d4cf111567fd122214c5 Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Wed, 2 Mar 2016 12:48:10 -0500
Subject: Added logging to setup script

---
 setup-environment-win.bat | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/setup-environment-win.bat b/setup-environment-win.bat
index 1fbd35a69a..91b6c91e39 100644
--- a/setup-environment-win.bat
+++ b/setup-environment-win.bat
@@ -6,20 +6,36 @@ if NOT ["%errorlevel%"]==["0"] (
 	exit
 ) 
 
+echo ------------------------------------------
+echo Installing wget and unzip
+echo ------------------------------------------
 mingw-get install msys-wget-bin msys-unzip-bin
 cd \MinGW\bin
 
 mkdir temp
-cd temp 
+cd temp
+echo ------------------------------------------
+echo Installing dfu-programmer.
+echo ------------------------------------------
 wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
 unzip dfu-programmer-win-0.7.2.zip
 copy dfu-programmer.exe ..
 
+echo ------------------------------------------
+echo Downloading driver
+echo ------------------------------------------
 wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
 unzip libusb-win32-bin-1.2.6.0.zip
 cp libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll
 
+echo ------------------------------------------
+echo Installing driver. Accept prompt.
+echo ------------------------------------------
 pnputil -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf
 
 cd ..
-rm -rf temp
\ No newline at end of file
+rm -rf temp
+
+echo ------------------------------------------
+echo Finished!
+pause
\ No newline at end of file
-- 
cgit v1.2.3


From 240f8d9fe0a6dbd7f51b1bd4cb93d884b6870ce1 Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Wed, 2 Mar 2016 12:54:53 -0500
Subject:  Renamed scripts to show order

---
 1-setup-path-win.bat        |  9 +++++++++
 2-setup-environment-win.bat | 41 +++++++++++++++++++++++++++++++++++++++++
 setup-environment-win.bat   | 41 -----------------------------------------
 setup-path-win.bat          |  9 ---------
 4 files changed, 50 insertions(+), 50 deletions(-)
 create mode 100644 1-setup-path-win.bat
 create mode 100644 2-setup-environment-win.bat
 delete mode 100644 setup-environment-win.bat
 delete mode 100644 setup-path-win.bat

diff --git a/1-setup-path-win.bat b/1-setup-path-win.bat
new file mode 100644
index 0000000000..49fb00e149
--- /dev/null
+++ b/1-setup-path-win.bat
@@ -0,0 +1,9 @@
+@echo off
+setx /M path "%PATH%;C:\MinGW\bin;C:\MinGW\msys\1.0\bin" > nul 2>&1
+if NOT ["%errorlevel%"]==["0"] (
+	echo FAILED. Rerun with administrator privileges.
+	pause
+) else (
+	echo Success!
+	pause
+)
diff --git a/2-setup-environment-win.bat b/2-setup-environment-win.bat
new file mode 100644
index 0000000000..91b6c91e39
--- /dev/null
+++ b/2-setup-environment-win.bat
@@ -0,0 +1,41 @@
+@echo off
+setx /M test test > nul 2>&1
+if NOT ["%errorlevel%"]==["0"] (
+	echo FAILED. Rerun with administrator privileges.
+	pause
+	exit
+) 
+
+echo ------------------------------------------
+echo Installing wget and unzip
+echo ------------------------------------------
+mingw-get install msys-wget-bin msys-unzip-bin
+cd \MinGW\bin
+
+mkdir temp
+cd temp
+echo ------------------------------------------
+echo Installing dfu-programmer.
+echo ------------------------------------------
+wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
+unzip dfu-programmer-win-0.7.2.zip
+copy dfu-programmer.exe ..
+
+echo ------------------------------------------
+echo Downloading driver
+echo ------------------------------------------
+wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
+unzip libusb-win32-bin-1.2.6.0.zip
+cp libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll
+
+echo ------------------------------------------
+echo Installing driver. Accept prompt.
+echo ------------------------------------------
+pnputil -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf
+
+cd ..
+rm -rf temp
+
+echo ------------------------------------------
+echo Finished!
+pause
\ No newline at end of file
diff --git a/setup-environment-win.bat b/setup-environment-win.bat
deleted file mode 100644
index 91b6c91e39..0000000000
--- a/setup-environment-win.bat
+++ /dev/null
@@ -1,41 +0,0 @@
-@echo off
-setx /M test test > nul 2>&1
-if NOT ["%errorlevel%"]==["0"] (
-	echo FAILED. Rerun with administrator privileges.
-	pause
-	exit
-) 
-
-echo ------------------------------------------
-echo Installing wget and unzip
-echo ------------------------------------------
-mingw-get install msys-wget-bin msys-unzip-bin
-cd \MinGW\bin
-
-mkdir temp
-cd temp
-echo ------------------------------------------
-echo Installing dfu-programmer.
-echo ------------------------------------------
-wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
-unzip dfu-programmer-win-0.7.2.zip
-copy dfu-programmer.exe ..
-
-echo ------------------------------------------
-echo Downloading driver
-echo ------------------------------------------
-wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
-unzip libusb-win32-bin-1.2.6.0.zip
-cp libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll
-
-echo ------------------------------------------
-echo Installing driver. Accept prompt.
-echo ------------------------------------------
-pnputil -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf
-
-cd ..
-rm -rf temp
-
-echo ------------------------------------------
-echo Finished!
-pause
\ No newline at end of file
diff --git a/setup-path-win.bat b/setup-path-win.bat
deleted file mode 100644
index 49fb00e149..0000000000
--- a/setup-path-win.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-setx /M path "%PATH%;C:\MinGW\bin;C:\MinGW\msys\1.0\bin" > nul 2>&1
-if NOT ["%errorlevel%"]==["0"] (
-	echo FAILED. Rerun with administrator privileges.
-	pause
-) else (
-	echo Success!
-	pause
-)
-- 
cgit v1.2.3


From 45933e84f178ae92506f4c1bfdc5a8dc30e587d2 Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Wed, 2 Mar 2016 13:02:13 -0500
Subject:  Added documentation for new Windows scripts

---
 keyboard/planck/PCB_GUIDE.md | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/keyboard/planck/PCB_GUIDE.md b/keyboard/planck/PCB_GUIDE.md
index d2ff703352..e396747dff 100644
--- a/keyboard/planck/PCB_GUIDE.md
+++ b/keyboard/planck/PCB_GUIDE.md
@@ -3,23 +3,11 @@
 ## Setting up the environment
 
 ### Windows
-
-Options
-1. Vagrant (overkill, lack of trust, no driver concerns)
-2. Chocolatey / dfu-programmer (more dev work required)
-3. Chocolatey / flip
-4. Write a batch script that installs dfu-programmer on the path, installs make with MinGW, and uses pnputil to install the proper driver https://technet.microsoft.com/en-us/library/cc732377%28v=ws.10%29.aspx?f=255&MSPPError=-2147217396#BKMK_Anchor2
-4. Look up altenatives (
-
-* Install [MHV AVR Tools](https://github.com/jackhumbert/qmk_firmware). Disable smatch, but be sure to leave the option to add the tools to the PATH checked.
-* Install the latest version of [the Atmel AVR **8-bit** toolchain](http://www.atmel.com/tools/atmelavrtoolchainforwindows.aspx)
-* Install [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download). During installation, uncheck the option to install a graphical user interface. **DO NOT change the default installation folder.** The script depends on the default location.
-* Right-click on the setup-path-win batch script at the root of the project and select "Run as administrator". Press the spacebar to dismiss the success message.
-* 
-
-1. Install [Chocolatey](https://chocolatey.org/). It's a package manager for Windows that will make it easy to set up the complete build environment. To install Chocolatey, run the following command in a command line window with administrator privileges (search for command prompt, right-click on it, and select "Run as administrator"). `@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin`
-2. Install DFU-Programmer by running (the -win one).
-3. Start DFU bootloader on the chip first time you will see 'Found New Hardware Wizard' to install driver. If you install device driver properly you can find chip name like 'ATmega32U4' under 'LibUSB-Win32 Devices' tree on 'Device Manager'. If not you will need to update its driver on 'Device Manager' to the `dfu-programmer` driver.
+1. Install [MHV AVR Tools](https://github.com/jackhumbert/qmk_firmware). Disable smatch, but **be sure to leave the option to add the tools to the PATH checked**.
+2. Install [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download). During installation, uncheck the option to install a graphical user interface. **DO NOT change the default installation folder.** The scripts depend on the default location.
+3. Clone this repository. [This link will download it as a zip file, which you'll need to extract.](https://github.com/jackhumbert/qmk_firmware/archive/master.zip) Open the extracted folder in Windows Explorer.
+4. Right-click on the 1-setup-path-win batch script, select "Run as administrator", and accept the User Account Control prompt. Press the spacebar to dismiss the success message in the command prompt that pops up.
+5. Right-click on the 2-setup-environment-win batch script, select "Run as administrator", and accept the User Account Control prompt. This part may take a couple of minutes, and you'll need to approve a driver installation, but once it finishes, your environment is complete!
 
 ### Mac
 
-- 
cgit v1.2.3


From 140a311e652829cb8c774d3d3bb4acdb7c9f9954 Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Wed, 2 Mar 2016 13:06:33 -0500
Subject: Fix link to MHV AVR Tools

---
 keyboard/planck/PCB_GUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboard/planck/PCB_GUIDE.md b/keyboard/planck/PCB_GUIDE.md
index e396747dff..797cee2e1b 100644
--- a/keyboard/planck/PCB_GUIDE.md
+++ b/keyboard/planck/PCB_GUIDE.md
@@ -3,7 +3,7 @@
 ## Setting up the environment
 
 ### Windows
-1. Install [MHV AVR Tools](https://github.com/jackhumbert/qmk_firmware). Disable smatch, but **be sure to leave the option to add the tools to the PATH checked**.
+1. Install [MHV AVR Tools](https://infernoembedded.com/sites/default/files/project/MHV_AVR_Tools_20131101.exe). Disable smatch, but **be sure to leave the option to add the tools to the PATH checked**.
 2. Install [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download). During installation, uncheck the option to install a graphical user interface. **DO NOT change the default installation folder.** The scripts depend on the default location.
 3. Clone this repository. [This link will download it as a zip file, which you'll need to extract.](https://github.com/jackhumbert/qmk_firmware/archive/master.zip) Open the extracted folder in Windows Explorer.
 4. Right-click on the 1-setup-path-win batch script, select "Run as administrator", and accept the User Account Control prompt. Press the spacebar to dismiss the success message in the command prompt that pops up.
-- 
cgit v1.2.3


From d47cac9bb3027a453c702a0dbb575de6e8668a37 Mon Sep 17 00:00:00 2001
From: Noah Andrews <NoahAndrews@users.noreply.github.com>
Date: Wed, 2 Mar 2016 21:27:45 -0500
Subject: Renamed QUICK_START.md to VAGRANT_GUIDE.md

---
 QUICK_START.md   | 25 -------------------------
 VAGRANT_GUIDE.md | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 QUICK_START.md
 create mode 100644 VAGRANT_GUIDE.md

diff --git a/QUICK_START.md b/QUICK_START.md
deleted file mode 100644
index 948308ca11..0000000000
--- a/QUICK_START.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Quick Start Directions
-
-This project includes a Vagrantfile that will allow you to build a new firmware for your keyboard very easily without major changes to your primary operating system. This also ensures that when you clone the project and perform a build, you have the exact same environment as anyone else using the Vagrantfile to build. This makes it much easier for people to help you troubleshoot any issues you encounter.
-
-## Requirements
-
-Using the Vagrantfile in this repository requires you have [Vagrant](http://www.vagrantup.com/) as well as [VirtualBox](https://www.virtualbox.org/) (or [VMware Workstation](https://www.vmware.com/products/workstation) and [Vagrant VMware plugin](http://www.vagrantup.com/vmware) but the (paid) VMware plugin requires a licensed copy of VMware Workstation/Fusion).
-
-*COMPATIBILITY NOTICE* Certain versions of Virtualbox 5 appear to have an incompatibility with the Virtualbox extensions installed in the boxes in this Vagrantfile. If you encounter any issues with the /vagrant mount not succeeding, please upgrade your version of Virtualbox to at least 5.0.12.
-
-Other than having Vagrant and Virtualbox installed and possibly a restart of your computer afterwards, you can simple run a 'vagrant up' anywhere inside the folder where you checked out this project and it will start a Linux virtual machine that contains all the tools required to build this project. There is a post Vagrant startup hint that will get you off on the right f