Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard

24 files changed, 5163 insertions, 4295 deletions

diff --git a/QUICK_START.md b/QUICK_START.md
index 6be377db3c..948308ca11 100644
--- a/QUICK_START.md
+++ b/QUICK_START.md
@@ -20,6 +20,6 @@ See [doc/keymap.md](tmk_core/doc/keymap.md).
 
 ## Flashing the firmware
 
-The "easy" way to flash the firmware is using a tool from your host OS like the Teensy programming app. [ErgoDox EZ](keyboard/ergodox_ez/README.md) gives a great example.
+The "easy" way to flash the firmware is using a tool from your host OS like the Teensy programming app. [ErgoDox EZ](keyboard/ergodox_ez/readme.md) gives a great example.
 
 If you want to program via the command line you can uncomment the ['modifyvm'] lines in the Vagrantfile to enable the USB passthrough into Linux and then program using the command line tools like dfu-util/dfu-programmer or you can install the Teensy CLI version.
diff --git a/keyboard/atreus/Makefile b/keyboard/atreus/Makefile
new file mode 100644
index 0000000000..e1ebee47bd
--- /dev/null
+++ b/keyboard/atreus/Makefile
@@ -0,0 +1,139 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF.
+#
+# make extcoff = Convert ELF to AVR Extended COFF.
+#
+# make program = Download the hex file to the device.
+#                Please customize your programmer settings(PROGRAM_CMD)
+#
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+#               (must have teensy_loader_cli installed).
+#
+# make dfu = Download the hex file to the device, using dfu-programmer (must
+#            have dfu-programmer installed).
+#
+# make flip = Download the hex file to the device, using Atmel FLIP (must
+#             have Atmel FLIP installed).
+#
+# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
+#               (must have dfu-programmer installed).
+#
+# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
+#                (must have Atmel FLIP installed).
+#
+# make debug = Start either simulavr or avarice as specified for debugging, 
+#              with avr-gdb or avr-insight as the front end for debugging.
+#
+# make filename.s = Just compile filename.c into the assembler code only.
+#
+# make filename.i = Create a preprocessed source file for use in submitting
+#                   bug reports to the GCC project.
+#
+# To rebuild project do "make clean" then "make all".
+#----------------------------------------------------------------------------
+
+# Target file name (without extension).
+TARGET = atreus
+
+
+# Directory common source filess exist
+TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
+
+# Directory keyboard dependent files exist
+TARGET_DIR = .
+
+# # project specific files
+SRC = atreus.c
+
+ifdef KEYMAP
+    SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymaps/keymap_default.c $(SRC)
+endif
+
+CONFIG_H = config.h
+
+# MCU name
+#MCU = at90usb1287
+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 Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+#   USBaspLoader     2048
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   comment out to disable the options.
+#
+#BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
+#MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+#EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
+CONSOLE_ENABLE = yes	# Console for debug(+400)
+COMMAND_ENABLE = yes    # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+# SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes		# USB Nkey Rollover - not yet supported in LUFA
+# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+# MIDI_ENABLE = YES 		# MIDI controls
+UNICODE_ENABLE = YES 		# Unicode
+# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
+
+
+# Optimize size but this may cause error "relocation truncated to fit"
+#EXTRALDFLAGS = -Wl,--relax
+
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
+
+include $(TOP_DIR)/quantum/quantum.mk
+
diff --git a/keyboard/atreus/README.md b/keyboard/atreus/README.md
new file mode 100644
index 0000000000..75f198fd1c
--- /dev/null
+++ b/keyboard/atreus/README.md
@@ -0,0 +1,184 @@
+atreus keyboard firmware
+======================
+
+## Note
+
+This is for the Teensy2 hand wired boards only.
+
+## Quantum MK Firmware
+
+You have access to a bunch of goodies! Check out the Makefile to enable/disable some of the features. Uncomment the `#` to enable them. Setting them to `no` does nothing and will only confuse future you.
+
+    BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+    MIDI_ENABLE = yes      # MIDI controls
+    # UNICODE_ENABLE = yes # Unicode support - this is commented out, just as an example. You have to use #, not //
+    BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
+
+## Quick aliases to common actions
+
+Your keymap can include shortcuts to common operations (called "function actions" in tmk).
+
+### Switching and toggling layers
+
+`MO(layer)` - momentary switch to *layer*. As soon as you let go of the key, the layer is deactivated and you pop back out to the previous layer. When you apply this to a key, that same key must be set as `KC_TRNS` on the destination layer. Otherwise, you won't make it back to the original layer when you release the key (and you'll get a keycode sent). You can only switch to layers *above* your current layer. If you're on layer 0 and you use `MO(1)`, that will switch to layer 1 just fine. But if you include `MO(3)` on layer 5, that won't do anything for you -- because layer 3 is lower than layer 5 on the stack.
+
+`LT(layer, kc)` - momentary switch to *layer* when held, and *kc* when tapped. Like `MO()`, this only works upwards in the layer stack (`layer` must be higher than the current layer).
+
+`TG(layer)` - toggles a layer on or off. As with `MO()`, you should set this key as `KC_TRNS` in the destination layer so that tapping it again actually toggles back to the original layer. Only works upwards in the layer stack.
+
+### Fun with modifier keys
+
+* `LSFT(kc)` - applies left Shift to *kc* (keycode) - `S(kc)` is an alias
+* `RSFT(kc)` - applies right Shift to *kc*
+* `LCTL(kc)` - applies left Control to *kc*
+* `RCTL(kc)` - applies right Control to *kc*
+* `LALT(kc)` - applies left Alt to *kc*
+* `RALT(kc)` - applies right Alt to *kc*
+* `LGUI(kc)` - applies left GUI (command/win) to *kc*
+* `RGUI(kc)` - applies right GUI (command/win) to *kc*
+
+You can also chain these, like this:
+
+    LALT(LCTL(KC_DEL)) -- this makes a key that sends Alt, Control, and Delete in a single keypress.
+
+The following shortcuts automatically add `LSFT()` to keycodes to get commonly used symbols. Their long names are also available and documented in `/quantum/keymap_common.h`.
+
+    KC_TILD  ~
+    KC_EXLM  !
+    KC_AT    @
+    KC_HASH  #
+    KC_DLR   $
+    KC_PERC  %
+    KC_CIRC  ^
+    KC_AMPR  &
+    KC_ASTR  *
+    KC_LPRN  (
+    KC_RPRN  )
+    KC_UNDS  _
+    KC_PLUS  +
+    KC_LCBR  {
+    KC_RCBR  }
+    KC_PIPE  |
+    KC_COLN  :
+
+`MT(mod, kc)` - is *mod* (modifier key - MOD_LCTL, MOD_LSFT) when held, and *kc* when tapped. In other words, you can have a key that sends Esc (or the letter O or whatever) when you tap it, but works as a Control key or a Shift key when you hold it down. 
+
+These are the values you can use for the `mod` in `MT()` (right-hand modifiers are not available):
+
+  * MOD_LCTL
+  * MOD_LSFT
+  * MOD_LALT
+  * MOD_LGUI
+
+These can also be combined like `MOD_LCTL | MOD_LSFT` e.g. `MT(MOD_LCTL | MOD_LSFT, KC_ESC)` which would activate Control and Shift when held, and send Escape when tapped.
+
+We've added shortcuts to make common modifier/tap (mod-tap) mappings more compact:
+
+  * `CTL_T(kc)` - is LCTL when held and *kc* when tapped 
+  * `SFT_T(kc)` - is LSFT when held and *kc* when tapped 
+  * `ALT_T(kc)` - is LALT when held and *kc* when tapped 
+  * `GUI_T(kc)` - is LGUI when held and *kc* when tapped 
+  * `ALL_T(kc)` - is Hyper (all mods) when held and *kc* when tapped. To read more about what you can do with a Hyper key, see [this blog post by Brett Terpstra](http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/)
+
+### Temporarily setting the default layer 
+
+`DF(layer)` - sets default layer to *layer*. The default layer is the one at the "bottom" of the layer stack - the ultimate fallback layer. This currently does not persist over power loss. When you plug the keyboard back in, layer 0 will always be the default. It is theoretically possible to work around that, but that's not what `DF` does.
+
+### Remember: These are just aliases
+
+These functions work the same way that their `ACTION_*` functions do - they're just quick aliases. To dig into all of the tmk ACTION_* functions, please see the [TMK documentation](https://github.com/jackhumbert/qmk_firmware/blob/master/tmk_core/doc/keymap.md#2-action).
+
+Instead of using `FNx` when defining `ACTION_*` functions, you can use `F(x)` - the benefit here is being able to use more than 32 function actions (up to 4096), if you happen to need them.
+
+## Macro shortcuts: Send a whole string when pressing just one key
+
+Instead of using the `ACTION_MACRO` function, you can simply use `M(n)` to access macro *n* - *n* will get passed into the `action_get_macro` as the `id`, and you can use a switch statement to trigger it. This gets called on the keydown and keyup, so you'll need to use an if statement testing `record->event.pressed` (see keymap_default.c).
+
+```c
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is.
+{
+  switch(id) {
+    case 0: // this would trigger when you hit a key mapped as M(0)
+      if (record->event.pressed) {
+        return MACRO( I(255), T(H), T(E), T(L), T(L), W(255), T(O), END  ); // this sends the string 'hello' when the macro executes
+      } 
+      break;
+  }
+  return MACRO_NONE;
+};
+```
+A macro can include the following commands:
+
+* I() change interval of stroke in milliseconds.
+* D() press key.
+* U() release key.
+* T() type key(press and release).
+* W() wait (milliseconds).
+* END end mark.
+
+So above you can see the stroke interval changed to 255ms between each keystroke, then a bunch of keys being typed, waits a while, then the macro ends.
+
+Note: Using macros to have your keyboard send passwords for you is a bad idea.
+
+### Additional keycode aliases for software-implemented layouts (Colemak, Dvorak, etc)
+
+Everything is assuming you're in Qwerty (in software) by default, but there is built-in support for using a Colemak or Dvorak layout by including this at the top of your keymap:
+
+   #include "keymap_<layout>.h"
+
+Where <layout> is "colemak" or "dvorak". After including this line, you will get access to:
+ 
+ * `CM_*` for all of the Colemak-equivalent characters
+ * `DV_*` for all of the Dvorak-equivalent characters
+ 
+These implementations assume you're using Colemak or Dvorak on your OS, not on your keyboard - this is referred to as a software-implemented layout. If your computer is in Qwerty and your keymap is in Colemak or Dvorak, this is referred to as a firmware-implemented layout, and you won't need these features. 
+
+To give an example, if you're using software-implemented Colemak, and want to get an `F`, you would use `CM_F` - `KC_F` under these same circumstances would result in `T`.
+
+## Additional language support
+
+In `quantum/keymap_extras/`, you'll see various language files - these work the same way as the alternative layout ones do. Most are defined by their two letter country/language code followed by an underscore and a 4-letter abbreviation of its name. `FR_UGRV` which will result in a `ù` when using a software-implemented AZERTY layout. It's currently difficult to send such characters in just the firmware (but it's being worked on - see Unicode support).
+
+## Unicode support
+
+You can currently send 4 hex digits with your OS-specific modifier key (RALT for OSX with the "Unicode Hex Input" layout) - this is currently limited to supporting one OS at a time, and requires a recompile for switching. 8 digit hex codes are being worked on. The keycode function is `UC(n)`, where *n* is a 4 digit hexidecimal. Enable from the Makefile.
+
+## Other firmware shortcut keycodes
+
+* `RESET` - puts the MCU in DFU mode for flashing new firmware (with `make dfu`)
+* `DEBUG` - the firmware into debug mode - you'll need hid_listen to see things
+* `BL_ON` - turns the backlight on
+* `BL_OFF` - turns the backlight off
+* `BL_<n>` - sets the backlight to level *n*
+* `BL_INC` - increments the backlight level by one
+* `BL_DEC` - decrements the backlight level by one
+* `BL_TOGG` - toggles the backlight
+* `BL_STEP` - steps through the backlight levels
+
+Enable the backlight from the Makefile.
+
+## MIDI functionalty
+
+This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile.
+
+## Bluetooth functionality
+
+This requires [some hardware changes](https://www.reddit.com/r/MechanicalKeyboards/comments/3psx0q/the_planck_keyboard_with_bluetooth_guide_and/?ref=search_posts), but can be enabled via the Makefile. The firmware will still output characters via USB, so be aware of this when charging via a computer. It would make sense to have a switch on the Bluefruit to turn it off at will.
+
+## Building
+
+Download or clone the whole firmware and navigate to the keyboard/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. 
+
+Depending on which keymap you would like to use, you will have to compile slightly differently.
+
+### Default
+To build with the default keymap, simply run `make`.
+
+### Other Keymaps
+Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
+
+To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like:
+```
+$ make KEYMAP=[default|jack|<name>]
+```
+Keymaps follow the format **__keymap\_\<name\>.c__** and are stored in the `keymaps` folder.
diff --git a/keyboard/atreus/atreus.c b/keyboard/atreus/atreus.c
new file mode 100644
index 0000000000..bfc893084f
--- /dev/null
+++ b/keyboard/atreus/atreus.c
@@ -0,0 +1,29 @@
+#include "atreus.h"
+
+__attribute__ ((weak))
+void * matrix_init_user(void) {
+	// leave these blank
+};
+
+__attribute__ ((weak))
+void * matrix_scan_user(void) {
+	// leave these blank
+};
+
+void * matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	if (matrix_init_user) {
+		(*matrix_init_user)();
+	}
+};
+
+void * matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+
+	if (matrix_scan_user) {
+		(*matrix_scan_user)();
+	}
+};
diff --git a/keyboard/atreus/atreus.h b/keyboard/atreus/atreus.h
new file mode 100644
index 0000000000..29d1d18bac
--- /dev/null
+++ b/keyboard/atreus/atreus.h
@@ -0,0 +1,29 @@
+#ifndef ATREUS_H
+#define ATREUS_H
+
+#include "matrix.h"
+#include "keymap_common.h"
+#include "backlight.h"
+#include <stddef.h>
+
+// This a shortcut to help you visually see your layout.
+// The following is an example using the Planck MIT layout
+// The first section contains all of the arguements
+// The second converts the arguments into a two-dimensional array
+#define KEYMAP( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
+) \
+{ \
+	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+	{ k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
+} 
+
+void * matrix_init_user(void);
+void * matrix_scan_user(void);
+
+#endif
diff --git a/keyboard/atreus/config.h b/keyboard/atreus/config.h
new file mode 100644
index 0000000000..733f579d43
--- /dev/null
+++ b/keyboard/atreus/config.h
@@ -0,0 +1,82 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+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/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Technomancy
+#define PRODUCT         Atreus
+#define DESCRIPTION     q.m.k. keyboard firmware for Atreus
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 11
+
+// Planck PCB default pin-out
+// Change this to how you wired your keyboard
+// COLS: Left to right, ROWS: Top to bottom
+#define COLS (int []){ F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0}
+#define ROWS (int []){ D0, D1, D2, D3 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+//#define BACKLIGHT_LEVELS 3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#endif
diff --git a/keyboard/atreus/keymaps/keymap_default.c b/keyboard/atreus/keymaps/keymap_default.c
new file mode 100644
index 0000000000..1c4280ff56
--- /dev/null
+++ b/keyboard/atreus/keymaps/keymap_default.c
@@ -0,0 +1,51 @@
+// this is the style you want to emulate.
+// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+
+#include "atreus.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _QW 0
+#define _RS 1
+#define _LW 2
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = { /* Qwerty */
+  {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_TRNS,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    },
+  {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_TRNS,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN },
+  {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_LALT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH },
+  {KC_ESC, KC_TAB, KC_LGUI,  KC_LSFT, KC_BSPC,  KC_LCTL, KC_SPC,  MO(_RS), KC_MINS, KC_QUOT, KC_ENT  }
+},
+[_RS] = { /* [> RAISE <] */
+  {KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR},
+  {KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,  KC_TRNS, KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS},
+  {KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_LALT, KC_AMPR, KC_1,    KC_2,   KC_3, KC_BSLS},
+  {TG(_LW), KC_INS,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL}
+},
+[_LW] = { /* [> LOWER <] */
+  {KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10},
+  {KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_TRNS, KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11},
+  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LALT, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F12},
+  {KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_SPC,  DF(_QW), KC_TRNS, KC_TRNS, RESET}
+}};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+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);
+          } else {
+            unregister_code(KC_RSFT);
+          }
+        break;
+      }
+    return MACRO_NONE;
+};
diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile
index 8066c7bb4b..5dfcca2c80 100644
--- a/keyboard/ergodox_ez/Makefile
+++ b/keyboard/ergodox_ez/Makefile
@@ -93,7 +93,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = no # Console for debug(+400)
+# CONSOLE_ENABLE   = yes # Console for debug(+400)
 COMMAND_ENABLE   = yes # Commands for debug and configuration
 CUSTOM_MATRIX    = yes # Custom matrix file for the ErgoDox EZ
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
diff --git a/keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex b/keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex
index c4804d4830..2c7f3ec549 100644
--- a/keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex
+++ b/keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex
@@ -1,1461 +1,1508 @@
-:100000000C94AF060C94F3060C94F3060C94F306D0

-:100010000C94F3060C94F3060C94F3060C94F3067C

-:100020000C94F3060C94F3060C9406120C94D8125C

-:100030000C94F3060C94F3060C94F3060C94F3065C

-:100040000C94F3060C94B02B0C94F3060C94F3066A

-:100050000C94F3060C94B7210C94F3060C94F3065D

-:100060000C94F3060C94F3060C94F3060C94F3062C

-:100070000C94F3060C94F3060C94F3060C94F3061C

-:100080000C94F3060C94F3060C94F3060C94F3060C

-:100090000C94F3060C94F3060C94F3060C94F306FC

-:1000A0000C94F3060C94F3060C94F3063D135F13C3

-:1000B0004A145F134A14A113C4134A1419142C14BC

-:1000C0007A177A17A817A817EB172718281A281ACB

-:1000D0003F18281A36193619021A281A281A161A19

-:1000E0000000F0A12B0034003900E100E000000026

-:1000F0001E00140004001D00E200007F1F001A0013

-:1001000016001B000152280020000800070006000E

-:10011000E3002C00210015000900190064002D00E7

-:10012000220017000A000500000050002E004A00BF

-:1001300000000100000052002E004D0000000100F0

-:100140000000510023001C000B00110000004F00B4

-:10015000240018000D001000E6002D0025000C0002

-:100160000E003600E7002C00260012000F003700BA

-:10017000015228002700130033003800E600007702

-:100180002A002F003100E500E4000000010001001A

-:100190000100010001000000010001000100010058

-:1001A0000100010001000100010001000100010047

-:1001B000010001000100010001000100010013A77E

-:1001C00015A701000100F400010001000100010079

-:1001D0000000F20001000100000001000000F0003A

-:1001E00001000100000001000000F1000100010019

-:1001F000010001000000F300010042003E003A004F

-:100200000100F500010043003F003B000100010038

-:100210000100440040003C000100010001004500D5

-:1002200041003D000100010001000100010001004A

-:10023000010000000A002530313662003A20002516

-:10024000303258000A722F63203031323334353661

-:100250003738394142434445460A000A00253032C6

-:100260005800626F756E6365213A20006C65667494

-:1002700020736964652061747461636865640A0051

-:100280006C6566742073696465206E6F7420726596

-:1002900073706F6E64696E670A00747279696E6755

-:1002A00020746F207265736574206D637032333013

-:1002B00031380A000A44454255473A20656E61626A

-:1002C0006C65642E0A005B735D004B6579626F613B

-:1002D00072642073746172742E0A005B575D005B58

-:1002E000535D005B525D005B445D005B435D001647

-:1002F000034500720067006F0044006F0078002023

-:100300000045005A00000016034500720067006FA8

-:100310000044006F007800200045005A00000004EF

-:1003200003090409028D00050100A0FA0904000078

-:100330000103010100092111010001223F0007050D

-:10034000810308000A0904010001030102000921D8

-:1003500011010001224D000705820308000A09046B

-:1003600002000103000000092111010001223600F2

-:100370000705830308000A090403000203000000C4

-:10038000092111010001222000070584032000013A

-:100390000705040320000109040400010300000014

-:1003A0000921110100012239000705850310000110

-:1003B0001201100100000008EDFE07130100010208

-:1003C000000105010906A101050719E029E715004B

-:1003D0002501950875018102050819012905950572

-:1003E000750191029501750391010507190029779F

-:1003F00015002501957875018102C00631FF097449

-:10040000A1010975150025FF95207508810209765F

-:10041000150025FF952075089102C005010980A1EE

-:1004200001850216010026B7001A01002AB70075DF

-:100430001095018100C0050C0901A1018503160179

-:1004400000269C021A01002A9C0275109501810069

-:10045000C005010902A1010901A10005091901292D

-:10046000051500250195057501810295017503812A

-:10047000010501093009311581257F950275088133

-:100480000609381581257F950175088106050C0A36

-:1004900038021581257F950175088106C0C00501C8

-:1004A0000906A101050719E029E7150025019508AE

-:1004B0007501810295017508810105081901290559

-:1004C00095057501910295017503910105071900C4

-:1004D00029FF150025FF950675088100C00A002533

-:1004E00030325820006B6579626F6172645F7265AB

-:1004F000706F72743A20000A0025303258006B6524

-:1005000079626F6172645F7365745F6C65643A20D1

-:100510000064656C5F6B65795F6269743A20636142

-:100520006E27742064656C3A20253032580A0061C9

-:1005300064645F6B65795F6269743A2063616E27FA

-:1005400074206164643A20253032580A00646F6E6A

-:10055000652E0A00626F6F676D6167696320736360

-:10056000616E3A202E2E2E2000290A002575002FBC

-:10057000002575005D28002564002000256400200A

-:100580000025640020002564007C002530325800DE

-:100590006D6F7573656B6579205B62746E7C782016

-:1005A00079207620685D287265702F61636C293A26

-:1005B000205B006D6B5F776865656C5F74696D6566

-:1005C0005F746F5F6D6178203D2025640A006D6B5C

-:1005D0005F776865656C5F6D61785F737065656492

-:1005E000203D2025640A006D6B5F74696D655F7442

-:1005F0006F5F6D6178203D2025640A006D6B5F6D33

-:1006000061785F7370656564203D2025640A006D24

-:100610006B5F696E74657276616C203D2025640A9B

-:10062000006D6B5F64656C6179203D2025640A0074

-:100630006D6B5F776865656C5F74696D655F746F1E

-:100640005F6D6178203D2025640A006D6B5F7768DF

-:1006500065656C5F6D61785F7370656564203D20D2

-:1006600025640A006D6B5F74696D655F746F5F6D03

-:100670006178203D2025640A006D6B5F6D61785FB5

-:100680007370656564203D2025640A006D6B5F69A9

-:100690006E74657276616C203D2025640A006D6B76

-:1006A0005F64656C6179203D2025640A000A00259D

-:1006B0007500363A20776865656C5F74696D655FB3

-:1006C000746F5F6D61783A20000A00257500353A35

-:1006D00020776865656C5F6D61785F7370656564D0

-:1006E0003A20000A00257500343A2074696D655F70

-:1006F000746F5F6D61783A20000A00257500333A07

-:10070000206D61785F73706565643A20000A00258A

-:100710007500323A20696E74657276616C286D736B

-:10072000293A20000A00257500313A2064656C6181

-:1007300079282A31306D73293A20000A092D205674

-:10074000616C756573202D0A004D3E004D25643E99

-:1007500020003F007365742064656661756C740ADF

-:1007600000433E200077686572652064656C7461A3

-:100770003A20637572736F723D25642C207768652B

-:10078000656C3D25640A53656520687474703A2F62

-:100790002F656E2E77696B6970656469612E6F7263

-:1007A000672F77696B692F4D6F7573655F6B65791F

-:1007B000730A000A092D204D6F7573656B657920EA

-:1007C0002D0A4553432F713A09717569740A313AFC

-:1007D0000964656C6179282A31306D73290A323ACF

-:1007E00009696E74657276616C286D73290A333AF3

-:1007F000096D61785F73706565640A343A097469DC

-:100800006D655F746F5F6D61780A353A0977686569

-:10081000656C5F6D61785F73706565640A363A096F

-:10082000776865656C5F74696D655F746F5F6D6136

-:10083000780A0A703A097072696E742076616C7574

-:1008400065730A643A097365742064656661756C42

-:1008500074730A75703A092B310A646F776E3A091E

-:100860002D310A706775703A092B31300A70676450

-:100870006F776E3A092D31300A0A7370656564200E

-:100880003D2064656C7461202A206D61785F73700F

-:10089000656564202A2028726570656174202F20A8

-:1008A00074696D655F746F5F6D6178290A003F0040

-:1008B0004D3E2000433E20004C25640A000A092DCD

-:1008C00020436F6E736F6C65202D0A4553432F7163

-:1008D0003A09717569740A6D3A096D6F7573656BC4

-:1008E00065790A000A092D204D61676963202D0A88

-:1008F000643A0964656275670A783A0964656275E5

-:1009000067206D61747269780A6B3A096465627573

-:1009100067206B6579626F6172640A6D3A0964657C

-:10092000627567206D6F7573650A763A0976657230

-:1009300073696F6E0A733A097374617475730A632D

-:100940003A09636F6E736F6C65206D6F64650A3072

-:100950002D343A096C61796572302D342846313076

-:100960002D4634290A506175733A09626F6F746CB1

-:100970006F616465720A653A09656570726F6D0A28

-:100980006E3A094E4B524F0A7A3A09736C6565709C

-:10099000204C454420746573740A000A00257500D4

-:1009A0002E6E6B726F3A20000A002575002E737749

-:1009B00061705F6261636B736C6173685F626163D6

-:1009C0006B73706163653A20000A002575002E7311

-:1009D0007761705F67726176655F6573633A200067

-:1009E0000A002575002E6E6F5F6775693A20000A50

-:1009F000002575002E737761705F72616C745F7291

-:100A00006775693A20000A002575002E73776170BA

-:100A10005F6C616C745F6C6775693A20000A002531

-:100A200075002E636170736C6F636B5F746