From d1fb51976aeef8eeea5975c5bf75b6b1aa649826 Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Mon, 6 Feb 2017 11:53:48 +0100
Subject: Added new keymap to the Satan GH60 keyboard.

Added new keymap `Admiral Strokers` to the Satan keyboard. This is an
ISO based layout with tap for brackets/ curly on shft and ctl keys.
Furthermore, there is added arrows and media/volume/special/f-keys layer
on the TAB button when you hold.
---
 keyboards/satan/keymaps/admiralStrokers/Makefile  |  26 +++
 keyboards/satan/keymaps/admiralStrokers/config.h  |  96 +++++++++++
 keyboards/satan/keymaps/admiralStrokers/keymap.c  | 189 ++++++++++++++++++++++
 keyboards/satan/keymaps/admiralStrokers/readme.md |  13 ++
 4 files changed, 324 insertions(+)
 create mode 100644 keyboards/satan/keymaps/admiralStrokers/Makefile
 create mode 100644 keyboards/satan/keymaps/admiralStrokers/config.h
 create mode 100644 keyboards/satan/keymaps/admiralStrokers/keymap.c
 create mode 100644 keyboards/satan/keymaps/admiralStrokers/readme.md

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/Makefile b/keyboards/satan/keymaps/admiralStrokers/Makefile
new file mode 100644
index 000000000..18d2280d6
--- /dev/null
+++ b/keyboards/satan/keymaps/admiralStrokers/Makefile
@@ -0,0 +1,26 @@
+# 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 	= 	no  # Mouse keys(+4700)
+EXTRAKEY_ENABLE 	=		yes  # 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   # Enables your LED to breathe while your computer is sleeping.
+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 	=		no   # Enable keyboard backlight functionality
+MIDI_ENABLE 			=		no   # MIDI controls
+AUDIO_ENABLE 			=		no   # Audio output on port C6
+UNICODEMAP_ENABLE	=		no	 # This allows sending unicode symbols using X(<unicode>) in your keymap.
+UNICODE_ENABLE 		=		no   # Unicode
+UCIS_ENABLE 			=		no	 # Keep in mind that not all will work (See WinCompose for details on Windows).
+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
+
+VARIABLE_TRACE		=		no	 # Use this to debug changes to variable values
+API_SYSEX_ENABLE	=		no	 # This enables using the Quantum SYSEX API to send strings
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/satan/keymaps/admiralStrokers/config.h b/keyboards/satan/keymaps/admiralStrokers/config.h
new file mode 100644
index 000000000..d0338fb7e
--- /dev/null
+++ b/keyboards/satan/keymaps/admiralStrokers/config.h
@@ -0,0 +1,96 @@
+/*
+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_ADMSTROK
+#define CONFIG_H_ADMSTROK
+
+#include "config_common.h"
+#include "../../config.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    SATAN
+#define PRODUCT         GH60
+#define DESCRIPTION     QMK keyboard firmware for Satan GH60 with WS2812 support
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN B6
+
+/* 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 4
+
+/* Underlight configuration */
+#define RGB_DI_PIN E2
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 8     // Number of LEDs
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
+
+#define DISABLE_SPACE_CADET_ROLLOVER
+
+
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#endif
diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
new file mode 100644
index 000000000..487deb086
--- /dev/null
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -0,0 +1,189 @@
+#include "satan.h"
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// general keydefs
+		#define norm 0		// Default layer
+		#define elev 1		// Layer directional keys
+		#define supr 2		// F-keys and mediakeys
+		#define spac 3
+		#define FNO1 4		//
+		#define FNO2 5		//
+		#define FNO3 6		//
+		#define MAC0 M(0)	//
+		#define MAC1 M(1)	//
+		#define MAC2 M(2)	//
+		#define MAC3 M(3)	//
+		#define MAC4 M(4)	//
+		#define MAC5 M(5)	//
+		#define MAC6 M(6)	//
+		#define MAC7 M(7)	//
+		#define MAC8 M(8)	//
+		#define MAC9 M(9)	//
+		#define GRAV KC_GRV //
+		#define MEDI F(FNO1)//
+
+// General shortenings
+		#define ESCA KC_ESC
+		#define MINS KC_MINS
+		#define EQUL KC_EQL
+		#define BSPC KC_BSPC
+		#define DELE KC_DEL
+		#define LBRC KC_LBRC
+		#define RBRC KC_RBRC
+		#define ALTR KC_RALT
+		#define SCLN KC_SCLN
+		#define QUOT KC_QUOT
+		#define NUHS KC_NUHS
+		#define ENTE KC_ENT
+		#define NUBS KC_NUBS	// Less/ greater sign
+		#define COMM KC_COMM	// Comma
+		#define FSTO KC_DOT		// Full stop
+		#define SLSH KC_SLSH
+		#define ALTL KC_LALT
+		#define GUIL KC_LGUI
+		#define GUIR KC_RGUI
+		#define MENO KC_MENU
+// The F-row/layer:
+		#define FK01 KC_F1
+		#define FK02 KC_F2
+		#define FK03 KC_F3
+		#define FK04 KC_F4
+		#define FK05 KC_F5
+		#define FK06 KC_F6
+		#define FK07 KC_F7
+		#define FK08 KC_F8
+		#define FK09 KC_F9
+		#define FK10 KC_F10
+		#define FK11 KC_F11
+		#define FK12 KC_F12
+		#define FK13 KC_F13
+		#define FK14 KC_F14
+// Special Actions and Media Keys
+		#define INSE KC_INS  	// Insert here
+		#define HOME KC_HOME 	// Go to beginning of line
+		#define ENDI  KC_END 	// go to end of line
+		#define PSCR  KC_PSCR 	// Print Screen
+		#define SLCK  KC_SLCK 	// go to end of line
+		#define PGDN  KC_PGDN 	// go to end of line
+		#define PGUP  KC_PGUP 	// go to end of line
+		#define PLPS KC_MPLY 	// Play/Pause
+		#define PAUS KC_PAUS 	// Pause button
+		#define MUTE KC_MUTE 	// Mute sound
+		#define VOLU KC_VOLU 	// Volume increase
+		#define VOLD KC_VOLD 	// Volume decrease
+		#define MNXT KC_MNXT 	// next track
+		#define MPRV KC_MPRV 	// prev track
+		#define MSTP KC_MSTP 	// stop playing
+		#define MSEL KC_MSEL 	// Select media (Start playing it)
+		#define MAIL KC_MAIL 	// Open default mail app
+		#define CALC KC_CALC 	// Open default calculator app
+		#define MYCM KC_MYCM 	// Open default file manager
+		//#define LILO KC_XXXXXX	// Reserved for later
+		//#define LIHI KC_XXXXXX	// Reserved for later
+
+
+// dual-role shortcuts
+		#define DUTB LT(elev, KC_TAB) 	// `tabs` layer on hold and tab on tap
+		#define DUSP LT(spac, KC_SPACE)	// `spce` layer on hold and space on tap
+		#define LOCK LGUI(KC_L)			// lock computer (win)
+
+// Space Admiral Strokers
+		#define SADL MAC0 				// Hold for lshift and { on tap
+		#define SADR MAC1				// Hold for rshift and } on tap
+		#define CADL MAC2				// Hold for lctrl and [ on tap
+		#define CADR MAC3				// Hold for rctrl and ] on tap
+
+// arrow cluster duality bottom right corner
+		#define ARLF ALT_T(KC_LEFT) // Left arrow
+		#define ARRT CTL_T(KC_RIGHT)// Right arrow
+		#define ARUP SFT_T(KC_UP)	// Up arrow
+		#define ARDN GUI_T(KC_DOWN) // Down arrow
+
+// brackets
+		#define NOCL RALT(KC_7)    // [
+		#define NOCR RALT(KC_0)    // ]
+		#define NOPL LSFT(KC_8)    // (
+		#define NOPR LSFT(KC_9)    // )
+		#define NOAL KC_NUBS       // <
+		#define NOAR LSFT(KC_NUBS) // >
+		#define NOBL RALT(KC_8)    // [
+		#define NOBR RALT(KC_9)    // ]
+
+// increase readability
+		#define XXXX	KC_TRNS
+		#define DEAD 	KC_NO
+		#define SCAN	KC_TRNS // Scandinavian keys, the Row 5 key 5 is actually Row 1 key 15 on the PCB
+
+[ norm ] = KEYMAP( // Normal scandinavian mapping (danish has QUOT and SCLN wapped)
+        GRAV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MINS, EQUL, BSPC, DELE,\
+        DUTB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, LBRC, RBRC, DEAD,\
+        ALTR, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT, NUHS, ENTE,\
+				SADL, NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, COMM, FSTO, SLSH, SADR, DEAD,\
+				CADL, ALTL, GUIL,           		DUSP,             	    GUIR, MEDI, MENO, CADR),
+
+[ elev ] = KEYMAP( // The f-Row (with f13-14), Special keys and media keys
+				LOCK, FK01, FK02, FK03, FK04, FK05, FK06, FK07, FK08, FK09, FK10, FK11, FK12, FK13, FK14,\
+				XXXX, XXXX, XXXX, XXXX, MAIL, XXXX, XXXX, HOME, INSE, PSCR, SLCK, PAUS, PGUP, XXXX,\
+			    XXXX, XXXX, XXXX, XXXX, MYCM, XXXX, XXXX, MPRV, PAUS, MNXT, XXXX, XXXX, PGDN, ENDI,\
+				XXXX, XXXX, XXXX, XXXX, CALC, XXXX, XXXX, XXXX, MUTE, VOLD, VOLU, XXXX, ARUP, DEAD,\
+				XXXX, XXXX, XXXX, 					PLPS,			  		XXXX, ARLF, ARDN, ARRT),
+
+[ spac ] = KEYMAP( // The space controls (by pressing space)
+				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,\
+			    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, DEAD,\
+				XXXX, XXXX, XXXX, 					XXXX,			        XXXX, XXXX, XXXX, XXXX),
+
+[ supr ] = KEYMAP( // Additional layer for later use.
+				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,\
+			    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, DEAD,\
+				XXXX, XXXX, XXXX, 					XXXX,			  		XXXX, XXXX, XXXX, XXXX),
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
+		static uint16_t key_timer;
+    switch(id) {
+        case 0: //MAC0 - Hold for lshift and { on tap
+					if (record->event.pressed) {
+						key_timer = timer_read();
+						return MACRO(D(LSFT), END );
+					} else {
+						return (timer_elapsed(key_timer) < 150) ? MACRO(U(LSFT),D(RALT),T(7),U(RALT),END): MACRO(U(LSFT),END);
+					}; break;
+			  case 1:	//MAC1 - Hold for rshift and } on tap
+					if (record->event.pressed) {
+						key_timer = timer_read();
+						return MACRO(D(RSFT), END );
+					} else {
+						return (timer_elapsed(key_timer) < 150) ? MACRO(U(RSFT),D(RALT),T(0),U(RALT),END): MACRO(U(RSFT),END);
+					}; break;
+        case 2: //MAC2 - Hold for lctrl and [ on tap
+						if (record->event.pressed) {
+							key_timer = timer_read();
+							return MACRO(D(LCTL), END );
+						} else {return (timer_elapsed(key_timer) < 150) ? MACRO(U(LCTL),D(RALT),T(8),U(RALT),END):MACRO(U(LCTL),END);
+						}; break;
+       	case 3: //MAC3 - Hold for rctrl and ] on tap
+						if (record->event.pressed) {
+							key_timer = timer_read();
+							return MACRO(D(RCTL), END );
+						} else {
+							return (timer_elapsed(key_timer) < 150) ? MACRO(U(RCTL),D(RALT),T(9),U(RALT),END):MACRO(U(RCTL),END);
+						}; break;
+      	case 4: //MAC4
+						if (record->event.pressed) { } else { }; break;
+       	case 5: //MAC5
+						if (record->event.pressed) { } else { }; break;
+       	case 6: //MAC6
+						if (record->event.pressed) { } else { }; break;
+    } return MACRO_NONE;
+};
+/*
+		Later use:
+		void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { }
+		enum function_id { };
+		const uint16_t PROGMEM fn_actions[] = { };
+
+*/
diff --git a/keyboards/satan/keymaps/admiralStrokers/readme.md b/keyboards/satan/keymaps/admiralStrokers/readme.md
new file mode 100644
index 000000000..9b30caf34
--- /dev/null
+++ b/keyboards/satan/keymaps/admiralStrokers/readme.md
@@ -0,0 +1,13 @@
+# Admiral Strokers keymap
+## For the  Satan GH60 PCB
+The Admiral STN60 is a layout for users of the satan GH60, optimized with some nice	features such as mod tap for brackets (Similar to Space Cadett), space mod for F-row/  layer with easy to access media and control keys. The layout below is just as an example and is ISO based, ANSI and JIS layouts will be included later.
+
+``````
+[ _tmp ] = KEYMAP(	// Copy this to get started. SCAN is scandinavian layout specific.
+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, DEAD,\
+XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, SCAN, XXXX,\
+XXXX, SCAN, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, DEAD,\
+XXXX, XXXX, XXXX, 					XXXX,		   SCAN, XXXX, XXXX, XXXX, XXXX),\
+
+```
-- 
cgit v1.2.3


From d1fe24ad9f85768774ae50465c71f3757a33cc00 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Feb 2017 17:18:05 -0800
Subject: Allow customization of the number of tone keycodes and add example
 keymap

---
 keyboards/satan/keymaps/midi/Makefile  | 21 ++++++++++++
 keyboards/satan/keymaps/midi/config.h  | 11 +++++++
 keyboards/satan/keymaps/midi/keymap.c  | 60 ++++++++++++++++++++++++++++++++++
 keyboards/satan/keymaps/midi/readme.md |  1 +
 4 files changed, 93 insertions(+)
 create mode 100644 keyboards/satan/keymaps/midi/Makefile
 create mode 100644 keyboards/satan/keymaps/midi/config.h
 create mode 100644 keyboards/satan/keymaps/midi/keymap.c
 create mode 100644 keyboards/satan/keymaps/midi/readme.md

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/midi/Makefile b/keyboards/satan/keymaps/midi/Makefile
new file mode 100644
index 000000000..5cbda96ce
--- /dev/null
+++ b/keyboards/satan/keymaps/midi/Makefile
@@ -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 = 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
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/satan/keymaps/midi/config.h b/keyboards/satan/keymaps/midi/config.h
new file mode 100644
index 000000000..e345d40c9
--- /dev/null
+++ b/keyboards/satan/keymaps/midi/config.h
@@ -0,0 +1,11 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+// place overrides here
+
+/* override number of MIDI tone keycodes (each octave adds 12 bytes) */
+#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+#endif
\ No newline at end of file
diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/satan/keymaps/midi/keymap.c
new file mode 100644
index 000000000..ac9725933
--- /dev/null
+++ b/keyboards/satan/keymaps/midi/keymap.c
@@ -0,0 +1,60 @@
+#include "satan.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 _ML 1
+
+// readability
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+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 |
+   * |-----------------------------------------------------------|
+   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
+   * |-----------------------------------------------------------|
+   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+   * |-----------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
+   * |-----------------------------------------------------------|
+   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
+   * `-----------------------------------------------------------'
+   */
+[_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_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_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_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_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, TG(_ML), KC_RCTL),
+
+/* Keymap _ML: MIDI Layer
+   * ,------------------------------------------------------------------------.
+   * | Exit |    |    |    |    |    |    |    |    |    |    |    |    |     |
+   * |------------------------------------------------------------------------|
+   * |  Ch+ |    | C# | D# |    | F# | G# | A# |    | C# | D# |    |    |     |
+   * |------------------------------------------------------------------------|
+   * |  Mod  | C  | D  | E  | F  | G  | A  | B  | C  | D  | E  | F  |>>OnStage|
+   * |------------------------------------------------------------------------|
+   * | Sustain |Oct-|Oct+|Mod-|Mod+|    |    |    |Tns-|Tns+|Tns0|   Sustain  |
+   * |------------------------------------------------------------------------|
+   * |     |     |     |         All notes off        |     |     |     |     |
+   * `------------------------------------------------------------------------'
+   *
+   * Foot switches:
+   *                ,--------.         ,--------.
+   *                |        |         |        |
+   *                |        |         |        |
+   *                `--------'         `--------'
+   */
+[_ML] = KEYMAP_ANSI(
+  TG(_ML), MI_VEL_1, MI_VEL_2, MI_VEL_3, MI_VEL_4, MI_VEL_5, MI_VEL_6, MI_VEL_7, MI_VEL_8, MI_VEL_9, MI_VEL_10, XXXXXXX, XXXXXXX, XXXXXXX, \
+  MI_CHU,  XXXXXXX, MI_Cs,   MI_Ds,   XXXXXXX, MI_Fs,   MI_Gs,   MI_As,   XXXXXXX, MI_Cs_1, MI_Ds_1, XXXXXXX, XXXXXXX, XXXXXXX, \
+  MI_MOD,  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,           _______, \
+  MI_SUS,  MI_OCTD, MI_OCTU, MI_MODSD, MI_MODSU, XXXXXXX, XXXXXXX, XXXXXXX, MI_TRNSD, MI_TRNSU, MI_TRNS_0,             MI_SUS, \
+  _______, _______, _______,                          MI_OFF,                               _______, _______, _______, _______),
+};
\ No newline at end of file
diff --git a/keyboards/satan/keymaps/midi/readme.md b/keyboards/satan/keymaps/midi/readme.md
new file mode 100644
index 000000000..87844a854
--- /dev/null
+++ b/keyboards/satan/keymaps/midi/readme.md
@@ -0,0 +1 @@
+# Satan GH60 layout demonstrating MIDI key mapping
-- 
cgit v1.2.3


From ed15973a3ffff6e18e62f81654632b97961f18d2 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Feb 2017 17:45:08 -0800
Subject: Document size added by MIDI_ENABLE (~3800 bytes according to my
 experiments)

satan/keymaps/midi

MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 3 // default

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 2 // fewer octaves

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex
---
 keyboards/satan/keymaps/midi/Makefile | 2 +-
 keyboards/satan/keymaps/midi/config.h | 2 +-
 keyboards/satan/keymaps/midi/keymap.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/midi/Makefile b/keyboards/satan/keymaps/midi/Makefile
index 5cbda96ce..4e2d9d2f7 100644
--- a/keyboards/satan/keymaps/midi/Makefile
+++ b/keyboards/satan/keymaps/midi/Makefile
@@ -9,7 +9,7 @@ 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 = yes            # MIDI controls
+MIDI_ENABLE = yes            # MIDI support (+3800)
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
diff --git a/keyboards/satan/keymaps/midi/config.h b/keyboards/satan/keymaps/midi/config.h
index e345d40c9..0dbdb5cbc 100644
--- a/keyboards/satan/keymaps/midi/config.h
+++ b/keyboards/satan/keymaps/midi/config.h
@@ -5,7 +5,7 @@
 
 // place overrides here
 
-/* override number of MIDI tone keycodes (each octave adds 12 bytes) */
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 #define MIDI_TONE_KEYCODE_OCTAVES 2
 
 #endif
\ No newline at end of file
diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/satan/keymaps/midi/keymap.c
index ac9725933..004690f41 100644
--- a/keyboards/satan/keymaps/midi/keymap.c
+++ b/keyboards/satan/keymaps/midi/keymap.c
@@ -32,6 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, TG(_ML), KC_RCTL),
 
+#ifdef MIDI_ENABLE
 /* Keymap _ML: MIDI Layer
    * ,------------------------------------------------------------------------.
    * | Exit |    |    |    |    |    |    |    |    |    |    |    |    |     |
@@ -57,4 +58,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   MI_MOD,  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,           _______, \
   MI_SUS,  MI_OCTD, MI_OCTU, MI_MODSD, MI_MODSU, XXXXXXX, XXXXXXX, XXXXXXX, MI_TRNSD, MI_TRNSU, MI_TRNS_0,             MI_SUS, \
   _______, _______, _______,                          MI_OFF,                               _______, _______, _______, _______),
+#endif
 };
\ No newline at end of file
-- 
cgit v1.2.3


From 64eecfc5303788bd82bf2fb466ec4a6f1bd0c028 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Feb 2017 22:23:06 -0800
Subject: fix typos in keymap

---
 keyboards/satan/keymaps/midi/keymap.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/satan/keymaps/midi/keymap.c
index 004690f41..397fe097b 100644
--- a/keyboards/satan/keymaps/midi/keymap.c
+++ b/keyboards/satan/keymaps/midi/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------|
    * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
    * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
+   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |Midi|Ctrl |
    * `-----------------------------------------------------------'
    */
 [_BL] = KEYMAP_ANSI(
@@ -39,18 +39,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------------------------------------------------------------------------|
    * |  Ch+ |    | C# | D# |    | F# | G# | A# |    | C# | D# |    |    |     |
    * |------------------------------------------------------------------------|
-   * |  Mod  | C  | D  | E  | F  | G  | A  | B  | C  | D  | E  | F  |>>OnStage|
+   * |  Mod  | C  | D  | E  | F  | G  | A  | B  | C  | D  | E  | F  |         |
    * |------------------------------------------------------------------------|
    * | Sustain |Oct-|Oct+|Mod-|Mod+|    |    |    |Tns-|Tns+|Tns0|   Sustain  |
    * |------------------------------------------------------------------------|
    * |     |     |     |         All notes off        |     |     |     |     |
    * `------------------------------------------------------------------------'
-   *
-   * Foot switches:
-   *                ,--------.         ,--------.
-   *                |        |         |        |
-   *                |        |         |        |
-   *                `--------'         `--------'
    */
 [_ML] = KEYMAP_ANSI(
   TG(_ML), MI_VEL_1, MI_VEL_2, MI_VEL_3, MI_VEL_4, MI_VEL_5, MI_VEL_6, MI_VEL_7, MI_VEL_8, MI_VEL_9, MI_VEL_10, XXXXXXX, XXXXXXX, XXXXXXX, \
-- 
cgit v1.2.3


From 525be99ee938aa6e48448d7dd6ea6e6fe50bb36d Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sat, 25 Feb 2017 15:02:43 -0800
Subject: Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED

MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19494	      0	  19494	   4c26	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19788	      0	  19788	   4d4c	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  21140	      0	  21140	   5294	satan_midi.hex
---
 keyboards/satan/keymaps/midi/config.h | 17 ++++++++++++++++-
 keyboards/satan/keymaps/midi/keymap.c |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/midi/config.h b/keyboards/satan/keymaps/midi/config.h
index 0dbdb5cbc..59250b49e 100644
--- a/keyboards/satan/keymaps/midi/config.h
+++ b/keyboards/satan/keymaps/midi/config.h
@@ -3,7 +3,22 @@
 
 #include "../../config.h"
 
-// place overrides here
+/*
+ * MIDI options
+ */
+
+/* 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
diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/satan/keymaps/midi/keymap.c
index 397fe097b..349391c3b 100644
--- a/keyboards/satan/keymaps/midi/keymap.c
+++ b/keyboards/satan/keymaps/midi/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, TG(_ML), KC_RCTL),
 
-#ifdef MIDI_ENABLE
+#if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
 /* Keymap _ML: MIDI Layer
    * ,------------------------------------------------------------------------.
    * | Exit |    |    |    |    |    |    |    |    |    |    |    |    |     |
@@ -51,6 +51,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   MI_CHU,  XXXXXXX, MI_Cs,   MI_Ds,   XXXXXXX, MI_Fs,   MI_Gs,   MI_As,   XXXXXXX, MI_Cs_1, MI_Ds_1, XXXXXXX, XXXXXXX, XXXXXXX, \
   MI_MOD,  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,           _______, \
   MI_SUS,  MI_OCTD, MI_OCTU, MI_MODSD, MI_MODSU, XXXXXXX, XXXXXXX, XXXXXXX, MI_TRNSD, MI_TRNSU, MI_TRNS_0,             MI_SUS, \
-  _______, _______, _______,                          MI_OFF,                               _______, _______, _______, _______),
+  _______, _______, _______,                          MI_ALLOFF,                            _______, _______, _______, _______),
 #endif
 };
\ No newline at end of file
-- 
cgit v1.2.3


From ea14ed122fb5c1b3be5f5d6edda9b39b151692e5 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sat, 25 Feb 2017 19:37:33 -0800
Subject: Add basic layer to sample MIDI keycap

---
 keyboards/satan/keymaps/midi/keymap.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/satan/keymaps/midi/keymap.c
index 349391c3b..8378b4e4b 100644
--- a/keyboards/satan/keymaps/midi/keymap.c
+++ b/keyboards/satan/keymaps/midi/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, TG(_ML), KC_RCTL),
 
 #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
-/* Keymap _ML: MIDI Layer
+/* Keymap _ML: MIDI Layer (Advanced)
    * ,------------------------------------------------------------------------.
    * | Exit |    |    |    |    |    |    |    |    |    |    |    |    |     |
    * |------------------------------------------------------------------------|
@@ -52,5 +52,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   MI_MOD,  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,           _______, \
   MI_SUS,  MI_OCTD, MI_OCTU, MI_MODSD, MI_MODSU, XXXXXXX, XXXXXXX, XXXXXXX, MI_TRNSD, MI_TRNSU, MI_TRNS_0,             MI_SUS, \
   _______, _______, _______,                          MI_ALLOFF,                            _______, _______, _______, _______),
+#elif defined(MIDI_ENABLE) && defined(MIDI_BASIC)
+/* Keymap _ML: MIDI Layer (Advanced)
+   * ,------------------------------------------------------------------------.
+   * | Exit |    |    |    |    |    |    |    |    |    |    |    |    |     |
+   * |------------------------------------------------------------------------|
+   * |      |    |    |    |    |    |    |    |    |    |    |    |    |     |
+   * |------------------------------------------------------------------------|
+   * |       |    |    |    |    |    |    |    |    |    |    |    |         |
+   * |------------------------------------------------------------------------|
+   * |         |MuOn|MuOf|MiOn|MiOf|    |    |    |    |    |    |            |
+   * |------------------------------------------------------------------------|
+   * |     |     |     |                              |     |     |     |     |
+   * `------------------------------------------------------------------------'
+   */
+
+[_ML] = KEYMAP_ANSI(
+  TG(_ML), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+  _______, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, _______,                   _______, \
+  _______, _______, _______,                          _______,                              _______, _______, _______, _______),
 #endif
 };
\ No newline at end of file
-- 
cgit v1.2.3


From a64ae1066250d3aafb6e9670bf617237ec4338e7 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sat, 25 Feb 2017 20:41:13 -0800
Subject: Update existing keymaps

Update existing keymaps to enable MIDI_BASIC functionality.  Also added
an option MIDI_ENABLE_STRICT to be strict about keycode use (which also
reduces memory footprint at runtime)
---
 keyboards/satan/keymaps/midi/config.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/midi/config.h b/keyboards/satan/keymaps/midi/config.h
index 59250b49e..8e10b04ec 100644
--- a/keyboards/satan/keymaps/midi/config.h
+++ b/keyboards/satan/keymaps/midi/config.h
@@ -7,6 +7,9 @@
  * 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
 */
-- 
cgit v1.2.3


From 976c856966841cd0be6e514c6365c73164f5b96d Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sat, 25 Feb 2017 21:38:35 -0800
Subject: Update size estimates in the Makefile

MIDI_ENABLE = no

   text    data     bss     dec     hex filename
      0   17080       0   17080    42b8 satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text    data     bss     dec     hex filename
      0   19494       0   19494    4c26 satan_midi.hex

      +2414 bytes (vs. MIDI_ENABLE = no)

MIDI_ENABLE = yes
      0   20846       0   20846    516e satan_midi.hex

      +1352 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text    data     bss     dec     hex filename
      0   21292       0   21292    532c satan_midi.hex

      +1798 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

Conclusion:
    +2400 to 4200, depending on config
---
 keyboards/satan/keymaps/midi/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/midi/Makefile b/keyboards/satan/keymaps/midi/Makefile
index 4e2d9d2f7..89c34b394 100644
--- a/keyboards/satan/keymaps/midi/Makefile
+++ b/keyboards/satan/keymaps/midi/Makefile
@@ -9,7 +9,7 @@ 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 = yes            # MIDI support (+3800)
+MIDI_ENABLE = yes            # MIDI support (+2400 to 4200, depending on config)
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-- 
cgit v1.2.3


From 1968ec4c24137eb413a80ae5031e09c09bad4138 Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 7 Mar 2017 19:40:18 +0100
Subject: changed definitions on keymap.c in admiral strokers

Made a few changes to my own keymaps. (organisation)
---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 213 ++++++++++++-----------
 1 file changed, 109 insertions(+), 104 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index 487deb086..97a0f225d 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -1,117 +1,117 @@
 #include "satan.h"
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // general keydefs
-		#define norm 0		// Default layer
-		#define elev 1		// Layer directional keys
-		#define supr 2		// F-keys and mediakeys
-		#define spac 3
-		#define FNO1 4		//
-		#define FNO2 5		//
-		#define FNO3 6		//
-		#define MAC0 M(0)	//
-		#define MAC1 M(1)	//
-		#define MAC2 M(2)	//
-		#define MAC3 M(3)	//
-		#define MAC4 M(4)	//
-		#define MAC5 M(5)	//
-		#define MAC6 M(6)	//
-		#define MAC7 M(7)	//
-		#define MAC8 M(8)	//
-		#define MAC9 M(9)	//
-		#define GRAV KC_GRV //
-		#define MEDI F(FNO1)//
+#define norm 0		// Default layer
+#define elev 1		// Layer directional keys
+#define supr 2		// F-keys and mediakeys
+#define spac 3
+#define FNO1 4		//
+#define FNO2 5		//
+#define FNO3 6				//
+#define MAC0 M(0)	//
+#define MAC1 M(1)	//
+#define MAC2 M(2)	//
+#define MAC3 M(3)	//
+#define MAC4 M(4)	//
+#define MAC5 M(5)	//
+#define MAC6 M(6)	//
+#define MAC7 M(7)	//
+#define MAC8 M(8)	//
+#define MAC9 M(9)	//
+#define GRAV KC_GRV //
+#define MEDI F(FNO1)//
 
 // General shortenings
-		#define ESCA KC_ESC
-		#define MINS KC_MINS
-		#define EQUL KC_EQL
-		#define BSPC KC_BSPC
-		#define DELE KC_DEL
-		#define LBRC KC_LBRC
-		#define RBRC KC_RBRC
-		#define ALTR KC_RALT
-		#define SCLN KC_SCLN
-		#define QUOT KC_QUOT
-		#define NUHS KC_NUHS
-		#define ENTE KC_ENT
-		#define NUBS KC_NUBS	// Less/ greater sign
-		#define COMM KC_COMM	// Comma
-		#define FSTO KC_DOT		// Full stop
-		#define SLSH KC_SLSH
-		#define ALTL KC_LALT
-		#define GUIL KC_LGUI
-		#define GUIR KC_RGUI
-		#define MENO KC_MENU
+#define ESCA KC_ESC
+#define MINS KC_MINS
+#define EQUL KC_EQL
+#define BSPC KC_BSPC
+#define DELE KC_DEL
+#define LBRC KC_LBRC
+#define RBRC KC_RBRC
+#define ALTR KC_RALT
+#define SCLN KC_SCLN
+#define QUOT KC_QUOT
+#define NUHS KC_NUHS
+#define ENTE KC_ENT
+#define NUBS KC_NUBS	// Less/ greater sign
+#define COMM KC_COMM	// Comma
+#define FSTO KC_DOT		// Full stop
+#define SLSH KC_SLSH
+#define ALTL KC_LALT
+#define GUIL KC_LGUI
+#define GUIR KC_RGUI
+#define MENO KC_MENU
 // The F-row/layer:
-		#define FK01 KC_F1
-		#define FK02 KC_F2
-		#define FK03 KC_F3
-		#define FK04 KC_F4
-		#define FK05 KC_F5
-		#define FK06 KC_F6
-		#define FK07 KC_F7
-		#define FK08 KC_F8
-		#define FK09 KC_F9
-		#define FK10 KC_F10
-		#define FK11 KC_F11
-		#define FK12 KC_F12
-		#define FK13 KC_F13
-		#define FK14 KC_F14
+#define FK01 KC_F1
+#define FK02 KC_F2
+#define FK03 KC_F3
+#define FK04 KC_F4
+#define FK05 KC_F5
+#define FK06 KC_F6
+#define FK07 KC_F7
+#define FK08 KC_F8
+#define FK09 KC_F9
+#define FK10 KC_F10
+#define FK11 KC_F11
+#define FK12 KC_F12
+#define FK13 KC_F13
+#define FK14 KC_F14
 // Special Actions and Media Keys
-		#define INSE KC_INS  	// Insert here
-		#define HOME KC_HOME 	// Go to beginning of line
-		#define ENDI  KC_END 	// go to end of line
-		#define PSCR  KC_PSCR 	// Print Screen
-		#define SLCK  KC_SLCK 	// go to end of line
-		#define PGDN  KC_PGDN 	// go to end of line
-		#define PGUP  KC_PGUP 	// go to end of line
-		#define PLPS KC_MPLY 	// Play/Pause
-		#define PAUS KC_PAUS 	// Pause button
-		#define MUTE KC_MUTE 	// Mute sound
-		#define VOLU KC_VOLU 	// Volume increase
-		#define VOLD KC_VOLD 	// Volume decrease
-		#define MNXT KC_MNXT 	// next track
-		#define MPRV KC_MPRV 	// prev track
-		#define MSTP KC_MSTP 	// stop playing
-		#define MSEL KC_MSEL 	// Select media (Start playing it)
-		#define MAIL KC_MAIL 	// Open default mail app
-		#define CALC KC_CALC 	// Open default calculator app
-		#define MYCM KC_MYCM 	// Open default file manager
-		//#define LILO KC_XXXXXX	// Reserved for later
-		//#define LIHI KC_XXXXXX	// Reserved for later
+#define INSE KC_INS  	// Insert here
+#define HOME KC_HOME 	// Go to beginning of line
+#define ENDI  KC_END 	// go to end of line
+#define PSCR  KC_PSCR 	// Print Screen
+#define SLCK  KC_SLCK 	// go to end of line
+#define PGDN  KC_PGDN 	// go to end of line
+#define PGUP  KC_PGUP 	// go to end of line
+#define PLPS KC_MPLY 	// Play/Pause
+#define PAUS KC_PAUS 	// Pause button
+#define MUTE KC_MUTE 	// Mute sound
+#define VOLU KC_VOLU 	// Volume increase
+#define VOLD KC_VOLD 	// Volume decrease
+#define MNXT KC_MNXT 	// next track
+#define MPRV KC_MPRV 	// prev track
+#define MSTP KC_MSTP 	// stop playing
+#define MSEL KC_MSEL 	// Select media (Start playing it)
+#define MAIL KC_MAIL 	// Open default mail app
+#define CALC KC_CALC 	// Open default calculator app
+#define MYCM KC_MYCM 	// Open default file manager
+//#define LILO KC_XXXXXX	// Reserved for later
+//#define LIHI KC_XXXXXX	// Reserved for later
 
 
 // dual-role shortcuts
-		#define DUTB LT(elev, KC_TAB) 	// `tabs` layer on hold and tab on tap
-		#define DUSP LT(spac, KC_SPACE)	// `spce` layer on hold and space on tap
-		#define LOCK LGUI(KC_L)			// lock computer (win)
+#define DUTB LT(elev, KC_TAB) 	// `tabs` layer on hold and tab on tap
+#define DUSP LT(spac, KC_SPACE)	// `spce` layer on hold and space on tap
+#define LOCK LGUI(KC_L)			// lock computer (win)
 
 // Space Admiral Strokers
-		#define SADL MAC0 				// Hold for lshift and { on tap
-		#define SADR MAC1				// Hold for rshift and } on tap
-		#define CADL MAC2				// Hold for lctrl and [ on tap
-		#define CADR MAC3				// Hold for rctrl and ] on tap
+#define SADL MAC0 				// Hold for lshift and { on tap
+#define SADR MAC1				// Hold for rshift and } on tap
+#define CADL MAC2				// Hold for lctrl and [ on tap
+#define CADR MAC3				// Hold for rctrl and ] on tap
 
 // arrow cluster duality bottom right corner
-		#define ARLF ALT_T(KC_LEFT) // Left arrow
-		#define ARRT CTL_T(KC_RIGHT)// Right arrow
-		#define ARUP SFT_T(KC_UP)	// Up arrow
-		#define ARDN GUI_T(KC_DOWN) // Down arrow
+#define ARLF ALT_T(KC_LEFT) // Left arrow
+#define ARRT CTL_T(KC_RIGHT)// Right arrow
+#define ARUP SFT_T(KC_UP)	// Up arrow
+#define ARDN GUI_T(KC_DOWN) // Down arrow
 
 // brackets
-		#define NOCL RALT(KC_7)    // [
-		#define NOCR RALT(KC_0)    // ]
-		#define NOPL LSFT(KC_8)    // (
-		#define NOPR LSFT(KC_9)    // )
-		#define NOAL KC_NUBS       // <
-		#define NOAR LSFT(KC_NUBS) // >
-		#define NOBL RALT(KC_8)    // [
-		#define NOBR RALT(KC_9)    // ]
+#define NOCL RALT(KC_7)    // [
+#define NOCR RALT(KC_0)    // ]
+#define NOPL LSFT(KC_8)    // (
+#define NOPR LSFT(KC_9)    // )
+#define NOAL KC_NUBS       // <
+#define NOAR LSFT(KC_NUBS) // >
+#define NOBL RALT(KC_8)    // [
+#define NOBR RALT(KC_9)    // ]
 
 // increase readability
-		#define XXXX	KC_TRNS
-		#define DEAD 	KC_NO
-		#define SCAN	KC_TRNS // Scandinavian keys, the Row 5 key 5 is actually Row 1 key 15 on the PCB
+#define XXXX	KC_TRNS
+#define DEAD 	KC_NO
+#define SCAN	KC_TRNS // Scandinavian keys, the Row 5 key 5 is actually Row 1 key 15 on the PCB
 
 [ norm ] = KEYMAP( // Normal scandinavian mapping (danish has QUOT and SCLN wapped)
         GRAV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MINS, EQUL, BSPC, DELE,\
@@ -143,40 +143,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
-		static uint16_t key_timer;
+	static uint16_t key_timer;
+	bool checkTime(){
+		return (timer_elapsed(key_timer) < 150) ? true : false;
+	}
+
+
     switch(id) {
         case 0: //MAC0 - Hold for lshift and { on tap
 					if (record->event.pressed) {
 						key_timer = timer_read();
 						return MACRO(D(LSFT), END );
 					} else {
-						return (timer_elapsed(key_timer) < 150) ? MACRO(U(LSFT),D(RALT),T(7),U(RALT),END): MACRO(U(LSFT),END);
+						return checktime() ? MACRO(U(LSFT),D(RALT),T(7),U(RALT),END): MACRO(U(LSFT),END);
 					}; break;
 			  case 1:	//MAC1 - Hold for rshift and } on tap
 					if (record->event.pressed) {
 						key_timer = timer_read();
 						return MACRO(D(RSFT), END );
 					} else {
-						return (timer_elapsed(key_timer) < 150) ? MACRO(U(RSFT),D(RALT),T(0),U(RALT),END): MACRO(U(RSFT),END);
+						return checktime()  ? MACRO(U(RSFT),D(RALT),T(0),U(RALT),END): MACRO(U(RSFT),END);
 					}; break;
         case 2: //MAC2 - Hold for lctrl and [ on tap
 						if (record->event.pressed) {
 							key_timer = timer_read();
 							return MACRO(D(LCTL), END );
-						} else {return (timer_elapsed(key_timer) < 150) ? MACRO(U(LCTL),D(RALT),T(8),U(RALT),END):MACRO(U(LCTL),END);
+						} else {return checktime() ? MACRO(U(LCTL),D(RALT),T(8),U(RALT),END):MACRO(U(LCTL),END);
 						}; break;
        	case 3: //MAC3 - Hold for rctrl and ] on tap
 						if (record->event.pressed) {
 							key_timer = timer_read();
 							return MACRO(D(RCTL), END );
 						} else {
-							return (timer_elapsed(key_timer) < 150) ? MACRO(U(RCTL),D(RALT),T(9),U(RALT),END):MACRO(U(RCTL),END);
+							return checktime() ? MACRO(U(RCTL),D(RALT),T(9),U(RALT),END):MACRO(U(RCTL),END);
 						}; break;
-      	case 4: //MAC4
+      	case 4: //MAC4 reserved for later.
 						if (record->event.pressed) { } else { }; break;
-       	case 5: //MAC5
+       	case 5: //MAC5 reserved for later.
 						if (record->event.pressed) { } else { }; break;
-       	case 6: //MAC6
+       	case 6: //MAC6 reserved for later.
 						if (record->event.pressed) { } else { }; break;
     } return MACRO_NONE;
 };
-- 
cgit v1.2.3


From 5ae0cfeef5134b8ba9d1f2bff0c105d4e18b064c Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@smt.io>
Date: Thu, 9 Mar 2017 13:58:33 -0500
Subject: Add smt keymap for Satan 'GH60'

---
 keyboards/satan/keymaps/smt/Makefile  |  21 ++++
 keyboards/satan/keymaps/smt/keymap.c  | 204 ++++++++++++++++++++++++++++++++++
 keyboards/satan/keymaps/smt/readme.md |   1 +
 3 files changed, 226 insertions(+)
 create mode 100644 keyboards/satan/keymaps/smt/Makefile
 create mode 100644 keyboards/satan/keymaps/smt/keymap.c
 create mode 100644 keyboards/satan/keymaps/smt/readme.md

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/smt/Makefile b/keyboards/satan/keymaps/smt/Makefile
new file mode 100644
index 000000000..2a7ff2779
--- /dev/null
+++ b/keyboards/satan/keymaps/smt/Makefile
@@ -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/satan/keymaps/smt/keymap.c b/keyboards/satan/keymaps/smt/keymap.c
new file mode 100644
index 000000000..1dfa9495b
--- /dev/null
+++ b/keyboards/satan/keymaps/smt/keymap.c
@@ -0,0 +1,204 @@
+#include "satan.h"
+
+
+// Used for SHIFT_ESC
+#define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+
+// 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
+
+enum planck_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK
+};
+
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+// Custom macros
+#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
+#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
+#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
+#define ALT_GRV     ALT_T(KC_GRV)               // Tap for Backtick, hold for Alt
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _QWERTY: (Base Layer) Default Layer
+   * ,-----------------------------------------------------------.
+   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
+   * |-----------------------------------------------------------|
+   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
+   * |-----------------------------------------------------------|
+   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+   * |-----------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
+   * |-----------------------------------------------------------|
+   * |Ctrl|Gui |Alt |      Space/Fn         |Alt |Gui |Fn  |Ctrl |
+   * `-----------------------------------------------------------'
+   */
+[_QWERTY] = KEYMAP_ANSI(
+  F(0),    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, \
+  HPR_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, \
+  CTL_ESC, 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_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
+  KC_LCTL, KC_LGUI,KC_LALT,                LT(_RAISE, KC_SPC),                     KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+
+  /* Keymap _COLEMAK: (Base Layer) Default Layer
+   * ,-----------------------------------------------------------.
+   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
+   * |-----------------------------------------------------------|
+   * |Tab  |  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|  \  |
+   * |-----------------------------------------------------------|
+   * |CAPS   |  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|Return |
+   * |-----------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /|Shift     |
+   * |-----------------------------------------------------------|
+   * |Ctrl|Gui |Alt |      Space/Fn         |Alt |Gui |Fn  |Ctrl |
+   * `-----------------------------------------------------------'
+   */
+[_COLEMAK] = KEYMAP_ANSI(
+  F(0),    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, \
+  HPR_TAB, KC_Q,   KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,KC_LBRC, KC_RBRC,KC_BSLS, \
+  CTL_ESC, KC_A,   KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,   KC_O   ,KC_QUOT,         KC_ENT,  \
+  KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
+  KC_LCTL, KC_LGUI,KC_LALT,                LT(_RAISE, KC_SPC),                     KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+
+  /* Keymap _DVORAK: (Base Layer) Default Layer
+   * ,-----------------------------------------------------------.
+   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|Backsp |
+   * |-----------------------------------------------------------|
+   * |HypTb|  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|  \  |
+   * |-----------------------------------------------------------|
+   * |CtrlEsc|  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|Return |
+   * |-----------------------------------------------------------|
+   * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|ShiftEnter|
+   * |-----------------------------------------------------------|
+   * |Ctrl|Gui |Alt |      Space/Fn         |Alt |Gui |Fn  |Ctrl |
+   * `-----------------------------------------------------------'
+   */
+[_DVORAK] = KEYMAP_ANSI(
+  F(0),    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_BSPC, \
+  HPR_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_BSLS, \
+  CTL_ESC, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_MINS,         KC_ENT,  \
+  KC_LSFT,         KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,            SFT_ENT, \
+  KC_LCTL, KC_LGUI,KC_LALT,                LT(_RAISE, KC_SPC),                     KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+
+  /* Keymap _LOWER: Function Layer
+   * ,-----------------------------------------------------------.
+   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
+   * |-----------------------------------------------------------|
+   * |     |Hom| UP|End|   |   |   |   |   |   |   |Vo-|Vo+|     |
+   * |-----------------------------------------------------------|
+   * |      |LFT| DN| RT|   |   |LFT| DN| UP| RT|   |Pg+|        |
+   * |-----------------------------------------------------------|
+   * |        |   |   |   |   |   |   |   |   |   |Pg-|          |
+   * |-----------------------------------------------------------|
+   * |    |    |Prev|         Play           |Next|    |    |    |
+   * `-----------------------------------------------------------'
+   */
+[_LOWER] = KEYMAP_ANSI(
+  KC_GRV ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_DEL,  \
+  _______,KC_HOME,KC_UP  ,KC_END ,_______,_______,_______,_______,_______,_______,_______,KC_VOLD,KC_VOLU,_______, \
+  _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,_______,KC_PGUP        ,_______, \
+  _______        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN        ,_______, \
+  _______,_______,KC_MPRV                        ,KC_MPLY                        ,KC_MNXT,_______,_______,_______),
+
+  /* Keymap _RAISE: Function Layer
+   * ,-----------------------------------------------------------.
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   | RESET |
+   * |-----------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
+   * |-----------------------------------------------------------|
+   * |      |   |   |   |   |   |   |QWT|CLM|DVK|   |   |        |
+   * |-----------------------------------------------------------|
+   * |        | F1|F2 | F3|F4 | F5| F6| F7| F8|   |   |          |
+   * |-----------------------------------------------------------|
+   * |    |    |    |                        |    |    |    |    |
+   * `-----------------------------------------------------------'
+   */
+[_RAISE] = KEYMAP_ANSI(
+  #ifdef RGBLIGHT_ENABLE
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
+  _______        ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______        ,_______, \
+  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______
+  #else
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
+  _______        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______, \
+  _______,_______,_______                        ,_______                        ,_______,_______,XXXXXXX,_______
+  #endif
+  )
+};
+
+void persistant_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) {
+        persistant_default_layer_set(1UL<<_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        persistant_default_layer_set(1UL<<_COLEMAK);
+      }
+      return false;
+      break;
+    case DVORAK:
+      if (record->event.pressed) {
+        persistant_default_layer_set(1UL<<_DVORAK);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+enum function_id {
+    SHIFT_ESC,
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+  [0]  = ACTION_FUNCTION(SHIFT_ESC),
+};
+
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  static uint8_t shift_esc_shift_mask;
+  switch (id) {
+    case SHIFT_ESC:
+      shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK;
+      if (record->event.pressed) {
+        if (shift_esc_shift_mask) {
+          add_key(KC_GRV);
+          send_keyboard_report();
+        } else {
+          add_key(KC_ESC);
+          send_keyboard_report();
+        }
+      } else {
+        if (shift_esc_shift_mask) {
+          del_key(KC_GRV);
+          send_keyboard_report();
+        } else {
+          del_key(KC_ESC);
+          send_keyboard_report();
+        }
+      }
+      break;
+  }
+}
diff --git a/keyboards/satan/keymaps/smt/readme.md b/keyboards/satan/keymaps/smt/readme.md
new file mode 100644
index 000000000..7b706d601
--- /dev/null
+++ b/keyboards/satan/keymaps/smt/readme.md
@@ -0,0 +1 @@
+# smt's Satan GH60 layout
-- 
cgit v1.2.3


From b19e34c81e3e16dc75a39cdc94300fb116c9254c Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@smt.io>
Date: Fri, 10 Mar 2017 16:10:05 -0500
Subject: Forsake spacefn in favor of left shift tapdance. Move media controls.

---
 keyboards/satan/keymaps/smt/keymap.c | 49 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/satan/keymaps/smt/keymap.c
index 1dfa9495b..4ac016f21 100644
--- a/keyboards/satan/keymaps/smt/keymap.c
+++ b/keyboards/satan/keymaps/smt/keymap.c
@@ -24,10 +24,11 @@ enum planck_keycodes {
 #define XXXXXXX KC_NO
 
 // Custom macros
+#define ALT_GRV     ALT_T(KC_GRV)               // Tap for Backtick, hold for Alt
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
 #define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
-#define ALT_GRV     ALT_T(KC_GRV)               // Tap for Backtick, hold for Alt
+#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
+#define SFT_RSE     TD(KC_LSFT, OS(_RAISE))     // Double-tap for RAISE one-shot, otherwise Left Shift
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _QWERTY: (Base Layer) Default Layer
@@ -40,15 +41,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------|
    * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
    * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space/Fn         |Alt |Gui |Fn  |Ctrl |
+   * |Ctrl|Gui |Alt |         Space         |Alt |Gui |Fn  |Ctrl |
    * `-----------------------------------------------------------'
    */
 [_QWERTY] = KEYMAP_ANSI(
   F(0),    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, \
   HPR_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, \
   CTL_ESC, 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_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
-  KC_LCTL, KC_LGUI,KC_LALT,                LT(_RAISE, KC_SPC),                     KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+  SFT_RSE,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
+  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
 
   /* Keymap _COLEMAK: (Base Layer) Default Layer
    * ,-----------------------------------------------------------.
@@ -60,15 +61,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------|
    * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /|Shift     |
    * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space/Fn         |Alt |Gui |Fn  |Ctrl |
+   * |Ctrl|Gui |Alt |         Space         |Alt |Gui |Fn  |Ctrl |
    * `-----------------------------------------------------------'
    */
 [_COLEMAK] = KEYMAP_ANSI(
   F(0),    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, \
   HPR_TAB, KC_Q,   KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,KC_LBRC, KC_RBRC,KC_BSLS, \
   CTL_ESC, KC_A,   KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,   KC_O   ,KC_QUOT,         KC_ENT,  \
-  KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
-  KC_LCTL, KC_LGUI,KC_LALT,                LT(_RAISE, KC_SPC),                     KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+  SFT_RSE,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
+  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
 
   /* Keymap _DVORAK: (Base Layer) Default Layer
    * ,-----------------------------------------------------------.
@@ -80,35 +81,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------|
    * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|ShiftEnter|
    * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space/Fn         |Alt |Gui |Fn  |Ctrl |
+   * |Ctrl|Gui |Alt |         Space         |Alt |Gui |Fn  |Ctrl |
    * `-----------------------------------------------------------'
    */
 [_DVORAK] = KEYMAP_ANSI(
   F(0),    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_BSPC, \
   HPR_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_BSLS, \
   CTL_ESC, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_MINS,         KC_ENT,  \
-  KC_LSFT,         KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,            SFT_ENT, \
-  KC_LCTL, KC_LGUI,KC_LALT,                LT(_RAISE, KC_SPC),                     KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+  SFT_RSE,         KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,            SFT_ENT, \
+  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
 
   /* Keymap _LOWER: Function Layer
    * ,-----------------------------------------------------------.
    * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
    * |-----------------------------------------------------------|
-   * |     |Hom| UP|End|   |   |   |   |   |   |   |Vo-|Vo+|     |
+   * |     |Hom| UP|End|   |   |   |   |   |   |   |BL-|BL+|BL   |
    * |-----------------------------------------------------------|
-   * |      |LFT| DN| RT|   |   |LFT| DN| UP| RT|   |Pg+|        |
+   * |      |LFT| DN| RT|   |   |LFT| DN| UP| RT|Vo+|Pg+|        |
    * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |Pg-|          |
+   * |        |   |   |Prv|Ply|Nxt|   |   |   |Vo-|Pg-|          |
    * |-----------------------------------------------------------|
-   * |    |    |Prev|         Play           |Next|    |    |    |
+   * |    |    |    |                        |    |    |    |    |
    * `-----------------------------------------------------------'
    */
 [_LOWER] = KEYMAP_ANSI(
   KC_GRV ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_DEL,  \
-  _______,KC_HOME,KC_UP  ,KC_END ,_______,_______,_______,_______,_______,_______,_______,KC_VOLD,KC_VOLU,_______, \
-  _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,_______,KC_PGUP        ,_______, \
-  _______        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN        ,_______, \
-  _______,_______,KC_MPRV                        ,KC_MPLY                        ,KC_MNXT,_______,_______,_______),
+  _______,KC_HOME,KC_UP  ,KC_END ,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
+  _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_VOLU,KC_PGUP        ,_______, \
+  KC_LSFT        ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN        ,_______, \
+  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______),
 
   /* Keymap _RAISE: Function Layer
    * ,-----------------------------------------------------------.
@@ -126,15 +127,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = KEYMAP_ANSI(
   #ifdef RGBLIGHT_ENABLE
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
-  _______        ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______        ,_______, \
-  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______
+  KC_LSFT        ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______        ,_______, \
+  _______,_______,_______                        ,_______                        ,_______,_______,XXXXXXX,_______
   #else
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
-  _______        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______, \
+  KC_LSFT        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______, \
   _______,_______,_______                        ,_______                        ,_______,_______,XXXXXXX,_______
   #endif
   )
-- 
cgit v1.2.3


From 3399e392977f91b1993e1ac581ff5a054a45848b Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@smt.io>
Date: Mon, 20 Mar 2017 07:26:28 -0400
Subject: Fix shift tap-dance (can't use one-shot layer)

---
 keyboards/satan/keymaps/smt/Makefile |  3 ++-
 keyboards/satan/keymaps/smt/keymap.c | 43 +++++++++---------------------------
 2 files changed, 12 insertions(+), 34 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/smt/Makefile b/keyboards/satan/keymaps/smt/Makefile
index 2a7ff2779..afcd025e1 100644
--- a/keyboards/satan/keymaps/smt/Makefile
+++ b/keyboards/satan/keymaps/smt/Makefile
@@ -8,13 +8,14 @@ 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
+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
+TAP_DANCE_ENABLE = yes      # Enable tap dance
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/satan/keymaps/smt/keymap.c
index 4ac016f21..7f9e9c2d5 100644
--- a/keyboards/satan/keymaps/smt/keymap.c
+++ b/keyboards/satan/keymaps/smt/keymap.c
@@ -20,6 +20,10 @@ enum planck_keycodes {
   DVORAK
 };
 
+enum {
+  TD_SHIFT_RAISE = 0
+};
+
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
 
@@ -28,7 +32,7 @@ enum planck_keycodes {
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
 #define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define SFT_RSE     TD(KC_LSFT, OS(_RAISE))     // Double-tap for RAISE one-shot, otherwise Left Shift
+#define SFT_RSE     TD(TD_SHIFT_RAISE)          // Double-tap for RAISE one-shot, otherwise Left Shift
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _QWERTY: (Base Layer) Default Layer
@@ -170,36 +174,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-enum function_id {
-    SHIFT_ESC,
+// Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  // Tap/hold once for Shift, tap twice for raise layer
+  [TD_SHIFT_RAISE] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, _RAISE)
+// Other declarations would go here, separated by commas, if you have them
 };
-
-const uint16_t PROGMEM fn_actions[] = {
-  [0]  = ACTION_FUNCTION(SHIFT_ESC),
-};
-
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  static uint8_t shift_esc_shift_mask;
-  switch (id) {
-    case SHIFT_ESC:
-      shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK;
-      if (record->event.pressed) {
-        if (shift_esc_shift_mask) {
-          add_key(KC_GRV);
-          send_keyboard_report();
-        } else {
-          add_key(KC_ESC);
-          send_keyboard_report();
-        }
-      } else {
-        if (shift_esc_shift_mask) {
-          del_key(KC_GRV);
-          send_keyboard_report();
-        } else {
-          del_key(KC_ESC);
-          send_keyboard_report();
-        }
-      }
-      break;
-  }
-}
-- 
cgit v1.2.3


From b10d95070831dde5801e930c615612dec3a6fd11 Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@smt.io>
Date: Mon, 20 Mar 2017 07:43:24 -0400
Subject: Use normal backtick in ESC spot - I've mapped ESC to caps lock

---
 keyboards/satan/keymaps/smt/keymap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/satan/keymaps/smt/keymap.c
index 7f9e9c2d5..1a2bc9769 100644
--- a/keyboards/satan/keymaps/smt/keymap.c
+++ b/keyboards/satan/keymaps/smt/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_QWERTY] = KEYMAP_ANSI(
-  F(0),    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_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_BSPC, \
   HPR_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, \
   CTL_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,  \
   SFT_RSE,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_COLEMAK] = KEYMAP_ANSI(
-  F(0),    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_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_BSPC, \
   HPR_TAB, KC_Q,   KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,KC_LBRC, KC_RBRC,KC_BSLS, \
   CTL_ESC, KC_A,   KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,   KC_O   ,KC_QUOT,         KC_ENT,  \
   SFT_RSE,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_DVORAK] = KEYMAP_ANSI(
-  F(0),    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_BSPC, \
+  KC_GRV,  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_BSPC, \
   HPR_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_BSLS, \
   CTL_ESC, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_MINS,         KC_ENT,  \
   SFT_RSE,         KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,            SFT_ENT, \
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_LOWER] = KEYMAP_ANSI(
-  KC_GRV ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_DEL,  \
+  _______,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_DEL,  \
   _______,KC_HOME,KC_UP  ,KC_END ,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
   _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_VOLU,KC_PGUP        ,_______, \
   KC_LSFT        ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN        ,_______, \
-- 
cgit v1.2.3


From 34c5f8094e3a07dfff344f95b29407c9efaa0e4c Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@smt.io>
Date: Mon, 20 Mar 2017 07:43:45 -0400
Subject: Remove tap-dance. Raise will be accessed via holding shift while
 lower is active

---
 keyboards/satan/keymaps/smt/Makefile |  1 -
 keyboards/satan/keymaps/smt/keymap.c | 32 +++++++++++---------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/smt/Makefile b/keyboards/satan/keymaps/smt/Makefile
index afcd025e1..0c9ae824f 100644
--- a/keyboards/satan/keymaps/smt/Makefile
+++ b/keyboards/satan/keymaps/smt/Makefile
@@ -15,7 +15,6 @@ 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 = yes      # Enable tap dance
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/satan/keymaps/smt/keymap.c
index 1a2bc9769..a21d3eb86 100644
--- a/keyboards/satan/keymaps/smt/keymap.c
+++ b/keyboards/satan/keymaps/smt/keymap.c
@@ -17,11 +17,9 @@
 enum planck_keycodes {
   QWERTY = SAFE_RANGE,
   COLEMAK,
-  DVORAK
-};
-
-enum {
-  TD_SHIFT_RAISE = 0
+  DVORAK,
+  LOWER,
+  RAISE
 };
 
 #define _______ KC_TRNS
@@ -32,7 +30,6 @@ enum {
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
 #define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define SFT_RSE     TD(TD_SHIFT_RAISE)          // Double-tap for RAISE one-shot, otherwise Left Shift
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _QWERTY: (Base Layer) Default Layer
@@ -52,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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_BSPC, \
   HPR_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, \
   CTL_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,  \
-  SFT_RSE,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
+  KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
   KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
 
   /* Keymap _COLEMAK: (Base Layer) Default Layer
@@ -72,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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_BSPC, \
   HPR_TAB, KC_Q,   KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,KC_LBRC, KC_RBRC,KC_BSLS, \
   CTL_ESC, KC_A,   KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,   KC_O   ,KC_QUOT,         KC_ENT,  \
-  SFT_RSE,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
+  KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
   KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
 
   /* Keymap _DVORAK: (Base Layer) Default Layer
@@ -92,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  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_BSPC, \
   HPR_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_BSLS, \
   CTL_ESC, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_MINS,         KC_ENT,  \
-  SFT_RSE,         KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,            SFT_ENT, \
+  KC_LSFT,         KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,            SFT_ENT, \
   KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
 
   /* Keymap _LOWER: Function Layer
@@ -112,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,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_HOME,KC_UP  ,KC_END ,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
   _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_VOLU,KC_PGUP        ,_______, \
-  KC_LSFT        ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN        ,_______, \
+  RAISE          ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN        ,_______, \
   _______,_______,_______                        ,_______                        ,_______,_______,_______,_______),
 
   /* Keymap _RAISE: Function Layer
@@ -133,14 +130,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
-  KC_LSFT        ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______        ,_______, \
-  _______,_______,_______                        ,_______                        ,_______,_______,XXXXXXX,_______
+  _______        ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______        ,_______, \
+  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______
   #else
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
-  KC_LSFT        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______, \
-  _______,_______,_______                        ,_______                        ,_______,_______,XXXXXXX,_______
+  _______        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______, \
+  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______
   #endif
   )
 };
@@ -173,10 +170,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  // Tap/hold once for Shift, tap twice for raise layer
-  [TD_SHIFT_RAISE] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, _RAISE)
-// Other declarations would go here, separated by commas, if you have them
-};
-- 
cgit v1.2.3


From dce3847ebb900ffebd9038da255309cbac634170 Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@smt.io>
Date: Mon, 20 Mar 2017 14:12:43 -0400
Subject: Use single _FUNC layer. Move RESET and base layout-changing keys to
 _FUNC.

---
 keyboards/satan/keymaps/smt/keymap.c | 55 ++++++++----------------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/satan/keymaps/smt/keymap.c
index a21d3eb86..d90849914 100644
--- a/keyboards/satan/keymaps/smt/keymap.c
+++ b/keyboards/satan/keymaps/smt/keymap.c
@@ -11,15 +11,12 @@
 #define _QWERTY 0
 #define _COLEMAK 1
 #define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
+#define _FUNC 3
 
 enum planck_keycodes {
   QWERTY = SAFE_RANGE,
   COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE
+  DVORAK
 };
 
 #define _______ KC_TRNS
@@ -50,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   HPR_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, \
   CTL_ESC, 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_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
-  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_FUNC),KC_RCTL),
 
   /* Keymap _COLEMAK: (Base Layer) Default Layer
    * ,-----------------------------------------------------------.
@@ -70,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   HPR_TAB, KC_Q,   KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,KC_LBRC, KC_RBRC,KC_BSLS, \
   CTL_ESC, KC_A,   KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,   KC_O   ,KC_QUOT,         KC_ENT,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         SFT_ENT, \
-  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_FUNC),KC_RCTL),
 
   /* Keymap _DVORAK: (Base Layer) Default Layer
    * ,-----------------------------------------------------------.
@@ -90,55 +87,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   HPR_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_BSLS, \
   CTL_ESC, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_MINS,         KC_ENT,  \
   KC_LSFT,         KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,            SFT_ENT, \
-  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL),
+  KC_LCTL, KC_LGUI,KC_LALT,                      KC_SPC,                           KC_RALT,KC_RGUI,MO(_FUNC),KC_RCTL),
 
-  /* Keymap _LOWER: Function Layer
+  /* Keymap _FUNC: Function Layer
    * ,-----------------------------------------------------------.
    * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
    * |-----------------------------------------------------------|
-   * |     |Hom| UP|End|   |   |   |   |   |   |   |BL-|BL+|BL   |
+   * |     |Hom| UP|End|   |   |   |Qwt|Cmk|Dvk|   |BL-|BL+|BL   |
    * |-----------------------------------------------------------|
    * |      |LFT| DN| RT|   |   |LFT| DN| UP| RT|Vo+|Pg+|        |
    * |-----------------------------------------------------------|
    * |        |   |   |Prv|Ply|Nxt|   |   |   |Vo-|Pg-|          |
    * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
+   * |RESET|    |    |                       |    |    |    |    |
    * `-----------------------------------------------------------'
    */
-[_LOWER] = KEYMAP_ANSI(
+[_FUNC] = 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_HOME,KC_UP  ,KC_END ,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \
+  _______,KC_HOME,KC_UP  ,KC_END ,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,BL_DEC ,BL_INC ,BL_TOGG, \
   _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_VOLU,KC_PGUP        ,_______, \
-  RAISE          ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN        ,_______, \
-  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______),
-
-  /* Keymap _RAISE: Function Layer
-   * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   | RESET |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |QWT|CLM|DVK|   |   |        |
-   * |-----------------------------------------------------------|
-   * |        | F1|F2 | F3|F4 | F5| F6| F7| F8|   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-[_RAISE] = KEYMAP_ANSI(
-  #ifdef RGBLIGHT_ENABLE
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
-  _______        ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______        ,_______, \
-  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______
-  #else
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  , \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______        ,_______, \
-  _______        ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______, \
-  _______,_______,_______                        ,_______                        ,_______,_______,_______,_______
-  #endif
+  _______        ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN        ,_______, \
+  RESET  ,_______,_______                        ,_______                        ,_______,_______,_______,_______
   )
 };
 
-- 
cgit v1.2.3


From d5ee0194abf5cc9df4086a89ad78cf188352028a Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 15:43:04 +0200
Subject: fixed #1139 issues

A fix described by jackhumbert has been sorted out now.
---
 keyboards/satan/keymaps/admiralStrokers/Makefile | 36 ++++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/Makefile b/keyboards/satan/keymaps/admiralStrokers/Makefile
index 18d2280d6..7aba5d809 100644
--- a/keyboards/satan/keymaps/admiralStrokers/Makefile
+++ b/keyboards/satan/keymaps/admiralStrokers/Makefile
@@ -2,25 +2,25 @@
 #   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 	= 	no  # Mouse keys(+4700)
-EXTRAKEY_ENABLE 	=		yes  # 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   # Enables your LED to breathe while your computer is sleeping.
-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 	=		no   # Enable keyboard backlight functionality
-MIDI_ENABLE 			=		no   # MIDI controls
-AUDIO_ENABLE 			=		no   # Audio output on port C6
-UNICODEMAP_ENABLE	=		no	 # This allows sending unicode symbols using X(<unicode>) in your keymap.
-UNICODE_ENABLE 		=		no   # Unicode
-UCIS_ENABLE 			=		no	 # Keep in mind that not all will work (See WinCompose for details on Windows).
-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
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # 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       # Enables your LED to breathe while your computer is sleeping.
+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 = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODEMAP_ENABLE =	no      # This allows sending unicode symbols using X(<unicode>) in your keymap.
+UNICODE_ENABLE =no          # Unicode
+UCIS_ENABLE = no            # Keep in mind that not all will work (See WinCompose for details on Windows).
+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
 
-VARIABLE_TRACE		=		no	 # Use this to debug changes to variable values
-API_SYSEX_ENABLE	=		no	 # This enables using the Quantum SYSEX API to send strings
+VARIABLE_TRACE = no         # Use this to debug changes to variable values
+API_SYSEX_ENABLE = no       # This enables using the Quantum SYSEX API to send strings
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
 endif
-- 
cgit v1.2.3


From 48dfc77718bf115c6d65257b07e8d87304c23d8f Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 15:58:46 +0200
Subject: removed a carriage return

---
 keyboards/satan/keymaps/admiralStrokers/Makefile | 37 ++++++++++++------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/Makefile b/keyboards/satan/keymaps/admiralStrokers/Makefile
index 7aba5d809..bb4072861 100644
--- a/keyboards/satan/keymaps/admiralStrokers/Makefile
+++ b/keyboards/satan/keymaps/admiralStrokers/Makefile
@@ -2,25 +2,24 @@
 #   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 = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # 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       # Enables your LED to breathe while your computer is sleeping.
-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 = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODEMAP_ENABLE =	no      # This allows sending unicode symbols using X(<unicode>) in your keymap.
-UNICODE_ENABLE =no          # Unicode
-UCIS_ENABLE = no            # Keep in mind that not all will work (See WinCompose for details on Windows).
-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
-
-VARIABLE_TRACE = no         # Use this to debug changes to variable values
-API_SYSEX_ENABLE = no       # This enables using the Quantum SYSEX API to send strings
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # 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 # Enables your LED to breathe while your computer is sleeping.
+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 = no # Enable keyboard backlight functionality
+MIDI_ENABLE = no # MIDI controls
+AUDIO_ENABLE = no # Audio output on port C6
+UNICODEMAP_ENABLE =	no # This allows sending unicode symbols using X(<unicode>) in your keymap.
+UNICODE_ENABLE =no # Unicode
+UCIS_ENABLE = no # Keep in mind that not all will work (See WinCompose for details on Windows).
+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
+VARIABLE_TRACE = no # Use this to debug changes to variable values
+API_SYSEX_ENABLE = no # This enables using the Quantum SYSEX API to send strings
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
 endif
-- 
cgit v1.2.3


From c72ca58528671eb582a1a7360407fd9347c9735b Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 16:50:44 +0200
Subject: Moved key_timer out of function.

---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index 97a0f225d..4bd49aaad 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -1,13 +1,14 @@
 #include "satan.h"
+static uint16_t key_timer;
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // general keydefs
 #define norm 0		// Default layer
 #define elev 1		// Layer directional keys
 #define supr 2		// F-keys and mediakeys
-#define spac 3
+#define spac 3		//
 #define FNO1 4		//
 #define FNO2 5		//
-#define FNO3 6				//
+#define FNO3 6		//
 #define MAC0 M(0)	//
 #define MAC1 M(1)	//
 #define MAC2 M(2)	//
@@ -143,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
-	static uint16_t key_timer;
+	
 	bool checkTime(){
 		return (timer_elapsed(key_timer) < 150) ? true : false;
 	}
-- 
cgit v1.2.3


From 37b7539af3a4e302a44ed9292ed5012a9ab34e5c Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 16:52:56 +0200
Subject: slight cleanup as per recommendation

---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index 4bd49aaad..72a4c3dc9 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -1,6 +1,6 @@
 #include "satan.h"
 static uint16_t key_timer;
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
 // general keydefs
 #define norm 0		// Default layer
 #define elev 1		// Layer directional keys
@@ -114,6 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #define DEAD 	KC_NO
 #define SCAN	KC_TRNS // Scandinavian keys, the Row 5 key 5 is actually Row 1 key 15 on the PCB
 
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [ norm ] = KEYMAP( // Normal scandinavian mapping (danish has QUOT and SCLN wapped)
         GRAV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MINS, EQUL, BSPC, DELE,\
         DUTB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, LBRC, RBRC, DEAD,\
-- 
cgit v1.2.3


From 1b821eca663fb6cbe13ea1753f220bce5a7636a6 Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 16:55:25 +0200
Subject: removed varable trace option from makefile

---
 keyboards/satan/keymaps/admiralStrokers/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/Makefile b/keyboards/satan/keymaps/admiralStrokers/Makefile
index bb4072861..61dfedeb8 100644
--- a/keyboards/satan/keymaps/admiralStrokers/Makefile
+++ b/keyboards/satan/keymaps/admiralStrokers/Makefile
@@ -18,7 +18,6 @@ UCIS_ENABLE = no # Keep in mind that not all will work (See WinCompose for detai
 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
-VARIABLE_TRACE = no # Use this to debug changes to variable values
 API_SYSEX_ENABLE = no # This enables using the Quantum SYSEX API to send strings
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
-- 
cgit v1.2.3


From 256abc64d5daee6d7526d33455f6f28cc782dee1 Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 17:08:01 +0200
Subject: fixed function to not accept any arguments.

As per Pramod's comment on stack overflow:

In C int foo() and int foo(void) are different functions. int foo()
accepts an arbitrary number of arguments, while int foo(void) accepts 0
arguments. In C++ they mean the same thing. I suggest that you use void
consistently when you mean no arguments.
---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index 72a4c3dc9..7a8459eb5 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
 	
-	bool checkTime(){
+	bool checkTime(void){
 		return (timer_elapsed(key_timer) < 150) ? true : false;
 	}
 
-- 
cgit v1.2.3


From f504082f7f4f2fe078cb1863b43d7ef0dc0c5c53 Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 17:17:08 +0200
Subject: declaring checktime before the function it is used in.

---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index 7a8459eb5..b5fd2ec60 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -1,5 +1,6 @@
 #include "satan.h"
 static uint16_t key_timer;
+bool checkTime(void);
 
 // general keydefs
 #define norm 0		// Default layer
-- 
cgit v1.2.3


From 411cd4fae27693324ca51eb5bf07ecebbc074c01 Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 17:30:15 +0200
Subject: moved checktime out of function

---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index b5fd2ec60..422a801ba 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -1,6 +1,8 @@
 #include "satan.h"
 static uint16_t key_timer;
-bool checkTime(void);
+bool checkTime(void){
+		return (timer_elapsed(key_timer) < 150) ? true : false;
+	}
 
 // general keydefs
 #define norm 0		// Default layer
@@ -147,11 +149,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
 	
-	bool checkTime(void){
-		return (timer_elapsed(key_timer) < 150) ? true : false;
-	}
-
-
     switch(id) {
         case 0: //MAC0 - Hold for lshift and { on tap
 					if (record->event.pressed) {
-- 
cgit v1.2.3


From 85cac3952965b37317d42bf7b3e5cf3a9e4ebdae Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 18:41:04 +0200
Subject: fixed capitalization issue (checkTime => checktime)

---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index 422a801ba..7b83ed7b0 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -1,6 +1,8 @@
 #include "satan.h"
+
 static uint16_t key_timer;
-bool checkTime(void){
+
+bool checktime(void){
 		return (timer_elapsed(key_timer) < 150) ? true : false;
 	}
 
@@ -147,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				XXXX, XXXX, XXXX, 					XXXX,			  		XXXX, XXXX, XXXX, XXXX),
 };
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {3 // MACRODOWN only works in this function
 	
     switch(id) {
         case 0: //MAC0 - Hold for lshift and { on tap
-- 
cgit v1.2.3


From 6de7e5d8dce42b56a0424da98408f3cf8f27cfa1 Mon Sep 17 00:00:00 2001
From: Ole Anders <git@swoy.org>
Date: Tue, 28 Mar 2017 18:45:26 +0200
Subject: typo removed {3 ...

---
 keyboards/satan/keymaps/admiralStrokers/keymap.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'keyboards/satan/keymaps')

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index 7b83ed7b0..b6dc29c67 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -4,7 +4,7 @@ static uint16_t key_timer;
 
 bool checktime(void){
 		return (timer_elapsed(key_timer) < 150) ? true : false;
-	}
+	};
 
 // general keydefs
 #define norm 0		// Default layer
@@ -149,8 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				XXXX, XXXX, XXXX, 					XXXX,			  		XXXX, XXXX, XXXX, XXXX),
 };
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {3 // MACRODOWN only works in this function
-	
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
     switch(id) {
         case 0: //MAC0 - Hold for lshift and { on tap
 					if (record->event.pressed) {
-- 
cgit v1.2.3