Merge remote-tracking branch 'origin/master' into develop

13 files changed, 1711 insertions, 0 deletions

diff --git a/keyboards/handwired/ortho5x14/.noci b/keyboards/handwired/ortho5x14/.noci
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/handwired/ortho5x14/.noci
diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h
new file mode 100644
index 0000000000..33ad68b0b1
--- /dev/null
+++ b/keyboards/handwired/ortho5x14/config.h
@@ -0,0 +1,109 @@
+/*
+Copyright 2021 Richard Nunez <antebios1@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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xBB80
+#define PRODUCT_ID      0x050D
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MPInc
+#define PRODUCT         Ortho 5x14
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1  }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+
+/* 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
+
+#define TAPPING_TERM 200
+
+//#define PERMISSIVE_HOLD
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+
+/*
+ * 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
+
diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json
new file mode 100644
index 0000000000..3ba4f3e7e8
--- /dev/null
+++ b/keyboards/handwired/ortho5x14/info.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "ortho5x14",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 14,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Delete", "x":0, "y":0},
+                {"label":"Bkspc", "x":1, "y":0},
+                {"label":"1", "x":2, "y":0},
+                {"label":"2", "x":3, "y":0},
+                {"label":"3", "x":4, "y":0},
+                {"label":"4", "x":5, "y":0},
+                {"label":"5", "x":6, "y":0},
+                {"label":"6", "x":7, "y":0},
+                {"label":"7", "x":8, "y":0},
+                {"label":"8", "x":9, "y":0},
+                {"label":"9", "x":10, "y":0},
+                {"label":"0", "x":11, "y":0},
+                {"label":"-", "x":12, "y":0},
+                {"label":"=", "x":13, "y":0},
+
+                {"label":"Home", "x":0, "y":1},
+                {"label":"Tab", "x":1, "y":1},
+                {"label":"Q", "x":2, "y":1},
+                {"label":"W", "x":3, "y":1},
+                {"label":"E", "x":4, "y":1},
+                {"label":"R", "x":5, "y":1},
+                {"label":"T", "x":6, "y":1},
+                {"label":"Y", "x":7, "y":1},
+                {"label":"U", "x":8, "y":1},
+                {"label":"I", "x":9, "y":1},
+                {"label":"O", "x":10, "y":1},
+                {"label":"P", "x":11, "y":1},
+                {"label":"[", "x":12, "y":1},
+                {"label":"]", "x":13, "y":1},
+
+                {"label":"PgUp", "x":0, "y":2},
+                {"label":"Caps", "x":1, "y":2},
+                {"label":"A", "x":2, "y":2},
+                {"label":"S", "x":3, "y":2},
+                {"label":"D", "x":4, "y":2},
+                {"label":"F", "x":5, "y":2},
+                {"label":"G", "x":6, "y":2},
+                {"label":"H", "x":7, "y":2},
+                {"label":"J", "x":8, "y":2},
+                {"label":"K", "x":9, "y":2},
+                {"label":"L", "x":10, "y":2},
+                {"label":";", "x":11, "y":2},
+                {"label":"'", "x":12, "y":2},
+                {"label":"Enter", "x":13, "y":2},
+
+
+
+                {"label":"PgDn", "x":0, "y":3},
+                {"label":"Shift", "x":1, "y":3},
+                {"label":"Z", "x":2, "y":3},
+                {"label":"X", "x":3, "y":3},
+                {"label":"C", "x":4, "y":3},
+                {"label":"V", "x":5, "y":3},
+                {"label":"B", "x":6, "y":3},
+                {"label":"N", "x":7, "y":3},
+                {"label":"M", "x":8, "y":3},
+                {"label":",", "x":9, "y":3},
+                {"label":".", "x":10, "y":3},
+                {"label":"/", "x":11, "y":3},
+                {"label":"\\", "x":12, "y":3},
+                {"label":"Shift", "x":13, "y":3},
+
+                {"label":"End", "x":0, "y":4},
+                {"label":"Ctrl", "x":1, "y":4},
+                {"label":"Hyper", "x":2, "y":4},
+                {"label":"Alt", "x":3, "y":4},
+                {"label":"Lower", "x":4, "y":4},
+                {"label":"Space", "x":5, "y":4, "w":2},
+                {"label":"Space", "x":7, "y":4, "w":2},
+                {"label":"Raise", "x":9, "y":4},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Prop", "x":11, "y":4},
+                {"label":"Ctrl", "x":12, "y":4},
+                {"label":"Esc", "x":13, "y":0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
new file mode 100644
index 0000000000..70a96fac9d
--- /dev/null
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -0,0 +1,633 @@
+/* Copyright 2021 Richard Nunez <antebios1@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/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "print.h"
+
+// Keep track of key presses for Modifier
+typedef struct {
+  bool is_press_action;
+  int state;
+} tap;
+
+// Key Tap enumerator
+enum {
+  SINGLE_TAP = 1,
+  SINGLE_HOLD = 2,
+  DOUBLE_TAP = 3,
+  DOUBLE_HOLD = 4,
+  TRIPLE_TAP = 5,
+  TRIPLE_HOLD = 6
+};
+
+// 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.
+enum custom_layer {
+  _QWERTY,
+  _ALT,
+  _CTRL,
+  _LOWER,
+  _RAISE,
+  _MOUSE,
+  _ADJUST,
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  ALT,
+  CTRL,
+  LOWER,
+  RAISE,
+  MOUSE,
+  ADJUST
+};
+
+// TAP DANCE ***********************************************************
+//Tap Dance Declarations
+enum {
+  ALT_OSL1 = 0,
+  CTL_OSL1,
+  TD_DEL_BSPC ,
+  TD_ESC_GRAVE,
+  TD_TAB_TILDE,
+  TD_9_LPRN,
+  TD_0_RPRN,
+  TD_MINS_UNDS,
+  TD_EQL_PLUS,
+  TD_LBRC_LCBR,
+  TD_RBRC_RCBR,
+  TD_SCLN_COLN,
+  TD_QUOT_DQT,
+  TD_COMM_LABK,
+  TD_DOT_RABK,
+  TD_SLSH_QUES,
+  TD_BSLS_PIPE,
+
+  TD_PGUP_HOME,
+  TD_PGDN_END,
+
+  TD_Q_LrALT,
+  TD_W_Lyr2,
+  TD_E_Lyr3,
+  TD_R_LrKey,
+  TD_T_LrMS,
+
+  TD_SHIFT_CAPS,
+  TD_SPC_ENT,
+  TD_SPC_BKSPC,
+  TD_LSPACE,
+  TD_RSPACE,
+
+  TD_LayerDn,
+  TD_LayerUp
+};
+
+
+// Alt key action:
+// SINGLE_TAP = toggle layer, then wait for keypress on called layer, then switch back to original layer.
+// SINGLE_HOLD = will work as normal sending the keypress.
+// DOUBLE_TAP = 3,
+// DOUBLE_HOLD = will then toggle layer and keep sending the Alt keycode until next keypress, then switch back to original layer.
+// TRIPLE_TAP = 5,
+// TRIPLE_HOLD = 6
+// // Alt held down, then use as normal.
+//
+// Alt tapped, then hold Alt,
+int cur_dance (qk_tap_dance_state_t *state);
+void alt_finished (qk_tap_dance_state_t *state, void *user_data);
+void alt_reset (qk_tap_dance_state_t *state, void *user_data);
+
+int cur_dance (qk_tap_dance_state_t *state) {
+  if (state->count == 1) {
+    if (state->pressed) return SINGLE_HOLD;
+    else return SINGLE_TAP;
+  }
+  else if (state->count == 2) {
+    if (state->pressed) return DOUBLE_HOLD;
+    else return DOUBLE_TAP;
+  }
+  else if (state->count == 3) {
+    if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
+    else return TRIPLE_HOLD;
+  }
+  else return 8;
+}
+
+static tap alttap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void alt_finished (qk_tap_dance_state_t *state, void *user_data) {
+  alttap_state.state = cur_dance(state);
+  switch (alttap_state.state) {
+    case SINGLE_TAP: set_oneshot_layer(_ALT, ONESHOT_START); clear_oneshot_layer_state(ONESHOT_PRESSED); break;
+    case SINGLE_HOLD: register_code(KC_LALT); break;
+    case DOUBLE_TAP: set_oneshot_layer(_ALT, ONESHOT_START); set_oneshot_layer(_ALT, ONESHOT_PRESSED); break;
+    case DOUBLE_HOLD: register_code(KC_LALT); layer_on(_ALT); break;
+    //Last case is for fast typing. Assuming your key is `f`:
+    //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
+    //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
+  }
+}
+
+void alt_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (alttap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: unregister_code(KC_LALT); break;
+    case DOUBLE_TAP: break;
+    case DOUBLE_HOLD: layer_off(_ALT); unregister_code(KC_LALT); break;
+  }
+  alttap_state.state = 0;
+}
+
+// Ctrl tapped, then hold Ctrl,
+void ctl_finished (qk_tap_dance_state_t *state, void *user_data);
+void ctl_reset (qk_tap_dance_state_t *state, void *user_data);
+
+static tap ctltap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void ctl_finished (qk_tap_dance_state_t *state, void *user_data) {
+  ctltap_state.state = cur_dance(state);
+  switch (ctltap_state.state) {
+    case SINGLE_TAP: set_oneshot_mods(MOD_BIT(KC_LCTL)); break;
+    case SINGLE_HOLD: register_code(KC_LCTL); break;
+    case DOUBLE_TAP: set_oneshot_layer(_ALT, ONESHOT_START); set_oneshot_layer(_ALT, ONESHOT_PRESSED); break;
+    case DOUBLE_HOLD: register_code(KC_LCTL); layer_on(_ALT); break;
+    case TRIPLE_TAP: register_mods(MOD_BIT(KC_LCTL)); register_mods(MOD_BIT(KC_LSFT)); break;
+  }
+}
+
+void ctl_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (ctltap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: unregister_code(KC_LCTL); break;
+    case DOUBLE_TAP: break;
+    case DOUBLE_HOLD: layer_off(_ALT); unregister_code(KC_LCTL); break;
+    case TRIPLE_TAP: break;
+  }
+  ctltap_state.state = 0;
+}
+
+
+// Layer Down tap dance
+void layerDown_finished (qk_tap_dance_state_t *state, void *user_data);
+void layerDown_reset (qk_tap_dance_state_t *state, void *user_data);
+
+static tap layerdn_tap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void layerDown_finished (qk_tap_dance_state_t *state, void *user_data) {
+  layerdn_tap_state.state = cur_dance(state);
+  switch (layerdn_tap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: layer_on(_LOWER); break;
+    case DOUBLE_TAP: layer_move(_QWERTY); break;
+    case DOUBLE_HOLD: break;
+    case TRIPLE_TAP: reset_keyboard(); break;
+  }
+}
+
+void layerDown_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (layerdn_tap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: layer_off(_LOWER); break;
+    case DOUBLE_TAP: break;
+    case DOUBLE_HOLD: break;
+  }
+  layerdn_tap_state.state = 0;
+}
+
+// Layer Up tap dance
+void layerUp_finished (qk_tap_dance_state_t *state, void *user_data);
+void layerUp_reset (qk_tap_dance_state_t *state, void *user_data);
+
+static tap layerup_tap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void layerUp_finished (qk_tap_dance_state_t *state, void *user_data) {
+  layerup_tap_state.state = cur_dance(state);
+  switch (layerup_tap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: layer_on(_RAISE); break;
+    case DOUBLE_TAP: layer_move(_RAISE); break;
+    case DOUBLE_HOLD: break;
+    case TRIPLE_TAP: layer_move(_MOUSE); break;
+  }
+}
+
+void layerUp_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (layerup_tap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: layer_off(_RAISE); break;
+    case DOUBLE_TAP: break;
+    case DOUBLE_HOLD: break;
+    case TRIPLE_TAP: break;
+  }
+  layerup_tap_state.state = 0;
+}
+
+
+// Shift key action:
+// Shift held down, then use as normal and use Shift Mode of key.
+// Shift tapped, then Capitlize next keystroke only.
+// Shift double-tapped, then CAPSLOCK
+// Shift double-tapped again, CAPS UNLOCKED
+// void dance_onshot_lsft(qk_tap_dance_state_t *state, void *user_data) {
+void lshift_finished (qk_tap_dance_state_t *state, void *user_data);
+void lshift_reset (qk_tap_dance_state_t *state, void *user_data);
+
+static tap lshifttap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void lshift_finished (qk_tap_dance_state_t *state, void *user_data) {
+  lshifttap_state.state = cur_dance(state);
+  switch (lshifttap_state.state) {
+    case SINGLE_TAP: set_oneshot_mods(MOD_BIT(KC_LSFT)); break;
+    case SINGLE_HOLD: register_code(KC_LSFT); break;
+    case DOUBLE_TAP: tap_code (KC_CAPS); break;
+    case DOUBLE_HOLD: break;
+  }
+}
+
+void lshift_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (lshifttap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: unregister_code(KC_LSFT); break;
+    case DOUBLE_TAP: break;
+    case DOUBLE_HOLD: break;
+  }
+  lshifttap_state.state = 0;
+}
+
+//TD_LSPACE
+void lspace_finished (qk_tap_dance_state_t *state, void *user_data);
+void lspace_reset (qk_tap_dance_state_t *state, void *user_data);
+
+static tap lspacetap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void lspace_finished (qk_tap_dance_state_t *state, void *user_data) {
+  lspacetap_state.state = cur_dance(state);
+  switch (lspacetap_state.state) {
+    case SINGLE_TAP: tap_code (KC_SPACE); break;
+    case SINGLE_HOLD: layer_on(_LOWER); break;
+    case DOUBLE_TAP: tap_code (KC_ENT);break;
+    case DOUBLE_HOLD: break;
+  }
+}
+
+void lspace_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (lspacetap_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: layer_off(_LOWER); break;
+    case DOUBLE_TAP: break;
+    case DOUBLE_HOLD: break;
+  }
+  lspacetap_state.state = 0;
+}
+
+//TD_RSPACE
+
+
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+   [TD_DEL_BSPC]  = ACTION_TAP_DANCE_DOUBLE(KC_DEL, KC_BSPC),
+   [TD_ESC_GRAVE]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_GRAVE),
+   [TD_TAB_TILDE]  = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_TILDE),
+
+   [TD_9_LPRN]  = ACTION_TAP_DANCE_DOUBLE(KC_9, KC_LPRN),
+   [TD_0_RPRN]  = ACTION_TAP_DANCE_DOUBLE(KC_0, KC_RPRN),
+
+   [TD_MINS_UNDS]  = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),
+   [TD_EQL_PLUS]  = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),
+
+   [TD_LBRC_LCBR]  = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),
+   [TD_RBRC_RCBR]  = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),
+
+   [TD_SCLN_COLN]  = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN),
+   [TD_QUOT_DQT]  = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQT),
+
+   [TD_COMM_LABK]  = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_LABK),
+   [TD_DOT_RABK]  = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_RABK),
+   [TD_SLSH_QUES]  = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_QUES),
+   [TD_BSLS_PIPE]  = ACTION_TAP_DANCE_DOUBLE(KC_BSLS, KC_PIPE),
+
+   [TD_PGUP_HOME]  = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, KC_HOME),
+   [TD_PGDN_END]   = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_END),
+
+   [TD_Q_LrALT] = ACTION_TAP_DANCE_DUAL_ROLE(KC_Q, _ALT),
+   [TD_R_LrKey] = ACTION_TAP_DANCE_DUAL_ROLE(KC_R, _RAISE),
+   [TD_T_LrMS]  = ACTION_TAP_DANCE_DUAL_ROLE(KC_T, _MOUSE),
+
+   [TD_SHIFT_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,lshift_finished, lshift_reset),
+   [TD_SPC_ENT]    = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_ENT),
+   [TD_SPC_BKSPC]  = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_BSPACE),
+   [TD_LSPACE]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL,lspace_finished,lspace_reset),
+
+   [ALT_OSL1]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL,alt_finished, alt_reset),
+   [CTL_OSL1]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL,ctl_finished, ctl_reset),
+   [TD_LayerDn]   = ACTION_TAP_DANCE_FN_ADVANCED(NULL,layerDown_finished, layerDown_reset),
+   [TD_LayerUp]   = ACTION_TAP_DANCE_FN_ADVANCED(NULL,layerUp_finished, layerUp_reset)
+};
+
+// Fillers to make layering more clear
+// #define _______ KC_TRNS
+// #define XXXXXXX KC_NO
+
+#define KC_L1 LOWER
+#define KC_L2 RAISE
+// MO(_LOWER)
+// MO(_RAISE)
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-------------------------------------------------------------------------------------------------.
+ * | DEL  | Bksp |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |   =  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | PGUP | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  |   ]  |
+ * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
+ * | PGDN | Enter|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  | Enter|
+ * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
+ * | Shift| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |   \  | Shift|
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Win  | Alt  |Lower |Raise | Space/Enter | Space/Bkspc | <--  |   v  |   ^  | -->  | Esc  |
+ * `-------------------------------------------------------------------------------------------------'
+ */
+  [_QWERTY] = LAYOUT(
+  //,-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+----------------+-----------------+-----------------+------------------.
+     TD(TD_DEL_BSPC)  , KC_BSPACE       , KC_1           , KC_2        , KC_3         , KC_4         , KC_5         , KC_6 , KC_7      , KC_8            , TD(TD_9_LPRN)  , TD(TD_0_RPRN)   ,TD(TD_MINS_UNDS) , TD(TD_EQL_PLUS),
+  //|-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+----------------+-----------------+-----------------+------------------|
+     TD(TD_PGUP_HOME) , TD(TD_TAB_TILDE), TD(TD_Q_LrALT), KC_W         , KC_E         , KC_R         , KC_T         , KC_Y , KC_U      , KC_I            , KC_O           , KC_P            ,TD(TD_LBRC_LCBR) , TD(TD_RBRC_RCBR),
+  //|-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+----------------+-----------------+-----------------+------------------|
+     TD(TD_PGDN_END)  , KC_ENT          , KC_A          , KC_S         , KC_D         , KC_F         , KC_G         , KC_H , KC_J      , KC_K            , KC_L           ,TD(TD_SCLN_COLN) ,TD(TD_QUOT_DQT)  , KC_ENT,
+  //|-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+----------------+-----------------+-----------------+------------------|
+     TD(TD_SHIFT_CAPS),TD(TD_SHIFT_CAPS), KC_Z          , KC_X         , KC_C         , KC_V         , KC_B         , KC_N , KC_M      ,TD(TD_COMM_LABK) ,TD(TD_DOT_RABK) ,TD(TD_SLSH_QUES) ,TD(TD_BSLS_PIPE) , KC_RSFT,
+  //|-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+--------+-------+-----------------+-----------------+------------------|
+      TD(CTL_OSL1)    , OSM(MOD_LGUI)   , TD(ALT_OSL1)  ,TD(TD_LayerDn),TD(TD_LayerUp),        TD(TD_LSPACE)        , TD(TD_SPC_BKSPC) , KC_LEFT         , KC_DOWN        , KC_UP           ,  KC_RIGHT      ,TD(TD_ESC_GRAVE)
+  //`-----------------+-----------------+---------------+--------------+--------------+-----------------------------+----------------------------------+--------+-------+-----------------+----------------+-------------------'
+  ),
+
+/* ALT Layout
+ * ,-----------------------------------------------------------------------------------------------------.
+ * | DEL      | Bksp |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
+ * |----------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | PGUP     | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  |   ]  |
+ * |----------+------+------+------+------+------+-------------+------+------+------+------+------+------|
+ * | PGDN     | Enter|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  | Enter|
+ * |----------+------+------+------+------+------+------|------+------+------+------+------+------+------|
+ * | Shift    | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |   \  | Shift|
+ * |----------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl     | Win  | Alt  |Lower |Raise | Space/Enter | Space/Bkspc | <--  |   v  |   ^  | -->  | Esc  |
+ * `----------------------------------------------------------------------------------------------------'
+ */
+  [_ALT] = LAYOUT(
+  //,---------------+---------------+-------------+---------------+--------------+---------+-----------------+-----------------+---------+---------+----------------+---------------+---------------+----------------.
+     KC_TRNS        , KC_TRNS       , 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_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         , KC_TRNS , KC_TRNS , KC_TRNS        , KC_TRNS       , KC_TRNS       , KC_TRNS,
+  //|---------------+---------------+-------------+---------------+--------------+---------+-----------------+-----------------+---------+---------+----------------+---------------+---------------+----------------|
+     TD(CTL_OSL1)   , OSM(MOD_LGUI) , TD(ALT_OSL1), TD(TD_LayerDn),TD(TD_LayerUp),   TD(TD_SPC_ENT)          ,         TD(TD_SPC_BKSPC)  , KC_TRNS , KC_TRNS        , KC_TRNS       , KC_TRNS       ,TD(TD_ESC_GRAVE)
+  //`---------------+---------------+-------------+---------------+--------------+---------------------------+---------------------------+---------+----------------+---------------+---------------+----------------'
+  ),
+
+/* CTRL Layout
+ * ,-----------------------------------------------------------------------------------------------------.
+ * | DEL/Bksp |  F1  |  F2  |  F3  |  F4  |  F5  |  DEL | Bksp |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |----------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab      |   Q  |   W  |   E  |   R  |   T  |  [   |   ]  |   Y  |   U  |   I  |   O  |   P  |  F12 |
+ * |----------+------+------+------+------+------+-------------+------+------+------+------+------+------|
+ * | Enter    |   A  |   S  |   D  |   F  |   G  | PGUP | HOME |   H  |   J  |   K  |   L  |   ;  |   '  |
+ * |----------+------+------+------+------+------+------|------+------+------+------+------+------+------|
+ * | Shift    |   Z  |   X  |   C  |   V  |   B  | PGDN | END  |   N  |   M  |   ,  |   .  |   /  |   \  |
+ * |----------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl     | Win  | Alt  |  Fn  |Lower | Space/Enter |    Space    | <--  |   v  |   ^  | -->  | Esc  |
+ * `----------------------------------------------------------------------------------------------------'
+ */
+//   [_CTRL] = LAYOUT(
+//   //,-----------------+-------------+-------------+--------------+--------------+---------+-----------------+-----------------+---------+---------+----------------+---------------+---------------+----------------.
+//      KC_TRNS          , KC_TRNS     , 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_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         , KC_TRNS , KC_TRNS , KC_TRNS        , KC_TRNS       , KC_TRNS       , KC_TRNS,
+//   //|-----------------+-------------+-------------+--------------+--------------+---------+-----------------+-----------------+---------+---------+----------------+---------------+---------------+----------------|
+//      TD(CTL_OSL1)     , KC_LGUI     , TD(ALT_OSL1),TD(TD_LayerDn),TD(TD_LayerUp),   TD(TD_SPC_ENT)          ,         TD(TD_SPC_ENT)    , KC_TRNS , KC_TRNS        , KC_TRNS       , KC_TRNS       ,TD(TD_ESC_GRAVE)
+//   //`-----------------+-------------+-------------+--------------+--------------+---------------------------+---------------------------+---------+----------------+---------------+---------------+----------------'
+//   ),
+
+/* Lower
+ * ,-------------------------------------------------------------------------------------------------.
+ * |  `   |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
+ * |------+------+------+------+------+------+------+-------------+------+------+------+------+------|
+ * |  ~   |      |      |      |  UP  |      |      |      | Prev | Next | Vol- | Vol+ | Play |      |
+ * |------+------+------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |Enter |      | LEFT | DOWN |RIGHT |      |      |      |      | MUTE |      |      |      |
+ * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |             |      |      |      |      |      |
+ * `------------------------------------------------------------------------------------------+------'
+ */
+[_LOWER] = LAYOUT(
+  KC_GRV , _______, 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_TILD, _______, _______, _______ , KC_UP   , _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______,
+  _______, KC_ENT , _______, KC_LEFT, KC_DOWN , KC_RIGHT, _______, _______, _______, _______, KC_MUTE, _______, _______, _______,
+  _______, _______, _______, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______ , _______ ,      _______    ,      _______    , _______, _______, _______, _______, _______
+),
+
+/* Raise
+ * ,-------------------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+
+ * ,-------------------------------------------------------------------------------------------------.
+ * | Ins  |      |Brite+|Brite-|      |      |      |      |  7   |  8   |  9   |  /   |  -   |  =   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Home | PrtSc|      |      |      |Reset |      |      |  4   |  5   |  6   |  *   |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------+------+------|
+ * | End  | ScLk |      |      |Debug |      |      |      |  1   |  2   |  3   |  -   |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------+------+------|
+ * |      | Pause|      |      |      |      |      |      |  0   |  ,   |  .   |  +   |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |CtAlDl|      |      |      |      |             |       Enter |      |      |      |      |      |
+ * `-------------------------------------------------------------------------------------------------'
+ */
+/*
+KC_INS
+KC_PSCR
+KC_SLCK
+KC_PAUS
+
+*/
+
+[_RAISE] = LAYOUT(
+  KC_INS            , XXXXXXX  , KC_BRIU, KC_BRID, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_7 , KC_8   , KC_9     , KC_SLASH , KC_MINUS, KC_EQUAL,
+  KC_HOME           , KC_PSCR  , XXXXXXX, XXXXXXX, XXXXXXX, RESET  , XXXXXXX, XXXXXXX,  KC_4 , KC_5   , KC_6     , KC_ASTR  , XXXXXXX , XXXXXXX,
+  KC_END            , KC_SLCK  , XXXXXXX, XXXXXXX, DEBUG  , XXXXXXX, XXXXXXX, XXXXXXX,  KC_1 , KC_2   , KC_3     , KC_MINUS , XXXXXXX , XXXXXXX,
+  XXXXXXX           , KC_PAUSE , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_0 , KC_DOT , KC_COMMA , KC_PLUS  , XXXXXXX , XXXXXXX,
+  LALT(LCTL(KC_DEL)), _______  , _______, _______, _______,     _______     ,   KC_KP_ENTER  , _______, _______  , _______  , _______ , _______
+),
+
+/* Adjust (Lower + Raise)
+ * ,-------------------------------------------------------------------------------------------------.
+ * |  Del |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      | Reset|      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |Audoff|Aud on|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
+ * |------+------+------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |Voice-|Voice+|Musoff|Mus on|      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |             |      |      |      |      |      |
+ * `-------------------------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT(
+  KC_DEL  , _______,  KC_F1,   KC_F2,   KC_F3, KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,  KC_F10,  KC_F11,  KC_F12,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, _______,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,  AU_OFF, AG_NORM, AG_SWAP, QWERTY,    XXXXXXX, XXXXXXX, XXXXXXX, _______,
+  XXXXXXX, XXXXXXX, XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,  MU_OFF,   MI_ON,  MI_OFF,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, _______, _______, _______, _______,     _______,        _______,       _______, _______, _______, _______, _______
+)
+,
+
+/* Layer 3 - Mouse Controls
+ * ,-------------------------------------------------------------------------------------------------.
+ * |      |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | PGUP |      |      |      |MS UP |      |SPEED0|      |      |WHUP  |      |      |      |      |
+ * |------+------+------+------+------+------+------+-------------+------+------+------+------+------|
+ * | PGDN |      |      |MSLeft|MS DN |MSRite|SPEED1|      |WHLeft|WHDN  |WHRite|      |      |      |
+ * |------+------+------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |