Merge remote-tracking branch 'upstream/master'

10 files changed, 913 insertions, 5 deletions

diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png
deleted file mode 100644
index 168780c824..0000000000
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png
+++ /dev/null
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.png b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.png
deleted file mode 100644
index 875eb3652f..0000000000
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.png
+++ /dev/null
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG b/keyboards/s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG
deleted file mode 100644
index c730c2d65a..0000000000
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG
+++ /dev/null
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/function_layer.PNG b/keyboards/s60_x/keymaps/ansi_qwertz/docs/function_layer.PNG
deleted file mode 100644
index fae2439cab..0000000000
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/function_layer.PNG
+++ /dev/null
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/gaming_layer.PNG b/keyboards/s60_x/keymaps/ansi_qwertz/docs/gaming_layer.PNG
deleted file mode 100644
index 59b202be2b..0000000000
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/gaming_layer.PNG
+++ /dev/null
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/readme.md b/keyboards/s60_x/keymaps/ansi_qwertz/readme.md
index b220106121..7fab63b738 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/readme.md
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/readme.md
@@ -24,12 +24,12 @@ one can also use AltGr to input the characters as intended by the US-Intl layout
 
 The illustration below shows the "US International" layout available in the Language settings of Windows, Linux and Mac OS.
 
-![KB_US-International](docs/KB_US-International.png)
+![KB_US-International](https://i.imgur.com/dBQ9dOo.png)
 
 Not all languages are supported by this layout. Linux also offers the "US International Alternative" layout, 
 which contains more dead keys to input pretty much every diacritic character in a language using latin letters. More information can be found [here](http://web.archive.org/web/20160818101234/http://dry.sailingissues.com/us-international-keyboard-layout.html).
 
-![KB_US-International-Alternative](docs/KB_US-International-Alternative.png)
+![KB_US-International-Alternative](https://i.imgur.com/CaLuEUP.png)
 
 ####0.0.0 Explicitly Supported Languages
 * German
@@ -77,17 +77,17 @@ If you don't want this to be the case, uncomment the following line in `keymap.c
 The base layer is shown here for ANSI keysm, HHKB-style right shift and split backspace. If you use a 2U backspace key there, `Del` will not be available.
 Again, the Y and Z keys are swapped, so you get the QWERTZ-positions of Y and Z when using the US-International layout.
 
-![base_layer](docs/base_layer.PNG)
+![base_layer](https://i.imgur.com/gDvJT2n.png)
 
 ###1.1 Gaming layer
 To turn this layer on, please use the combination `Fn+RShift`, not `Space+RShift`. If you do the latter, the Function layer will become stuck. You can press `Fn` once to unstick it if this happens to you. A solution is being worked on.
 
-![gaming_layer](docs/gaming_layer.PNG)
+![gaming_layer](https://i.imgur.com/mPBElHc.png)
 
 ###1.2 Function Layer
 This is the function layer for German diacritics. It can be accessed via the `Fn` or by holding `Space` on the base layer.
 
-![function_layer](docs/function_layer.PNG)
+![function_layer](https://i.imgur.com/abpqBDE.png)
 
 
 
diff --git a/keyboards/s60_x/keymaps/bluebear/Makefile b/keyboards/s60_x/keymaps/bluebear/Makefile
new file mode 100644
index 0000000000..dfefad39da
--- /dev/null
+++ b/keyboards/s60_x/keymaps/bluebear/Makefile
@@ -0,0 +1,18 @@
+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 = no	        # 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 = yes	        # 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
+TAP_DANCE_ENABLE = no		# Enable tap dancing keys
+
+ifndef QUANTUM_DIR
+    include ../../../../Makefile
+endif
diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/s60_x/keymaps/bluebear/config.h
new file mode 100644
index 0000000000..5c0d08833f
--- /dev/null
+++ b/keyboards/s60_x/keymaps/bluebear/config.h
@@ -0,0 +1,128 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    Sentraq
+#define PRODUCT         S60-RGB
+#define DESCRIPTION     QMK keyboard firmware for Sentraq S60-RGB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN B7
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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)) \
+)
+
+/* Backlight configuration
+ */
+#define BACKLIGHT_LEVELS 3
+
+/* Underlight configuration
+ */
+
+#define RGB_DI_PIN F6
+#define RGBLIGHT_TIMER
+#define RGBLED_NUM 10    // Number of LEDs
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// For Tap Dancing
+
+#define TAPPING_TOGGLE 1
+#define TAPPING_TERM 300
+
+/*
+ * 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
+
+// Space Cadet Rollover - if set, allows to tap opposite shift key to cancel erroneous press
+#define DISABLE_SPACE_CADET_ROLLOVER
+
+// Prevent stuck modifiers
+#define PREVENT_STUCK_MODIFIERS
+
+#endif
diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c
new file mode 100644
index 0000000000..cfd8d4b556
--- /dev/null
+++ b/keyboards/s60_x/keymaps/bluebear/keymap.c
@@ -0,0 +1,695 @@
+#include "s60_x.h"
+
+// Keyboard Layers
+
+enum keyboard_layers {
+  BASE,        //Base Layer
+  ARROWFN,     //Arrow/FN Layer
+  MOUSE,       //Mouse Layer
+  MIDI_BASE,   //Midi Layer
+  MIDI_CHORDS, //Midi Chord Layer
+  MORSE,       //Morse Code Layer
+};
+
+// Morse Code Macro Keys
+
+enum morse_macros {
+  MC_0 = M(0),
+  MC_1 = M(1),
+  MC_2 = M(2),
+  MC_3 = M(3),
+  MC_4 = M(4),
+  MC_5 = M(5),
+  MC_6 = M(6),
+  MC_7 = M(7),
+  MC_8 = M(8),
+  MC_9 = M(9),
+  MC_A = M(10),
+  MC_B = M(11),
+  MC_C = M(12),
+  MC_D = M(13),
+  MC_E = M(14),
+  MC_F = M(15),
+  MC_G = M(16),
+  MC_H = M(17),
+  MC_I = M(18),
+  MC_J = M(19),
+  MC_K = M(20),
+  MC_L = M(21),
+  MC_M = M(22),
+  MC_N = M(23),
+  MC_O = M(24),
+  MC_P = M(25),
+  MC_Q = M(26),
+  MC_R = M(27),
+  MC_S = M(28),
+  MC_T = M(29),
+  MC_U = M(30),
+  MC_V = M(31),
+  MC_W = M(32),
+  MC_X = M(33),
+  MC_Y = M(34),
+  MC_Z = M(35),
+  MC_DOT = M(36),
+  MC_COMM = M(37),
+  MC_APOS = M(38),
+  MC_SLSH = M(39),
+  MC_SCLN = M(40),
+  MC_EQL = M(41),
+  MC_MINS = M(42),
+  MC_SPACE = M(43),
+};
+
+// Custom Keys
+
+enum custom_keys {
+
+  // Miscellaneous Keycodes
+  
+  TFS = LCTL(LALT(KC_DEL)), // Three Finger Salute - Sends Ctl-Alt-Del  
+  MAGSYS = SAFE_RANGE, // Magic SysRq key - Sends Alt-PSCR
+  MC_LSFT, // Morse Code Left Shift
+  MC_RSFT, // Morse Code Right Shift
+
+  // MIDI Chord Keycodes - Major
+  
+  MI_CH_C,
+  MI_CH_Cs,
+  MI_CH_Db = MI_CH_Cs,
+  MI_CH_D,
+  MI_CH_Ds,
+  MI_CH_Eb = MI_CH_Ds,
+  MI_CH_E,
+  MI_CH_F,
+  MI_CH_Fs,
+  MI_CH_Gb = MI_CH_Fs,
+  MI_CH_G ,
+  MI_CH_Gs,
+  MI_CH_Ab = MI_CH_Gs,
+  MI_CH_A,
+  MI_CH_As,
+  MI_CH_Bb = MI_CH_As,
+  MI_CH_B,
+
+  // MIDI Chord Keycodes Minor
+
+  MI_CH_Cm,
+  MI_CH_Csm,
+  MI_CH_Dbm = MI_CH_Csm,
+  MI_CH_Dm,
+  MI_CH_Dsm,
+  MI_CH_Ebm = MI_CH_Dsm,
+  MI_CH_Em,
+  MI_CH_Fm,
+  MI_CH_Fsm,
+  MI_CH_Gbm = MI_CH_Fsm,
+  MI_CH_Gm,
+  MI_CH_Gsm,
+  MI_CH_Abm = MI_CH_Gsm,
+  MI_CH_Am,
+  MI_CH_Asm,
+  MI_CH_Bbm = MI_CH_Asm,
+  MI_CH_Bm,
+
+  //MIDI Chord Keycodes Dominant Seventh
+
+  MI_CH_CDom7,
+  MI_CH_CsDom7,
+  MI_CH_DbDom7 = MI_CH_CsDom7,
+  MI_CH_DDom7,
+  MI_CH_DsDom7,
+  MI_CH_EbDom7 = MI_CH_DsDom7,
+  MI_CH_EDom7,
+  MI_CH_FDom7,
+  MI_CH_FsDom7,
+  MI_CH_GbDom7 = MI_CH_FsDom7,
+  MI_CH_GDom7,
+  MI_CH_GsDom7,
+  MI_CH_AbDom7 = MI_CH_GsDom7,
+  MI_CH_ADom7,
+  MI_CH_AsDom7,
+  MI_CH_BbDom7 = MI_CH_AsDom7,
+  MI_CH_BDom7,
+
+  // MIDI Chord Keycodes Diminished Seventh
+
+  MI_CH_CDim7,
+  MI_CH_CsDim7,
+  MI_CH_DbDim7 = MI_CH_CsDim7,
+  MI_CH_DDim7,
+  MI_CH_DsDim7,
+  MI_CH_EbDim7 = MI_CH_DsDim7,
+  MI_CH_EDim7,
+  MI_CH_FDim7,
+  MI_CH_FsDim7,
+  MI_CH_GbDim7 = MI_CH_FsDim7,
+  MI_CH_GDim7,
+  MI_CH_GsDim7,
+  MI_CH_AbDim7 = MI_CH_GsDim7,
+  MI_CH_ADim7,
+  MI_CH_AsDim7,
+  MI_CH_BbDim7 = MI_CH_AsDim7,
+  MI_CH_BDim7,
+
+};
+
+//Keymaps
+  
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* 0: Custom Dvorak/HHKBish Base Layer
+	 
+	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+	 │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  [  │  ]  │  \  │  `  │
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │ TAB │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │BSPC │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │CT/ES│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│CT/EN│█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │LSPO │▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSPC │▒▒▒▒▒│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │MO(2)│L_GUI│L_ALT│█████│█████│█████│SPFN1│█████│█████│█████│AG/AP│R_GUI│CT|S │CT|AL│█████│
+	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+  */
+  
+  [BASE] = KEYMAP(
+				  KC_ESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_GRV, \
+				  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_EQL,  KC_BSPC,	\
+				  CTL_T(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_NO,  MT(MOD_RCTL, KC_ENT),	\
+				  KC_LSPO,  KC_NO,  KC_SCLN,  KC_Q,  KC_J,  KC_K,  KC_X,  KC_B,  KC_M,  KC_W,  KC_V,  KC_Z,  KC_NO,  KC_RSPC,  KC_NO, \
+				  MO(2), KC_LGUI, KC_LALT,  LT(1, KC_SPACE),  ALGR_T(KC_APP),  KC_RGUI,  OSM(MOD_LCTL | MOD_LSFT),  OSM(MOD_LCTL | MOD_LALT)
+				  ),
+
+  /* 1: Arrow/FN Layer
+
+	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+	 │     │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │TO(3)│TO(5)│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │     │     │     │     │     │     │PGUP │  UP │     │     │     │ INS │ DEL │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │CAPS │HOME │     │ END │     │     │     │LEFT │DOWN │RIGHT│     │     │▒▒▒▒▒│     │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │▒▒▒▒▒│     │     │     │     │     │SPACE│PGDN │PSCR │SLCK │PAUSE│▒▒▒▒▒│     │▒▒▒▒▒│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
+	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+  */
+
+  [ARROWFN] = KEYMAP(
+					 KC_TRNS,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10,  KC_F11,  KC_F12,  TO(3),  TO(5), \
+					 KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_PGUP,  KC_UP,  KC_NO,  KC_NO,  KC_NO,  KC_INS,  KC_DEL, \
+					 KC_CAPS,  KC_HOME,  KC_NO,  KC_END,  KC_NO,  KC_NO,  KC_NO,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,  \
+					 KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_SPACE,  KC_PGDN,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_NO,  KC_TRNS,  KC_NO, \
+					 KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS
+					 ),
+
+  /* 2: Mouse Keys Layer
+
+	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+	 │RESET│ F13 │ F14 │ F15 │ F16 │ F17 │ F18 │ F19 │ F20 │ F21 │ F22 │ F23 │ F24 │     │     │
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │DEBUG│     │     │     │     │     │     │BTN1 │MS_UP│BTN2 │WH_UP│     │     │     │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │TFS  │     │     │     │     │     │     │MS_LT│MS_DN│MS_RT│WH_DN│BTN3 │▒▒▒▒▒│     │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │MAGSYS▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │     │     │█████│█████│█████│ PWR │█████│█████│█████│     │     │     │     │█████│
+	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+  */
+
+  [MOUSE] = KEYMAP(
+					 
+				   RESET,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21, KC_F22,  KC_F23,  KC_F24,  KC_NO,  KC_NO,  \
+				   DEBUG,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BTN1,  KC_MS_UP,  KC_BTN2,  KC_WH_U,  KC_NO,  KC_NO,  KC_NO, \
+				   TFS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_RIGHT,  KC_WH_D,  KC_BTN3,  KC_NO,  KC_TRNS,  \
+				   MAGSYS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,  KC_NO, \
+				   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_POWER,  KC_TRNS, KC_TRNS,  KC_NO,  KC_NO
+				   ),
+
+  /* 3: Midi Base Layer
+
+	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+	 │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│     │TO(4)│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │OCT+ │     │  C# │  D# │     │  F# │  G# │  A# │     │  C# │  D# │     │     │     │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │OCT- │  C  │  D  │  E  │  F  │  G  │  A  │  B  │  C  │  D  │  E  │  F  │▒▒▒▒▒│     │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │ Cm  │▒▒▒▒▒│ Gm  │ Dm  │ Am  │ Em  │ Bm  │ Gbm │ Dbm │ Abm │ Ebm │ Bbm │▒▒▒▒▒│ Fm  │▒▒▒▒▒│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │     │     │█████│█████│█████│A-OFF│█████│█████│█████│     │     │     │     │█████│
+	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+  */
+	
+  [MIDI_BASE] = KEYMAP(
+					   TO(0),  MI_CH_C,  MI_CH_G,  MI_CH_D,  MI_CH_A,  MI_CH_E,  MI_CH_B,  MI_CH_Gb,  MI_CH_Db,  MI_CH_Ab, MI_CH_Eb,  MI_CH_Bb,  MI_CH_F,  KC_NO,  TO(4), \
+					   MI_OCTU,  KC_NO,  MI_Cs,  MI_Ds,  KC_NO,  MI_Fs,  MI_Gs,  MI_As,  KC_NO,  MI_Cs_1,  MI_Ds_1,  KC_NO,  KC_NO,  KC_NO, \
+					   MI_OCTD,  MI_C,  MI_D,  MI_E,  MI_F,  MI_G,  MI_A,  MI_B,  MI_C_1,  MI_D_1,  MI_E_1,  MI_F_1,  KC_NO,  KC_NO,  \
+					   MI_CH_Cm,  KC_NO,  MI_CH_Gm,  MI_CH_Dm,  MI_CH_Am,  MI_CH_Em,  MI_CH_Bm,  MI_CH_Gbm,  MI_CH_Dbm,  MI_CH_Abm,  MI_CH_Ebm,  MI_CH_Bbm,  KC_NO,  MI_CH_Fm,  KC_NO, \
+					   KC_NO,  KC_NO,  KC_NO,  MI_ALLOFF,  KC_NO, KC_NO,  KC_NO,  KC_NO
+					   ),
+
+  /* 4: Midi Chord Layer
+
+	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+	 │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│TO(3)│     │
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │OCT+ │  Cm │  Gm │  Dm │  Am │  Em │ Bbm │ Gbm │ Dbm │ Abm │ Ebm │ Bbm │ Fm  │     │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │OCT- │Cdom7│Gdom7│Ddom7│Adom7│Edom7│Bdom7│Gbdo7│Dbdo7│Abdo7│Ebdo7│Bbdo7│▒▒▒▒▒│Fdom7│█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │Cdim7│▒▒▒▒▒│Gdim7│Ddim7│Adim7│Edim7│Bdim7│Gbdi7│Dbdi7│Abdi7│Ebdi7│Bbdi7│▒▒▒▒▒│Fdim7│▒▒▒▒▒│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │     │     │█████│█████│█████│A-OFF│█████│█████│█████│     │     │     │     │█████│
+	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+  */
+	
+  [MIDI_CHORDS] = KEYMAP(
+						 TO(0),  MI_CH_C,  MI_CH_G,  MI_CH_D,  MI_CH_A,  MI_CH_E,  MI_CH_B,  MI_CH_Gb,  MI_CH_Db,  MI_CH_Ab, MI_CH_Eb,  MI_CH_Bb,  MI_CH_F,  TO(3),  KC_NO, \
+						 MI_OCTU,  MI_CH_Cm,  MI_CH_Gm,  MI_CH_Dm,  MI_CH_Am,  MI_CH_Em,  MI_CH_Bm,  MI_CH_Gbm,  MI_CH_Dbm,  MI_CH_Abm,  MI_CH_Ebm,  MI_CH_Bbm,  MI_CH_Fm,  KC_NO, \
+						 MI_OCTD,  MI_CH_CDom7,  MI_CH_GDom7,  MI_CH_DDom7,  MI_CH_ADom7,  MI_CH_EDom7,  MI_CH_BDom7,  MI_CH_GbDom7,  MI_CH_DbDom7,  MI_CH_AbDom7,  MI_CH_EbDom7,  MI_CH_BbDom7,  KC_NO,  MI_CH_FDom7, \
+						 MI_CH_CDim7,  KC_NO,  MI_CH_GDim7,  MI_CH_DDim7,  MI_CH_ADim7,  MI_CH_EDim7,  MI_CH_BDim7,  MI_CH_GbDim7,  MI_CH_DbDim7,  MI_CH_AbDim7,  MI_CH_EbDim7,  MI_CH_BbDim7,  KC_NO,  MI_CH_FDim7,  KC_NO, \
+						 KC_NO,  KC_NO,  KC_NO,  MI_ALLOFF,  KC_NO, KC_NO,  KC_NO,  KC_NO
+						 ),
+
+  /* 5: Morse Code Layer
+	 
+	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+	 │TO(0)│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │     │     │     │     │
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │BSPC │█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │SHIFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│SHIFT│▒▒▒▒▒│
+	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+	 │     │     │     │█████│█████│█████│SPACE│█████│█████│█████│     │     │     │     │█████│
+	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+  */
+  
+  [MORSE] = KEYMAP(
+				   TO(0),  MC_1,  MC_2,  MC_3,  MC_4,  MC_5,  MC_6,  MC_7,  MC_8,  MC_9,  MC_0,  KC_NO,  KC_NO,  KC_NO,  KC_NO, \
+				   KC_TAB,  MC_APOS,  MC_COMM, MC_DOT,  MC_P,  MC_Y,  MC_F,  MC_G,  MC_C,  MC_R,  MC_L,  MC_SLSH,  MC_EQL,  KC_BSPC, \
+				   KC_NO,  MC_A,  MC_O,  MC_E,  MC_U,  MC_I,  MC_D,  MC_H,  MC_T,  MC_N,  MC_S,  MC_MINS,  KC_NO,  KC_ENT, \
+				   MC_LSFT,  KC_NO,  MC_SCLN,  MC_Q,  MC_J,  MC_K,  MC_X,  MC_B,  MC_M,  MC_W,  MC_V,  MC_Z,  KC_NO,  MC_RSFT,  KC_NO, \
+				   KC_NO, KC_NO, KC_NO,   MC_SPACE,  KC_NO,  KC_NO,  KC_NO, KC_NO
+				   ),
+
+};
+
+// Morse Code Macros
+
+int mc_shift_on = false; // Variable that defines whether MC_LSFT or MC_RSFT are pressed
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+
+  switch(id) {
+
+  case 0: //Number 0-)
+	if (record->event.pressed) {
+	  if (mc_shift_on == true) {
+		return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.-
+	  }
+	  else {
+		return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //-----
+	  }
+	}
+	break;
+
+  case 1: //Number 1-!
+	if (record->event.pressed) {
+	  if (mc_shift_on == true) {
+		return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.--
+	  }
+	  else {
+		return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.----
+	  }
+	}
+	break;
+
+  case 2: //Number 2-@
+	if (record->event.pressed) {
+	  if (mc_shift_on == true) {
+		return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-.
+	  }
+	  else {
+		return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //..---
+	  }
+	}
+	break;
+
+  case 3: // Number 3
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...--
+	}
+	break;
+
+  case 4: //Number 4-$
+	if (record->event.pressed) {
+	  if (mc_shift_on == true) {		
+		return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..-
+	  }
+	  else {
+		return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //....-
+	  }
+	}
+	break;
+
+  case 5: //Number 5
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.....
+	}
+	break;
+
+  case 6: //Number 6
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-....
+	}
+	break;
+
+  case 7: //Number 7-&
+	if (record->event.pressed) {
+	  if (mc_shift_on == true) {		
+		return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-...
+	  }
+	  else {
+		return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //--...
+	  }
+	}
+	break;
+
+  case 8: //Number 8
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---..
+	}
+	break;
+
+  case 9: //Number 9-(
+	if (record->event.pressed) {
+	  if (mc_shift_on == true) {		
+		return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--.
+	  }
+	  else {
+		return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //----.
+	  }
+	}
+	break;
+
+  case 10: //Letter A
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(MINS), T(SPACE), END); //.-
+	}
+	break;
+
+  case 11: //Letter B
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-...
+	}
+	break;
+
+  case 12: //Letter C
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-.
+	}
+	break;
+
+  case 13: //Letter D
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-..
+	}
+	break;
+
+  case 14: //Letter E
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(SPACE), END); //.
+	}
+	break;
+
+  case 15: //Letter F
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-.
+	}
+	break;
+
+  case 16: //Letter G
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--.
+	}
+	break;
+
+  case 17: //Letter H
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //....
+	}
+	break; 
+
+  case 18: //Letter I
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(SPACE), END); //..
+	}
+	break;
+
+  case 19: //Letter J
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.---
+	}
+	break;
+
+  case 20: //Letter K
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.-
+	}
+	break;
+
+  case 21: //Letter L
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-..
+	}
+	break;
+
+  case 22: //Letter M
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(MINS), T(SPACE), END); //--
+	}
+	break;
+
+  case 23: //Letter N
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(DOT), T(SPACE), END); //-.
+	}
+	break;
+
+  case 24: //Letter O
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //---
+	}
+	break;
+
+  case 25: //Letter P
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--.
+	}
+	break;
+
+  case 26: //Letter Q
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.-
+	}
+	break;
+
+  case 27: //Letter R
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.
+	}
+	break;
+
+  case 28: //Letter S
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //...
+	}
+	break;
+
+  case 29: //Letter T
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(SPACE), END); //-
+	}
+	break;
+
+  case 30: //Letter U
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..-
+	}
+	break;
+
+  case 31: //Letter V
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-
+	}
+	break;
+
+  case 32: //Letter W
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.--
+	}
+	break;
+
+  case 33: //Letter X
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..-
+	}
+	break;
+
+  case 34: //Letter Y
+	if (record->event.pressed) {
+	  if (mc_shift_on == true) {		
+	  }
+	  return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.--
+	}
+	break;
+
+  case 35: //Letter Z
+	if (record->event.pressed) {
+	  return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--..
+	}
+	break;
+
+  case 36: //Punctuation .
+	if (record->event.pressed) {
+	  return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.-
+	}
+	break;
+