From 27e3458f44ee9b06ec84431b9d4e861668ace563 Mon Sep 17 00:00:00 2001
From: Xyverz <xyverz@gmail.com>
Date: Fri, 18 May 2018 15:32:50 -0700
Subject: Updating my maps in upstream master (#2987)

* Adding Rama M10-A Macropad

* ch-ch-ch changes...

* Major overhaul based on SMT's keymap.

* more changes.

* Moved the FKeys to the ADJUST layer.

* More rearranging.

* Alias in Atreus62 keymap to make it more legible
Added config.h to fix tapping_term issue for Caps Lock key in OSX

* Added OrthoDox layout.

* More layout changes.

* Fixing things with the keyboard.

* Finishing touches.

Set left-hand master in config.h
Embedded the arrow keys in keymap.c

* Revised keymap making this easier to use.

* additions and changes.

* changes to various keymaps.

* Minor adjustments to OrthoDox layout.

* Added Eco keymap. Updated Let's Split keymap.

* Added gherkin

* Removed my M10A keymap

* Planck Keymap Updates

Updated my Planck keymap and created a simple keymap for Seph's Preonic.

* Added readme

* readme fixes

* Update readme.md

more clarification

* Keymap Tweaks

Removed the Power button setting from the keymap. It was in a
horrible location. I'll work on getting it setup somewhere else
sometime later.

* Added Readme

I finally got around to adding a readme to this keymap. I've also added minor changes to the layout.

* Fixed Keymap Error

* Fixed Readme

* adding iris and levinson keymaps

* Tweaks to keymap

* added youngJZ keymap

* Changes to keymap
Added a readme.md

* Levinson changes

Added the readme.md and rules.mk files.
Configured RGB underglow and backlighting.

* fixed readme

* changes to keymaps

* Updated keymap

* Updated readme.md

* Updated Readme (again)

* Updated Readme

Fixed formatting. Again.

* Updated readme

This is the last readme update for this keyboard update. I hope.

* Added Contra keymap

* Kinesis Keymap Update

* Updated Keymaps

I've updated my Kinesis (Stapelberg) layout and my Clueboard 66 layout.
I've also updated my Kinesis Readme.

* Clueboard Keymap update

Added media keys to my Clueboard 66 Rev2 layout.

* Added keymap

Added Minidox keymap & rules.
Added user function to Let's Split keymap that turns off the red
 LEDs on the Pro Micros.

* New Zen keymap

Added Zen keyboard to my list of keyboards, so had to generate a new
keymap for it.

Also adding some changes to my MiniDox keymap and config.h, as well
as my Levinson's config.h.

The config.h file changes enable ee_hands.

* A few changes for useability

I made a few changes to the Minidox keymap to see if I can't make it more useable.

I'm also working on streamlining the Zen keyboard keymap to reduce layers.

* Re-vamped Iris keymap.

* changes

* minor keymap change

This was a minor keymap change to use mod_tap for the backspace key:
ALT when held, BSPC when tapped.

* Added Fourier keymap

* Keymap Cleanup

Moved KC_ESC to KC_CAPS, and changed KC_ESC to KC_GRV
This is because of muscle memory, I kept hitting ESC when trying to hit TAB.

* Keymap Adjustments

Swapped Caps/Esc, put Caps in Raise/Lower layers, put Grv in normal
Esc position. Adjusted the readme.md to reflect these changes.

* minor tweaks

Added code to disable red ProMicro LEDs after flashing.

* Clean-up

* Corrections to keymap.

Fixed a foul-up in the Zen keymap where the lctrl was where the LOWER
should have been.

* Changes to make this fall in line with the new Layout features

* Moving to LAYOUTs for 4x12 boards

* fixed config.h file

* standardization changes

* Reverted Atreus62 keymap to LAYOUT format

* Switch Preonic and Nyquist to ortho_5x12

* Corrections to config.h

* config.h file tweaks

* config.h file tweaks
---
 keyboards/lets_split/keymaps/xyverz/config.h |  45 -------
 keyboards/lets_split/keymaps/xyverz/keymap.c | 190 ---------------------------
 2 files changed, 235 deletions(-)
 delete mode 100644 keyboards/lets_split/keymaps/xyverz/config.h
 delete mode 100644 keyboards/lets_split/keymaps/xyverz/keymap.c

(limited to 'keyboards/lets_split')

diff --git a/keyboards/lets_split/keymaps/xyverz/config.h b/keyboards/lets_split/keymaps/xyverz/config.h
deleted file mode 100644
index e37cfe88a..000000000
--- a/keyboards/lets_split/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
-#ifdef SUBPROJECT_rev2
-    /* RGB Underglow */
-    #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
-    #define RGBLED_NUM 8
-#endif
-
-#endif
diff --git a/keyboards/lets_split/keymaps/xyverz/keymap.c b/keyboards/lets_split/keymaps/xyverz/keymap.c
deleted file mode 100644
index 838f57983..000000000
--- a/keyboards/lets_split/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,190 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT ( \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,\
-  KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   GUI_T(KC_BSPC), KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT \
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT ( \
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
-  KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   GUI_T(KC_BSPC), KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT \
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  /   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  -   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | Left |Right |Lower | Bksp |Space |Raise |  Up  | Down |  GUI |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT ( \
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, \
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, \
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, \
-  KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   GUI_T(KC_BSPC), KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      | Mute | Vol- | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      | Home |  End |      |  Del |  Ins |      | PgUp | PgDN |      |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT ( \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
-  KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
-  _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______ \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      | Prev | Play | Next |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      | Home |  End |      |  Del |  Ins |      | PgUp | PgDN |      |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT ( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
-  KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, \
-  _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______ \
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Reset|      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |RGB ON| MODE | HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT ( \
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 , \
-  _______, RESET,   _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-)
-
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-- 
cgit v1.2.3-70-g09d2


From 504ce1b4bc2a7ed785ba85bb8f6b80987c7b2412 Mon Sep 17 00:00:00 2001
From: mtdjr <mtdjr@users.noreply.github.com>
Date: Sat, 26 May 2018 14:06:08 -0400
Subject: Add mtdjr keymaps for Iris, Let's Split, TADA68, XD75, and handwired
 dox (#3058)

* Add keymaps for Iris, Let's Split, TADA68, XD75, and handwired not_so_minidox

* remove handwired not_so_minidox
---
 keyboards/iris/keymaps/mtdjr/config.h       |  42 ++++
 keyboards/iris/keymaps/mtdjr/keymap.c       | 307 ++++++++++++++++++++++++++++
 keyboards/iris/keymaps/mtdjr/rules.mk       |   7 +
 keyboards/lets_split/keymaps/mtdjr/config.h |  37 ++++
 keyboards/lets_split/keymaps/mtdjr/keymap.c | 194 ++++++++++++++++++
 keyboards/lets_split/keymaps/mtdjr/rules.mk |   4 +
 keyboards/tada68/keymaps/mtdjr/keymap.c     |  87 ++++++++
 keyboards/tada68/keymaps/mtdjr/readme.md    |   3 +
 keyboards/tada68/keymaps/mtdjr/rules.mk     |  21 ++
 keyboards/xd75/keymaps/mtdjr/config.h       |  28 +++
 keyboards/xd75/keymaps/mtdjr/keymap.c       | 135 ++++++++++++
 keyboards/xd75/keymaps/mtdjr/readme.md      |   1 +
 keyboards/xd75/keymaps/mtdjr/rules.mk       |  22 ++
 13 files changed, 888 insertions(+)
 create mode 100644 keyboards/iris/keymaps/mtdjr/config.h
 create mode 100644 keyboards/iris/keymaps/mtdjr/keymap.c
 create mode 100644 keyboards/iris/keymaps/mtdjr/rules.mk
 create mode 100644 keyboards/lets_split/keymaps/mtdjr/config.h
 create mode 100644 keyboards/lets_split/keymaps/mtdjr/keymap.c
 create mode 100644 keyboards/lets_split/keymaps/mtdjr/rules.mk
 create mode 100644 keyboards/tada68/keymaps/mtdjr/keymap.c
 create mode 100644 keyboards/tada68/keymaps/mtdjr/readme.md
 create mode 100644 keyboards/tada68/keymaps/mtdjr/rules.mk
 create mode 100644 keyboards/xd75/keymaps/mtdjr/config.h
 create mode 100644 keyboards/xd75/keymaps/mtdjr/keymap.c
 create mode 100644 keyboards/xd75/keymaps/mtdjr/readme.md
 create mode 100644 keyboards/xd75/keymaps/mtdjr/rules.mk

(limited to 'keyboards/lets_split')

diff --git a/keyboards/iris/keymaps/mtdjr/config.h b/keyboards/iris/keymaps/mtdjr/config.h
new file mode 100644
index 000000000..0e8938775
--- /dev/null
+++ b/keyboards/iris/keymaps/mtdjr/config.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2017 Danny Nguyen <danny@hexwire.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_USER_H
+#define CONFIG_USER_H
+
+#include "config_common.h"
+
+/* Use I2C or Serial, not both */
+
+#define USE_SERIAL
+//#define USE_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+#define TAPPING_TERM 250
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+// #undef RGBLED_NUM
+// #define RGBLIGHT_ANIMATIONS
+// #define RGBLED_NUM 12
+// #define RGBLIGHT_HUE_STEP 8
+// #define RGBLIGHT_SAT_STEP 8
+// #define RGBLIGHT_VAL_STEP 8
+
+#endif
diff --git a/keyboards/iris/keymaps/mtdjr/keymap.c b/keyboards/iris/keymaps/mtdjr/keymap.c
new file mode 100644
index 000000000..ba95d16b2
--- /dev/null
+++ b/keyboards/iris/keymaps/mtdjr/keymap.c
@@ -0,0 +1,307 @@
+#include "iris.h"
+#include "action_layer.h"
+#include "eeconfig.h"
+#include "action_macro.h"
+#include <timer.h>
+#include "pincontrol.h"
+
+extern keymap_config_t keymap_config;
+
+#define _QWERTY 0
+#define _LOWER 1
+#define _RAISE 2
+#define _SUPER 3
+#define _ADJUST 16
+#define SOLENOID_DEFAULT_DWELL 12
+#define SOLENOID_MAX_DWELL 100
+#define SOLENOID_MIN_DWELL 4
+#define SOLENOID_PIN C6
+
+
+bool solenoid_enabled = false;
+bool solenoid_on = false;
+bool solenoid_buzz = false;
+bool solenoid_buzzing = false;
+uint16_t solenoid_start = 0;
+uint8_t solenoid_dwell = SOLENOID_DEFAULT_DWELL;
+
+
+void solenoid_buzz_on(void) {
+  solenoid_buzz = true;
+}
+
+void solenoid_buzz_off(void) {
+  solenoid_buzz = false;
+}
+
+void solenoid_dwell_minus(void) {
+  if (solenoid_dwell > 0) solenoid_dwell--;
+}
+
+void solenoid_dwell_plus(void) {
+  if (solenoid_dwell < SOLENOID_MAX_DWELL) solenoid_dwell++;
+}
+
+void solenoid_toggle(void) {
+  solenoid_enabled = !solenoid_enabled;
+}
+
+void solenoid_stop(void) {
+  digitalWrite(SOLENOID_PIN, PinLevelLow);
+  solenoid_on = false;
+  solenoid_buzzing = false;
+}
+
+void solenoid_fire(void) {
+  if (!solenoid_enabled) return;
+
+  if (!solenoid_buzz && solenoid_on) return;
+  if (solenoid_buzz && solenoid_buzzing) return;
+
+  solenoid_on = true;
+  solenoid_buzzing = true;
+  solenoid_start = timer_read();
+  digitalWrite(SOLENOID_PIN, PinLevelHigh);
+}
+
+void solenoid_check(void) {
+  uint16_t elapsed = 0;
+
+  if (!solenoid_on) return;
+
+  elapsed = timer_elapsed(solenoid_start);
+
+  //Check if it's time to finish this solenoid click cycle
+  if (elapsed > solenoid_dwell) {
+    solenoid_stop();
+    return;
+  }
+
+  //Check whether to buzz the solenoid on and off
+  if (solenoid_buzz) {
+    if (elapsed / SOLENOID_MIN_DWELL % 2 == 0){
+      if (!solenoid_buzzing) {
+        solenoid_buzzing = true;
+        digitalWrite(SOLENOID_PIN, PinLevelHigh);
+      }
+    }
+    else {
+      if (solenoid_buzzing) {
+        solenoid_buzzing = false;
+        digitalWrite(SOLENOID_PIN, PinLevelLow);
+      }
+    }
+  }
+}
+
+void solenoid_setup(void) {
+  pinMode(SOLENOID_PIN, PinDirectionOutput);
+}
+
+void matrix_init_user(void) {
+  solenoid_setup();
+}
+
+void matrix_scan_user(void) {
+  solenoid_check();
+}
+
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  SUPER,
+  ADJUST,
+  SOL_TOG,
+  SOLENOID_DWELL_MINUS,
+  SOLENOID_DWELL_PLUS,
+  SOLENOID_BUZZ_ON,
+  SOLENOID_BUZZ_OFF,
+  TD_ESC = 0,
+};
+
+#define KC_ KC_TRNS
+#define _______ KC_TRNS
+
+#define KC_LOWR LOWER
+#define KC_RASE RAISE
+#define KC_SUPR SUPER
+#define KC_RST RESET
+#define KC_BL_S BL_STEP
+#define KC_EXC TD(TD_ESC)
+#define SOLTOG SOLENOID_TOG
+
+// Macro Declarations
+#define UM_ROOT M(0)
+#define UM_PPLY M(1)
+#define UM_PSEF M(2)
+#define KC_XCPY M(3)
+#define KC_XINS M(4)
+#define UM_CAD  M(5)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_kc(
+  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
+     EXC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,QUOT,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+     LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,ENT ,
+  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
+      EQL, Z  , X  , C  , V  , B  ,LGUI,     LALT, N  , M  ,COMM,DOT ,SLSH,MINS,
+  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
+                       LCTL,RASE,SPC ,         SPC ,LOWR,SUPR
+  //                  `----+----+----'        `----+----+----'
+  ),
+
+  [_LOWER] = LAYOUT_kc(
+  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
+         ,    ,    ,    ,    ,    ,                   ,    ,    ,LCBR,RCBR,DEL ,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,                   ,    , UP ,    ,    ,PIPE,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,                   ,LEFT,DOWN,RGHT,    ,    ,
+  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,    ,         ,    ,HOME,    ,END ,    ,EQL ,
+  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
+                           ,    ,    ,             ,    ,
+  //                  `----+----+----'        `----+----+----'
+  ),
+
+  [_RAISE] = LAYOUT_kc(
+  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
+         , F1 , F2 , F3 , F4 ,    ,                   ,    ,    ,LBRC,RBRC,DEL ,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+         , F5 , F6 , F7 , F8 ,    ,                   ,    ,    ,    ,    ,BSLS,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+         , F9 ,F10 ,F11 ,F12 ,    ,                   ,    ,    ,    ,    ,    ,
+  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
+         ,    ,    ,XCPY,XINS,    ,    ,         ,    ,    ,    ,    ,    ,PLUS,
+  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
+                           ,    ,    ,             ,    ,
+  //                  `----+----+----'        `----+----+----'
+  ),
+
+  [_SUPER] = LAYOUT(
+  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
+      SOL_TOG, UM_ROOT, UM_PPLY, UM_PSEF, _______, _______,                            _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,                            _______, KC_LBRC, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, UM_CAD ,
+  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY,
+  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
+                                      _______, _______, _______,                  _______, _______, _______
+  //                                `--------+--------+--------'                `--------+--------+--------'
+)
+
+};
+
+void persistent_default_layer_set(uint16_t default_layer) {
+  eeconfig_update_default_layer(default_layer);
+  default_layer_set(default_layer);
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  //Tap once for grave accent, twice for ESC
+  [TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_ESC)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    solenoid_fire();
+  }
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        persistent_default_layer_set(1UL<<_QWERTY);
+      }
+      return false;
+      break;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case SUPER:
+      if (record->event.pressed) {
+        layer_on(_SUPER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_SUPER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case SOLTOG:
+      if (record->event.pressed) {
+        solenoid_toggle();
+      }
+      break;
+    case SOLENOID_DWELL_MINUS:
+      if (record->event.pressed) {
+        solenoid_dwell_minus();
+      }
+      break;
+    case SOLENOID_DWELL_PLUS:
+      if (record->event.pressed) {
+        solenoid_dwell_plus();
+      }
+      break;
+    case SOLENOID_BUZZ_ON:
+      if (record->event.pressed) {
+        solenoid_buzz_on();
+      }
+      break;
+    case SOLENOID_BUZZ_OFF:
+      if (record->event.pressed) {
+        solenoid_buzz_off();
+      }
+      break;
+  }
+  return true;
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  if (record->event.pressed) {
+      switch(id) {
+          case 0:
+              SEND_STRING("sudo su -\n");
+              return false; break;
+          case 1:
+              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
+              return false; break;
+          case 2:
+              SEND_STRING("ps -ef | grep ");
+              return false; break;
+          case 3:
+              return MACRO(D(LCTL), T(INS), U(LCTL), END);
+              break;
+          case 4:
+              return MACRO(D(LSFT), T(INS), U(LSFT), END);
+              break;
+          case 5:
+              return MACRO(D(LCTL), D(RALT), T(DEL), END);
+              break;
+      }
+  }
+  return MACRO_NONE;
+};
diff --git a/keyboards/iris/keymaps/mtdjr/rules.mk b/keyboards/iris/keymaps/mtdjr/rules.mk
new file mode 100644
index 000000000..7c19013e5
--- /dev/null
+++ b/keyboards/iris/keymaps/mtdjr/rules.mk
@@ -0,0 +1,7 @@
+RGBLIGHT_ENABLE = no
+BACKLIGHT_ENABLE = no
+TAP_DANCE_ENABLE = no
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/lets_split/keymaps/mtdjr/config.h b/keyboards/lets_split/keymaps/mtdjr/config.h
new file mode 100644
index 000000000..761e9e175
--- /dev/null
+++ b/keyboards/lets_split/keymaps/mtdjr/config.h
@@ -0,0 +1,37 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+/* Use I2C or Serial, not both */
+
+// #define USE_SERIAL
+ #define USE_I2C
+ #define TAPPING_TERM 250
+/* Select hand configuration */
+
+// #define MASTER_LEFT
+// #define _MASTER_RIGHT
+#define EE_HANDS
+
+#endif
diff --git a/keyboards/lets_split/keymaps/mtdjr/keymap.c b/keyboards/lets_split/keymaps/mtdjr/keymap.c
new file mode 100644
index 000000000..36aa51722
--- /dev/null
+++ b/keyboards/lets_split/keymaps/mtdjr/keymap.c
@@ -0,0 +1,194 @@
+#include "lets_split.h"
+#include "action_layer.h"
+#include "eeconfig.h"
+#include "action_macro.h"
+
+extern keymap_config_t keymap_config;
+
+// 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 _QWERTY 0
+#define _LOWER 1
+#define _RAISE 2
+#define _ADJUST 16
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  ADJUST,
+  TD_ESC = 0
+};
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+
+// Macro Declarations
+#define UM_ROOT M(0)
+#define UM_PPLY M(1)
+#define UM_COPY M(2)
+#define UM_INSR M(3)
+#define UM_PSEF M(4)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Qwerty
+  * ,-----------------------------------------.  ,-----------------------------------------.
+  * | Tab  |   Q  |   W  |   E  |   R  |   T  |  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |Esc/~ |   A  |   S  |   D  |   F  |   G  |  |   H  |   J  |   K  |   L  |   ;  |  '/" |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * | Shift|   Z  |   X  |   C  |   V  |   B  |  |   N  |   M  |   ,  |   .  |   /  |Enter |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Left |  Up  | Down |Right |
+  * `-----------------------------------------'  '-----------------------------------------'
+  */
+[_QWERTY] = KEYMAP( \
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+  TD(TD_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
+  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT \
+),
+
+  /* Lower
+  * ,-----------------------------------------.  ,-----------------------------------------.
+  * |   ~  |   1  |   2  |   3  |   4  |   5  |  |   6  |   7  |   8  |   9  |   0  | Bksp |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |      |      |   [  |   ]  |   {  |   }  |  |      |   4  |   5  |   6  |   *  |   \  |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |Shift |      |      | copy |insert|      |  |      |   1  |   2  |   3  |   +  |   -  |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise |   0  |   .  |   =  |   _  |
+  * `-----------------------------------------'  '-----------------------------------------'
+  */
+[_LOWER] = KEYMAP( \
+  KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,  KC_9,   KC_0,    _______, \
+  XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, XXXXXXX, KC_4,    KC_5,  KC_6,   KC_ASTR, KC_BSLS, \
+  _______, XXXXXXX, XXXXXXX, UM_COPY, UM_INSR, XXXXXXX, XXXXXXX, KC_1,    KC_2,  KC_3,   KC_PLUS, KC_MINS, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_0,  KC_DOT, KC_EQL,  KC_UNDS \
+),
+
+
+/* Raise
+ * ,-----------------------------------------.  ,-----------------------------------------.
+ * |   `  |   !  |   @  |   #  |   $  |   %  |  |   ^  |  &   |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |  |      |      |      |      |   \  |   |  |
+ * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+ * |Shift |      |      |      |      |      |  |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+ * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------'  '-----------------------------------------'
+ */
+[_RAISE] = KEYMAP( \
+  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,\
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+),
+
+  /* Adjust (Lower + Raise)
+  * ,-----------------------------------------.  ,-----------------------------------------.
+  * |      | Reset|      |      |      |      |  | ROOT | PPLY | PSEF |      |      |  Del |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |      |      |      |Aud on|Audoff|      |  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |      | UNDO | CUT  | COPY |PASTE |      |  |  F7  |  F8  |  F9  |  F10 | F11  |  F12 |
+  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+  * |      |      |      |      |      |      |  |      |      | Home |      |      | End  |
+  * `-----------------------------------------'  '-----------------------------------------'
+  */
+[_ADJUST] =  KEYMAP( \
+  _______, UM_ROOT, UM_PPLY, UM_PSEF, _______, _______, RESET,   _______, _______, _______, _______, KC_DEL, \
+  _______, _______, _______, AU_ON,   AU_OFF,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, \
+  _______, KC_UNDO, KC_CUT,  UM_COPY, UM_INSR, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, KC_END \
+)
+
+
+};
+
+#ifdef AUDIO_ENABLE
+float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
+#endif
+
+void persistent_default_layer_set(uint16_t default_layer) {
+  eeconfig_update_default_layer(default_layer);
+  default_layer_set(default_layer);
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  //Tap once for nothing, twice for ESC
+  [TD_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_NO, KC_ESC)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_qwerty);
+        #endif
+        persistent_default_layer_set(1UL<<_QWERTY);
+      }
+      return false;
+      break;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      return false;
+      break;
+  }
+  return true;
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  if (record->event.pressed) {
+      switch(id) {
+          case 0:
+              SEND_STRING("sudo su -\n");
+              return false; break;
+          case 1:
+              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
+              return false; break;
+          case 2:
+              return MACRO(D(LCTL), T(INS), U(LCTL), END);
+              break;
+          case 3:
+              return MACRO(D(LSFT), T(INS), U(LSFT), END);
+              break;
+          case 4:
+              SEND_STRING("ps -ef | grep ");
+              return false; break;
+      }
+  }
+  return MACRO_NONE;
+};
diff --git a/keyboards/lets_split/keymaps/mtdjr/rules.mk b/keyboards/lets_split/keymaps/mtdjr/rules.mk
new file mode 100644
index 000000000..f0ed9e8dc
--- /dev/null
+++ b/keyboards/lets_split/keymaps/mtdjr/rules.mk
@@ -0,0 +1,4 @@
+TAP_DANCE_ENABLE = yes
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/tada68/keymaps/mtdjr/keymap.c b/keyboards/tada68/keymaps/mtdjr/keymap.c
new file mode 100644
index 000000000..1b1f6ad4f
--- /dev/null
+++ b/keyboards/tada68/keymaps/mtdjr/keymap.c
@@ -0,0 +1,87 @@
+#include "tada68.h"
+#include "action_macro.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 _BL 0
+#define _FL 1
+
+// Macro Declarations
+#define UM_ROOT M(0)
+#define UM_PPLY M(1)
+#define UM_PSEF M(2)
+#define UM_XCPY M(3)
+#define UM_XINS M(4)
+#define UM_CAD  M(5)
+
+#define _______ KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: (Base Layer) Default Layer
+   * ,----------------------------------------------------------------.
+   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Ins |
+   * |----------------------------------------------------------------|
+   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
+   * |----------------------------------------------------------------|
+   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+   * |----------------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
+   * |----------------------------------------------------------------|
+   * |Ctrl|Alt |Gui |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
+   * `----------------------------------------------------------------'
+   */
+[_BL] = KEYMAP_ANSI(
+  KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    KC_MINS,  KC_EQL, KC_BSPC, KC_INS, \
+  KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,    KC_LBRC,  KC_RBRC,KC_BSLS, KC_DEL, \
+  KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN, KC_QUOT,    KC_ENT,        KC_PGUP,  \
+  KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,  KC_RSFT,KC_UP,   KC_PGDN, \
+  KC_LCTL,KC_LALT,KC_LGUI,                KC_SPC,                         KC_RALT,MO(_FL), KC_RCTRL, KC_LEFT,KC_DOWN, KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   * ,----------------------------------------------------------------.
+   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Grv |
+   * |----------------------------------------------------------------|
+   * |     |  RT | PPLY| PS |   |   |   |   |   |   |   |   |   |     |Hme |
+   * |----------------------------------------------------------------|
+   * |      | BL- |BL | BL+|BLG|   |   |   |   |   |   |   |        |End |
+   * |----------------------------------------------------------------|
+   * |        |   |   |CP|PST |   | PLY| NXT|MUT|VD |VU | McL|MsU|McR |
+   * |----------------------------------------------------------------|
+   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
+   * `----------------------------------------------------------------'
+   */
+[_FL] = KEYMAP_ANSI(
+  _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRV,  \
+  _______,UM_ROOT,UM_PPLY,UM_PSEF,_______,_______,_______,_______,_______,_______,KC_PSCR,_______,_______,_______, KC_HOME, \
+  _______,BL_DEC ,BL_TOGG,BL_INC,BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        _______, KC_END,  \
+  _______,_______ ,_______,UM_XCPY,UM_XINS,_______,KC_MPLY,KC_MNXT,KC_MUTE,KC_VOLD,KC_VOLU,KC_BTN1,KC_MS_U,KC_BTN2, \
+  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_R),
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  if (record->event.pressed) {
+      switch(id) {
+          case 0:
+              SEND_STRING("sudo su -\n");
+              return false; break;
+          case 1:
+              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
+              return false; break;
+          case 2:
+              SEND_STRING("ps -ef | grep ");
+              return false; break;
+          case 3:
+              return MACRO(D(LCTL), T(INS), U(LCTL), END);
+              break;
+          case 4:
+              return MACRO(D(LSFT), T(INS), U(LSFT), END);
+              break;
+          case 5:
+              return MACRO(D(LCTL), D(RALT), T(DEL), END);
+              break;
+      }
+  }
+  return MACRO_NONE;
+};
diff --git a/keyboards/tada68/keymaps/mtdjr/readme.md b/keyboards/tada68/keymaps/mtdjr/readme.md
new file mode 100644
index 000000000..53412d7c2
--- /dev/null
+++ b/keyboards/tada68/keymaps/mtdjr/readme.md
@@ -0,0 +1,3 @@
+# default TADA68 layout
+
+This layout replicates the default factory layout of the TADA68.
diff --git a/keyboards/tada68/keymaps/mtdjr/rules.mk b/keyboards/tada68/keymaps/mtdjr/rules.mk
new file mode 100644
index 000000000..2a7ff2779
--- /dev/null
+++ b/keyboards/tada68/keymaps/mtdjr/rules.mk
@@ -0,0 +1,21 @@
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # 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)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/xd75/keymaps/mtdjr/config.h b/keyboards/xd75/keymaps/mtdjr/config.h
new file mode 100644
index 000000000..aadcaa387
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2017 Benjamin Kesselring
+ *
+ * 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_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+// place overrides here
+#define RGBLIGHT_SLEEP
+#define MANUFACTURER    mtdjr
+#define PRODUCT         XD75
+#define DESCRIPTION     XD75Re
+
+#endif
diff --git a/keyboards/xd75/keymaps/mtdjr/keymap.c b/keyboards/xd75/keymaps/mtdjr/keymap.c
new file mode 100644
index 000000000..696c82ae4
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/keymap.c
@@ -0,0 +1,135 @@
+/* Copyright 2017 Wunder
+ *
+ * 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 "xd75.h"
+#include "action_layer.h"
+
+
+enum custom_keycodes {
+  // TD_ESC = 0,
+  TD_LOCK = 0,
+};
+
+// Layers
+#define _QWERTY 0
+#define _LOWER  1
+#define _RAISE  2
+
+
+
+// Shortcuts
+#define KC_____ KC_NO
+#define KC_     KC_TRNS
+#define KC_RST  RESET
+#define KC_RASE MO(_RAISE)
+#define KC_LOWR MO(_LOWER)
+
+// RGB and Backlighting
+#define KC_RGB  RGB_TOG
+#define KC_RHUI RGB_HUI
+#define KC_RHUD RGB_HUD
+#define KC_RSAI RGB_SAI
+#define KC_RSAD RGB_SAD
+#define KC_RVAI RGB_VAI
+#define KC_RVAD RGB_VAD
+#define KC_BLT  BL_TOGG
+#define KC_BLS  BL_STEP
+#define KC_BLI  BL_INC
+#define KC_BLD  BL_DEC
+
+// Tapdance
+//#define KC_EXC TD(TD_ESC)
+#define KC_LOCK TD(TD_LOCK)
+
+// Macros
+#define KC_ROOT M(0)
+#define KC_PPLY M(1)
+#define KC_PSEF M(2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_QWERTY] = KC_KEYMAP(
+//  .--------------------------------------------------------------------------.
+      ESC, 1  , 2  , 3  , 4  , 5  ,PGUP,PSCR,PGDN, 6  , 7  , 8  , 9  , 0  ,BSPC,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+      TAB, Q  , W  ,  E , R  , T  , INS,BSLS, DEL, Y  , U  , I  , O  , P  ,QUOT,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     LCTL, A  , S  ,  D , F  , G  ,HOME,PLUS,LOCK, H  , J  , K  , L  ,SCLN, ENT,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     LSFT, Z  , X  ,  C , V  , B  ,LBRC,MINS,RBRC, N  , M  ,COMM, DOT,SLSH,RSFT,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     LOWR,LCTL,LALT,LGUI,____, SPC,RASE, GRV,LOWR, SPC,____,LEFT,DOWN,UP  ,RGHT
+//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
+),
+
+ [_LOWER] = KC_KEYMAP(
+//  .--------------------------------------------------------------------------.
+     ____,  F1,  F2,  F3,  F4,  F5,  F6,____,  F7,  F8,  F9, F10, F11, F12,____,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     ____,ROOT,PPLY,PSEF,____,____,____,____,____,____,____,____,____,____,____,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     ____,____,____,____,____,____,____,____,____,____,____,____,____,____,____,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     ____,____,____,____,____,____,____,____,____,____,____,____,____,____,MUTE,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+         ,____,____,____,____,____,    ,____,    ,MPLY,____,MPRV,VOLD,VOLU,MNXT
+//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
+),
+
+[_RAISE] = KC_KEYMAP(
+//  .--------------------------------------------------------------------------.
+     ____,____,____,____,____,____,____,____,____,____,____,____,____,____,____,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     ____,____,____,____, RST,____,____,____,____,____,____,____,____,____,____,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     CAPS,____,____,____,____,____,____, BLI,____,____,____,____,____,____,____,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+      RGB,RHUI,RHUD,RSAI,RSAD,RVAI,RVAD, BLD,____,____,____,____,BTN1,BTN2,____,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+         ,____,____,____,____,____,    ,____,    ,____,____,MS_L,MS_D,MS_U,MS_R
+//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
+)
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  //Tap once for left ctrl, twice for ESC
+  //[TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_ESC),
+  [TD_LOCK] = ACTION_TAP_DANCE_DOUBLE(KC_END, LGUI(KC_L))
+};
+void led_set_user(uint8_t usb_led) {
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        capslock_led_on();
+    } else {
+        capslock_led_off();
+    }
+}
+
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  if (record->event.pressed) {
+    switch(id) {
+      case 0:
+          SEND_STRING("sudo su -\n");
+          return false; break;
+      case 1:
+          SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
+          return false; break;
+      case 2:
+          SEND_STRING("ps -ef | grep ");
+          return false; break;
+    }
+  }
+  return MACRO_NONE;
+};
diff --git a/keyboards/xd75/keymaps/mtdjr/readme.md b/keyboards/xd75/keymaps/mtdjr/readme.md
new file mode 100644
index 000000000..d53c0f34a
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/readme.md
@@ -0,0 +1 @@
+# The default keymap for xd75
diff --git a/keyboards/xd75/keymaps/mtdjr/rules.mk b/keyboards/xd75/keymaps/mtdjr/rules.mk
new file mode 100644
index 000000000..28462ff16
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/rules.mk
@@ -0,0 +1,22 @@
+# Copyright 2013 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 QUANTUM_DIR
+	include ../../../../Makefile
+endif
+
+BACKLIGHT_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+RGBLIGHT_ENABLE = yes
-- 
cgit v1.2.3-70-g09d2


From 2b677ddac9aaba14f75787ab4b6d81054ad6ffd4 Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Mon, 28 May 2018 18:02:41 -0400
Subject: Fix nyquist (and other splits using D2 in debouncing) (#3067)

* Update default Nyquist revision

* LED slave fix

* Sync changes from lets_split

* Add needed check for debouncing

* Remove line that was setting PD2 pin and interfering with use of that pin

* Add backlight key to keymap
---
 keyboards/deltasplit75/matrix.c              |  1 -
 keyboards/ergo42/matrix.c                    |  1 -
 keyboards/fourier/matrix.c                   |  1 -
 keyboards/handwired/dactyl_manuform/matrix.c |  1 -
 keyboards/iris/matrix.c                      |  1 -
 keyboards/lets_split/matrix.c                |  1 -
 keyboards/levinson/matrix.c                  |  1 -
 keyboards/nyquist/keymaps/hexwire/keymap.c   |  3 +-
 keyboards/nyquist/matrix.c                   | 48 ++++++++++++++++++++++++++--
 keyboards/nyquist/rules.mk                   |  6 ++--
 keyboards/redox/matrix.c                     |  1 -
 keyboards/vitamins_included/matrix.c         |  1 -
 keyboards/viterbi/matrix.c                   |  1 -
 keyboards/zen/matrix.c                       |  1 -
 14 files changed, 50 insertions(+), 18 deletions(-)

(limited to 'keyboards/lets_split')

diff --git a/keyboards/deltasplit75/matrix.c b/keyboards/deltasplit75/matrix.c
index db84fb02c..1ac5c5039 100644
--- a/keyboards/deltasplit75/matrix.c
+++ b/keyboards/deltasplit75/matrix.c
@@ -146,7 +146,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/ergo42/matrix.c b/keyboards/ergo42/matrix.c
index 80d4ce46a..fc42dd14d 100644
--- a/keyboards/ergo42/matrix.c
+++ b/keyboards/ergo42/matrix.c
@@ -151,7 +151,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/fourier/matrix.c b/keyboards/fourier/matrix.c
index ed913f34b..fdeead7dc 100644
--- a/keyboards/fourier/matrix.c
+++ b/keyboards/fourier/matrix.c
@@ -149,7 +149,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/handwired/dactyl_manuform/matrix.c b/keyboards/handwired/dactyl_manuform/matrix.c
index c3bfe8042..904850d4d 100644
--- a/keyboards/handwired/dactyl_manuform/matrix.c
+++ b/keyboards/handwired/dactyl_manuform/matrix.c
@@ -157,7 +157,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/iris/matrix.c b/keyboards/iris/matrix.c
index 7195fb0ea..217264f26 100644
--- a/keyboards/iris/matrix.c
+++ b/keyboards/iris/matrix.c
@@ -153,7 +153,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/lets_split/matrix.c b/keyboards/lets_split/matrix.c
index c3bfe8042..904850d4d 100644
--- a/keyboards/lets_split/matrix.c
+++ b/keyboards/lets_split/matrix.c
@@ -157,7 +157,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/levinson/matrix.c b/keyboards/levinson/matrix.c
index 7195fb0ea..217264f26 100644
--- a/keyboards/levinson/matrix.c
+++ b/keyboards/levinson/matrix.c
@@ -153,7 +153,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/nyquist/keymaps/hexwire/keymap.c b/keyboards/nyquist/keymaps/hexwire/keymap.c
index 699cc3de5..40df4bcab 100644
--- a/keyboards/nyquist/keymaps/hexwire/keymap.c
+++ b/keyboards/nyquist/keymaps/hexwire/keymap.c
@@ -36,6 +36,7 @@ enum custom_keycodes {
 #define KC_X2 RAISE
 #define KC_X3 LT(_FN3, KC_GRV)
 #define KC_X4 MT(MOD_LSFT, KC_ENT)
+#define KC_BL_S BL_STEP
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -91,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|
          ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    ,
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,
+     BL_S,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,
   //`----+----+----+----+----+----'    `----+----+----+----+----+----'
   ),
 
diff --git a/keyboards/nyquist/matrix.c b/keyboards/nyquist/matrix.c
index 5fbae1150..3cdad4adb 100644
--- a/keyboards/nyquist/matrix.c
+++ b/keyboards/nyquist/matrix.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
+Copyright 2017 Danny Nguyen <danny@keeb.io>
 
 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
@@ -31,6 +31,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #include "timer.h"
 
+#ifdef BACKLIGHT_ENABLE 
+    #include "backlight.h"
+    extern backlight_config_t backlight_config;
+#endif
+
 #ifdef USE_I2C
 #  include "i2c.h"
 #else // USE_SERIAL
@@ -58,6 +63,8 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
 #define ERROR_DISCONNECT_COUNT 5
 
+#define SERIAL_LED_ADDR 0x00
+
 #define ROWS_PER_HAND (MATRIX_ROWS/2)
 
 static uint8_t error_count = 0;
@@ -115,12 +122,23 @@ uint8_t matrix_cols(void)
 
 void matrix_init(void)
 {
+#ifdef DISABLE_JTAG
+    // JTAG disable for PORT F. write JTD bit twice within four cycles.
+    MCUCR |= (1<<JTD);
+    MCUCR |= (1<<JTD);
+#endif
+  
     debug_enable = true;
     debug_matrix = true;
     debug_mouse = true;
     // initialize row and col
+#if (DIODE_DIRECTION == COL2ROW)
     unselect_rows();
     init_cols();
+#elif (DIODE_DIRECTION == ROW2COL)
+    unselect_cols();
+    init_rows();
+#endif
 
     TX_RX_LED_INIT;
 
@@ -146,7 +164,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
@@ -196,6 +213,15 @@ int i2c_transaction(void) {
     err = i2c_master_write(0x00);
     if (err) goto i2c_error;
 
+#ifdef BACKLIGHT_ENABLE
+    // Write backlight level for slave to read
+    err = i2c_master_write(backlight_config.enable ? backlight_config.level : 0);
+#else
+    // Write zero, so our byte index is the same
+    err = i2c_master_write(0x00);
+#endif
+    if (err) goto i2c_error;
+
     // Start read
     err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
     if (err) goto i2c_error;
@@ -228,6 +254,11 @@ int serial_transaction(void) {
     for (int i = 0; i < ROWS_PER_HAND; ++i) {
         matrix[slaveOffset+i] = serial_slave_buffer[i];
     }
+
+#ifdef BACKLIGHT_ENABLE
+    // Write backlight level for slave to read
+    serial_master_buffer[SERIAL_LED_ADDR] = backlight_config.enable ? backlight_config.level : 0;
+#endif
     return 0;
 }
 #endif
@@ -268,19 +299,30 @@ void matrix_slave_scan(void) {
     int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
 
 #ifdef USE_I2C
+#ifdef BACKLIGHT_ENABLE
+    // Read backlight level sent from master and update level on slave
+    backlight_set(i2c_slave_buffer[0]);
+#endif
     for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        i2c_slave_buffer[i] = matrix[offset+i];
+        i2c_slave_buffer[i+1] = matrix[offset+i];
     }
 #else // USE_SERIAL
     for (int i = 0; i < ROWS_PER_HAND; ++i) {
         serial_slave_buffer[i] = matrix[offset+i];
     }
+
+#ifdef BACKLIGHT_ENABLE
+    // Read backlight level sent from master and update level on slave
+    backlight_set(serial_master_buffer[SERIAL_LED_ADDR]);
+#endif
 #endif
 }
 
 bool matrix_is_modified(void)
 {
+#if (DEBOUNCING_DELAY > 0)
     if (debouncing) return false;
+#endif
     return true;
 }
 
diff --git a/keyboards/nyquist/rules.mk b/keyboards/nyquist/rules.mk
index 840628e1c..e8f184041 100644
--- a/keyboards/nyquist/rules.mk
+++ b/keyboards/nyquist/rules.mk
@@ -58,13 +58,13 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 USE_I2C = yes
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
@@ -72,4 +72,4 @@ CUSTOM_MATRIX = yes
 
 LAYOUTS = ortho_5x12
 
-DEFAULT_FOLDER = nyquist/rev1
\ No newline at end of file
+DEFAULT_FOLDER = nyquist/rev2
diff --git a/keyboards/redox/matrix.c b/keyboards/redox/matrix.c
index 20c0f1d34..1607775bd 100644
--- a/keyboards/redox/matrix.c
+++ b/keyboards/redox/matrix.c
@@ -146,7 +146,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/vitamins_included/matrix.c b/keyboards/vitamins_included/matrix.c
index 7079a8da9..cf4c1064f 100644
--- a/keyboards/vitamins_included/matrix.c
+++ b/keyboards/vitamins_included/matrix.c
@@ -198,7 +198,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/viterbi/matrix.c b/keyboards/viterbi/matrix.c
index 5fbae1150..c56b49c5f 100644
--- a/keyboards/viterbi/matrix.c
+++ b/keyboards/viterbi/matrix.c
@@ -146,7 +146,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
diff --git a/keyboards/zen/matrix.c b/keyboards/zen/matrix.c
index 12f22214e..6e274d3ba 100644
--- a/keyboards/zen/matrix.c
+++ b/keyboards/zen/matrix.c
@@ -148,7 +148,6 @@ uint8_t _matrix_scan(void)
             if (matrix_changed) {
                 debouncing = true;
                 debouncing_time = timer_read();
-                PORTD ^= (1 << 2);
             }
 
 #       else
-- 
cgit v1.2.3-70-g09d2


From 034a25aedf5e0ddba2b05f4b3534c1522330d5cd Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Tue, 29 May 2018 11:01:24 -0400
Subject: Keymap fixes (#3074)

* Fix keymap to use correct macro

* Make sure RGBLED_NUM is defined to a value
---
 keyboards/lets_split/keymaps/mtdjr/keymap.c  | 8 ++++----
 layouts/community/ortho_4x12/xyverz/config.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'keyboards/lets_split')

diff --git a/keyboards/lets_split/keymaps/mtdjr/keymap.c b/keyboards/lets_split/keymaps/mtdjr/keymap.c
index 36aa51722..4846772ed 100644
--- a/keyboards/lets_split/keymaps/mtdjr/keymap.c
+++ b/keyboards/lets_split/keymaps/mtdjr/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Left |  Up  | Down |Right |
   * `-----------------------------------------'  '-----------------------------------------'
   */
-[_QWERTY] = KEYMAP( \
+[_QWERTY] = LAYOUT( \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   TD(TD_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise |   0  |   .  |   =  |   _  |
   * `-----------------------------------------'  '-----------------------------------------'
   */
-[_LOWER] = KEYMAP( \
+[_LOWER] = LAYOUT( \
   KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,  KC_9,   KC_0,    _______, \
   XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, XXXXXXX, KC_4,    KC_5,  KC_6,   KC_ASTR, KC_BSLS, \
   _______, XXXXXXX, XXXXXXX, UM_COPY, UM_INSR, XXXXXXX, XXXXXXX, KC_1,    KC_2,  KC_3,   KC_PLUS, KC_MINS, \
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------'  '-----------------------------------------'
  */
-[_RAISE] = KEYMAP( \
+[_RAISE] = LAYOUT( \
   KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,\
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |      |      |      |      |      |      |  |      |      | Home |      |      | End  |
   * `-----------------------------------------'  '-----------------------------------------'
   */
-[_ADJUST] =  KEYMAP( \
+[_ADJUST] =  LAYOUT( \
   _______, UM_ROOT, UM_PPLY, UM_PSEF, _______, _______, RESET,   _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, \
   _______, KC_UNDO, KC_CUT,  UM_COPY, UM_INSR, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index cf83cbf19..a5ddc2e73 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -13,10 +13,10 @@
   #define RGB_DI_PIN D1
 #endif
 #ifdef KEYBOARD_levinson_rev2
-  #define RGBLED_NUM
+  #define RGBLED_NUM 1
 #endif
 #ifdef KEYBOARD_lets_split_rev2
-  #define RGBLED_NUM
+  #define RGBLED_NUM 1
 #endif
 
 #define RGBLIGHT_ANIMATIONS
-- 
cgit v1.2.3-70-g09d2


From ee9a7aba396160929604aca54a23ad5534d59940 Mon Sep 17 00:00:00 2001
From: mtdjr <mtdjr@users.noreply.github.com>
Date: Thu, 31 May 2018 11:30:05 -0400
Subject: add not-so-minidox handwire keyboard (#3061)

* add not-so-minidox handwire keyboard

* corrected keymap

* multiple adjustments to not_so_minidox keyboard

* remove I2C master left define

* update default layer set function

* move solenoid code into userspace

* minor adjustments to config.h

* update keymaps to utilize userspace

* move features and config to userspace, correct build issue

* correct solenoid pin

* adjust defaults for solenoid pin and enable

* default solenoid to on for not_so_minidox

* disable RGBLIGHT_SLEEP for xd75

* tweaking solenoid enable/disable in userspace and keymaps
---
 keyboards/handwired/not_so_minidox/config.h        |  84 ++++++
 keyboards/handwired/not_so_minidox/i2c.c           | 162 +++++++++++
 keyboards/handwired/not_so_minidox/i2c.h           |  49 ++++
 .../not_so_minidox/keymaps/default/keymap.c        | 121 ++++++++
 .../not_so_minidox/keymaps/mtdjr/config.h          |  11 +
 .../not_so_minidox/keymaps/mtdjr/keymap.c          |  56 ++++
 .../not_so_minidox/keymaps/mtdjr/rules.mk          |   1 +
 keyboards/handwired/not_so_minidox/matrix.c        | 307 +++++++++++++++++++++
 .../handwired/not_so_minidox/not_so_minidox.c      |   1 +
 .../handwired/not_so_minidox/not_so_minidox.h      |  42 +++
 keyboards/handwired/not_so_minidox/readme.md       |  71 +++++
 keyboards/handwired/not_so_minidox/rules.mk        |  71 +++++
 keyboards/handwired/not_so_minidox/serial.c        | 228 +++++++++++++++
 keyboards/handwired/not_so_minidox/serial.h        |  26 ++
 keyboards/handwired/not_so_minidox/split_util.c    |  84 ++++++
 keyboards/handwired/not_so_minidox/split_util.h    |  20 ++
 keyboards/iris/keymaps/mtdjr/config.h              |   5 +-
 keyboards/iris/keymaps/mtdjr/keymap.c              | 278 ++-----------------
 keyboards/iris/keymaps/mtdjr/rules.mk              |   1 -
 keyboards/lets_split/keymaps/mtdjr/config.h        |   4 +-
 keyboards/lets_split/keymaps/mtdjr/keymap.c        | 263 +++++-------------
 keyboards/lets_split/keymaps/mtdjr/rules.mk        |   1 -
 keyboards/tada68/keymaps/mtdjr/keymap.c            |  57 +---
 keyboards/xd75/keymaps/mtdjr/config.h              |   3 +-
 keyboards/xd75/keymaps/mtdjr/keymap.c              | 108 +-------
 users/mtdjr/config.h                               |   7 +
 users/mtdjr/mtdjr.c                                | 137 +++++++++
 users/mtdjr/mtdjr.h                                |  76 +++++
 users/mtdjr/readme.md                              |  14 +
 users/mtdjr/rules.mk                               |   2 +
 users/mtdjr/solenoid.h                             | 103 +++++++
 31 files changed, 1796 insertions(+), 597 deletions(-)
 create mode 100644 keyboards/handwired/not_so_minidox/config.h
 create mode 100644 keyboards/handwired/not_so_minidox/i2c.c
 create mode 100644 keyboards/handwired/not_so_minidox/i2c.h
 create mode 100644 keyboards/handwired/not_so_minidox/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
 create mode 100644 keyboards/handwired/not_so_minidox/keymaps/mtdjr/keymap.c
 create mode 100644 keyboards/handwired/not_so_minidox/keymaps/mtdjr/rules.mk
 create mode 100644 keyboards/handwired/not_so_minidox/matrix.c
 create mode 100644 keyboards/handwired/not_so_minidox/not_so_minidox.c
 create mode 100644 keyboards/handwired/not_so_minidox/not_so_minidox.h
 create mode 100644 keyboards/handwired/not_so_minidox/readme.md
 create mode 100644 keyboards/handwired/not_so_minidox/rules.mk
 create mode 100644 keyboards/handwired/not_so_minidox/serial.c
 create mode 100644 keyboards/handwired/not_so_minidox/serial.h
 create mode 100644 keyboards/handwired/not_so_minidox/split_util.c
 create mode 100644 keyboards/handwired/not_so_minidox/split_util.h
 create mode 100644 users/mtdjr/config.h
 create mode 100644 users/mtdjr/mtdjr.c
 create mode 100644 users/mtdjr/mtdjr.h
 create mode 100644 users/mtdjr/readme.md
 create mode 100644 users/mtdjr/rules.mk
 create mode 100644 users/mtdjr/solenoid.h

(limited to 'keyboards/lets_split')

diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
new file mode 100644
index 000000000..3c0af7bf7
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/config.h
@@ -0,0 +1,84 @@
+/*
+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      0x3060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    mtdjr
+#define PRODUCT         Not So MiniDox
+#define DESCRIPTION     A larger version of the MiniDox
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, D4 }
+
+#define USE_SERIAL
+
+//#define EE_HANDS
+
+#define MASTER_LEFT
+//#define MASTER_RIGHT
+
+/* 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 DEBOUNCING_DELAY 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)) \
+)
+
+/* 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/keyboards/handwired/not_so_minidox/i2c.c b/keyboards/handwired/not_so_minidox/i2c.c
new file mode 100644
index 000000000..084c890c4
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/i2c.c
@@ -0,0 +1,162 @@
+#include <util/twi.h>
+#include <avr/io.h>
+#include <stdlib.h>
+#include <avr/interrupt.h>
+#include <util/twi.h>
+#include <stdbool.h>
+#include "i2c.h"
+
+#ifdef USE_I2C
+
+// Limits the amount of we wait for any one i2c transaction.
+// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
+// 9 bits, a single transaction will take around 90μs to complete.
+//
+// (F_CPU/SCL_CLOCK)  =>  # of μC cycles to transfer a bit
+// poll loop takes at least 8 clock cycles to execute
+#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8
+
+#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE)
+
+volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
+
+static volatile uint8_t slave_buffer_pos;
+static volatile bool slave_has_register_set = false;
+
+// Wait for an i2c operation to finish
+inline static
+void i2c_delay(void) {
+  uint16_t lim = 0;
+  while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT)
+    lim++;
+
+  // easier way, but will wait slightly longer
+  // _delay_us(100);
+}
+
+// Setup twi to run at 100kHz
+void i2c_master_init(void) {
+  // no prescaler
+  TWSR = 0;
+  // Set TWI clock frequency to SCL_CLOCK. Need TWBR>10.
+  // Check datasheets for more info.
+  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;
+}
+
+// Start a transaction with the given i2c slave address. The direction of the
+// transfer is set with I2C_READ and I2C_WRITE.
+// returns: 0 => success
+//          1 => error
+uint8_t i2c_master_start(uint8_t address) {
+  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
+
+  i2c_delay();
+
+  // check that we started successfully
+  if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
+    return 1;
+
+  TWDR = address;
+  TWCR = (1<<TWINT) | (1<<TWEN);
+
+  i2c_delay();
+
+  if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) )
+    return 1; // slave did not acknowledge
+  else
+    return 0; // success
+}
+
+
+// Finish the i2c transaction.
+void i2c_master_stop(void) {
+  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
+
+  uint16_t lim = 0;
+  while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT)
+    lim++;
+}
+
+// Write one byte to the i2c slave.
+// returns 0 => slave ACK
+//         1 => slave NACK
+uint8_t i2c_master_write(uint8_t data) {
+  TWDR = data;
+  TWCR = (1<<TWINT) | (1<<TWEN);
+
+  i2c_delay();
+
+  // check if the slave acknowledged us
+  return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1;
+}
+
+// Read one byte from the i2c slave. If ack=1 the slave is acknowledged,
+// if ack=0 the acknowledge bit is not set.
+// returns: byte read from i2c device
+uint8_t i2c_master_read(int ack) {
+  TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA);
+
+  i2c_delay();
+  return TWDR;
+}
+
+void i2c_reset_state(void) {
+  TWCR = 0;
+}
+
+void i2c_slave_init(uint8_t address) {
+  TWAR = address << 0; // slave i2c address
+  // TWEN  - twi enable
+  // TWEA  - enable address acknowledgement
+  // TWINT - twi interrupt flag
+  // TWIE  - enable the twi interrupt
+  TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN);
+}
+
+ISR(TWI_vect);
+
+ISR(TWI_vect) {
+  uint8_t ack = 1;
+  switch(TW_STATUS) {
+    case TW_SR_SLA_ACK:
+      // this device has been addressed as a slave receiver
+      slave_has_register_set = false;
+      break;
+
+    case TW_SR_DATA_ACK:
+      // this device has received data as a slave receiver
+      // The first byte that we receive in this transaction sets the location
+      // of the read/write location of the slaves memory that it exposes over
+      // i2c.  After that, bytes will be written at slave_buffer_pos, incrementing
+      // slave_buffer_pos after each write.
+      if(!slave_has_register_set) {
+        slave_buffer_pos = TWDR;
+        // don't acknowledge the master if this memory loctaion is out of bounds
+        if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) {
+          ack = 0;
+          slave_buffer_pos = 0;
+        }
+        slave_has_register_set = true;
+      } else {
+        i2c_slave_buffer[slave_buffer_pos] = TWDR;
+        BUFFER_POS_INC();
+      }
+      break;
+
+    case TW_ST_SLA_ACK:
+    case TW_ST_DATA_ACK:
+      // master has addressed this device as a slave transmitter and is
+      // requesting data.
+      TWDR = i2c_slave_buffer[slave_buffer_pos];
+      BUFFER_POS_INC();
+      break;
+
+    case TW_BUS_ERROR: // something went wrong, reset twi state
+      TWCR = 0;
+    default:
+      break;
+  }
+  // Reset everything, so we are ready for the next TWI interrupt
+  TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
+}
+#endif
diff --git a/keyboards/handwired/not_so_minidox/i2c.h b/keyboards/handwired/not_so_minidox/i2c.h
new file mode 100644
index 000000000..c15b6bc50
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/i2c.h
@@ -0,0 +1,49 @@
+#ifndef I2C_H
+#define I2C_H
+
+#include <stdint.h>
+
+#ifndef F_CPU
+#define F_CPU 16000000UL
+#endif
+
+#define I2C_READ 1
+#define I2C_WRITE 0
+
+#define I2C_ACK 1
+#define I2C_NACK 0
+
+#define SLAVE_BUFFER_SIZE 0x10
+
+// i2c SCL clock frequency
+#define SCL_CLOCK  400000L
+
+extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
+
+void i2c_master_init(void);
+uint8_t i2c_master_start(uint8_t address);
+void i2c_master_stop(void);
+uint8_t i2c_master_write(uint8_t data);
+uint8_t i2c_master_read(int);
+void i2c_reset_state(void);
+void i2c_slave_init(uint8_t address);
+
+
+static inline unsigned char i2c_start_read(unsigned char addr) {
+  return i2c_master_start((addr << 1) | I2C_READ);
+}
+
+static inline unsigned char i2c_start_write(unsigned char addr) {
+  return i2c_master_start((addr << 1) | I2C_WRITE);
+}
+
+// from SSD1306 scrips
+extern unsigned char i2c_rep_start(unsigned char addr);
+extern void i2c_start_wait(unsigned char addr);
+extern unsigned char i2c_readAck(void);
+extern unsigned char i2c_readNak(void);
+extern unsigned char i2c_read(unsigned char ack);
+
+#define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak();
+
+#endif
diff --git a/keyboards/handwired/not_so_minidox/keymaps/default/keymap.c b/keyboards/handwired/not_so_minidox/keymaps/default/keymap.c
new file mode 100644
index 000000000..8ea36198a
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/keymaps/default/keymap.c
@@ -0,0 +1,121 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+// 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 _QWERTY 0
+#define _LOWER 1
+#define _RAISE 2
+#define _ADJUST 16
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+#define KC_LOWR LOWER
+#define KC_RASE RAISE
+#define KC_RST  RESET
+#define KC_CAD  LCTL(LALT(KC_DEL))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+// ,-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------.
+    KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,             KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_BSPC,
+// |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+    KC_LCTL,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,             KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,
+// |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+    KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,             KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_ENT,
+// '-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------'
+                              KC_LGUI,KC_LOWR, KC_SPC,       KC_SPC,KC_RASE,KC_RALT
+                          // `-------+-------+-------`     `-------+-------+-------`
+   ),
+
+  [_LOWER] = LAYOUT(
+// ,-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------.
+     KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,             KC_6,   KC_7,   KC_8,   KC_9,   KC_0, KC_DEL,
+// |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+    _______,_______,_______,_______,_______,_______,          _______,_______,_______,KC_LCBR,KC_RCBR,KC_BSLS,
+// |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+    _______,_______,_______,_______,_______,_______,          _______,_______,_______,_______,_______,_______,
+// '-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------'
+                              _______,_______,_______,      _______,_______,_______
+                          // `-------+-------+-------`     `-------+-------+-------`
+  ),
+
+  [_RAISE] = LAYOUT(
+ // ,-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------.
+      KC_GRV,KC_EXLM,  KC_AT,KC_HASH, KC_DLR,KC_PERC,          KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_DEL,
+ // |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+     _______,_______,_______,_______,KC_MINS, KC_EQL,          _______,  KC_UP,_______,KC_LBRC,KC_RBRC,KC_PIPE,
+ // |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+     _______,_______,_______,_______,_______,_______,          KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,
+ // '-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------'
+                               _______,_______,_______,      _______,_______,_______
+                           // `-------+-------+-------`     `-------+-------+-------`
+   ),
+  [_ADJUST] = LAYOUT(
+// ,-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------.
+    _______,_______,_______,_______, KC_RST,_______,          _______,_______,_______,_______,_______, KC_CAD,
+// |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+    _______,_______,_______,_______,_______,_______,          _______,_______,_______,_______,_______,_______,
+// |-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------|
+    _______,_______,_______,_______,_______,_______,          _______,_______,_______,_______,_______,_______,
+// '-------+-------+-------+-------+-------+-------.         ,-------+-------+-------+-------+-------+-------'
+                              _______,_______,_______,      _______,_______,_______
+                          // `-------+-------+-------`     `-------+-------+-------`
+  )
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_ADJUST);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
new file mode 100644
index 000000000..fa6151e10
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
@@ -0,0 +1,11 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include QMK_KEYBOARD_CONFIG_H
+
+#define SOLENOID_ENABLE
+#define SOLENOID_PIN F6
+#undef  SOLENOID_ACTIVE
+#define SOLENOID_ACTIVE true
+
+#endif
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/keymap.c b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/keymap.c
new file mode 100644
index 000000000..01c64d870
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/keymap.c
@@ -0,0 +1,56 @@
+#include QMK_KEYBOARD_H
+#include "mtdjr.h"
+
+extern keymap_config_t keymap_config;
+
+#define KC_LOCK TD(TD_ALTLOCK)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_kc(
+  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
+       TAB,    Q,    W,    E,    R,    T,             Y,    U,    I,    O,    P, BSPC,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+      LCTL,    A,    S,    D,    F,    G,             H,    J,    K,    L, SCLN, QUOT,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+      LSFT,    Z,    X,    C,    V,    B,             N,    M, COMM,  DOT, SLSH,  ENT,
+  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
+                          LGUI, LOWR,  SPC,       SPC, RASE, LOCK
+  //                     `----+-----+-----`     `----+-----+-----`
+   ),
+
+  [_LOWER] = LAYOUT_kc(
+  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
+       ESC,    1,    2,    3,    4,    5,             6,    7,    8,    9,    0,  DEL,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+          ,     ,     ,     ,     ,     ,              ,     ,     , LCBR, RCBR, BSLS,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+          ,     ,     , XCPY, XINS,     ,              ,     ,     ,     ,     ,     ,
+  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
+                              ,     ,     ,          ,     ,
+  //                     `----+-----+-----`     `----+-----+-----`
+  ),
+
+  [_RAISE] = LAYOUT_kc(
+  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
+       GRV, EXLM,   AT, HASH,  DLR, PERC,          CIRC, AMPR, ASTR, LPRN, RPRN,  DEL,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+          ,     ,     ,     , MINS,  EQL,              ,     ,   UP, LBRC, RBRC, PIPE,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+          ,     ,     ,     ,     ,     ,              , LEFT, DOWN, RGHT,     ,     ,
+  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
+                              ,     ,     ,          ,     ,
+  //                     `----+-----+-----`     `----+-----+-----`
+   ),
+  [_ADJUST] = LAYOUT_kc(
+  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
+      STOG, xxxx, xxxx, xxxx,  RST, xxxx,          ROOT, PPLY, PSEF, xxxx, xxxx,  CAD,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+      SDM,   SDP, SBOF, SBON, xxxx, xxxx,          xxxx, xxxx, xxxx, xxxx, xxxx, xxxx,
+  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
+      xxxx, xxxx, xxxx, xxxx, xxxx, xxxx,          xxxx, xxxx, xxxx, xxxx, xxxx, xxxx,
+  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
+                          xxxx,     , xxxx,      xxxx,     , xxxx
+  //                     `----+-----+-----`     `----+-----+-----`
+  )
+};
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/rules.mk b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/rules.mk
new file mode 100644
index 000000000..e5ddcae8d
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/not_so_minidox/matrix.c b/keyboards/handwired/not_so_minidox/matrix.c
new file mode 100644
index 000000000..27a38dca0
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/matrix.c
@@ -0,0 +1,307 @@
+/*
+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/>.
+*/
+
+/*
+ * scan matrix
+ */
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include "print.h"
+#include "debug.h"
+#include "util.h"
+#include "matrix.h"
+#include "split_util.h"
+#include "pro_micro.h"
+#include "config.h"
+
+#ifdef USE_I2C
+#  include "i2c.h"
+#else // USE_SERIAL
+#  include "serial.h"
+#endif
+
+#ifndef DEBOUNCE
+#  define DEBOUNCE	5
+#endif
+
+#define ERROR_DISCONNECT_COUNT 5
+
+static uint8_t debouncing = DEBOUNCE;
+static const int ROWS_PER_HAND = MATRIX_ROWS/2;
+static uint8_t error_count = 0;
+
+static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
+
+static matrix_row_t read_cols(void);
+static void init_cols(void);
+static void unselect_rows(void);
+static void select_row(uint8_t row);
+
+
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
+
+void matrix_init(void)
+{
+    debug_enable = true;
+    debug_matrix = true;
+    debug_mouse = true;
+    // initialize row and col
+    unselect_rows();
+    init_cols();
+
+    TX_RX_LED_INIT;
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
+    }
+
+    matrix_init_quantum();
+}
+
+uint8_t _matrix_scan(void)
+{
+    // Right hand is stored after the left in the matirx so, we need to offset it
+    int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
+
+    for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
+        select_row(i);
+        _delay_us(30);  // without this wait read unstable value.
+        matrix_row_t cols = read_cols();
+        if (matrix_debouncing[i+offset] != cols) {
+            matrix_debouncing[i+offset] = cols;
+            debouncing = DEBOUNCE;
+        }
+        unselect_rows();
+    }
+
+    if (debouncing) {
+        if (--debouncing) {
+            _delay_ms(1);
+        } else {
+            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
+                matrix[i+offset] = matrix_debouncing[i+offset];
+            }
+        }
+    }
+
+    return 1;
+}
+
+#ifdef USE_I2C
+
+// Get rows from other half over i2c
+int i2c_transaction(void) {
+    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
+
+    int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
+    if (err) goto i2c_error;
+
+    // start of matrix stored at 0x00
+    err = i2c_master_write(0x00);
+    if (err) goto i2c_error;
+
+    // Start read
+    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
+    if (err) goto i2c_error;
+
+    if (!err) {
+        int i;
+        for (i = 0; i < ROWS_PER_HAND-1; ++i) {
+            matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
+        }
+        matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
+        i2c_master_stop();
+    } else {
+i2c_error: // the cable is disconnceted, or something else went wrong
+        i2c_reset_state();
+        return err;
+    }
+
+    return 0;
+}
+
+#else // USE_SERIAL
+
+int serial_transaction(void) {
+    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
+
+    if (serial_update_buffers()) {
+        return 1;
+    }
+
+    for (int i = 0; i < ROWS_PER_HAND; ++i) {
+        matrix[slaveOffset+i] = serial_slave_buffer[i];
+    }
+    return 0;
+}
+#endif
+
+uint8_t matrix_scan(void)
+{
+    int ret = _matrix_scan();
+
+
+
+#ifdef USE_I2C
+    if( i2c_transaction() ) {
+#else // USE_SERIAL
+    if( serial_transaction() ) {
+#endif
+        // turn on the indicator led when halves are disconnected
+        TXLED1;
+
+        error_count++;
+
+        if (error_count > ERROR_DISCONNECT_COUNT) {
+            // reset other half if disconnected
+            int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
+            for (int i = 0; i < ROWS_PER_HAND; ++i) {
+                matrix[slaveOffset+i] = 0;
+            }
+        }
+    } else {
+        // turn off the indicator led on no error
+        TXLED0;
+        error_count = 0;
+    }
+    matrix_scan_quantum();
+    return ret;
+}
+
+void matrix_slave_scan(void) {
+    _matrix_scan();
+
+    int offset = (isLeftHand) ? 0 : (MATRIX_ROWS / 2);
+
+#ifdef USE_I2C
+    for (int i = 0; i < ROWS_PER_HAND; ++i) {
+        /* i2c_slave_buffer[i] = matrix[offset+i]; */
+        i2c_slave_buffer[i] = matrix[offset+i];
+    }
+#else // USE_SERIAL
+    for (int i = 0; i < ROWS_PER_HAND; ++i) {
+        serial_slave_buffer[i] = matrix[offset+i];
+    }
+#endif
+}
+
+bool matrix_is_modified(void)
+{
+    if (debouncing) return false;
+    return true;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & ((matrix_row_t)1<<col));
+}
+
+inline
+matrix_row_t matrix_get_row(uint8_t row)
+{
+    return matrix[row];
+}
+
+void matrix_print(void)
+{
+    print("\nr/c 0123456789ABCDEF\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        phex(row); print(": ");
+        pbin_reverse16(matrix_get_row(row));
+        print("\n");
+    }
+}
+
+uint8_t matrix_key_count(void)
+{
+    uint8_t count = 0;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        count += bitpop16(matrix[i]);
+    }
+    return count;
+}
+
+static void  init_cols(void)
+{
+    for(int x = 0; x < MATRIX_COLS; x++) {
+        _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
+        _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
+    }
+}
+
+static matrix_row_t read_cols(void)
+{
+    matrix_row_t result = 0;
+    for(int x = 0; x < MATRIX_COLS; x++) {
+        result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
+    }
+    return result;
+}
+
+static void unselect_rows(void)
+{
+    for(int x = 0; x < ROWS_PER_HAND; x++) {
+        _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
+        _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
+    }
+}
+
+static void select_row(uint8_t row)
+{
+    _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
+    _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
+}
diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.c b/keyboards/handwired/not_so_minidox/not_so_minidox.c
new file mode 100644
index 000000000..898c9eaca
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/not_so_minidox.c
@@ -0,0 +1 @@
+#include "not_so_minidox.h"
\ No newline at end of file
diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.h b/keyboards/handwired/not_so_minidox/not_so_minidox.h
new file mode 100644
index 000000000..05e7bc491
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/not_so_minidox.h
@@ -0,0 +1,42 @@
+#ifndef NOSOTMINIDOX_H
+#define NOSOTMINIDOX_H
+
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05,           R05, R04, R03, R02, R01, R00, \
+	L10, L11, L12, L13, L14, L15,           R15, R14, R13, R12, R11, R10, \
+	L20, L21, L22, L23, L24, L25,           R25, R24, R23, R22, R21, R20, \
+											LT1, LT2, LT3, RT3, RT2, RT1 \
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05 }, \
+		{ L10, L11, L12, L13, L14, L15 }, \
+		{ L20, L21, L22, L23, L24, L25 }, \
+		{ KC_NO, KC_NO, KC_NO, LT1, LT2, LT3 }, \
+		{ R00, R01, R02, R03, R04, R05 }, \
+		{ R10, R11, R12, R13, R14, R15 }, \
+		{ R20, R21, R22, R23, R24, R25 }, \
+		{ KC_NO, KC_NO, KC_NO, RT1, RT2, RT3 }, \
+	}
+
+// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT_kc( \
+	L00, L01, L02, L03, L04, L05,           R05, R04, R03, R02, R01, R00, \
+	L10, L11, L12, L13, L14, L15,           R15, R14, R13, R12, R11, R10, \
+	L20, L21, L22, L23, L24, L25,           R25, R24, R23, R22, R21, R20, \
+											LT1, LT2, LT3, RT3, RT2, RT1 \
+	) \
+	{ \
+		{ KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05 }, \
+		{ KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15 }, \
+		{ KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25 }, \
+		{ KC_NO, KC_NO, KC_NO, KC_##LT1, KC_##LT2, KC_##LT3 }, \
+		{ KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05 }, \
+		{ KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15 }, \
+		{ KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25 }, \
+		{ KC_NO, KC_NO, KC_NO, KC_##RT1, KC_##RT2, KC_##RT3 }, \
+	}
+
+#endif
diff --git a/keyboards/handwired/not_so_minidox/readme.md b/keyboards/handwired/not_so_minidox/readme.md
new file mode 100644
index 000000000..fbfa7b7be
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/readme.md
@@ -0,0 +1,71 @@
+not_so_minidox
+=====
+
+![not_so_minidox]()
+
+A slightly larger version of the MiniDox
+
+Keyboard Maintainer: mtdjr
+Hardware Supported: None yet/ProMicro
+
+Make example for this keyboard (after setting up your build environment):
+
+    make not_so_minidox/rev1:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+
+Flashing
+-------
+Note: Most of this is copied from the Let's Split readme, because it is awesome
+
+From the root directory run `make PROJECT:KEYMAP:avrdude` for automatic serial port resolution and flashing.
+Example: `make not_so_minidox/rev1:default:avrdude`
+
+Choosing which board to plug the USB cable into (choosing Master)
+--------
+Because the two boards are identical, the firmware has logic to differentiate the left and right board.
+
+It uses two strategies to figure things out: look at the EEPROM (memory on the chip) or looks if the current board has the usb cable.
+
+The EEPROM approach requires additional setup (flashing the eeeprom) but allows you to swap the usb cable to either side.
+
+The USB cable approach is easier to setup and if you just want the usb cable on the left board, you do not need to do anything extra.
+
+### Setting the left hand as master
+If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` or `MASTER_RIGHT` if for some reason it was set.
+
+### Setting the right hand as master
+If you always plug the usb cable into the right board, add an extra flag to your `config.h`
+```
+ #define MASTER_RIGHT
+```
+
+### Setting EE_hands to use either hands as master
+If you define `EE_HANDS` in your `config.h`, you will need to set the
+EEPROM for the left and right halves.
+
+The EEPROM is used to store whether the
+half is left handed or right handed. This makes it so that the same firmware
+file will run on both hands instead of having to flash left and right handed
+versions of the firmware to each half. To flash the EEPROM file for the left
+half run:
+```
+avrdude -p atmega32u4 -P $(COM_PORT) -c avr109 -U eeprom:w:eeprom-lefthand.eep
+// or the equivalent in dfu-programmer
+
+```
+and similarly for right half
+```
+avrdude -p atmega32u4 -P $(COM_PORT) -c avr109 -U eeprom:w:eeprom-righhand.eep
+// or the equivalent in dfu-programmer
+```
+
+NOTE: replace `$(COM_PORT)` with the port of your device (e.g. `/dev/ttyACM0`)
+
+After you have flashed the EEPROM, you then need to set `EE_HANDS` in your config.h, rebuild the hex files and reflash.
+
+Note that you need to program both halves, but you have the option of using
+different keymaps for each half. You could program the left half with a QWERTY
+layout and the right half with a Colemak layout using bootmagic's default layout option.
+Then if you connect the left half to a computer by USB the keyboard will use QWERTY and Colemak when the
+right half is connected.
diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk
new file mode 100644
index 000000000..fe4cc014e
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/rules.mk
@@ -0,0 +1,71 @@
+SRC += matrix.c \
+	   i2c.c \
+	   split_util.c \
+	   serial.c
+
+# 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)
+
+# Bootloader
+#     This definition is optional, and if your keyboard supports multiple bootloaders of
+#     different sizes, comment this out, and the correct address will be loaded
+#     automatically (+60). See bootloader.mk for all options.
+BOOTLOADER = caterina
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= no       # Audio control and System control(+450)
+CONSOLE_ENABLE ?= no         # Console for debug(+400)
+COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+NKRO_ENABLE ?= no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE ?= no      # Enable keyboard backlight functionality
+MIDI_ENABLE ?= no            # MIDI controls
+AUDIO_ENABLE ?= no           # Audio output on port C6
+UNICODE_ENABLE ?= no         # Unicode
+BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE ?= no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+USE_I2C ?= no
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend
+
+CUSTOM_MATRIX = yes
diff --git a/keyboards/handwired/not_so_minidox/serial.c b/keyboards/handwired/not_so_minidox/serial.c
new file mode 100644
index 000000000..74bcbb6bf
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/serial.c
@@ -0,0 +1,228 @@
+/*
+ * WARNING: be careful changing this code, it is very timing dependent
+ */
+
+#ifndef F_CPU
+#define F_CPU 16000000
+#endif
+
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <stdbool.h>
+#include "serial.h"
+
+#ifndef USE_I2C
+
+// Serial pulse period in microseconds. Its probably a bad idea to lower this
+// value.
+#define SERIAL_DELAY 24
+
+uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
+uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
+
+#define SLAVE_DATA_CORRUPT (1<<0)
+volatile uint8_t status = 0;
+
+inline static
+void serial_delay(void) {
+  _delay_us(SERIAL_DELAY);
+}
+
+inline static
+void serial_output(void) {
+  SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
+}
+
+// make the serial pin an input with pull-up resistor
+inline static
+void serial_input(void) {
+  SERIAL_PIN_DDR  &= ~SERIAL_PIN_MASK;
+  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
+}
+
+inline static
+uint8_t serial_read_pin(void) {
+  return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);
+}
+
+inline static
+void serial_low(void) {
+  SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
+}
+
+inline static
+void serial_high(void) {
+  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
+}
+
+void serial_master_init(void) {
+  serial_output();
+  serial_high();
+}
+
+void serial_slave_init(void) {
+  serial_input();
+
+  // Enable INT0
+  EIMSK |= _BV(INT0);
+  // Trigger on falling edge of INT0
+  EICRA &= ~(_BV(ISC00) | _BV(ISC01));
+}
+
+// Used by the master to synchronize timing with the slave.
+static
+void sync_recv(void) {
+  serial_input();
+  // This shouldn't hang if the slave disconnects because the
+  // serial line will float to high if the slave does disconnect.
+  while (!serial_read_pin());
+  serial_delay();
+}
+
+// Used by the slave to send a synchronization signal to the master.
+static
+void sync_send(void) {
+  serial_output();
+
+  serial_low();
+  serial_delay();
+
+  serial_high();
+}
+
+// Reads a byte from the serial line
+static
+uint8_t serial_read_byte(void) {
+  uint8_t byte = 0;
+  serial_input();
+  for ( uint8_t i = 0; i < 8; ++i) {
+    byte = (byte << 1) | serial_read_pin();
+    serial_delay();
+    _delay_us(1);
+  }
+
+  return byte;
+}
+
+// Sends a byte with MSB ordering
+static
+void serial_write_byte(uint8_t data) {
+  uint8_t b = 8;
+  serial_output();
+  while( b-- ) {
+    if(data & (1 << b)) {
+      serial_high();
+    } else {
+      serial_low();
+    }
+    serial_delay();
+  }
+}
+
+// interrupt handle to be used by the slave device
+ISR(SERIAL_PIN_INTERRUPT) {
+  sync_send();
+
+  uint8_t checksum = 0;
+  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) {
+    serial_write_byte(serial_slave_buffer[i]);
+    sync_send();
+    checksum += serial_slave_buffer[i];
+  }
+  serial_write_byte(checksum);
+  sync_send();
+
+  // wait for the sync to finish sending
+  serial_delay();
+
+  // read the middle of pulses
+  _delay_us(SERIAL_DELAY/2);
+
+  uint8_t checksum_computed = 0;
+  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) {
+    serial_master_buffer[i] = serial_read_byte();
+    sync_send();
+    checksum_computed += serial_master_buffer[i];
+  }
+  uint8_t checksum_received = serial_read_byte();
+  sync_send();
+
+  serial_input(); // end transaction
+
+  if ( checksum_computed != checksum_received ) {
+    status |= SLAVE_DATA_CORRUPT;
+  } else {
+    status &= ~SLAVE_DATA_CORRUPT;
+  }
+}
+
+inline
+bool serial_slave_DATA_CORRUPT(void) {
+  return status & SLAVE_DATA_CORRUPT;
+}
+
+// Copies the serial_slave_buffer to the master and sends the
+// serial_master_buffer to the slave.
+//
+// Returns:
+// 0 => no error
+// 1 => slave did not respond
+int serial_update_buffers(void) {
+  // this code is very time dependent, so we need to disable interrupts
+  cli();
+
+  // signal to the slave that we want to start a transaction
+  serial_output();
+  serial_low();
+  _delay_us(1);
+
+  // wait for the slaves response
+  serial_input();
+  serial_high();
+  _delay_us(SERIAL_DELAY);
+
+  // check if the slave is present
+  if (serial_read_pin()) {
+    // slave failed to pull the line low, assume not present
+    sei();
+    return 1;
+  }
+
+  // if the slave is present syncronize with it
+  sync_recv();
+
+  uint8_t checksum_computed = 0;
+  // receive data from the slave
+  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) {
+    serial_slave_buffer[i] = serial_read_byte();
+    sync_recv();
+    checksum_computed += serial_slave_buffer[i];
+  }
+  uint8_t checksum_received = serial_read_byte();
+  sync_recv();
+
+  if (checksum_computed != checksum_received) {
+    sei();
+    return 1;
+  }
+
+  uint8_t checksum = 0;
+  // send data to the slave
+  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) {
+    serial_write_byte(serial_master_buffer[i]);
+    sync_recv();
+    checksum += serial_master_buffer[i];
+  }
+  serial_write_byte(checksum);
+  sync_recv();
+
+  // always, release the line when not in use
+  serial_output();
+  serial_high();
+
+  sei();
+  return 0;
+}
+
+#endif
diff --git a/keyboards/handwired/not_so_minidox/serial.h b/keyboards/handwired/not_so_minidox/serial.h
new file mode 100644
index 000000000..15fe4db7b
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/serial.h
@@ -0,0 +1,26 @@
+#ifndef MY_SERIAL_H
+#define MY_SERIAL_H
+
+#include "config.h"
+#include <stdbool.h>
+
+/* TODO:  some defines for interrupt setup */
+#define SERIAL_PIN_DDR DDRD
+#define SERIAL_PIN_PORT PORTD
+#define SERIAL_PIN_INPUT PIND
+#define SERIAL_PIN_MASK _BV(PD0)
+#define SERIAL_PIN_INTERRUPT INT0_vect
+
+#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
+#define SERIAL_MASTER_BUFFER_LENGTH 1
+
+// Buffers for master - slave communication
+extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH];
+extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH];
+
+void serial_master_init(void);
+void serial_slave_init(void);
+int serial_update_buffers(void);
+bool serial_slave_data_corrupt(void);
+
+#endif
diff --git a/keyboards/handwired/not_so_minidox/split_util.c b/keyboards/handwired/not_so_minidox/split_util.c
new file mode 100644
index 000000000..39639c3b4
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/split_util.c
@@ -0,0 +1,84 @@
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/power.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <avr/eeprom.h>
+#include "split_util.h"
+#include "matrix.h"
+#include "keyboard.h"
+#include "config.h"
+
+#ifdef USE_I2C
+#  include "i2c.h"
+#else
+#  include "serial.h"
+#endif
+
+volatile bool isLeftHand = true;
+
+static void setup_handedness(void) {
+  #ifdef EE_HANDS
+    isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
+  #else
+    // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c
+    #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
+      isLeftHand = !has_usb();
+    #else
+      isLeftHand = has_usb();
+    #endif
+  #endif
+}
+
+static void keyboard_master_setup(void) {
+#ifdef USE_I2C
+    i2c_master_init();
+#ifdef SSD1306OLED
+    matrix_master_OLED_init ();
+#endif
+#else
+    serial_master_init();
+#endif
+}
+
+static void keyboard_slave_setup(void) {
+#ifdef USE_I2C
+    i2c_slave_init(SLAVE_I2C_ADDRESS);
+#else
+    serial_slave_init();
+#endif
+}
+
+bool has_usb(void) {
+   USBCON |= (1 << OTGPADE); //enables VBUS pad
+   _delay_us(5);
+   return (USBSTA & (1<<VBUS));  //checks state of VBUS
+}
+
+void split_keyboard_setup(void) {
+   setup_handedness();
+
+   if (has_usb()) {
+      keyboard_master_setup();
+   } else {
+      keyboard_slave_setup();
+   }
+   sei();
+}
+
+void keyboard_slave_loop(void) {
+   matrix_init();
+
+   while (1) {
+      matrix_slave_scan();
+   }
+}
+
+// this code runs before the usb and keyboard is initialized
+void matrix_setup(void) {
+    split_keyboard_setup();
+
+    if (!has_usb()) {
+        keyboard_slave_loop();
+    }
+}
diff --git a/keyboards/handwired/not_so_minidox/split_util.h b/keyboards/handwired/not_so_minidox/split_util.h
new file mode 100644
index 000000000..595a0659e
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/split_util.h
@@ -0,0 +1,20 @@
+#ifndef SPLIT_KEYBOARD_UTIL_H
+#define SPLIT_KEYBOARD_UTIL_H
+
+#include <stdbool.h>
+#include "eeconfig.h"
+
+#define SLAVE_I2C_ADDRESS           0x32
+
+extern volatile bool isLeftHand;
+
+// slave version of matix scan, defined in matrix.c
+void matrix_slave_scan(void);
+
+void split_keyboard_setup(void);
+bool has_usb(void);
+void keyboard_slave_loop(void);
+
+void matrix_master_OLED_init (void);
+
+#endif
diff --git a/keyboards/iris/keymaps/mtdjr/config.h b/keyboards/iris/keymaps/mtdjr/config.h
index 0e8938775..28109d3ab 100644
--- a/keyboards/iris/keymaps/mtdjr/config.h
+++ b/keyboards/iris/keymaps/mtdjr/config.h
@@ -20,6 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
+#define SOLENOID_ENABLE
+#define SOLENOID_PIN C6
+
 /* Use I2C or Serial, not both */
 
 #define USE_SERIAL
@@ -28,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Select hand configuration */
 
 #define MASTER_LEFT
-#define TAPPING_TERM 250
+
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
diff --git a/keyboards/iris/keymaps/mtdjr/keymap.c b/keyboards/iris/keymaps/mtdjr/keymap.c
index ba95d16b2..d6e3ec05e 100644
--- a/keyboards/iris/keymaps/mtdjr/keymap.c
+++ b/keyboards/iris/keymaps/mtdjr/keymap.c
@@ -1,145 +1,8 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "action_macro.h"
-#include <timer.h>
-#include "pincontrol.h"
+#include QMK_KEYBOARD_H
+#include "mtdjr.h"
 
 extern keymap_config_t keymap_config;
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _SUPER 3
-#define _ADJUST 16
-#define SOLENOID_DEFAULT_DWELL 12
-#define SOLENOID_MAX_DWELL 100
-#define SOLENOID_MIN_DWELL 4
-#define SOLENOID_PIN C6
-
-
-bool solenoid_enabled = false;
-bool solenoid_on = false;
-bool solenoid_buzz = false;
-bool solenoid_buzzing = false;
-uint16_t solenoid_start = 0;
-uint8_t solenoid_dwell = SOLENOID_DEFAULT_DWELL;
-
-
-void solenoid_buzz_on(void) {
-  solenoid_buzz = true;
-}
-
-void solenoid_buzz_off(void) {
-  solenoid_buzz = false;
-}
-
-void solenoid_dwell_minus(void) {
-  if (solenoid_dwell > 0) solenoid_dwell--;
-}
-
-void solenoid_dwell_plus(void) {
-  if (solenoid_dwell < SOLENOID_MAX_DWELL) solenoid_dwell++;
-}
-
-void solenoid_toggle(void) {
-  solenoid_enabled = !solenoid_enabled;
-}
-
-void solenoid_stop(void) {
-  digitalWrite(SOLENOID_PIN, PinLevelLow);
-  solenoid_on = false;
-  solenoid_buzzing = false;
-}
-
-void solenoid_fire(void) {
-  if (!solenoid_enabled) return;
-
-  if (!solenoid_buzz && solenoid_on) return;
-  if (solenoid_buzz && solenoid_buzzing) return;
-
-  solenoid_on = true;
-  solenoid_buzzing = true;
-  solenoid_start = timer_read();
-  digitalWrite(SOLENOID_PIN, PinLevelHigh);
-}
-
-void solenoid_check(void) {
-  uint16_t elapsed = 0;
-
-  if (!solenoid_on) return;
-
-  elapsed = timer_elapsed(solenoid_start);
-
-  //Check if it's time to finish this solenoid click cycle
-  if (elapsed > solenoid_dwell) {
-    solenoid_stop();
-    return;
-  }
-
-  //Check whether to buzz the solenoid on and off
-  if (solenoid_buzz) {
-    if (elapsed / SOLENOID_MIN_DWELL % 2 == 0){
-      if (!solenoid_buzzing) {
-        solenoid_buzzing = true;
-        digitalWrite(SOLENOID_PIN, PinLevelHigh);
-      }
-    }
-    else {
-      if (solenoid_buzzing) {
-        solenoid_buzzing = false;
-        digitalWrite(SOLENOID_PIN, PinLevelLow);
-      }
-    }
-  }
-}
-
-void solenoid_setup(void) {
-  pinMode(SOLENOID_PIN, PinDirectionOutput);
-}
-
-void matrix_init_user(void) {
-  solenoid_setup();
-}
-
-void matrix_scan_user(void) {
-  solenoid_check();
-}
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  SUPER,
-  ADJUST,
-  SOL_TOG,
-  SOLENOID_DWELL_MINUS,
-  SOLENOID_DWELL_PLUS,
-  SOLENOID_BUZZ_ON,
-  SOLENOID_BUZZ_OFF,
-  TD_ESC = 0,
-};
-
-#define KC_ KC_TRNS
-#define _______ KC_TRNS
-
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_SUPR SUPER
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_EXC TD(TD_ESC)
-#define SOLTOG SOLENOID_TOG
-
-// Macro Declarations
-#define UM_ROOT M(0)
-#define UM_PPLY M(1)
-#define UM_PSEF M(2)
-#define KC_XCPY M(3)
-#define KC_XINS M(4)
-#define UM_CAD  M(5)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_kc(
@@ -152,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
       EQL, Z  , X  , C  , V  , B  ,LGUI,     LALT, N  , M  ,COMM,DOT ,SLSH,MINS,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LCTL,RASE,SPC ,         SPC ,LOWR,SUPR
+                       LCTL,RASE,SPC ,         SPC ,LOWR,xxxx
   //                  `----+----+----'        `----+----+----'
   ),
 
@@ -178,130 +41,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
          , F9 ,F10 ,F11 ,F12 ,    ,                   ,    ,    ,    ,    ,    ,
   //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,XCPY,XINS,    ,    ,         ,    ,    ,    ,    ,    ,PLUS,
+         ,    ,    ,XCPY,XINS,    ,    ,         ,    ,    ,    ,    ,    ,    ,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
                            ,    ,    ,             ,    ,
   //                  `----+----+----'        `----+----+----'
   ),
 
-  [_SUPER] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      SOL_TOG, UM_ROOT, UM_PPLY, UM_PSEF, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                            _______, KC_LBRC, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, UM_CAD ,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-)
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for grave accent, twice for ESC
-  [TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_ESC)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    solenoid_fire();
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case SUPER:
-      if (record->event.pressed) {
-        layer_on(_SUPER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_SUPER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case SOLTOG:
-      if (record->event.pressed) {
-        solenoid_toggle();
-      }
-      break;
-    case SOLENOID_DWELL_MINUS:
-      if (record->event.pressed) {
-        solenoid_dwell_minus();
-      }
-      break;
-    case SOLENOID_DWELL_PLUS:
-      if (record->event.pressed) {
-        solenoid_dwell_plus();
-      }
-      break;
-    case SOLENOID_BUZZ_ON:
-      if (record->event.pressed) {
-        solenoid_buzz_on();
-      }
-      break;
-    case SOLENOID_BUZZ_OFF:
-      if (record->event.pressed) {
-        solenoid_buzz_off();
-      }
-      break;
-  }
-  return true;
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  if (record->event.pressed) {
-      switch(id) {
-          case 0:
-              SEND_STRING("sudo su -\n");
-              return false; break;
-          case 1:
-              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
-              return false; break;
-          case 2:
-              SEND_STRING("ps -ef | grep ");
-              return false; break;
-          case 3:
-              return MACRO(D(LCTL), T(INS), U(LCTL), END);
-              break;
-          case 4:
-              return MACRO(D(LSFT), T(INS), U(LSFT), END);
-              break;
-          case 5:
-              return MACRO(D(LCTL), D(RALT), T(DEL), END);
-              break;
-      }
-  }
-  return MACRO_NONE;
+  [_ADJUST] = LAYOUT_kc(
+  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
+     STOG,ROOT,PPLY,PSEF,xxxx,xxxx,               xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,               xxxx,xxxx,xxxx,xxxx,xxxx,BSLS,
+  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,               xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
+                       xxxx,    ,xxxx,         xxxx,    ,
+  //                  `----+----+----'        `----+----+----'
+  )
 };
diff --git a/keyboards/iris/keymaps/mtdjr/rules.mk b/keyboards/iris/keymaps/mtdjr/rules.mk
index 7c19013e5..c5e16f136 100644
--- a/keyboards/iris/keymaps/mtdjr/rules.mk
+++ b/keyboards/iris/keymaps/mtdjr/rules.mk
@@ -1,6 +1,5 @@
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = no
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
diff --git a/keyboards/lets_split/keymaps/mtdjr/config.h b/keyboards/lets_split/keymaps/mtdjr/config.h
index 761e9e175..2b5a19365 100644
--- a/keyboards/lets_split/keymaps/mtdjr/config.h
+++ b/keyboards/lets_split/keymaps/mtdjr/config.h
@@ -23,11 +23,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
+#define SOLENOID_ENABLE
+#define SOLENOID_PIN F4
+
 /* Use I2C or Serial, not both */
 
 // #define USE_SERIAL
  #define USE_I2C
- #define TAPPING_TERM 250
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/mtdjr/keymap.c b/keyboards/lets_split/keymaps/mtdjr/keymap.c
index 4846772ed..72476c700 100644
--- a/keyboards/lets_split/keymaps/mtdjr/keymap.c
+++ b/keyboards/lets_split/keymaps/mtdjr/keymap.c
@@ -1,194 +1,81 @@
-#include "lets_split.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "action_macro.h"
+#include QMK_KEYBOARD_H
+#include "mtdjr.h"
 
 extern keymap_config_t keymap_config;
 
-// 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 _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  TD_ESC = 0
-};
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-
-// Macro Declarations
-#define UM_ROOT M(0)
-#define UM_PPLY M(1)
-#define UM_COPY M(2)
-#define UM_INSR M(3)
-#define UM_PSEF M(4)
-
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  /* Qwerty
-  * ,-----------------------------------------.  ,-----------------------------------------.
-  * | Tab  |   Q  |   W  |   E  |   R  |   T  |  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |Esc/~ |   A  |   S  |   D  |   F  |   G  |  |   H  |   J  |   K  |   L  |   ;  |  '/" |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * | Shift|   Z  |   X  |   C  |   V  |   B  |  |   N  |   M  |   ,  |   .  |   /  |Enter |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Left |  Up  | Down |Right |
-  * `-----------------------------------------'  '-----------------------------------------'
-  */
-[_QWERTY] = LAYOUT( \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  TD(TD_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT \
-),
-
-  /* Lower
-  * ,-----------------------------------------.  ,-----------------------------------------.
-  * |   ~  |   1  |   2  |   3  |   4  |   5  |  |   6  |   7  |   8  |   9  |   0  | Bksp |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |      |      |   [  |   ]  |   {  |   }  |  |      |   4  |   5  |   6  |   *  |   \  |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |Shift |      |      | copy |insert|      |  |      |   1  |   2  |   3  |   +  |   -  |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise |   0  |   .  |   =  |   _  |
-  * `-----------------------------------------'  '-----------------------------------------'
-  */
-[_LOWER] = LAYOUT( \
-  KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,  KC_9,   KC_0,    _______, \
-  XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, XXXXXXX, KC_4,    KC_5,  KC_6,   KC_ASTR, KC_BSLS, \
-  _______, XXXXXXX, XXXXXXX, UM_COPY, UM_INSR, XXXXXXX, XXXXXXX, KC_1,    KC_2,  KC_3,   KC_PLUS, KC_MINS, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_0,  KC_DOT, KC_EQL,  KC_UNDS \
-),
-
-
-/* Raise
- * ,-----------------------------------------.  ,-----------------------------------------.
- * |   `  |   !  |   @  |   #  |   $  |   %  |  |   ^  |  &   |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------|  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |  |      |      |      |      |   \  |   |  |
- * |------+------+------+------+------+------|  |------+------+------+------+------+------|
- * |Shift |      |      |      |      |      |  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|  |------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------'  '-----------------------------------------'
- */
-[_RAISE] = LAYOUT( \
-  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,\
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
-
-  /* Adjust (Lower + Raise)
-  * ,-----------------------------------------.  ,-----------------------------------------.
-  * |      | Reset|      |      |      |      |  | ROOT | PPLY | PSEF |      |      |  Del |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |      |      |      |Aud on|Audoff|      |  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |      | UNDO | CUT  | COPY |PASTE |      |  |  F7  |  F8  |  F9  |  F10 | F11  |  F12 |
-  * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |      |      |      |      |      |      |  |      |      | Home |      |      | End  |
-  * `-----------------------------------------'  '-----------------------------------------'
-  */
-[_ADJUST] =  LAYOUT( \
-  _______, UM_ROOT, UM_PPLY, UM_PSEF, _______, _______, RESET,   _______, _______, _______, _______, KC_DEL, \
-  _______, _______, _______, AU_ON,   AU_OFF,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, \
-  _______, KC_UNDO, KC_CUT,  UM_COPY, UM_INSR, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, KC_END \
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for nothing, twice for ESC
-  [TD_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_NO, KC_ESC)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  if (record->event.pressed) {
-      switch(id) {
-          case 0:
-              SEND_STRING("sudo su -\n");
-              return false; break;
-          case 1:
-              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
-              return false; break;
-          case 2:
-              return MACRO(D(LCTL), T(INS), U(LCTL), END);
-              break;
-          case 3:
-              return MACRO(D(LSFT), T(INS), U(LSFT), END);
-              break;
-          case 4:
-              SEND_STRING("ps -ef | grep ");
-              return false; break;
-      }
-  }
-  return MACRO_NONE;
-};
+    /* Qwerty
+    * ,-----------------------------------------.  ,-----------------------------------------.
+    * | Tab  |   Q  |   W  |   E  |   R  |   T  |  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |Esc/~ |   A  |   S  |   D  |   F  |   G  |  |   H  |   J  |   K  |   L  |   ;  |  '/" |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * | Shift|   Z  |   X  |   C  |   V  |   B  |  |   N  |   M  |   ,  |   .  |   /  |Enter |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Left |  Up  | Down |Right |
+    * `-----------------------------------------'  '-----------------------------------------'
+    */
+  [_QWERTY] = LAYOUT( \
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+    KC_EXC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
+    ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT \
+  ),
+
+    /* Lower
+    * ,-----------------------------------------.  ,-----------------------------------------.
+    * |   ~  |   1  |   2  |   3  |   4  |   5  |  |   6  |   7  |   8  |   9  |   0  | Bksp |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |      |      |   [  |   ]  |   {  |   }  |  |      |   4  |   5  |   6  |   *  |   \  |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |Shift |      |      | copy |insert|      |  |      |   1  |   2  |   3  |   +  |   -  |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise |   0  |   .  |   =  |   _  |
+    * `-----------------------------------------'  '-----------------------------------------'
+    */
+  [_LOWER] = LAYOUT( \
+    KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,  KC_9,   KC_0,    _______, \
+    XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, XXXXXXX, KC_4,    KC_5,  KC_6,   KC_ASTR, KC_BSLS, \
+    _______, XXXXXXX, XXXXXXX, KC_XCPY, KC_XINS, XXXXXXX, XXXXXXX, KC_1,    KC_2,  KC_3,   KC_PLUS, KC_MINS, \
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_0,  KC_DOT, KC_EQL,  KC_UNDS \
+  ),
+
+
+  /* Raise
+   * ,-----------------------------------------.  ,-----------------------------------------.
+   * |   `  |   !  |   @  |   #  |   $  |   %  |  |   ^  |  &   |   *  |   (  |   )  | Bksp |
+   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+   * |      |      |      |      |      |      |  |      |      |      |      |   \  |   |  |
+   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+   * |Shift |      |      |      |      |      |  |      |      |      |      |      |      |
+   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |  |Space |Raise | Next | Vol- | Vol+ | Play |
+   * `-----------------------------------------'  '-----------------------------------------'
+   */
+  [_RAISE] = LAYOUT( \
+    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,\
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+  ),
+
+    /* Adjust (Lower + Raise)
+    * ,-----------------------------------------.  ,-----------------------------------------.
+    * |      | Reset|      |      |      |      |  | ROOT | PPLY | PSEF |      |      |  Del |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |      |      |      |Aud on|Audoff|      |  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |      | UNDO | CUT  | COPY |PASTE |      |  |  F7  |  F8  |  F9  |  F10 | F11  |  F12 |
+    * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+    * |      |      |      |      |      |      |  |      |      | Home |      |      | End  |
+    * `-----------------------------------------'  '-----------------------------------------'
+    */
+  [_ADJUST] =  LAYOUT( \
+    KC_STOG, KC_ROOT, KC_PPLY, KC_PSEF, _______, _______, RESET,   _______, _______, _______, _______, KC_DEL, \
+    _______, _______, _______, AU_ON,   AU_OFF,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, \
+    _______, KC_UNDO, KC_CUT,  KC_XCPY, KC_XINS, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, KC_END \
+  )
+};
\ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/mtdjr/rules.mk b/keyboards/lets_split/keymaps/mtdjr/rules.mk
index f0ed9e8dc..457a3d01d 100644
--- a/keyboards/lets_split/keymaps/mtdjr/rules.mk
+++ b/keyboards/lets_split/keymaps/mtdjr/rules.mk
@@ -1,4 +1,3 @@
-TAP_DANCE_ENABLE = yes
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
 endif
diff --git a/keyboards/tada68/keymaps/mtdjr/keymap.c b/keyboards/tada68/keymaps/mtdjr/keymap.c
index 1b1f6ad4f..d24bbf956 100644
--- a/keyboards/tada68/keymaps/mtdjr/keymap.c
+++ b/keyboards/tada68/keymaps/mtdjr/keymap.c
@@ -1,22 +1,5 @@
-#include "tada68.h"
-#include "action_macro.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 _BL 0
-#define _FL 1
-
-// Macro Declarations
-#define UM_ROOT M(0)
-#define UM_PPLY M(1)
-#define UM_PSEF M(2)
-#define UM_XCPY M(3)
-#define UM_XINS M(4)
-#define UM_CAD  M(5)
-
-#define _______ KC_TRNS
+#include QMK_KEYBOARD_H
+#include "mtdjr.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: (Base Layer) Default Layer
@@ -32,12 +15,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Ctrl|Alt |Gui |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
    * `----------------------------------------------------------------'
    */
-[_BL] = KEYMAP_ANSI(
+[_QWERTY] = KEYMAP_ANSI(
   KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    KC_MINS,  KC_EQL, KC_BSPC, KC_INS, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,    KC_LBRC,  KC_RBRC,KC_BSLS, KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN, KC_QUOT,    KC_ENT,        KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,  KC_RSFT,KC_UP,   KC_PGDN, \
-  KC_LCTL,KC_LALT,KC_LGUI,                KC_SPC,                         KC_RALT,MO(_FL), KC_RCTRL, KC_LEFT,KC_DOWN, KC_RGHT),
+  KC_LCTL,KC_LALT,KC_LGUI,                KC_SPC,                         KC_RALT,KC_LOWR, KC_RCTRL, KC_LEFT,KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
@@ -52,36 +35,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
    * `----------------------------------------------------------------'
    */
-[_FL] = KEYMAP_ANSI(
+[_LOWER] = KEYMAP_ANSI(
   _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRV,  \
-  _______,UM_ROOT,UM_PPLY,UM_PSEF,_______,_______,_______,_______,_______,_______,KC_PSCR,_______,_______,_______, KC_HOME, \
+  _______,KC_ROOT,KC_PPLY,KC_PSEF,_______,_______,_______,_______,_______,_______,KC_PSCR,_______,_______,_______, KC_HOME, \
   _______,BL_DEC ,BL_TOGG,BL_INC,BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        _______, KC_END,  \
-  _______,_______ ,_______,UM_XCPY,UM_XINS,_______,KC_MPLY,KC_MNXT,KC_MUTE,KC_VOLD,KC_VOLU,KC_BTN1,KC_MS_U,KC_BTN2, \
+  _______,_______ ,_______,KC_XCPY,KC_XINS,_______,KC_MPLY,KC_MNXT,KC_MUTE,KC_VOLD,KC_VOLU,KC_BTN1,KC_MS_U,KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_R),
 };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  if (record->event.pressed) {
-      switch(id) {
-          case 0:
-              SEND_STRING("sudo su -\n");
-              return false; break;
-          case 1:
-              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
-              return false; break;
-          case 2:
-              SEND_STRING("ps -ef | grep ");
-              return false; break;
-          case 3:
-              return MACRO(D(LCTL), T(INS), U(LCTL), END);
-              break;
-          case 4:
-              return MACRO(D(LSFT), T(INS), U(LSFT), END);
-              break;
-          case 5:
-              return MACRO(D(LCTL), D(RALT), T(DEL), END);
-              break;
-      }
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/xd75/keymaps/mtdjr/config.h b/keyboards/xd75/keymaps/mtdjr/config.h
index aadcaa387..7e2227c87 100644
--- a/keyboards/xd75/keymaps/mtdjr/config.h
+++ b/keyboards/xd75/keymaps/mtdjr/config.h
@@ -20,7 +20,8 @@
 #include "../../config.h"
 
 // place overrides here
-#define RGBLIGHT_SLEEP
+#undef MANUFACTURER
+#undef DESCRIPTION
 #define MANUFACTURER    mtdjr
 #define PRODUCT         XD75
 #define DESCRIPTION     XD75Re
diff --git a/keyboards/xd75/keymaps/mtdjr/keymap.c b/keyboards/xd75/keymaps/mtdjr/keymap.c
index 696c82ae4..28d4b4961 100644
--- a/keyboards/xd75/keymaps/mtdjr/keymap.c
+++ b/keyboards/xd75/keymaps/mtdjr/keymap.c
@@ -1,68 +1,13 @@
-/* Copyright 2017 Wunder
- *
- * 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 "xd75.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
+#include "mtdjr.h"
 
-
-enum custom_keycodes {
-  // TD_ESC = 0,
-  TD_LOCK = 0,
-};
-
-// Layers
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-
-
-
-// Shortcuts
-#define KC_____ KC_NO
-#define KC_     KC_TRNS
-#define KC_RST  RESET
-#define KC_RASE MO(_RAISE)
-#define KC_LOWR MO(_LOWER)
-
-// RGB and Backlighting
-#define KC_RGB  RGB_TOG
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-#define KC_BLT  BL_TOGG
-#define KC_BLS  BL_STEP
-#define KC_BLI  BL_INC
-#define KC_BLD  BL_DEC
-
-// Tapdance
-//#define KC_EXC TD(TD_ESC)
-#define KC_LOCK TD(TD_LOCK)
-
-// Macros
-#define KC_ROOT M(0)
-#define KC_PPLY M(1)
-#define KC_PSEF M(2)
+#define KC_LOCK TD(TD_ENDLOCK)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [_QWERTY] = KC_KEYMAP(
 //  .--------------------------------------------------------------------------.
-      ESC, 1  , 2  , 3  , 4  , 5  ,PGUP,PSCR,PGDN, 6  , 7  , 8  , 9  , 0  ,BSPC,
+      EXC, 1  , 2  , 3  , 4  , 5  ,PGUP,xxxx,PGDN, 6  , 7  , 8  , 9  , 0  ,BSPC,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
       TAB, Q  , W  ,  E , R  , T  , INS,BSLS, DEL, Y  , U  , I  , O  , P  ,QUOT,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
@@ -70,44 +15,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
      LSFT, Z  , X  ,  C , V  , B  ,LBRC,MINS,RBRC, N  , M  ,COMM, DOT,SLSH,RSFT,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     LOWR,LCTL,LALT,LGUI,____, SPC,RASE, GRV,LOWR, SPC,____,LEFT,DOWN,UP  ,RGHT
+     LOWR,LCTL,LALT,LGUI,xxxx, SPC, SPC,RASE,SPC, SPC,xxxx,LEFT,DOWN,UP  ,RGHT
 //  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
 ),
 
  [_LOWER] = KC_KEYMAP(
 //  .--------------------------------------------------------------------------.
-     ____,  F1,  F2,  F3,  F4,  F5,  F6,____,  F7,  F8,  F9, F10, F11, F12,____,
+     xxxx,  F1,  F2,  F3,  F4,  F5,  F6,xxxx,  F7,  F8,  F9, F10, F11, F12, DEL,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     ____,ROOT,PPLY,PSEF,____,____,____,____,____,____,____,____,____,____,____,
+     xxxx,ROOT,PPLY,PSEF,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     ____,____,____,____,____,____,____,____,____,____,____,____,____,____,____,
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     ____,____,____,____,____,____,____,____,____,____,____,____,____,____,MUTE,
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,MUTE,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,____,____,____,____,____,    ,____,    ,MPLY,____,MPRV,VOLD,VOLU,MNXT
+         ,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,    ,xxxx,MPLY,xxxx,MPRV,VOLD,VOLU,MNXT
 //  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
 ),
 
 [_RAISE] = KC_KEYMAP(
 //  .--------------------------------------------------------------------------.
-     ____,____,____,____,____,____,____,____,____,____,____,____,____,____,____,
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     ____,____,____,____, RST,____,____,____,____,____,____,____,____,____,____,
+     xxxx,xxxx,xxxx,xxxx, RST,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     CAPS,____,____,____,____,____,____, BLI,____,____,____,____,____,____,____,
+     CAPS,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, BLI,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-      RGB,RHUI,RHUD,RSAI,RSAD,RVAI,RVAD, BLD,____,____,____,____,BTN1,BTN2,____,
+      RGB,RHUI,RHUD,RSAI,RSAD,RVAI,RVAD, BLD,xxxx,xxxx,xxxx,xxxx,BTN1,BTN2,xxxx,
 //  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,____,____,____,____,____,    ,____,    ,____,____,MS_L,MS_D,MS_U,MS_R
+         ,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,    ,xxxx,xxxx,xxxx,MS_L,MS_D,MS_U,MS_R
 //  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
 )
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for left ctrl, twice for ESC
-  //[TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_ESC),
-  [TD_LOCK] = ACTION_TAP_DANCE_DOUBLE(KC_END, LGUI(KC_L))
-};
 void led_set_user(uint8_t usb_led) {
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
         capslock_led_on();
@@ -115,21 +55,3 @@ void led_set_user(uint8_t usb_led) {
         capslock_led_off();
     }
 }
-
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  if (record->event.pressed) {
-    switch(id) {
-      case 0:
-          SEND_STRING("sudo su -\n");
-          return false; break;
-      case 1:
-          SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
-          return false; break;
-      case 2:
-          SEND_STRING("ps -ef | grep ");
-          return false; break;
-    }
-  }
-  return MACRO_NONE;
-};
diff --git a/users/mtdjr/config.h b/users/mtdjr/config.h
new file mode 100644
index 000000000..9769ebc18
--- /dev/null
+++ b/users/mtdjr/config.h
@@ -0,0 +1,7 @@
+#ifndef USERSPACE_CONFIG_H
+#define USERSPACE_CONFIG_H
+
+// Put normal config.h settings here:
+#define TAPPING_TERM 250
+
+#endif // !USERSPACE_CONFIG_H
diff --git a/users/mtdjr/mtdjr.c b/users/mtdjr/mtdjr.c
new file mode 100644
index 000000000..da4f57047
--- /dev/null
+++ b/users/mtdjr/mtdjr.c
@@ -0,0 +1,137 @@
+#include "mtdjr.h"
+
+#ifdef SOLENOID_ENABLE
+  #include "solenoid.h"
+
+  void solenoid_buzz_on(void);
+  void solenoid_buzz_off(void);
+  void solenoid_dwell_minus(void);
+  void solenoid_dwell_plus(void);
+  void solenoid_toggle(void);
+  void solenoid_stop(void);
+  void solenoid_fire(void);
+  void solenoid_check(void);
+  void solenoid_setup(void);
+  void matrix_init_user(void);
+  void matrix_scan_user(void);
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  #ifdef SOLENOID_ENABLE
+    if (record->event.pressed) {
+      solenoid_fire();
+    }
+  #endif
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_ADJUST);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case SOLENOID_TOG:
+      #ifdef SOLENOID_ENABLE
+        if (record->event.pressed) {
+          solenoid_toggle();
+        }
+      #endif
+      break;
+    case SOLENOID_DWELL_MINUS:
+      #ifdef SOLENOID_ENABLE
+        if (record->event.pressed) {
+          solenoid_dwell_minus();
+        }
+        #endif
+      break;
+    case SOLENOID_DWELL_PLUS:
+      #ifdef SOLENOID_ENABLE
+        if (record->event.pressed) {
+          solenoid_dwell_plus();
+        }
+        #endif
+      break;
+    case SOLENOID_BUZZ_ON:
+      #ifdef SOLENOID_ENABLE
+        if (record->event.pressed) {
+          solenoid_buzz_on();
+        }
+        #endif
+      break;
+    case SOLENOID_BUZZ_OFF:
+      #ifdef SOLENOID_ENABLE
+        if (record->event.pressed) {
+          solenoid_buzz_off();
+        }
+        #endif
+      break;
+  }
+  return true;
+};
+
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_ESC),
+  [TD_ALTLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, LGUI(KC_L)),
+  [TD_ENDLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_END, LGUI(KC_L)),
+  //[TD_PRNT] = ACTION_TAP_DANCE_DOUBLE(PRINT, PRINT_SEL)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  if (record->event.pressed) {
+      switch(id) {
+          case 0:
+              SEND_STRING("sudo su -\n");
+              return false; break;
+          case 1:
+              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
+              return false; break;
+          case 2:
+              SEND_STRING("ps -ef | grep ");
+              return false; break;
+          case 3: // control + insert
+              return MACRO(D(LCTL), T(INS), U(LCTL), END);
+              break;
+          case 4: // shift + insert
+              return MACRO(D(LSFT), T(INS), U(LSFT), END);
+              break;
+          case 5: // control + alt + delete
+              return MACRO(D(LCTL), D(RALT), T(DEL), U(LCTL), U(LALT), END);
+              break;
+          case 6: // lgui + L
+              return MACRO(D(LGUI), T(L), U(LGUI), END);
+              break;
+      }
+  }
+  return MACRO_NONE;
+};
diff --git a/users/mtdjr/mtdjr.h b/users/mtdjr/mtdjr.h
new file mode 100644
index 000000000..012a35610
--- /dev/null
+++ b/users/mtdjr/mtdjr.h
@@ -0,0 +1,76 @@
+#ifndef USERSPACE
+#define USERSPACE
+
+#include "quantum.h"
+
+#define _QWERTY 0
+#define _LOWER 1
+#define _RAISE 2
+#define _SUPER 3
+#define _ADJUST 16
+
+enum user_layers {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  SUPER,
+  ADJUST,
+};
+
+enum user_tapdance {
+  TD_ENDLOCK,
+  TD_ALTLOCK,
+  TD_ESC,
+};
+
+enum user_solenoid {
+  SOLENOID_TOG,
+  SOLENOID_DWELL_MINUS,
+  SOLENOID_DWELL_PLUS,
+  SOLENOID_BUZZ_ON,
+  SOLENOID_BUZZ_OFF,
+};
+
+#define KC_STOG SOLENOID_TOG
+#define KC_SDM  SOLENOID_DWELL_MINUS
+#define KC_SDP  SOLENOID_DWELL_PLUS
+#define KC_SBON SOLENOID_BUZZ_ON
+#define KC_SBOF SOLENOID_BUZZ_OFF
+
+#define KC_     KC_TRNS
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+#define KC_xxxx KC_NO
+
+#define KC_LOWR LOWER
+#define KC_RASE RAISE
+#define KC_SUPR SUPER
+#define KC_RST  RESET
+
+// TapDance Keycodes
+#define KC_EXC  TD_ESC
+
+// Macro Declarations
+#define KC_ROOT M(0)
+#define KC_PPLY M(1)
+#define KC_PSEF M(2)
+#define KC_XCPY M(3)
+#define KC_XINS M(4)
+#define KC_CAD  M(5)
+#define UM_LOCK M(6)
+
+// RGB and Backlighting
+#define KC_RGB  RGB_TOG
+#define KC_RHUI RGB_HUI
+#define KC_RHUD RGB_HUD
+#define KC_RSAI RGB_SAI
+#define KC_RSAD RGB_SAD
+#define KC_RVAI RGB_VAI
+#define KC_RVAD RGB_VAD
+#define KC_BLT  BL_TOGG
+#define KC_BLS  BL_STEP
+#define KC_BLI  BL_INC
+#define KC_BLD  BL_DEC
+
+
+#endif
diff --git a/users/mtdjr/readme.md b/users/mtdjr/readme.md
new file mode 100644
index 000000000..e795ee23a
--- /dev/null
+++ b/users/mtdjr/readme.md
@@ -0,0 +1,14 @@
+Copyright 2018 @mtdjr
+
+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/>.
diff --git a/users/mtdjr/rules.mk b/users/mtdjr/rules.mk
new file mode 100644
index 000000000..6eec4b5b8
--- /dev/null
+++ b/users/mtdjr/rules.mk
@@ -0,0 +1,2 @@
+SRC += mtdjr.c
+TAP_DANCE_ENABLE = yes
diff --git a/users/mtdjr/solenoid.h b/users/mtdjr/solenoid.h
new file mode 100644
index 000000000..38066f4c3
--- /dev/null
+++ b/users/mtdjr/solenoid.h
@@ -0,0 +1,103 @@
+#ifndef SOLENOID_H
+#define SOLENOID_H
+
+#include <timer.h>
+#include "pincontrol.h"
+
+#define SOLENOID_DEFAULT_DWELL 12
+#define SOLENOID_MAX_DWELL 100
+#define SOLENOID_MIN_DWELL 4
+#ifndef SOLENOID_ACTIVE
+  #define SOLENOID_ACTIVE false
+#endif
+//#define SOLENOID_PIN F6
+
+bool solenoid_enabled = SOLENOID_ACTIVE;
+bool solenoid_on = false;
+bool solenoid_buzz = false;
+bool solenoid_buzzing = false;
+uint16_t solenoid_start = 0;
+uint8_t solenoid_dwell = SOLENOID_DEFAULT_DWELL;
+
+
+void solenoid_buzz_on(void) {
+  solenoid_buzz = true;
+}
+
+void solenoid_buzz_off(void) {
+  solenoid_buzz = false;
+}
+
+void solenoid_dwell_minus(void) {
+  if (solenoid_dwell > 0) solenoid_dwell--;
+}
+
+void solenoid_dwell_plus(void) {
+  if (solenoid_dwell < SOLENOID_MAX_DWELL) solenoid_dwell++;
+}
+
+void solenoid_toggle(void) {
+  solenoid_enabled = !solenoid_enabled;
+}
+
+void solenoid_stop(void) {
+  digitalWrite(SOLENOID_PIN, PinLevelLow);
+  solenoid_on = false;
+  solenoid_buzzing = false;
+}
+
+void solenoid_fire(void) {
+  if (!solenoid_enabled) return;
+
+  if (!solenoid_buzz && solenoid_on) return;
+  if (solenoid_buzz && solenoid_buzzing) return;
+
+  solenoid_on = true;
+  solenoid_buzzing = true;
+  solenoid_start = timer_read();
+  digitalWrite(SOLENOID_PIN, PinLevelHigh);
+}
+
+void solenoid_check(void) {
+  uint16_t elapsed = 0;
+
+  if (!solenoid_on) return;
+
+  elapsed = timer_elapsed(solenoid_start);
+
+  //Check if it's time to finish this solenoid click cycle
+  if (elapsed > solenoid_dwell) {
+    solenoid_stop();
+    return;
+  }
+
+  //Check whether to buzz the solenoid on and off
+  if (solenoid_buzz) {
+    if (elapsed / SOLENOID_MIN_DWELL % 2 == 0){
+      if (!solenoid_buzzing) {
+        solenoid_buzzing = true;
+        digitalWrite(SOLENOID_PIN, PinLevelHigh);
+      }
+    }
+    else {
+      if (solenoid_buzzing) {
+        solenoid_buzzing = false;
+        digitalWrite(SOLENOID_PIN, PinLevelLow);
+      }
+    }
+  }
+}
+
+void solenoid_setup(void) {
+  pinMode(SOLENOID_PIN, PinDirectionOutput);
+}
+
+void matrix_init_user(void) {
+  solenoid_setup();
+}
+
+void matrix_scan_user(void) {
+  solenoid_check();
+}
+
+#endif
-- 
cgit v1.2.3-70-g09d2


From 8eaf23ae8146766615cc1cec3fc8e04111e8ef49 Mon Sep 17 00:00:00 2001
From: Batuhan Baserdem <bbaserdem@users.noreply.github.com>
Date: Thu, 31 May 2018 21:55:45 -0400
Subject: User space fixed (#3095)

* Put in my keymaps

* Fixed all but weird lets split issue

* Organized and tried to trobleshoot lets split

* Organized and tried to trobleshoot lets split

* Added bbaserdem keymaps

* Added bbaserdem keymaps

* Fixed stuff

* FIxed a filename error
---
 keyboards/gherkin/keymaps/bbaserdem/README.md      |  11 +
 keyboards/gherkin/keymaps/bbaserdem/config.h       |  13 +
 keyboards/gherkin/keymaps/bbaserdem/keymap.c       |  36 ++
 keyboards/gherkin/keymaps/bbaserdem/rules.mk       |  14 +
 keyboards/lets_split/keymaps/bbaserdem/README.md   |  27 +
 keyboards/lets_split/keymaps/bbaserdem/config.h    |  27 +
 keyboards/lets_split/keymaps/bbaserdem/keymap.c    |  37 ++
 keyboards/lets_split/keymaps/bbaserdem/rules.mk    |  11 +
 .../lets_split/keymaps/bbaserdem_right/README.md   |   5 +
 .../lets_split/keymaps/bbaserdem_right/config.h    |   9 +
 .../lets_split/keymaps/bbaserdem_right/keymap.c    |  35 ++
 .../lets_split/keymaps/bbaserdem_right/rules.mk    |  24 +
 keyboards/planck/keymaps/bbaserdem/README.md       |  38 +-
 keyboards/planck/keymaps/bbaserdem/config.h        |  50 +-
 keyboards/planck/keymaps/bbaserdem/keymap.c        | 430 +-------------
 keyboards/planck/keymaps/bbaserdem/rules.mk        |  22 +-
 keyboards/xd75/keymaps/bbaserdem/config.h          |  22 +
 keyboards/xd75/keymaps/bbaserdem/keymap.c          |  80 +++
 keyboards/xd75/keymaps/bbaserdem/readme.md         |  12 +
 keyboards/xd75/keymaps/bbaserdem/rules.mk          |  10 +
 users/bbaserdem/README.md                          |  49 ++
 users/bbaserdem/bbaserdem.c                        | 651 +++++++++++++++++++++
 users/bbaserdem/bbaserdem.h                        | 279 +++++++++
 users/bbaserdem/rules.mk                           |  22 +
 24 files changed, 1425 insertions(+), 489 deletions(-)
 create mode 100644 keyboards/gherkin/keymaps/bbaserdem/README.md
 create mode 100644 keyboards/gherkin/keymaps/bbaserdem/config.h
 create mode 100644 keyboards/gherkin/keymaps/bbaserdem/keymap.c
 create mode 100644 keyboards/gherkin/keymaps/bbaserdem/rules.mk
 create mode 100644 keyboards/lets_split/keymaps/bbaserdem/README.md
 create mode 100755 keyboards/lets_split/keymaps/bbaserdem/config.h
 create mode 100755 keyboards/lets_split/keymaps/bbaserdem/keymap.c
 create mode 100755 keyboards/lets_split/keymaps/bbaserdem/rules.mk
 create mode 100644 keyboards/lets_split/keymaps/bbaserdem_right/README.md
 create mode 100755 keyboards/lets_split/keymaps/bbaserdem_right/config.h
 create mode 100755 keyboards/lets_split/keymaps/bbaserdem_right/keymap.c
 create mode 100755 keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
 mode change 100644 => 100755 keyboards/planck/keymaps/bbaserdem/config.h
 mode change 100644 => 100755 keyboards/planck/keymaps/bbaserdem/keymap.c
 mode change 100644 => 100755 keyboards/planck/keymaps/bbaserdem/rules.mk
 create mode 100644 keyboards/xd75/keymaps/bbaserdem/config.h
 create mode 100644 keyboards/xd75/keymaps/bbaserdem/keymap.c
 create mode 100644 keyboards/xd75/keymaps/bbaserdem/readme.md
 create mode 100644 keyboards/xd75/keymaps/bbaserdem/rules.mk
 create mode 100644 users/bbaserdem/README.md
 create mode 100644 users/bbaserdem/bbaserdem.c
 create mode 100644 users/bbaserdem/bbaserdem.h
 create mode 100644 users/bbaserdem/rules.mk

(limited to 'keyboards/lets_split')

diff --git a/keyboards/gherkin/keymaps/bbaserdem/README.md b/keyboards/gherkin/keymaps/bbaserdem/README.md
new file mode 100644
index 000000000..3c9a5e98b
--- /dev/null
+++ b/keyboards/gherkin/keymaps/bbaserdem/README.md
@@ -0,0 +1,11 @@
+# Gherkin Layout
+This is my gherkin layout.
+It is used as a game pad, and key layout is inspired by spare keys I had lying around.
+The firmware is very simple, and only includes one layer keymap, and RGB effects.
+
+# Flashing
+The following command should be used from the main qmk directory.
+```
+make gherkin:bbaserdem
+sudo avrdude -p atmgea34u4 -P `ls /dev/ttyACM*` -c avr109 -U flash:.build/gherkin_bbaserdem.hex
+```
diff --git a/keyboards/gherkin/keymaps/bbaserdem/config.h b/keyboards/gherkin/keymaps/bbaserdem/config.h
new file mode 100644
index 000000000..2bd89e8ec
--- /dev/null
+++ b/keyboards/gherkin/keymaps/bbaserdem/config.h
@@ -0,0 +1,13 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+#define RGB_DI_PIN F6
+#define RGBLED_NUM 10
+#define RGBLIGHT_ANIMATIONS
+#ifdef BACKLIGHT_LEVELS
+#undef BACKLIGHT_LEVELS
+#endif
+#define BACKLIGHT_LEVELS 3
+
+#endif
diff --git a/keyboards/gherkin/keymaps/bbaserdem/keymap.c b/keyboards/gherkin/keymaps/bbaserdem/keymap.c
new file mode 100644
index 000000000..6e9898a27
--- /dev/null
+++ b/keyboards/gherkin/keymaps/bbaserdem/keymap.c
@@ -0,0 +1,36 @@
+// This is a game-pad gherkin layout with RGB and LED lights
+
+#include "gherkin.h"
+
+backlight_config_t backlight_config;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Game pad
+ * ,-----------------------------------------------------------.
+ * | Esc |  1  |  2  |  3  |  4  |  5  |  6  | Ctl | Alt |  ~  |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * | Tab |  Q  |  W  |  E  |  R  |  T  | |^| |  ;  |  '  |  /  |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * | Shf |  A  |  S  |  D  |  F  | <-- | |v| | --> |  ,  |  .  |
+ * `-----------------------------------------------------------'
+ */
+    KEYMAP(
+        KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5,    KC_6,    KC_LCTRL, KC_LALT,  KC_GRAVE,
+        KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T,    KC_UP,   KC_SCLN,  KC_QUOTE, KC_SLASH,
+        KC_LSHIFT, KC_A, KC_S, KC_D, KC_F, KC_LEFT, KC_DOWN, KC_RIGHT, KC_COMMA, KC_DOT
+    )
+};
+
+void matrix_init_user(void) {
+    // Set LED's to max
+    _delay_us(300);
+    backlight_config.level = 2;
+    backlight_config.enable = 1;
+    eeconfig_update_backlight(backlight_config.raw);
+    backlight_set(backlight_config.level);
+    // Set RGB to rainbow mood light
+    rgblight_enable();
+    rgblight_mode(1);
+    rgblight_sethsv(120,255,255);
+    rgblight_mode(6);
+}
diff --git a/keyboards/gherkin/keymaps/bbaserdem/rules.mk b/keyboards/gherkin/keymaps/bbaserdem/rules.mk
new file mode 100644
index 000000000..4e3a41820
--- /dev/null
+++ b/keyboards/gherkin/keymaps/bbaserdem/rules.mk
@@ -0,0 +1,14 @@
+ifndef QUANTUM_DIR
+  include ../../../../Makefile
+endif
+
+STENO_ENABLE = no      # Additional protocols for Stenography(+1700), requires VIRTSER
+MOUSEKEY_ENABLE = no   # Mouse keys(+4700)
+EXTRAKEY_ENABLE = no   # Audio control and System control(+450)
+CONSOLE_ENABLE = no    # Console for debug(+400)
+COMMAND_ENABLE = no    # Commands for debug and configuration
+SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes      # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+AUDIO_ENABLE = no 	   # Enable audio output from keyboard
+RGBLIGHT_ENABLE = yes  # Enable RBG light strips
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
diff --git a/keyboards/lets_split/keymaps/bbaserdem/README.md b/keyboards/lets_split/keymaps/bbaserdem/README.md
new file mode 100644
index 000000000..4b37d7355
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem/README.md
@@ -0,0 +1,27 @@
+# Lets Split Layout
+
+Check out [user readme](../../../../users/bbaserdem/README.md) for more info.
+
+# Usage
+
+**These commands depend on there being no other arduino connected!**
+Also udev rules can be set instead of using sudo.
+Please unplug all other usb devices.
+
+To make the hex files;
+```
+make lets_split/rev2:bbaserdem
+make lets_split/rev2:bbaserdem_right
+```
+
+For the left half, after plugging in and resetting; (from repo main directory)
+```
+sudo avrdude -p atmega32u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:.build/lets_split_rev2_bbaserdem.hex
+sudo avrdude -p atmega32u4 -P "$(ls /dev/ttyACM*)" -c avr109 -U eeprom:w:keyboards/lets_split/eeprom-lefthand.eep
+```
+
+For the right half;
+```
+sudo avrdude -p atmgea34u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:.build/lets_split_rev2_bbaserdem_right.hex
+sudo avrdude -p atmega32u4 -P "$(ls /dev/ttyACM*)" -c avr109 -U eeprom:w:keyboards/lets_split/eeprom-righhand.eep
+```
diff --git a/keyboards/lets_split/keymaps/bbaserdem/config.h b/keyboards/lets_split/keymaps/bbaserdem/config.h
new file mode 100755
index 000000000..f908e6d9a
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem/config.h
@@ -0,0 +1,27 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#define USE_SERIAL
+#define EE_HANDS
+
+// LED strip stuff
+#ifdef RGBLIGHT_ENABLE
+
+// Who thought it was a good idea to predefine these in the rev2/config.h ???
+#ifdef RGBLED_NUM
+#undef RGBLED_NUM
+#endif
+#define RGBLED_NUM 12
+
+#define RGBLIGHT_HUE_STEP 6
+#define RGBLIGHT_SAT_STEP 12
+#define RGBLIGHT_VAL_STEP 20
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 6
+#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 2000
+#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
+#endif
+
+#endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem/keymap.c b/keyboards/lets_split/keymaps/bbaserdem/keymap.c
new file mode 100755
index 000000000..09da67a69
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * Let's Split - Dvorak turkish
+ * Keymap by @bbaserdem
+ * Dvorak layout with multiple features
+ * Most of the code is in the "user" directory.
+ * Check qmk_firmware/users/bbaserdem for the main part of the code
+ */
+#define KEYMAP(...) LAYOUT_ortho_4x12(__VA_ARGS__)
+
+#include "lets_split.h"
+#include "bbaserdem.h"
+
+
+void matrix_init_keymap (void) {
+}
+
+uint32_t layer_state_set_keymap(uint32_t state) {
+    return state;
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Main Dvorak layer
+    [_DV] = DVORAK,
+    // Turkish and special character overlay
+    [_AL] = ALTCHAR,
+    // Gaming layer
+    [_GA] = GAME,
+    // Numbers layer
+    [_NU] = NUMBERS,
+    // Settings layer
+    [_SE] = SETTINGS,
+    // Mouse emulation layer
+    [_MO] = MOUSE,
+#ifdef AUDIO_ENABLE
+    [_MU] = MUSIC,
+#endif
+};
diff --git a/keyboards/lets_split/keymaps/bbaserdem/rules.mk b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
new file mode 100755
index 000000000..4159db3fe
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
@@ -0,0 +1,11 @@
+# Build options
+
+BACKLIGHT_ENABLE = no		# Switch LEDs
+MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
+RGBLIGHT_ENABLE = yes 		# LED strips
+TAP_DANCE_ENABLE = no 		# Use multi-tap features
+AUDIO_ENABLE = no 			# Audio stuff
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/README.md b/keyboards/lets_split/keymaps/bbaserdem_right/README.md
new file mode 100644
index 000000000..8608f23f7
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem_right/README.md
@@ -0,0 +1,5 @@
+# Lets Split - Right Half
+
+Keymap for my right half, to be used as a numpad.
+Check [main readme](../bbaserdem/README.md) for flashing info.
+
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/config.h b/keyboards/lets_split/keymaps/bbaserdem_right/config.h
new file mode 100755
index 000000000..9b6527db2
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem_right/config.h
@@ -0,0 +1,9 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#define USE_SERIAL
+#define EE_HANDS
+
+#endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c b/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c
new file mode 100755
index 000000000..c7a81ecb5
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c
@@ -0,0 +1,35 @@
+/*
+ * Let's Split - Dvorak turkish
+ * Keymap by @bbaserdem
+ * Dvorak layout with multiple features
+ * Most of the code is in the "user" directory.
+ * Check qmk_firmware/users/bbaserdem for the main part of the code
+ */
+
+#include "lets_split.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+        
+/*      Navigation All Supered)                        Numpad
+ * ,-----------------------. ,-----------------------.
+ * | F4| ` | Q |Alt| L | > | | ) | - | + | = |Ent|Bkp|
+ * |---+---+---+---+---+---| |---+---+---+---+---+---|
+ * | F3| M |Ent|Ctl| K | ^ | | ( | * | 9 | 6 | 3 | . |
+ * |---+---+---+---+---+---| |---+---+---+---+---+---|
+ * | F2| T |Spc|Shf| J | v | | % | / | 8 | 5 | 2 | , |
+ * |---+---+---+---+---+---| |---+---+---+---+---+---|
+ * | F1| F | P |Tab| H | < | |Nlc|Tab| 7 | 4 | 1 | 0 |
+ * `-----------------------' `-----------------------' 
+ */
+    // Main Dvorak layer
+    [0] = KEYMAP(
+        LGUI(KC_F4), LGUI(KC_GRV), LGUI(KC_Q),   LGUI(KC_LALT), LGUI(KC_L), LGUI(KC_RGHT),
+        KC_RPRN,     KC_PMNS,      KC_PPLS,      KC_PEQL,       KC_PENT, KC_BSPC,
+        LGUI(KC_F3), LGUI(KC_M),   LGUI(KC_ENT), LGUI(KC_LCTL), LGUI(KC_K), LGUI(KC_UP),
+        KC_LPRN,     KC_PAST,      KC_P9,        KC_P6,         KC_P3,   KC_PDOT,
+        LGUI(KC_F2), LGUI(KC_T),   LGUI(KC_SPC), LGUI(KC_LSFT), LGUI(KC_J), LGUI(KC_DOWN),
+        KC_PERC,     KC_PSLS,      KC_P8,        KC_P5,         KC_P2,   KC_PCMM,
+        LGUI(KC_F1), LGUI(KC_F),   LGUI(KC_P),   LGUI(KC_TAB),  LGUI(KC_H), LGUI(KC_LEFT),
+        KC_NLCK,     KC_TAB,       KC_P7,        KC_P4,         KC_P1,   KC_P0 )
+};
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
new file mode 100755
index 000000000..65a64c94f
--- /dev/null
+++ b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
@@ -0,0 +1,24 @@
+# Build options
+
+BACKLIGHT_ENABLE = no		# Switch LEDs
+MOUSEKEY_ENABLE = no		# Emulates mouse key using keypresses
+RGBLIGHT_ENABLE = no 		# LED strips
+TAP_DANCE_ENABLE = no 		# Use multi-tap features
+AUDIO_ENABLE = no 			# Audio stuff
+BLUETOOTH_ENABLE = no 		# No bluetooth
+COMMAND_ENABLE = no			# Some bootmagic thing
+BOOTMAGIC_ENABLE = no 		# Access to EEPROM settings, not needed
+CONSOLE_ENABLE = no			# Allows console output with a command
+SLEEP_LED_ENABLE = no  		# Breathes LED's when computer is asleep. Untested.
+NKRO_ENABLE = no 			# Default is 6KRO which is plenty
+MIDI_ENABLE = no 			# Untested feature
+FAUXCLICKY_ENABLE = no 		# Emulates clicks using speaker
+KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
+API_SYSEX_ENABLE = no 		# Allows OS to send signals.
+KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
+UNICODE_ENABLE = no			# Used for unicode character emulation
+EXTRAKEY_ENABLE = no		# OS signals like volume control
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/planck/keymaps/bbaserdem/README.md b/keyboards/planck/keymaps/bbaserdem/README.md
index 881307566..c8e8c3963 100644
--- a/keyboards/planck/keymaps/bbaserdem/README.md
+++ b/keyboards/planck/keymaps/bbaserdem/README.md
@@ -1,35 +1,15 @@
 # Planck Layout
 
-Built this planck layout to use DVORAK with an unorthodox Turkish layout.
-If you used a previous layout with a persistent base layer change,
-change it to 0 before proceeding.
-The layout has the following functionality
+Current keymap is for rev4.
+Audio is disabled in favor of RGB.
+Check out [user readme](../../../../users/bbaserdem/README.md) for more info.
 
-* **QWERTY** can be toggled on/off from **Function** layer.
-* **Mouse** layer allows manipulation of the mouse.
-* **Function** layer has F and special keys.
-* **Symbol** layer has numericals and symbols.
-* **Game** layout can be toggled on/off from **Function** layer.
-* **Music** layer allows playing sounds like a keyboard.
+# Build
 
-Double tapping **Mouse**, **Function** and **Symbol** layers activate them until deacivation.
-Topleftmost key turns off **Function**, **Symbol**, **Game** and **Music** layers,
-and puts the board into *reset* mode from the **Mouse** layer.
+Get keyboard into reset mode, and then;
 
-# Using Turkish letters
+```
+make planck/rev4:bbaserdem:dfu
+```
 
-Instead of a turkish F keyboard layout (very inconvenient to code in),
-I opted to modulate characters like an *AltGr* impleentation.
-Tap and holding *Alt* on **DVORAK** and **QWERTY** layer will change some letters
-to Turkish equivelants.
-Shifting these letters will work.
-The keycodes should transmit the correct unicode characters combined with shift.
-The turkish letters are sent via the unicode implementation.
-No software layout change is neccessary (hence making coding easier).
-By default, the unicode is set to Linux mode. Switch to windows (non-persistent)
-can be done from the associated key in **Function** layer.
-**Symbol** layer also has the symbol for Turkish Lira.
-
-# To improve
-
-I want to write a couple pieces of my own music for layer switching.
+Either use sudo or set up udev rules.
diff --git a/keyboards/planck/keymaps/bbaserdem/config.h b/keyboards/planck/keymaps/bbaserdem/config.h
old mode 100644
new mode 100755
index d7632aecd..2edb45673
--- a/keyboards/planck/keymaps/bbaserdem/config.h
+++ b/keyboards/planck/keymaps/bbaserdem/config.h
@@ -3,42 +3,20 @@
 
 #include "../../config.h"
 
-#ifdef AUDIO_ENABLE
-    // Compose own song in future
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
+// LED strip stuff
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN B2
+#define RGBLED_NUM 12
+#define RGBLIGHT_HUE_STEP 6
+#define RGBLIGHT_SAT_STEP 12
+#define RGBLIGHT_VAL_STEP 20
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 6
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 6
+#define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 6
+#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 2000
+#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
 #endif
 
-// Enables tap magic
-#define TAPPING_TERM 300
-#define TAPPING_TOGGLE 1
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
 #endif
diff --git a/keyboards/planck/keymaps/bbaserdem/keymap.c b/keyboards/planck/keymaps/bbaserdem/keymap.c
old mode 100644
new mode 100755
index 74dfabdec..063e9a98e
--- a/keyboards/planck/keymaps/bbaserdem/keymap.c
+++ b/keyboards/planck/keymaps/bbaserdem/keymap.c
@@ -1,413 +1,29 @@
-/* Copyright 2015-2017 Jack Humbert
- *
- * 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/>.
+/*
+ * PLANCK - Dvorak turkish
+ * Keymap by @bbaserdem
+ * Dvorak layout with multiple features
+ * Most of the code is in the "user" directory.
+ * Check qmk_firmware/users/bbaserdem for the main part of the code
  */
 
 #include "planck.h"
-
-#define _______ KC_TRNS
-#define XXX KC_NO
-
-#define _DV 0
-#define _TD 1
-#define _GM 2
-#define _MO 3
-#define _SY 4
-#define _FN 5
-#define _MS 6
-
-#define PARAN TD(PAR)
-#define CURLY TD(CUR)
-#define SQUAR TD(SQU)
-#define ANGUL TD(ANG)
-
-#define UNDO    LCTL(KC_Z)
-#define REDO    LCTL(KC_Y)
-#define COPYCUT TD(CPC)
-#define PASTE   LCTL(KC_V)
-
-#define MO_SC_U KC_MS_WH_UP
-#define MO_SC_D KC_MS_WH_DOWN
-#define MO_SC_L KC_MS_WH_LEFT
-#define MO_SC_R KC_MS_WH_RIGHT
-#define MO_U    KC_MS_UP
-#define MO_D    KC_MS_DOWN
-#define MO_L    KC_MS_LEFT
-#define MO_R    KC_MS_RIGHT
-#define MO_CL_L KC_MS_BTN1
-#define MO_CL_R KC_MS_BTN2
-#define MO_CL_M KC_MS_BTN3
-#define MO_CL_1 KC_MS_BTN4
-#define MO_CL_2 KC_MS_BTN5
-#define MO_AC_0 KC_MS_ACCEL0
-#define MO_AC_1 KC_MS_ACCEL1
-#define MO_AC_2 KC_MS_ACCEL2
-
-#define PHY_HB UC(0x0127)
-#define PHY_DE UC(0xc2b0)
-#define TUR_TL UC(0x20ba)
-#define EUR_ER UC(0x20ac)
-#define EUR_PN UC(0x00a3)
-
-enum custom_keycodes {
-    TUR_A = SAFE_RANGE,
-    TUR_C,
-    TUR_G,
-    TUR_I,
-    TUR_O,
-    TUR_S,
-    TUR_U,
-    UNI_LI,
-    UNI_WN
-};
-
-// Tap dance
-enum {
-    ATD = 0,
-    CLS,
-    SCL,
-    QUO,
-    PAR,
-    CUR,
-    SQU,
-    ANG,
-    CPC
-};
+#include "bbaserdem.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Dvorak
- * ,------------------------------------------------------------------------.
- * | Blt |  "  |  ,  |  .  |  P  |  Y  ||  F  |  G  |  C  |  R  |  L  | Bkp |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * | Esc |  A  |  O  |  E  |  U  |  I  ||  D  |  H  |  T  |  N  |  S  | Del |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |Sh\CL| ; : |  Q  |  J  |  K  |  X  ||  B  |  M  |  W  |  V  |  Z  |MOUSE|
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * | Ctl | Alt | Meta| Tab | SYM | Spc || Ent | FUN | Lft | Dwn |  Up | Rgt |
- * `------------------------------------------------------------------------'
- */
-[_DV] = {
-  {BL_STEP,TD(QUO),KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,   KC_BSPC},
-  {KC_ESC ,KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_DEL },
-  {TD(CLS),TD(SCL),KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,   TT(_MO)},
-  {KC_LCTL,TD(ATD),KC_LGUI,KC_TAB, TT(_SY),KC_SPC, KC_ENT, TT(_FN),KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT}
-},
-[_TD] = {
-  {_______,_______,_______,_______,_______,_______,_______, TUR_G, TUR_C,  _______,_______,_______},
-  {_______, TUR_A,  TUR_O, _______, TUR_U,  TUR_I, _______, PHY_HB,_______,_______, TUR_S, _______},
-  {_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______},
-  {_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______}
-},
-
-/* Game layer
- * ,------------------------------------------------------------------------.
- * | OFF |  Q  |  W  |  E  |  R  |  T  ||  F1 |  F2 | Ctrl|  ^  |Shift| Esc |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |  ~  |  A  |  S  |  D  |  F  |  G  ||  F3 |  F4 |  <  |  v  |  >  |Enter|
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * | Shf |  Z  |  X  |  C  |  V  |  B  ||  F5 |  F6 |  ,  |  .  | / ? | Alt |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * | Alt | Ctrl| ` ~ | - _ |     | Spc || Spc |     |  1  |  2  |  3  |  4  |
- * `------------------------------------------------------------------------'
- */
-[_GM] = {
-  {TG(_GM),KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_F1,  KC_F2,  KC_RCTL,KC_UP,  KC_RSFT,KC_ESC },
-  {KC_TAB, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_F3,  KC_F4,  KC_LEFT,KC_DOWN,KC_RGHT,KC_ENT },
-  {KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_F5,  KC_F6,  KC_COMM,KC_DOT, KC_SLSH,KC_RALT},
-  {KC_LALT,KC_LCTL,KC_GRV, KC_MINS,_______,KC_SPC, KC_SPC, _______,KC_1,   KC_2,   KC_3,   KC_4   }
-},
-
-/* Mouse control layer
- * ,------------------------------------------------------------------------.
- * |     |.....|  ^  |.....|.....|Acc 2||.....|.....|.....| |^| |.....|     |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |     |  <  |  v  |  >  |.....|Acc 1||.....|.....| <-- | |v| | --> |     |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |     | Left| Mid |Right|.....|Acc 0||.....|.....|Btn 4|.....|Btn 5|     |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |     |     |     |     |     |     ||     |     |     |     |     |     |
- * `------------------------------------------------------------------------'
- */
-[_MO] = {
-  {TG(_MO),XXX,    MO_U,   XXX,    XXX,    MO_AC_2,XXX,    XXX,    XXX,    MO_SC_U,XXX,    _______},
-  {_______,MO_L,   MO_D,   MO_R,   XXX,    MO_AC_1,XXX,    XXX,    MO_SC_L,MO_SC_D,MO_SC_R,_______},
-  {_______,MO_CL_L,MO_CL_M,MO_CL_R,XXX,    MO_AC_0,XXX,    XXX,    MO_CL_1,XXX,    MO_CL_2,_______},
-  {_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______}
-},
-
-/* Symbols layer
- * ,------------------------------------------------------------------------.
- * | OFF |  !  |  1  |  2  |  3  |  &  ||  =  |  +  |  -  |  *  |  %  |     |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |  _  | ( ) |  4  |  5  |  6  |  \  ||  /  | [ ] | { } | < > |  |  |     |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |degre|  ?  |  7  |  8  |  9  |  ~  ||  `  |  @  |  #  |  $  |  ^  |     |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |     |     |     |  0  |     |     ||     |     |TLira| Euro|Pound|     |
- * `------------------------------------------------------------------------'
- */
-
-[_SY] = {
-  {TG(_SY),KC_EXLM,KC_1,   KC_2,   KC_3,   KC_AMPR,KC_EQL, KC_PLUS,KC_MINS,KC_ASTR,KC_PERC,_______},
-  {KC_UNDS,PARAN,  KC_4,   KC_5,   KC_6,   KC_BSLS,KC_SLSH,SQUAR,  CURLY,  ANGUL,  KC_PIPE,_______},
-  {PHY_DE, KC_QUES,KC_7,   KC_8,   KC_9,   KC_TILD,KC_GRV, KC_AT,  KC_HASH,KC_DLR, KC_CIRC,_______},
-  {_______,_______,_______,KC_0,   _______,_______,_______,_______,TUR_TL, EUR_ER, EUR_PN, _______}
-},
-
-/* Function layer
- * ,------------------------------------------------------------------------.
- * | OFF | game|music|     |     |RESET||RESET| win | lin | wake|sleep|power|
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 ||  F7 |  F8 |  F9 | F10 | F11 | F12 |
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |     | undo| redo|cutcp|paste|vol 0||prtsc| ins | rev.| stop| play| next|
- * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
- * |     |     |     |     |     |vol -||vol +|     | home|pg dn|pg up| end |
- * `------------------------------------------------------------------------'
- */
-
-[_FN] = {
-  {TG(_FN),TG(_GM),MU_ON,  _______,_______,RESET,  RESET,  UNI_LI, UNI_WN ,KC_WAKE,KC_SLEP,KC_PWR },
-  {KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12 },
-  {_______,UNDO,   REDO,   COPYCUT,PASTE,  KC_MUTE,KC_PSCR,KC_INS, KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT},
-  {_______,_______,_______,_______,_______,KC_VOLD,KC_VOLU,_______,KC_HOME,KC_PGDN,KC_PGUP,KC_END }
-},
-
-/* Music layer
- * ,-----------------------------------------------------------------------.
- * | OFF |rec S| stop| play|sped^|spedv|cycle|.....|.....|.....|.....|.....|
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|
- * `-----------------------------------------------------------------------'
- */
-[_MS] = {
-    { MU_OFF, KC_LCTL, KC_LALT, KC_LGUI, KC_UP, KC_DOWN, MU_MOD, XXX, XXX, XXX, XXX, XXX },
-    { XXX,    XXX,     XXX,     XXX,     XXX,   XXX,     XXX,    XXX, XXX, XXX, XXX, XXX },
-    { XXX,    XXX,     XXX,     XXX,     XXX,   XXX,     XXX,    XXX, XXX, XXX, XXX, XXX },
-    { XXX,    XXX,     XXX,     XXX,     XXX,   XXX,     XXX,    XXX, XXX, XXX, XXX, XXX }
-}
-};
-
-// Set unicode method to linux.
-void matrix_init_user(){
-  set_unicode_input_mode(UC_LNX);
-}
-
-// User defined keys
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // This section is a bit tedious in VIM, so I shortened lines
-  // Check for shift letter
-  bool is_capital = ( keyboard_report->mods &
-      (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) ) ^
-      ( keyboard_report->mods & MOD_BIT(KC_CAPS) );
-  switch (keycode) {
-    // Add music layer to music functionality
-    case MU_ON:
-      if (record->event.pressed) { layer_on(_MS); }
-      return true; break;
-    case MU_OFF:
-      if (record->event.pressed) { layer_off(_MS); }
-      return true; break;
-    // Turkish letters keycodes
-    case TUR_A:
-      if (record->event.pressed) {
-        if ( is_capital ) {
-            unicode_input_start(); register_hex(0x00c2); unicode_input_finish();
-        } else {
-            unicode_input_start(); register_hex(0x00e2); unicode_input_finish();
-        }
-      }
-      return false; break;
-    case TUR_U:
-      if (record->event.pressed) {
-        if ( is_capital ) {
-            unicode_input_start(); register_hex(0x00dc); unicode_input_finish();
-        } else {
-            unicode_input_start(); register_hex(0x00fc); unicode_input_finish();
-        }
-      }
-      return false; break;
-    case TUR_I:
-      if (record->event.pressed) {
-        if ( is_capital ) {
-            unicode_input_start(); register_hex(0x0130); unicode_input_finish();
-        } else {
-            unicode_input_start(); register_hex(0x0131); unicode_input_finish();
-        }
-      }
-      return false; break;
-    case TUR_O:
-      if (record->event.pressed) {
-        if ( is_capital ) {
-            unicode_input_start(); register_hex(0x00d6); unicode_input_finish();
-        } else {
-            unicode_input_start(); register_hex(0x00f6); unicode_input_finish();
-        }
-      }
-      return false; break;
-    case TUR_S:
-      if (record->event.pressed) {
-        if ( is_capital ) {
-            unicode_input_start(); register_hex(0x015e); unicode_input_finish();
-        } else {
-            unicode_input_start(); register_hex(0x015f); unicode_input_finish();
-        }
-      }
-      return false; break;
-    case TUR_G:
-      if (record->event.pressed) {
-        if ( is_capital ) {
-            unicode_input_start(); register_hex(0x011e); unicode_input_finish();
-        } else {
-            unicode_input_start(); register_hex(0x011f); unicode_input_finish();
-        }
-      }
-      return false; break;
-    case TUR_C:
-      if (record->event.pressed) {
-        if ( is_capital ) {
-            unicode_input_start(); register_hex(0x00c7); unicode_input_finish();
-        } else {
-            unicode_input_start(); register_hex(0x00e7); unicode_input_finish();
-        }
-      }
-      return false; break;
-    // Keys to change unicode mode
-    case UNI_LI:
-      if( record->event.pressed ) {
-          set_unicode_input_mode(UC_LNX);
-      }
-      return false; break;
-    case UNI_WN:
-      if( record->event.pressed ) {
-          set_unicode_input_mode(UC_WIN);
-      }
-      return false; break;
-  }
-  return true;
-}
-
-// Tap dance feature for the altgr implementation
-void altgr_dvo_tap (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_RALT);
-  } else if (state->count == 2) {
-    unregister_code (KC_RALT);
-    layer_on(_TD);
-  } else if (state->count == 3) {
-      layer_off(_TD);
-  }
-}
-void altgr_dvo_end (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-      unregister_code (KC_RALT);
-  } else if (state->count == 2) {
-      layer_off(_TD);
-  }
-}
-
-// Shift vs capslock function
-void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code (KC_LSFT);
-    } else if (state->count == 2) {
-        unregister_code (KC_LSFT);
-        register_code (KC_CAPS);
-    }
-}
-void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code (KC_LSFT);
-    } else {
-        unregister_code (KC_CAPS);
-    }
-}
-
-// Parantheses
-void paranthesis_dance (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        SEND_STRING("()"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-        } else if (state->count == 2) {
-            SEND_STRING("(");
-        } else if (state->count == 3) {
-            SEND_STRING(")");
-    }
-}
-void curly_dance (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        SEND_STRING("{}"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-        } else if (state->count == 2) {
-            SEND_STRING("{");
-        } else if (state->count == 3) {
-            SEND_STRING("}");
-    }
-}
-
-void square_dance (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        SEND_STRING("[]"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-        } else if (state->count == 2) {
-            SEND_STRING("[");
-        } else if (state->count == 3) {
-            SEND_STRING("]");
-    }
-}
-
-void angular_dance (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        SEND_STRING("<>"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-        } else if (state->count == 2) {
-            SEND_STRING("<");
-        } else if (state->count == 3) {
-            SEND_STRING(">");
-    }
-}
-
-// Copy or cut feature
-void copy_cut (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code (KC_LCTL);
-        register_code (KC_C);
-        unregister_code (KC_C);
-        unregister_code (KC_LCTL);
-    } else if (state->count == 2) {
-        register_code (KC_LCTL);
-        register_code (KC_X);
-        unregister_code (KC_X);
-        unregister_code (KC_LCTL);
-    }
-}
-
-// Tap dance feature
-qk_tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Left Ctrl, second one is momentory switch to layer TUR
-     [ATD] = ACTION_TAP_DANCE_FN_ADVANCED( altgr_dvo_tap, NULL, altgr_dvo_end )
-    // Advanced tap dance feature allows for immediate response to shift
-    ,[CLS] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
-    // Shifting for double quote and semicolon
-    ,[SCL] = ACTION_TAP_DANCE_DOUBLE( KC_SCLN, KC_COLN )
-    ,[QUO] = ACTION_TAP_DANCE_DOUBLE( KC_QUOT, KC_DQUO )
-    // Tap dances for paranthesis, which sends macros
-    ,[PAR] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, paranthesis_dance )
-    ,[CUR] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, curly_dance )
-    ,[SQU] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, square_dance )
-    ,[ANG] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, angular_dance )
-    // Tap dance for copy/cutting
-    ,[CPC] = ACTION_TAP_DANCE_FN( copy_cut )
+    // Main Dvorak layer
+    [_DV] = DVORAK,
+    // Turkish and special character overlay
+    [_AL] = ALTCHAR,
+    // Gaming layer
+    [_GA] = GAME,
+    // Numbers layer
+    [_NU] = NUMBERS,
+    // Settings layer
+    [_SE] = SETTINGS,
+    // Mouse emulation layer
+    [_MO] = MOUSE,
+#ifdef MUSIC_ENABLE
+    // Music mode
+    [_MU] = MUSIC,
+#endif
 };
diff --git a/keyboards/planck/keymaps/bbaserdem/rules.mk b/keyboards/planck/keymaps/bbaserdem/rules.mk
old mode 100644
new mode 100755
index 9c6bd8e19..e2b5eb3c3
--- a/keyboards/planck/keymaps/bbaserdem/rules.mk
+++ b/keyboards/planck/keymaps/bbaserdem/rules.mk
@@ -1,22 +1,10 @@
 # Build options
 
-# ENABLE
-TAP_DANCE_ENABLE = yes
-UNICODE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-AUDIO_ENABLE = yes
-
-# DISABLE
-BOOTMAGIC_ENABLE = no
-MIDI_ENABLE = no
-
-# Not for planck
-RGBLIGHT_ENABLE = no #Clashes with audio
-BLUETOOTH_ENABLE = no #No bluetooth
-SLEEP_LED_ENABLE = no #Uses BACKLIGHT_ENABLE rimer
+BACKLIGHT_ENABLE = yes		# Switch LEDs
+MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
+RGBLIGHT_ENABLE = yes 		# LED strips
+TAP_DANCE_ENABLE = no 		# Use multi-tap features
+AUDIO_ENABLE = no			# Audio stuff
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
diff --git a/keyboards/xd75/keymaps/bbaserdem/config.h b/keyboards/xd75/keymaps/bbaserdem/config.h
new file mode 100644
index 000000000..2c24bb767
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2017 REPLACE_WITH_YOUR_NAME
+ *
+ * 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_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#endif
diff --git a/keyboards/xd75/keymaps/bbaserdem/keymap.c b/keyboards/xd75/keymaps/bbaserdem/keymap.c
new file mode 100644
index 000000000..0b8ab6235
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/keymap.c
@@ -0,0 +1,80 @@
+#include "xd75.h"
+#include "bbaserdem.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Layout
+ * ,-----------------------------------------------------------.
+ * |Blt|Lck| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |
+ * |---+---+-----------------------------------------------+---|
+ * |Int|Trm|                                               |Cps|
+ * |---+---|                                               |---|
+ * |Clc|Psw|                                               | \ |
+ * |---+---|                    PLANCK                     |---|
+ * |Rev|Ffw|                                               | [ |
+ * |---+---|                                               |---|
+ * |Tog|Mut|                                               | ] |
+ * `-----------------------------------------------------------'
+ */
+[_DV] = KM(
+    BL_STEP, LGUI(KC_ESC), KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,
+    KC_WHOM, LGUI(KC_ENT), DVORAK_1, KC_CAPS,
+    KC_CALC, LGUI(KC_P),   DVORAK_2, KC_BSLS,
+    KC_MPRV, KC_MNXT,      DVORAK_3, KC_LBRC,
+    KC_MPLY, KC_MUTE,      DVORAK_4, KC_RBRC ),
+
+[_AL] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, ALTCHAR_1, _______,
+    _______,_______, ALTCHAR_2, _______,
+    _______,_______, ALTCHAR_3, _______,
+    _______,_______, ALTCHAR_4, _______ ),
+
+[_GA] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, GAME_1, _______,
+    _______,_______, GAME_2, _______,
+    _______,_______, GAME_3, _______,
+    _______,_______, GAME_4, _______ ),
+
+[_NU] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, NUMBERS_1, _______,
+    _______,_______, NUMBERS_2, _______,
+    _______,_______, NUMBERS_3, _______,
+    _______,_______, NUMBERS_4, _______ ),
+
+[_SE] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, SETTINGS_1, _______,
+    _______,_______, SETTINGS_2, _______,
+    _______,_______, SETTINGS_3, _______,
+    _______,_______, SETTINGS_4, _______ ),
+
+[_MO] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, MOUSE_1, _______,
+    _______,_______, MOUSE_2, _______,
+    _______,_______, MOUSE_3, _______,
+    _______,_______, MOUSE_4, _______ ),
+
+#ifdef AUDIO_ENABLE
+[_MU] = KM(
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MUSIC_4,  XXX ),
+#endif
+
+};
+
diff --git a/keyboards/xd75/keymaps/bbaserdem/readme.md b/keyboards/xd75/keymaps/bbaserdem/readme.md
new file mode 100644
index 000000000..68a05b030
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/readme.md
@@ -0,0 +1,12 @@
+# XD75RE Setup
+
+This layout is the xd75re layout, inspired by my planck keymap.
+Contains some code from the original keymap here, but had to be modded.
+
+# Make
+
+Take the board into reset mode, then
+```
+make xd75:bbaserdem:dfu
+```
+Either sudo it or set permissions in udev.
diff --git a/keyboards/xd75/keymaps/bbaserdem/rules.mk b/keyboards/xd75/keymaps/bbaserdem/rules.mk
new file mode 100644
index 000000000..4839c644f
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/rules.mk
@@ -0,0 +1,10 @@
+# Build options
+BACKLIGHT_ENABLE = yes		# Switch LEDs
+MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
+RGBLIGHT_ENABLE = no 		# LED strips
+TAP_DANCE_ENABLE = no 		# Use multi-tap features
+AUDIO_ENABLE = no  			# Audio stuff
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/users/bbaserdem/README.md b/users/bbaserdem/README.md
new file mode 100644
index 000000000..2011e74b6
--- /dev/null
+++ b/users/bbaserdem/README.md
@@ -0,0 +1,49 @@
+# Overview
+
+I have mostly ortholinear keyboards, which share a lot of functions.
+For this purpose, I collected them here.
+
+I have the following keymaps:
+
+* Gherkin (Does not use the user space)
+* Let's Split
+* Let's Split It Up
+* Planck
+
+# Layout
+
+I use DVORAK with an unorthodox Turkish layout.
+If you wanna grab my code, andused a previous layout with a persistent base
+layer change, change it to layer 0 before proceeding.
+
+# Layers
+
+* **Dvorak**: Base layer,withdvorak layout.
+* **Alternative**: Has alternate characters.
+* **Game**: Toggled from *Function*, comfortable for gaming use.
+* **Numeric**: Has numericals and symbols. Can be locked.
+* **Function**: Layer has media and function keys.
+* **Mouse**: Manipulates mouse. Can be locked.
+* **Music** Allows playing sounds like a keyboard.
+
+# Functionality
+
+* **RGB Backlight**: With layer indication, and ability to change base layer lighting mode.
+* **Secrets**: By placing a secrets.h, and not tracking it, you can store passwords etc.
+* **Mouse**: Mouse emulation, complete with diagonal keys.
+* **Turkish**: An AltGr-like overlay that allows some non-common letters, in unicode.
+
+I suggest checking out how I enabled shifting for Turkish layer,
+how I planned out RGB lighting, and my mouse implementation; they might offer
+some insight into fringe user cases.
+
+# Issues
+
+All features are too big for the 32kB bootloader.
+Offenders are audio and rgb lights; it comes down to one or the other.
+~The Proton board, and rev 6 should fix that.~
+
+# Credits
+
+I have previously written my keymap by myself before, but I rewrote it here,
+heavily inspired by @drashna's user folder.
diff --git a/users/bbaserdem/bbaserdem.c b/users/bbaserdem/bbaserdem.c
new file mode 100644
index 000000000..59e5d4ba7
--- /dev/null
+++ b/users/bbaserdem/bbaserdem.c
@@ -0,0 +1,651 @@
+#include "bbaserdem.h"
+
+/*---------------*\
+|*-----MOUSE-----*|
+\*---------------*/
+#ifdef MOUSEKEY_ENABLE
+#include "mousekey.h"
+#endif
+
+/*-------------*\
+|*-----RGB-----*|
+\*-------------*/
+#ifdef RGBLIGHT_ENABLE
+#include "rgblight.h"
+#endif
+
+/*-----------------*\
+|*-----SECRETS-----*|
+\*-----------------*/
+// Enabled by adding a non-tracked secrets.h to this dir.
+#if (__has_include("secrets.h"))
+#include "secrets.h"
+#endif
+
+/*---------------*\
+|*-----MUSIC-----*|
+\*---------------*/
+#ifdef AUDIO_ENABLE
+float tone_game[][2]    = SONG(ZELDA_PUZZLE);
+float tone_return[][2]  = SONG(ZELDA_TREASURE);
+float tone_linux[][2]   = SONG(UNICODE_LINUX);
+float tone_windows[][2] = SONG(UNICODE_WINDOWS);
+#endif
+
+/*-------------------*\
+|*-----TAP-DANCE-----*|
+\*-------------------*/
+#ifdef TAP_DANCE_ENABLE
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Shift on double tap of semicolon
+    [SCL] = ACTION_TAP_DANCE_DOUBLE( KC_SCLN, KC_COLN )
+};
+#endif
+
+/* In keymaps, instead of writing _user functions, write _keymap functions
+ * The __attribute__((weak)) allows for empty definitions here, and during
+ * compilation, if these functions are defined elsewhere, they are written
+ * over. This allows to include custom code from keymaps in the generic code
+ * in this file.
+ */
+__attribute__ ((weak)) void matrix_init_keymap(void) { }
+__attribute__ ((weak)) void matrix_scan_keymap(void) { }
+__attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+__attribute__ ((weak)) uint32_t layer_state_set_keymap (uint32_t state) {
+    return state;
+}
+__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { }
+
+/* ----------------------- *\
+ * -----RGB Functions----- *
+\* ----------------------- */
+
+
+#ifdef RGBLIGHT_ENABLE
+// Storage variables
+extern  rgblight_config_t rgblight_config;
+bool    base_sta;   // Keeps track if in saveable state
+bool    base_tog;   // Whether base state is active or not
+int     base_hue;   // Hue value of base state
+int     base_sat;   // Saturation value of base state
+int     base_val;   // Brightness value of base state
+uint8_t base_mod;   // Animation mode of the base state
+
+// Save the current state of the rgb mode
+void rgblight_saveBase(void) {
+    base_hue = rgblight_config.hue;
+    base_sat = rgblight_config.sat;
+    base_val = rgblight_config.val;
+    base_mod = rgblight_config.mode;
+    base_tog = rgblight_config.enable;
+    base_sta = false;   // If saving, that means base layer is being left
+}
+
+// Load the base state back 
+void rgblight_loadBase(void) {
+    // Don't do anything if not enabled
+    if ( !base_sta ) {
+        if ( base_tog ) {
+            rgblight_enable();
+            rgblight_mode( base_mod );
+            rgblight_sethsv( base_hue, base_sat, base_val );
+        } else {
+            rgblight_disable();
+        }
+    }
+    // Mark that base is loaded, and to be saved before leaving
+    base_sta = true;
+}
+
+// Set to plain HSV color
+void rgblight_colorStatic( int hu, int sa, int va ) {
+    // First, it must be enabled or color change is not written
+    rgblight_enable();
+    rgblight_mode(1);
+    rgblight_sethsv(hu,sa,va);
+}
+/* HSV values, thank you @drashna!
+ * white        (  0,   0, 255)
+ * red          (  0, 255, 255)
+ * coral        ( 16, 176, 255)
+ * orange       ( 39, 255, 255)
+ * goldenrod    ( 43, 218, 218)
+ * gold         ( 51, 255, 255)
+ * yellow       ( 60, 255, 255)
+ * chartreuse   ( 90, 255, 255)
+ * green        (120, 255, 255)
+ * springgreen  (150, 255, 255)
+ * turquoise    (174,  90, 112)
+ * teal         (180, 255, 128)
+ * cyan         (180, 255, 255)
+ * azure        (186, 102, 255)
+ * blue         (240, 255, 255)
+ * purple       (270, 255, 255)
+ * magenta      (300, 255, 255)
+ * pink         (330, 128, 255)
+ */
+// Set RGBLIGHT state depending on layer
+void rgblight_change( uint8_t last_layer ) {
+    // Save state, if saving is requested
+    /*
+    if ( base_sta ) {
+        rgblight_saveBase();
+    }
+    */
+    // Change RGB light
+    switch ( last_layer ) {
+        case _DV:
+            // Load base layer
+            rgblight_loadBase();
+            break;
+        case _AL:
+            // Do yellow for alternate
+            rgblight_colorStatic( 60,255,255);
+            break;
+        case _GA:
+            // Do purple for game
+            rgblight_colorStatic(285,255,255);
+            break;
+        case _NU:
+            // Do azure for number
+            rgblight_colorStatic(186,200,255);
+            break;
+        case _SE:
+            // Do red for settings
+            rgblight_colorStatic( 16,255,255);
+            break;
+        case _MO:
+            // Do green for mouse
+            rgblight_colorStatic(120,255,255);
+            break;
+#ifdef AUDIO_ENABLE
+        case _MU:
+            // Do orange for music
+            rgblight_colorStatic( 39,255,255);
+            break;
+#endif
+        default:
+            // Something went wrong
+            rgblight_colorStatic(  0,255,255);
+            break;
+    }
+}
+
+#endif
+
+/*---------------------*\
+|*-----MATRIX INIT-----*|
+\*---------------------*/
+void matrix_init_user (void) {
+
+    // Keymap specific things, do it first thing to allow for delays etc
+    matrix_init_keymap();
+
+    // Correct unicode
+    set_unicode_input_mode(UC_LNX);
+
+    // Make beginning layer DVORAK
+    set_single_persistent_default_layer(_DV);
+
+//--RGB light initialize base layer
+#ifdef RGBLIGHT_ENABLE
+    // Base hue is white, and RGB disabled
+    base_hue = 100;
+    base_sat = 0;
+    base_val = 255;
+    base_mod = 2;
+    base_tog = false;
+    rgblight_enable();
+    rgblight_mode(base_mod);
+    rgblight_sethsv(base_hue,base_sat,base_val);
+    rgblight_disable();
+    rgblight_loadBase();
+#endif
+
+}
+
+/*---------------------*\
+|*-----MATRIX SCAN-----*|
+\*---------------------*/
+void matrix_scan_user (void) {
+    // Keymap specific, do it first
+    matrix_scan_keymap();
+    // Moved RGB check to layer_state_set_user
+}
+
+/*------------------*\
+|*-----KEYCODES-----*|
+\*------------------*/
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    // Shift check
+    bool is_capital = ( keyboard_report->mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
+    static bool lock_flag = false;
+    uint8_t layer = biton32 (layer_state);
+
+    switch (keycode) {
+        // Secrets implementation
+        case SECRET1 ... SECRET3:
+#if (__has_include("secrets.h"))
+            if( !record->event.pressed ) {
+                send_string_P( secret[ keycode - SECRET1 ] );
+            }
+#endif
+            return false;
+            break;
+        // If these keys are pressed, load base layer config, and mark saving
+        case RGB_TOG:
+        case RGB_MOD:
+        case RGB_VAI:
+        case RGB_VAD:
+        case RGB_SAI:
+        case RGB_SAD:
+        case RGB_HUI:
+        case RGB_HUD:
+#ifdef RGBLIGHT_ENABLE
+            if ( !base_sta ) {
+                rgblight_loadBase(); 
+            }
+#endif
+            return true;
+            break;
+
+        // Lock functionality: These layers are locked if the LOCKED buttons are
+        // pressed. Otherwise, they are momentary toggles
+        case K_LOCK:
+            if (record->event.pressed) {
+                lock_flag = !lock_flag;
+            }
+            return false;
+            break;
+        case K_MOUSE:
+#ifdef MOUSEKEY_ENABLE
+            if (record->event.pressed) {
+                layer_on(_MO);
+                lock_flag = false;
+            } else {
+                if ( lock_flag ) {
+                    lock_flag = false;
+                } else {
+                    layer_off(_MO);
+                }
+            }
+#endif
+            return false;
+            break;
+        case K_NUMBR:
+            if (record->event.pressed) {
+                layer_on(_NU);
+                lock_flag = false;
+            } else {
+                if ( lock_flag ) {
+                    lock_flag = false;
+                } else {
+                    layer_off(_NU);
+                }
+            }
+            return false;
+            break;
+            
+        // Layer switches with sound
+        case K_GAMES:
+            if (record->event.pressed) {
+                // On press, turn off layer if active
+                if ( layer == _GA ) {
+#ifdef AUDIO_ENABLE
+                    stop_all_notes();
+                    PLAY_SONG(tone_return);
+#endif
+                    layer_off(_GA);
+                }
+            } else {
+                // After click, turn on layer if accessed from setting
+                if ( layer == _SE ) {
+#ifdef AUDIO_ENABLE
+                    stop_all_notes();
+                    PLAY_SONG(tone_game);
+#endif
+                    layer_on(_GA);
+                    layer_off(_SE);
+                }
+            }
+            return false;
+            break;
+        case MU_TOG:
+#ifdef AUDIO_ENABLE
+            if (record->event.pressed) {
+                // On press, turn off layer if active
+                if ( layer == _SE ) {
+                    layer_off(_SE);
+                    layer_on(_MU);
+                } else {
+                    layer_off(_MU);
+                }
+            }
+#endif
+            return true;
+            break;
+
+//------UNICODE
+        // Unicode switches with sound
+        case UNI_LI:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+#ifdef AUDIO_ENABLE
+                stop_all_notes();
+                PLAY_SONG(tone_linux);
+#endif
+                set_unicode_input_mode(UC_LNX);
+            }
+#endif
+            return false;
+            break;
+        case UNI_WN:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+#ifdef AUDIO_ENABLE
+                stop_all_notes();
+                PLAY_SONG(tone_windows);
+#endif
+                set_unicode_input_mode(UC_WIN);
+            }
+#endif
+            return false;
+            break;
+
+        // Turkish letters, with capital functionality
+        case TUR_A:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00c2);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00e2);
+                    unicode_input_finish();
+                }
+            }
+#endif
+            return false;
+            break;
+        case TUR_O:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00d6);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00f6);
+                    unicode_input_finish();
+                }
+            }
+#endif
+            return false;
+            break;
+        case TUR_U:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00dc);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00fc);
+                    unicode_input_finish();
+                }
+            }
+#endif
+            return false;
+            break;
+        case TUR_I:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x0130);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x0131);
+                    unicode_input_finish();
+                }
+            }
+#endif
+            return false;
+            break;
+        case TUR_G:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x011e);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x011f);
+                    unicode_input_finish();
+                }
+            }
+#endif
+            return false;
+            break;
+        case TUR_C:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00c7);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00e7);
+                    unicode_input_finish();
+                }
+            }
+#endif
+            return false;
+            break;
+        case TUR_S:
+#ifdef UNICODE_ENABLE
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x015e);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x015f);
+                    unicode_input_finish();
+                }
+            }
+#endif
+            return false;
+            break;
+
+//-------Diagonal mouse movements
+        case MO_NE:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_N);
+                mousekey_on(MO_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_N);
+                mousekey_off(MO_E);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+        case MO_NW:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_N);
+                mousekey_on(MO_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_N);
+                mousekey_off(MO_W);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+        case MO_SE:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_S);
+                mousekey_on(MO_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S);
+                mousekey_off(MO_E);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+        case MO_SW:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_S);
+                mousekey_on(MO_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S);
+                mousekey_off(MO_W);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+        case MO_S_NE:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_N);
+                mousekey_on(MO_S_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_N);
+                mousekey_off(MO_S_E);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+        case MO_S_NW:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_N);
+                mousekey_on(MO_S_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_N);
+                mousekey_off(MO_S_W);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+        case MO_S_SE:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_S);
+                mousekey_on(MO_S_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_S);
+                mousekey_off(MO_S_E);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+        case MO_S_SW:
+#ifdef MOUSEKEY_ENABLE
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_S);
+                mousekey_on(MO_S_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_S);
+                mousekey_off(MO_S_W);
+                mousekey_send();
+            }
+#endif
+            return false;
+            break;
+//------DOUBLE PRESS, with added left navigation
+        case DBL_SPC:
+            if( record->event.pressed ) {
+                SEND_STRING("  "SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_ANG:
+            if( record->event.pressed ) {
+                SEND_STRING("<>"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_PAR:
+            if( record->event.pressed ) {
+                SEND_STRING("()"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_SQR:
+            if( record->event.pressed ) {
+                SEND_STRING("[]"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_BRC:
+            if( record->event.pressed ) {
+                SEND_STRING("{}"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_QUO:
+            if( record->event.pressed ) {
+                SEND_STRING("\'\'"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_DQT:
+            if( record->event.pressed ) {
+                SEND_STRING("\"\""SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_GRV:
+            if( record->event.pressed ) {
+                SEND_STRING("``"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+// END OF KEYCODES
+    }
+    return process_record_keymap(keycode, record);
+}
+
+/*----------------------*\
+|*-----LAYER CHANGE-----*|
+\*----------------------*/
+
+uint32_t layer_state_set_user(uint32_t state) {
+
+    state = layer_state_set_keymap (state);
+#ifdef RGBLIGHT_ENABLE
+    // Change RGB lighting depending on the last layer activated
+    rgblight_change( biton32(state) );
+#endif
+    return state;
+}
diff --git a/users/bbaserdem/bbaserdem.h b/users/bbaserdem/bbaserdem.h
new file mode 100644
index 000000000..1b1b53710
--- /dev/null
+++ b/users/bbaserdem/bbaserdem.h
@@ -0,0 +1,279 @@
+#ifndef USERSPACE
+#define USERSPACE
+
+#include "quantum.h"
+
+// Use 7 wide characters for keymaps
+#define _______ KC_TRNS
+#define XXX     KC_NO
+
+// Layers
+#define _DV 0 // Base layer
+#define _AL 1 // Alt char overlay
+#define _GA 2 // Game layer
+#define _NU 3 // Numbers layer
+#define _SE 4 // Settings layer
+#define _MO 5 // Mouse emulation
+#define _MU 6 // Music mode
+
+// Define short macros
+#define UNDO    LCTL(KC_Z)
+#define REDO    LCTL(KC_Y)
+#define COPY    LCTL(KC_C)
+#define CUT     LCTL(KC_X)
+#define PASTE   LCTL(KC_V)
+
+// Rename mouse keys
+#ifdef MOUSEKEY_ENABLE
+#define MO_S_N  KC_MS_WH_UP
+#define MO_S_S  KC_MS_WH_DOWN
+#define MO_S_E  KC_MS_WH_RIGHT
+#define MO_S_W  KC_MS_WH_LEFT
+#define MO_N    KC_MS_UP
+#define MO_S    KC_MS_DOWN
+#define MO_E    KC_MS_RIGHT
+#define MO_W    KC_MS_LEFT
+#define MO_CL_L KC_MS_BTN1
+#define MO_CL_R KC_MS_BTN2
+#define MO_CL_M KC_MS_BTN3
+#define MO_CL_4 KC_MS_BTN4
+#define MO_CL_5 KC_MS_BTN5
+#define MO_AC_0 KC_MS_ACCEL0
+#define MO_AC_1 KC_MS_ACCEL1
+#define MO_AC_2 KC_MS_ACCEL2
+#else
+#define MO_S_N  KC_NO
+#define MO_S_S  KC_NO
+#define MO_S_E  KC_NO
+#define MO_S_W  KC_NO
+#define MO_N    KC_NO
+#define MO_S    KC_NO
+#define MO_E    KC_NO
+#define MO_W    KC_NO
+#define MO_CL_L KC_NO
+#define MO_CL_R KC_NO
+#define MO_CL_M KC_NO
+#define MO_CL_1 KC_NO
+#define MO_CL_2 KC_NO
+#define MO_AC_0 KC_NO
+#define MO_AC_1 KC_NO
+#define MO_AC_2 KC_NO
+#endif
+
+// Define non-capitalized UTF shortcuts here
+#ifdef UNICODE_ENABLE
+#define PHY_HBR UC(0x0127)
+#define PHY_DEG UC(0x00b0)
+#define CUR_LIR UC(0x20ba)
+#define CUR_BIT UC(0x20bf)
+#define CUR_EUR UC(0x20ac)
+#define CUR_BPN UC(0x00a3)
+#define CUR_YEN UC(0x00a5)
+#else
+#define PHY_HBR KC_NO
+#define PHY_DEG KC_NO
+#define CUR_LIR KC_NO
+#define CUR_BIT KC_NO
+#define CUR_EUR KC_NO
+#define CUR_BPN KC_NO
+#define CUR_YEN KC_NO
+#endif
+
+// Make only KC_NO be grabbed by music mode
+#ifdef AUDIO_ENABLE
+#define MUSIC_MASK keycode == XXX
+#endif
+
+// Custom keycodes
+enum userspace_custom_keycodes {
+    // Turkish letters, with shifting
+    TUR_A = SAFE_RANGE,
+    TUR_C,
+    TUR_G,
+    TUR_I,
+    TUR_O,
+    TUR_S,
+    TUR_U,
+    // Unicode mode switch
+    UNI_LI,
+    UNI_WN,
+    // Double keys
+    DBL_SPC,
+    DBL_ANG,
+    DBL_PAR,
+    DBL_SQR,
+    DBL_BRC,
+    DBL_QUO,
+    DBL_DQT,
+    DBL_GRV,
+    // Diagonal mouse movements
+    MO_NE,
+    MO_NW,
+    MO_SE,
+    MO_SW,
+    MO_S_NE,
+    MO_S_NW,
+    MO_S_SE,
+    MO_S_SW,
+    // Layer switches and lock functionality
+    K_MOUSE,
+    K_NUMBR,
+    K_LOCK,
+    K_GAMES,
+    // Secret macros
+    SECRET1,
+    SECRET2,
+    SECRET3
+};
+
+// Do tap dancable semicolon key if available
+#ifdef TAP_DANCE_ENABLE
+#define TAPPING_TERM 300
+#define TAPPING_TOGGLE 1
+enum {
+    SCL = 0
+};
+#define MY_SCL  TD(SCL)
+#else
+#define MY_SCL  KC_SCLN
+#endif
+
+// Shared keymaps
+#define KM(...) KEYMAP(__VA_ARGS__) // Required to expand the CSVs
+
+/* Dvorak
+ * ,------------------------------------------------------------------------.
+ * | Esc | ' " |  ,  |  .  |  P  |  Y  ||  F  |  G  |  C  |  R  |  L  | Bkp |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Tab |  A  |  O  |  E  |  U  |  I  ||  D  |  H  |  T  |  N  |  S  | / ? |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | SYM | ; : |  Q  |  J  |  K  |  X  ||  B  |  M  |  W  |  V  |  Z  | SET |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | TUR | OS  | Ctrl| Alt | Shf | Spc || Ent | Lft | Dwn |  Up | Rght| MSE |
+ * `------------------------------------------------------------------------' */
+#define DVORAK_1 \
+    KC_ESC, KC_QUOT,KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,   KC_BSPC
+#define DVORAK_2 \
+    KC_TAB, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_SLSH
+#define DVORAK_3 \
+    K_NUMBR,MY_SCL, KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,   MO(_SE)
+#define DVORAK_4 \
+    MO(_AL),KC_LGUI,KC_LCTL,KC_LALT,KC_LSFT,KC_SPC, KC_ENT, KC_LEFT,KC_DOWN,KC_RGHT,KC_UP,  K_MOUSE
+#define DVORAK KM(DVORAK_1,DVORAK_2,DVORAK_3,DVORAK_4)
+
+/* Alternative character overlay
+ * ,------------------------------------------------------------------------.
+ * |     | ' ' | Undo| Redo|Pound| Yen ||     |  G  |  C  |     |TLira| Del |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  A  |  O  | Euro|  U  |  I  ||Degre|Plank|     |     |  S  | Ins |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     | " " | Cut | Copy|Paste|     || BTC | < > | ( ) | [ ] | { } | PgUp|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     |     ||     | Home|PgDwn| PgUp| End |     |
+ * `------------------------------------------------------------------------' */
+#define ALTCHAR_1 \
+    _______,DBL_QUO,UNDO,   REDO,   CUR_BPN,CUR_YEN,_______,TUR_G,  TUR_C,  _______,CUR_LIR,KC_DEL
+#define ALTCHAR_2 \
+    _______,TUR_A,  TUR_O,  CUR_EUR,TUR_U,  TUR_I,  PHY_DEG,PHY_HBR,_______,_______,TUR_S,  KC_INS
+#define ALTCHAR_3 \
+    _______,DBL_DQT,CUT,    COPY,   PASTE,  _______,CUR_BIT,DBL_ANG,DBL_PAR,DBL_SQR,DBL_BRC,_______
+#define ALTCHAR_4 \
+    _______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP,KC_END,_______
+#define ALTCHAR KM(ALTCHAR_1,ALTCHAR_2,ALTCHAR_3,ALTCHAR_4)
+
+/* Game layer
+ * ,------------------------------------------------------------------------.
+ * | OFF |  Q  |  W  |  E  |  R  |  T  || Esc |  7  |  8  |  9  |NumLk|Bkspc|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Tab |  A  |  S  |  D  |  F  |  G  ||  F1 |  4  |  5  |  6  |  \  | Ent |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  Z  |  X  |  C  |  V  |  B  ||  F2 |  1  |  2  |  3  |  ^  |     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |  /  |  `  |     |     |     | Spc || Spc | Ent |  0  |  <  |  v  |  >  |
+ * `------------------------------------------------------------------------' */
+#define GAME_1 \
+    K_GAMES,KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_ESC, KC_P7,  KC_P8,  KC_P9,  KC_NLCK,KC_BSPC
+#define GAME_2 \
+    KC_TAB, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_F1,  KC_P4,  KC_P5,  KC_P6,  KC_BSLS,KC_ENT 
+#define GAME_3 \
+    _______,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_F2,  KC_P1,  KC_P2,  KC_P3,  KC_UP,  _______
+#define GAME_4 \
+    KC_SLSH,KC_GRV, _______,_______,_______,KC_SPC, KC_SPC, KC_ENT, KC_P0,  KC_LEFT,KC_DOWN,KC_RGHT
+#define GAME KM(GAME_1,GAME_2,GAME_3,GAME_4)
+
+/* Symbols layer
+ * ,------------------------------------------------------------------------.
+ * | OFF |  `  |  ~  |  [  |  ]  |  {  ||  }  |  -  |  _  |  =  |  +  |     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  1  |  2  |  3  |  4  |  5  ||  6  |  7  |  8  |  9  |  0  |  \  |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  !  |  @  |  #  |  $  |  %  ||  ^  |  &  |  *  |  (  |  )  | LCK |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |  |  |     |     |  |  |     |     ||     |     |     |     |     |     |
+ * `------------------------------------------------------------------------' */
+#define NUMBERS_1 \
+    K_NUMBR,KC_GRV, KC_TILD,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_MINS,KC_UNDS,KC_EQL, KC_PLUS,_______
+#define NUMBERS_2 \
+    _______,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSLS
+#define NUMBERS_3 \
+    _______,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,K_LOCK
+#define NUMBERS_4 \
+    KC_PIPE,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+#define NUMBERS KM(NUMBERS_1,NUMBERS_2,NUMBERS_3,NUMBERS_4)
+
+/* Settings layer
+ * ,------------------------------------------------------------------------.
+ * |BLLed|  F1 |  F2 |  F3 |  F4 | Lin || Win | Wake|     |Hue -|Hue +|Reset|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  F5 |  F6 |  F7 |  F8 |     ||     |     |RGBto|Sat -|Sat +|     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Game|  F9 | F10 | F11 | F12 |Vol 0||PrtSc|     |RGBan|Bri -|Bri +|     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |Musir|     |     |     |     |Vol -||Vol +| Prev| Stop|TogMu| Next|     |
+ * `------------------------------------------------------------------------' */
+#define SETTINGS_1 \
+    BL_STEP,KC_F1,  KC_F2,  KC_F3,  KC_F4,  UNI_LI, UNI_WN, KC_WAKE,_______,RGB_HUD,RGB_HUI,RESET  
+#define SETTINGS_2 \
+    _______,KC_F5,  KC_F6,  KC_F7,  KC_F8,  _______,_______,_______,RGB_TOG,RGB_SAD,RGB_SAI,_______
+#define SETTINGS_3 \
+    K_GAMES,KC_F9,  KC_F10, KC_F11, KC_F12, KC_MUTE,KC_PSCR,_______,RGB_MOD,RGB_VAD,RGB_VAI,_______
+#define SETTINGS_4 \
+    MU_TOG, _______,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,_______
+#define SETTINGS KM(SETTINGS_1,SETTINGS_2,SETTINGS_3,SETTINGS_4)
+
+/* Mouse layer
+ * ,------------------------------------------------------------------------.
+ * |Ulock|  \  |  ^  |  /  |.....|.....||.....|.....| |\|.| |^| | |/|.|     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  <  | Mid |  >  |Btn 4|.....||.....|Btn 5| <-- | Mid | --> |     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  /  |  v  |  \  |.....|.....||.....|.....| |/| | |v| | |\| | LCK |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     | Left||Right|     |     |Accl0|Accl1|Accl2|
+ * `------------------------------------------------------------------------' */
+#define MOUSE_1 \
+    K_MOUSE,MO_NW,  MO_N,   MO_NE,  XXX,    XXX    ,XXX,    XXX,    MO_S_NW,MO_S_N, MO_S_NE,_______
+#define MOUSE_2 \
+    _______,MO_W,   MO_CL_M,MO_E,   MO_CL_4,XXX    ,XXX,    MO_CL_5,MO_S_W, MO_CL_M,MO_S_E, _______
+#define MOUSE_3 \
+    _______,MO_SW,  MO_S,   MO_SE,  XXX,    XXX    ,XXX,    XXX,    MO_S_SW,MO_S_S, MO_S_SE,K_LOCK
+#define MOUSE_4 \
+    _______,_______,_______,_______,_______,MO_CL_L,MO_CL_R,_______,MO_AC_0,MO_AC_1,MO_AC_2,_______
+#define MOUSE KM(MOUSE_1,MOUSE_2,MOUSE_3,MOUSE_4)
+
+/* Music layer
+ * ,------------------------------------------------------------------------.
+ * |.....|.....|.....|.....|.....|.....||.....|.....|.....|.....|.....|.....|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |.....|.....|.....|.....|.....|.....||.....|.....|.....|.....|.....|.....|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |.....|.....|.....|.....|.....|.....||.....|.....|.....|.....|.....|.....|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | togg| rec | stop| play| slow| fast||modes|.....|.....|.....|.....|.....|
+ * `------------------------------------------------------------------------'
+ */
+#define MASK XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX
+#define MUSIC_4 MU_TOG, KC_LCTL, KC_LALT, KC_LGUI, KC_DOWN, KC_UP, MU_MOD, XXX, XXX, XXX, XXX, XXX
+#define MUSIC KM(MASK,MASK,MASK,MUSIC_4)
+
+#endif
diff --git a/users/bbaserdem/rules.mk b/users/bbaserdem/rules.mk
new file mode 100644
index 000000000..513ce4fe0
--- /dev/null
+++ b/users/bbaserdem/rules.mk
@@ -0,0 +1,22 @@
+SRC += bbaserdem.c
+EXTRAFLAGS += -flto
+
+# ENABLE
+UNICODE_ENABLE = yes		# Used for unicode character emulation
+EXTRAKEY_ENABLE = yes		# OS signals like volume control
+
+# DISABLE
+BLUETOOTH_ENABLE = no 		# No bluetooth
+COMMAND_ENABLE = no			# Some bootmagic thing
+BOOTMAGIC_ENABLE = no 		# Access to EEPROM settings, not needed
+CONSOLE_ENABLE = no			# Allows console output with a command
+SLEEP_LED_ENABLE = no  		# Breathes LED's when computer is asleep. Untested.
+NKRO_ENABLE = no 			# Default is 6KRO which is plenty
+MIDI_ENABLE = no 			# Untested feature
+FAUXCLICKY_ENABLE = no 		# Emulates clicks using speaker
+KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
+API_SYSEX_ENABLE = no 		# Allows OS to send signals.
+KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
+
+# Disabling this makes it compile, prob bad upstream code
+# VARIABLE_TRACE = no 		# Allows debugging variables
-- 
cgit v1.2.3-70-g09d2


From 82500842f6bae2ced179fe03348cbd91604bc09f Mon Sep 17 00:00:00 2001
From: Andrew Dunai <andunai@gmail.com>
Date: Sat, 2 Jun 2018 19:14:59 +0300
Subject: Add ability to write additional code in matrix scann loop on slave.
 (#3072)

---
 keyboards/lets_split/matrix.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'keyboards/lets_split')

diff --git a/keyboards/lets_split/matrix.c b/keyboards/lets_split/matrix.c
index 904850d4d..f753d234a 100644
--- a/keyboards/lets_split/matrix.c
+++ b/keyboards/lets_split/matrix.c
@@ -101,6 +101,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {
 }
 
+__attribute__ ((weak))
+void matrix_slave_scan_user(void) {
+}
+
 inline
 uint8_t matrix_rows(void)
 {
@@ -286,6 +290,7 @@ void matrix_slave_scan(void) {
         serial_slave_buffer[i] = matrix[offset+i];
     }
 #endif
+    matrix_slave_scan_user();
 }
 
 bool matrix_is_modified(void)
-- 
cgit v1.2.3-70-g09d2


From 815dab6275eda7fee5a4ea4d02a845e90d4b469f Mon Sep 17 00:00:00 2001
From: Jorge Porras <jorgeporras.tij@gmail.com>
Date: Thu, 7 Jun 2018 08:20:41 -0700
Subject: Normacos update (#3141)

* Cheers let's split keymap

* fixed typo on norman layer of cheers keymap for let's split

* fixed right handed mappings for home row

* cheers keymap for let's split redefinition

* updated Cheers keymap for let's split

* cheers keymap for let's split updated with some terminal macros

* renamed cheers let's split keymap to a more appropriate normacos

* updated normacos keymap doc / removed non functional keys

* reset let's split rules to default values

* added more spotlight search macros

* normalized keymap comments

* Moved numpad on lower layer

* updated normacos layout and fixed some readme typos

* removed leftover merge diff

* added waits to macros that make use of SEND_STRING

* fixed wrong waits on macros that use SEND_STRING

* normalized macro comments after adding waits
---
 keyboards/lets_split/keymaps/normacos/keymap.c  | 60 +++++++++++++++++--------
 keyboards/lets_split/keymaps/normacos/readme.md | 11 ++---
 2 files changed, 48 insertions(+), 23 deletions(-)

(limited to 'keyboards/lets_split')

diff --git a/keyboards/lets_split/keymaps/normacos/keymap.c b/keyboards/lets_split/keymaps/normacos/keymap.c
index 9868fab6e..8902b7b56 100644
--- a/keyboards/lets_split/keymaps/normacos/keymap.c
+++ b/keyboards/lets_split/keymaps/normacos/keymap.c
@@ -1,6 +1,5 @@
 #include QMK_KEYBOARD_H
 
-
 extern keymap_config_t keymap_config;
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -18,7 +17,7 @@ enum custom_keycodes {
   LOWER,
   RAISE,
   ADJUST,
-  SH_SUDO,
+  SH_LOG,
   SH_GOUP,
   SH_TERM,
   SPOT,
@@ -86,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------. ,-----------------------------------------.
  * |  Tab |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  |  Del |
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |CtlEsc| Sudo | UpDir| Slack| Term | OutLk| |   =  |   -  |   \  |   [  |   ]  |   `  |
+ * |CtlEsc|  Log | UpDir| Slack| Term | OutLk| |   =  |   -  |   \  |   [  |   ]  |   `  |
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
  * | Shift|ClrHom|ClrEnd|ShHome| ShEnd|Search| | Play | Mute | VolDn| VolUp|ScnSht|SftEnt|
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -95,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_RAISE] = LAYOUT_ortho_4x12( \
   _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,  \
-  _______, SH_SUDO, SH_GOUP, SLACK,   SH_TERM, OUTLOOK,    KC_EQL,  KC_MINS, KC_BSLS, KC_LBRC, KC_RBRC, KC_GRV,  \
+  _______, SH_LOG,  SH_GOUP, SLACK,   SH_TERM, OUTLOOK,  KC_EQL, KC_MINS, KC_BSLS, KC_LBRC, KC_RBRC, KC_GRV,  \
   _______, SH_CLRH, SH_CLRE, SH_HOME, SH_END,  SH_RSCH, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, SCN_SHT, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
@@ -149,26 +148,51 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       case ADJUST:
         layer_on(_ADJUST);
         return false;
-      case SH_SUDO:
-        SEND_STRING("sudo !!"SS_TAP(X_ENTER));					// Elevate last command
+      case SH_LOG:  // Open Jira log work window
+        SEND_STRING(SS_TAP(X_DOT));
+        _delay_ms(100);
+        SEND_STRING("log work");
+        _delay_ms(100);
+        SEND_STRING(SS_TAP(X_ENTER));
+        return false;
+      case SH_GOUP:  // Go up a directory
+        SEND_STRING("cd .."SS_TAP(X_ENTER));
         return false;
-      case SH_GOUP:
-        SEND_STRING("cd .."SS_TAP(X_ENTER));					// Go up a directory
+      case SH_TERM:  // Open Terminal
+        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
+        _delay_ms(100);
+        SEND_STRING("terminal");
+        _delay_ms(100);
+        SEND_STRING(SS_TAP(X_ENTER));
         return false;
-      case SH_TERM:
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE))"terminal"SS_TAP(X_ENTER));		// Open Terminal
+      case SPOT:  // Open Spotify
+        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
+        _delay_ms(100);
+        SEND_STRING("spotify app");
+        _delay_ms(100);
+        SEND_STRING(SS_TAP(X_ENTER));
         return false;
-      case SPOT:
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE))"spotify app"SS_TAP(X_ENTER));	// Open Spotify
+      case SLACK:  // Open Slack
+        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
+        _delay_ms(100);
+        SEND_STRING("slack");
+        _delay_ms(100);
+        SEND_STRING(SS_TAP(X_ENTER));
         return false;
-      case SLACK:
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE))"slack"SS_TAP(X_ENTER));		// Open Slack
+      case OUTLOOK:  // Open MS Outlook
+        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
+        _delay_ms(100);
+        SEND_STRING("outlook");
+        _delay_ms(100);
+        SEND_STRING(SS_TAP(X_ENTER));
         return false;
-      case OUTLOOK:
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE))"outlook"SS_TAP(X_ENTER));		// Open Outlook
+      case CHROME:  // Open Chrome
+        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
+        _delay_ms(100);
+        SEND_STRING("chrome");
+        _delay_ms(100);
+        SEND_STRING(SS_TAP(X_ENTER));
         return false;
-      case CHROME:
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE))"chrome"SS_TAP(X_ENTER));		// Open Chrome
     }
   } else {
     switch(keycode) {
diff --git a/keyboards/lets_split/keymaps/normacos/readme.md b/keyboards/lets_split/keymaps/normacos/readme.md
index 5ab245bdf..3b7a20632 100644
--- a/keyboards/lets_split/keymaps/normacos/readme.md
+++ b/keyboards/lets_split/keymaps/normacos/readme.md
@@ -1,9 +1,9 @@
 # normacos
-This keymap was designed especifically to be used on a MacOS High Sierra system with constant use of the Terminal, as it includes a multitude of macros for both the terminal as well as Spotlight Search.
+This keymap was designed specifically to be used on a MacOS High Sierra system with constant use of the Terminal, as it includes a multitude of macros for both the terminal as well as Spotlight Search.
 
 Norman keyboard layout [info page.](https://normanlayout.info/)
 
-Some Norman layout keys were placed on different layers and different positions based on available space.
+Some Norman layout keys were placed on different layers and different positions based on available space and preference.
 
 
 Macros:
@@ -13,7 +13,7 @@ Macros:
 - Slack opens Slack through Spotlight Search
 - Term opens Terminal through Spotlight Search
 - Spot opens Spotify through Spotlight Search
-- Chrome opesn Chrome through Spotlight Search
+- Chrome opens Chrome through Spotlight Search
 - OutLk opens Microsoft Outlook through Spotlight Search
 - ScnSht allows the user to take a screenshot of a selected portion of the screen
 - ClrHom clears Terminal line from beginning of line up to cursor
@@ -21,9 +21,10 @@ Macros:
 - ShHome moves Terminal cursor to beginning of line
 - ShEnd moves Terminal cursor to end of line
 - Search activates Terminal Reverse Search Command History
-- Sudo elevates last Terminal command
+- Log opens the 'Log Work' modal on Atlassian's Jira web client
 - UpDir moves working directory to its parent
 
+All macros that make use of the SEND_STRING command have a 100 millisecond wait before and after "writing" to let the computer/OS/app catch up.
 Any and all empty keys shown below are will be set in the future, and do nothing as of the time of this writing.
 
 
@@ -62,7 +63,7 @@ Any and all empty keys shown below are will be set in the future, and do nothing
 ,-----------------------------------------. ,-----------------------------------------.
 |  Tab |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  |  Del |
 |------+------+------+------+------+------| |------+------+------+------+------+------|
-|CtlEsc| Sudo | UpDir| Slack| Term | OutLk| |   =  |   -  |   \  |   [  |   ]  |   `  |
+|CtlEsc|  Log | UpDir| Slack| Term | OutLk| |   =  |   -  |   \  |   [  |   ]  |   `  |
 |------+------+------+------+------+------| |------+------+------+------+------+------|
 | Shift|ClrHom|ClrEnd|ShHome| ShEnd|Search| | Play | Mute | VolDn| VolUp|ScnSht|SftEnt|
 |------+------+------+------+------+------| |------+------+------+------+------+------|
-- 
cgit v1.2.3-70-g09d2