Keymap: Adding my DZ60, Satan, XD75 kemaps and updates to userspace (#4039)

* Update userspace with common config.h * Add my dz60, satan and xd75 keyboard keymaps * Fixing executable bits changed during last upstream merge * Cleanup unnecessary files and defines * Remove unnecessary defines from userspace config
author: Jarred Steenvoorden <jazzjarred@gmail.com> 2018-10-03 01:14:37 +1000
committer: Drashna Jaelre <drashna@live.com> 2018-10-02 08:14:37 -0700
commit: 5c2ac733afe9f6d68d2ad42c9d58fbff466a7874 (patch)
tree: e6ad426fc9ded25e13e45b77e3699a3c9483a3d7
parent: 1a33054a3586fa69812a249762e24ecc08a40423 (diff)
download: qmk_firmware-5c2ac733afe9f6d68d2ad42c9d58fbff466a7874.tar.gz
qmk_firmware-5c2ac733afe9f6d68d2ad42c9d58fbff466a7874.zip
12 files changed, 173 insertions, 22 deletions
diff --git a/keyboards/dz60/keymaps/jarred/keymap.c b/keyboards/dz60/keymaps/jarred/keymap.c
new file mode 100644
index 000000000..9e6850683
--- /dev/null
+++ b/keyboards/dz60/keymaps/jarred/keymap.c
@@ -0,0 +1,21 @@
+#include QMK_KEYBOARD_H
+#define _QW 0
+#define _NV 1
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [_QW] = LAYOUT(
+        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, XXXXXXX, 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,
+        MO(_NV), 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, XXXXXXX,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,XXXXXXX,
+                KC_LCTL, KC_LGUI,KC_LALT,        KC_SPC, KC_SPC, KC_SPC,                 KC_RALT,KC_RGUI, XXXXXXX,KC_APP, KC_RCTL),
+        [_NV] = LAYOUT(
+        KC_GRV ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,_______,_______,
+        _______,_______,_______,_______,KC_DEL ,KC_BSPC,_______,KC_HOME,KC_UP  ,KC_END ,KC_INS ,_______,_______,_______,
+        _______,_______,_______,KC_LSFT,KC_LCTL,KC_ENT ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,KC_DEL ,        _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,_______,_______,
+        _______,_______,_______,        _______,_______,_______,                _______,_______,_______,  RESET, _______)
+};
diff --git a/keyboards/planck/keymaps/jarred/rules.mk b/keyboards/planck/keymaps/jarred/rules.mk
deleted file mode 100644
index cd14c41e1..000000000
--- a/keyboards/planck/keymaps/jarred/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build options
-BACKLIGHT_ENABLE = no       # Switch LEDs
-MOUSEKEY_ENABLE = no        # Emulates mouse key using keypresses
diff --git a/keyboards/satan/keymaps/jarred/keymap.c b/keyboards/satan/keymaps/jarred/keymap.c
new file mode 100644
index 000000000..c6852e4eb
--- /dev/null
+++ b/keyboards/satan/keymaps/jarred/keymap.c
@@ -0,0 +1,22 @@
+#include QMK_KEYBOARD_H
+#define _QW 0
+#define _NV 1
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_60_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, \
+  MO(_NV), 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, KC_APP, KC_RCTL),
+[_NV] = LAYOUT_60_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_BSPC,_______,KC_HOME,KC_UP  ,KC_END ,KC_INS ,_______,_______,_______, \
+  _______,_______,_______,KC_LSFT,KC_LCTL,KC_ENT ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,KC_DEL ,        _______, \
+  _______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,_______, \
+  _______,_______,_______,                 _______,                       _______,_______,  RESET, _______),
+  
+};
diff --git a/keyboards/satan/keymaps/jarred/readme.md b/keyboards/satan/keymaps/jarred/readme.md
new file mode 100644
index 000000000..522cb19b6
--- /dev/null
+++ b/keyboards/satan/keymaps/jarred/readme.md
@@ -0,0 +1 @@
+# Jarred's Satan GH60 layout
diff --git a/keyboards/xd75/keymaps/daniel/keymap.c b/keyboards/xd75/keymaps/daniel/keymap.c
new file mode 100644
index 000000000..2804a6cd0
--- /dev/null
+++ b/keyboards/xd75/keymaps/daniel/keymap.c
@@ -0,0 +1,29 @@
+#include QMK_KEYBOARD_H
+#define _QW 0
+#define _NV 1
+#define _NM 2
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_QW] = {
+  { 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_GRV , 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_DEL  },
+  { MO(_NV), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , MO(_NM), KC_PGUP },
+  { KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, KC_RSFT, KC_UP  , KC_PGDN },
+  { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT },
+ },
+ [_NV] = {
+  { 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_BSPC, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______, _______, _______, _______ },
+  { _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______, _______, _______, _______ },
+  { _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______ },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+ },
+ [_NM] = {
+  { _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+  { _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+  { _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+  { _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+  { RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+ }
+};
diff --git a/keyboards/xd75/keymaps/daniel/readme.md b/keyboards/xd75/keymaps/daniel/readme.md
new file mode 100644
index 000000000..3305d0f30
--- /dev/null
+++ b/keyboards/xd75/keymaps/daniel/readme.md
@@ -0,0 +1 @@
+# Daniels xd75 keymap
diff --git a/keyboards/xd75/keymaps/jarred/keymap.c b/keyboards/xd75/keymaps/jarred/keymap.c
new file mode 100644
index 000000000..f85178711
--- /dev/null
+++ b/keyboards/xd75/keymaps/jarred/keymap.c
@@ -0,0 +1,37 @@
+#include QMK_KEYBOARD_H
+#define _QW 0
+#define _LW 1
+#define _NV 2
+#define _NM 3
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_QW] = {
+  { KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_MUTE, KC_VOLD, KC_VOLU, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC },
+  { KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_INS , KC_HOME, KC_PGUP, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC },
+  { MO(_NV), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_DEL , KC_END , KC_PGDN, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT },
+  { KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , _______, KC_UP  , _______, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT },
+  { KC_LCTL, KC_LGUI, MO(_NM), KC_LALT, MO(_LW), KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , MO(_LW), KC_RALT, KC_RGUI, KC_APP , KC_RCTL },
+ },
+ [_LW] = {
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+  { KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______, _______, _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______ },
+  { _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , _______, _______, _______, KC_F11 , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS },
+  { _______, KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , _______, _______, _______, KC_F12 , KC_GRV , _______, _______, _______, _______ },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+ },
+ [_NV] = {
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+  { _______, _______, _______, _______, KC_DEL , KC_BSPC, _______, _______, _______, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______ },
+  { _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______ },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______ },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+ },
+ [_NM] = {
+  { _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______ },
+  { _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______ },
+  { _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______ },
+  { _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______ },
+  { RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+ }
+};
diff --git a/keyboards/xd75/keymaps/jarred/readme.md b/keyboards/xd75/keymaps/jarred/readme.md
new file mode 100644
index 000000000..4070bb3ee
--- /dev/null
+++ b/keyboards/xd75/keymaps/jarred/readme.md
@@ -0,0 +1 @@
+# Jarreds xd75 keymap
diff --git a/keyboards/planck/keymaps/jarred/config.h b/users/jarred/config.h
index 9e8f404c1..f28208814 100644
--- a/keyboards/planck/keymaps/jarred/config.h
+++ b/users/jarred/config.h
@@ -14,24 +14,37 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef CONFIG_USER_H
+#pragma once
-#define CONFIG_USER_H
-#include "config_common.h"
+// Sets good default for the speed of the mouse.
+#undef MOUSEKEY_INTERVAL
+#undef MOUSEKEY_DELAY
+#undef MOUSEKEY_TIME_TO_MAX
+#undef MOUSEKEY_MAX_SPEED
-#ifdef AUDIO_ENABLE
+#define MOUSEKEY_INTERVAL       16
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
+#define MOUSEKEY_DELAY          0
-#endif
+#define MOUSEKEY_TIME_TO_MAX    40
+#define MOUSEKEY_MAX_SPEED      5
-#define TAPPING_TERM    200
+#undef MOUSEKEY_WHEEL_MAX_SPEED
+#undef MOUSEKEY_WHEEL_TIME_TO_MAX
+#undef MOUSEKEY_WHEEL_DELAY
-#define MOUSEKEY_DELAY 0
+#define MOUSEKEY_WHEEL_MAX_SPEED    4
-#define MOUSEKEY_INTERVAL 16
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  255
-#define MOUSEKEY_TIME_TO_MAX 40
+#define MOUSEKEY_WHEEL_DELAY        0
-#define MOUSEKEY_MAX_SPEED 5
-#define MOUSEKEY_WHEEL_DELAY 0
+#undef TAPPING_TOGGLE
-#define MOUSEKEY_WHEEL_MAX_SPEED   4
+#undef TAPPING_TERM
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
+#undef IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TOGGLE  1
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
 #endif
+#define MACRO_TIMER 5
diff --git a/users/jarred/jarred.c b/users/jarred/jarred.c
index f8413ca3b..33162b689 100644
--- a/users/jarred/jarred.c
+++ b/users/jarred/jarred.c
@@ -15,3 +15,18 @@
 */
 #include "jarred.h"
+#include "version.h"
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case VRSN: // Prints firmware version
+      if (record->event.pressed) {
+        send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), MACRO_TIMER);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
diff --git a/users/jarred/jarred.h b/users/jarred/jarred.h
index b1253f76a..a6774ce26 100644
--- a/users/jarred/jarred.h
+++ b/users/jarred/jarred.h
@@ -19,9 +19,9 @@
 #include "quantum.h"
-// Use 7 wide characters for keymaps
+enum userspace_custom_keycodes {
-#define _______ KC_TRNS
+  VRSN = SAFE_RANGE               // Prints QMK Firmware and board info
-#define XXXXXXX KC_NO
+};
 // Layers
 #define _QW 0
@@ -72,7 +72,7 @@
 #define NUMPAD_L1  RGB_TOG, RGB_MOD, _______, _______, RGB_HUD, RGB_HUI
 #define NUMPAD_L2  BL_TOGG, BL_STEP, BL_BRTG, _______, RGB_SAD, RGB_SAI
 #define NUMPAD_L3  _______, _______, _______, _______, RGB_VAD, RGB_VAI
-#define NUMPAD_L4    RESET, _______, _______, _______, RGB_SPD, RGB_SPI
+#define NUMPAD_L4    RESET,    VRSN, _______, _______, RGB_SPD, RGB_SPI
 #define NUMPAD_R1                                                        _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______
 #define NUMPAD_R2                                                        _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______
diff --git a/users/jarred/rules.mk b/users/jarred/rules.mk
index 3c15cd0f9..9a00cbf72 100644
--- a/users/jarred/rules.mk
+++ b/users/jarred/rules.mk
@@ -1 +1,16 @@
 SRC += jarred.c
+ifneq (,$(findstring planck,$(KEYBOARD)))
+  # Enable backlight for rev4 planck only
+  ifneq (,$(findstring rev4,$(KEYBOARD)))
+    BACKLIGHT_ENABLE = yes
+    BACKLIGHT_BREATHING = yes
+  else
+    BACKLIGHT_ENABLE = no
+    BACKLIGHT_BREATHING = no
+  endif
+  
+  AUDIO_ENABLE = yes
+endif
+MOUSEKEY_ENABLE = no
author	Jarred Steenvoorden <jazzjarred@gmail.com>	2018-10-03 01:14:37 +1000
committer	Drashna Jaelre <drashna@live.com>	2018-10-02 08:14:37 -0700
commit	5c2ac733afe9f6d68d2ad42c9d58fbff466a7874 (patch)
tree	e6ad426fc9ded25e13e45b77e3699a3c9483a3d7
parent	1a33054a3586fa69812a249762e24ecc08a40423 (diff)
download	qmk_firmware-5c2ac733afe9f6d68d2ad42c9d58fbff466a7874.tar.gz qmk_firmware-5c2ac733afe9f6d68d2ad42c9d58fbff466a7874.zip

diff --git a/keyboards/dz60/keymaps/jarred/keymap.c b/keyboards/dz60/keymaps/jarred/keymap.c new file mode 100644 index 000000000..9e6850683 --- /dev/null +++ b/keyboards/dz60/keymaps/jarred/keymap.c
@@ -0,0 +1,21 @@
		1	#include QMK_KEYBOARD_H
		2
		3	#define _QW 0
		4	#define _NV 1
		5
		6	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		7
		8	[_QW] = LAYOUT(
		9	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, XXXXXXX, KC_BSPC,
		10	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,
		11	MO(_NV), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT,
		12	KC_LSFT, XXXXXXX,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,XXXXXXX,
		13	KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT,KC_RGUI, XXXXXXX,KC_APP, KC_RCTL),
		14
		15	[_NV] = LAYOUT(
		16	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 ,_______,_______,
		17	_______,_______,_______,_______,KC_DEL ,KC_BSPC,_______,KC_HOME,KC_UP ,KC_END ,KC_INS ,_______,_______,_______,
		18	_______,_______,_______,KC_LSFT,KC_LCTL,KC_ENT ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,KC_DEL , _______,
		19	_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,_______,_______,
		20	_______,_______,_______, _______,_______,_______, _______,_______,_______, RESET, _______)
		21	};


diff --git a/keyboards/planck/keymaps/jarred/rules.mk b/keyboards/planck/keymaps/jarred/rules.mk deleted file mode 100644 index cd14c41e1..000000000 --- a/keyboards/planck/keymaps/jarred/rules.mk +++ /dev/null
@@ -1,4 +0,0 @@
1	# Build options
2
3	BACKLIGHT_ENABLE = no # Switch LEDs
4	MOUSEKEY_ENABLE = no # Emulates mouse key using keypresses


diff --git a/keyboards/satan/keymaps/jarred/keymap.c b/keyboards/satan/keymaps/jarred/keymap.c new file mode 100644 index 000000000..c6852e4eb --- /dev/null +++ b/keyboards/satan/keymaps/jarred/keymap.c
@@ -0,0 +1,22 @@
		1	#include QMK_KEYBOARD_H
		2
		3	#define _QW 0
		4	#define _NV 1
		5
		6	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		7
		8	[_QW] = LAYOUT_60_ansi(
		9	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, \
		10	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, \
		11	MO(_NV), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \
		12	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, \
		13	KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_APP, KC_RCTL),
		14
		15	[_NV] = LAYOUT_60_ansi(
		16	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 ,_______, \
		17	_______,_______,_______,_______,KC_DEL ,KC_BSPC,_______,KC_HOME,KC_UP ,KC_END ,KC_INS ,_______,_______,_______, \
		18	_______,_______,_______,KC_LSFT,KC_LCTL,KC_ENT ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,KC_DEL , _______, \
		19	_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,_______, \
		20	_______,_______,_______, _______, _______,_______, RESET, _______),
		21
		22	};


diff --git a/keyboards/satan/keymaps/jarred/readme.md b/keyboards/satan/keymaps/jarred/readme.md new file mode 100644 index 000000000..522cb19b6 --- /dev/null +++ b/keyboards/satan/keymaps/jarred/readme.md
@@ -0,0 +1 @@
			# Jarred's Satan GH60 layout


diff --git a/keyboards/xd75/keymaps/daniel/keymap.c b/keyboards/xd75/keymaps/daniel/keymap.c new file mode 100644 index 000000000..2804a6cd0 --- /dev/null +++ b/keyboards/xd75/keymaps/daniel/keymap.c
@@ -0,0 +1,29 @@
		1	#include QMK_KEYBOARD_H
		2
		3	#define _QW 0
		4	#define _NV 1
		5	#define _NM 2
		6
		7	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		8	[_QW] = {
		9	{ 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_GRV , KC_BSPC },
		10	{ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL },
		11	{ MO(_NV), KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , MO(_NM), KC_PGUP },
		12	{ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, _______, KC_RSFT, KC_UP , KC_PGDN },
		13	{ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT },
		14	},
		15	[_NV] = {
		16	{ KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______ },
		17	{ _______, _______, _______, _______, KC_DEL , KC_BSPC, _______, KC_HOME, KC_UP , KC_END , KC_INS , _______, _______, _______, _______ },
		18	{ _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______, _______, _______, _______ },
		19	{ _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______ },
		20	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		21	},
		22	[_NM] = {
		23	{ _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		24	{ _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		25	{ _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		26	{ _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		27	{ RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		28	}
		29	};


diff --git a/keyboards/xd75/keymaps/daniel/readme.md b/keyboards/xd75/keymaps/daniel/readme.md new file mode 100644 index 000000000..3305d0f30 --- /dev/null +++ b/keyboards/xd75/keymaps/daniel/readme.md
@@ -0,0 +1 @@
			# Daniels xd75 keymap


diff --git a/keyboards/xd75/keymaps/jarred/keymap.c b/keyboards/xd75/keymaps/jarred/keymap.c new file mode 100644 index 000000000..f85178711 --- /dev/null +++ b/keyboards/xd75/keymaps/jarred/keymap.c
@@ -0,0 +1,37 @@
		1	#include QMK_KEYBOARD_H
		2
		3	#define _QW 0
		4	#define _LW 1
		5	#define _NV 2
		6	#define _NM 3
		7
		8	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		9	[_QW] = {
		10	{ KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_MUTE, KC_VOLD, KC_VOLU, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC },
		11	{ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_INS , KC_HOME, KC_PGUP, KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSPC },
		12	{ MO(_NV), KC_A , KC_S , KC_D , KC_F , KC_G , KC_DEL , KC_END , KC_PGDN, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT },
		13	{ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , _______, KC_UP , _______, KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT },
		14	{ KC_LCTL, KC_LGUI, MO(_NM), KC_LALT, MO(_LW), KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , MO(_LW), KC_RALT, KC_RGUI, KC_APP , KC_RCTL },
		15	},
		16	[_LW] = {
		17	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		18	{ KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______ },
		19	{ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , _______, _______, _______, KC_F11 , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS },
		20	{ _______, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , _______, _______, _______, KC_F12 , KC_GRV , _______, _______, _______, _______ },
		21	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		22	},
		23	[_NV] = {
		24	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		25	{ _______, _______, _______, _______, KC_DEL , KC_BSPC, _______, _______, _______, _______, KC_HOME, KC_UP , KC_END , KC_INS , _______ },
		26	{ _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______ },
		27	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______ },
		28	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		29	},
		30	[_NM] = {
		31	{ _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______ },
		32	{ _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______ },
		33	{ _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______ },
		34	{ _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______ },
		35	{ RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
		36	}
		37	};


diff --git a/keyboards/xd75/keymaps/jarred/readme.md b/keyboards/xd75/keymaps/jarred/readme.md new file mode 100644 index 000000000..4070bb3ee --- /dev/null +++ b/keyboards/xd75/keymaps/jarred/readme.md
@@ -0,0 +1 @@
			# Jarreds xd75 keymap


diff --git a/keyboards/planck/keymaps/jarred/config.h b/users/jarred/config.h index 9e8f404c1..f28208814 100644 --- a/keyboards/planck/keymaps/jarred/config.h +++ b/users/jarred/config.h
@@ -14,24 +14,37 @@
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16		16
17	#ifndef CONFIG_USER_H	17	#pragma once
18	#define CONFIG_USER_H
19		18
20	#include "config_common.h"	19	// Sets good default for the speed of the mouse.
		20	#undef MOUSEKEY_INTERVAL
		21	#undef MOUSEKEY_DELAY
		22	#undef MOUSEKEY_TIME_TO_MAX
		23	#undef MOUSEKEY_MAX_SPEED
21		24
22	#ifdef AUDIO_ENABLE	25	#define MOUSEKEY_INTERVAL 16
23	#define STARTUP_SONG SONG(PLANCK_SOUND)	26	#define MOUSEKEY_DELAY 0
24	#endif	27	#define MOUSEKEY_TIME_TO_MAX 40
		28	#define MOUSEKEY_MAX_SPEED 5
25		29
26	#define TAPPING_TERM 200	30	#undef MOUSEKEY_WHEEL_MAX_SPEED
		31	#undef MOUSEKEY_WHEEL_TIME_TO_MAX
		32	#undef MOUSEKEY_WHEEL_DELAY
27		33
28	#define MOUSEKEY_DELAY 0	34	#define MOUSEKEY_WHEEL_MAX_SPEED 4
29	#define MOUSEKEY_INTERVAL 16	35	#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
30	#define MOUSEKEY_TIME_TO_MAX 40	36	#define MOUSEKEY_WHEEL_DELAY 0
31	#define MOUSEKEY_MAX_SPEED 5
32		37
33	#define MOUSEKEY_WHEEL_DELAY 0	38	#undef TAPPING_TOGGLE
34	#define MOUSEKEY_WHEEL_MAX_SPEED 4	39	#undef TAPPING_TERM
35	#define MOUSEKEY_WHEEL_TIME_TO_MAX 255	40	#undef IGNORE_MOD_TAP_INTERRUPT
36		41
		42	#define TAPPING_TOGGLE 1
		43	#define TAPPING_TERM 200
		44	#define IGNORE_MOD_TAP_INTERRUPT
		45
		46	#ifdef AUDIO_ENABLE
		47	#define STARTUP_SONG SONG(PLANCK_SOUND)
37	#endif	48	#endif
		49
		50	#define MACRO_TIMER 5


diff --git a/users/jarred/jarred.c b/users/jarred/jarred.c index f8413ca3b..33162b689 100644 --- a/users/jarred/jarred.c +++ b/users/jarred/jarred.c
@@ -15,3 +15,18 @@
15	*/	15	*/
16		16
17	#include "jarred.h"	17	#include "jarred.h"
		18	#include "version.h"
		19
		20	bool process_record_user(uint16_t keycode, keyrecord_t *record) {
		21
		22	switch (keycode) {
		23	case VRSN: // Prints firmware version
		24	if (record->event.pressed) {
		25	send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), MACRO_TIMER);
		26	}
		27	return false;
		28	break;
		29	}
		30
		31	return true;
		32	}


diff --git a/users/jarred/jarred.h b/users/jarred/jarred.h index b1253f76a..a6774ce26 100644 --- a/users/jarred/jarred.h +++ b/users/jarred/jarred.h
@@ -19,9 +19,9 @@
19		19
20	#include "quantum.h"	20	#include "quantum.h"
21		21
22	// Use 7 wide characters for keymaps	22	enum userspace_custom_keycodes {
23	#define _______ KC_TRNS	23	VRSN = SAFE_RANGE // Prints QMK Firmware and board info
24	#define XXXXXXX KC_NO	24	};
25		25
26	// Layers	26	// Layers
27	#define _QW 0	27	#define _QW 0
@@ -72,7 +72,7 @@
72	#define NUMPAD_L1 RGB_TOG, RGB_MOD, _______, _______, RGB_HUD, RGB_HUI	72	#define NUMPAD_L1 RGB_TOG, RGB_MOD, _______, _______, RGB_HUD, RGB_HUI
73	#define NUMPAD_L2 BL_TOGG, BL_STEP, BL_BRTG, _______, RGB_SAD, RGB_SAI	73	#define NUMPAD_L2 BL_TOGG, BL_STEP, BL_BRTG, _______, RGB_SAD, RGB_SAI
74	#define NUMPAD_L3 _______, _______, _______, _______, RGB_VAD, RGB_VAI	74	#define NUMPAD_L3 _______, _______, _______, _______, RGB_VAD, RGB_VAI
75	#define NUMPAD_L4 RESET, _______, _______, _______, RGB_SPD, RGB_SPI	75	#define NUMPAD_L4 RESET, VRSN, _______, _______, RGB_SPD, RGB_SPI
76		76
77	#define NUMPAD_R1 _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______	77	#define NUMPAD_R1 _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______
78	#define NUMPAD_R2 _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______	78	#define NUMPAD_R2 _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______


diff --git a/users/jarred/rules.mk b/users/jarred/rules.mk index 3c15cd0f9..9a00cbf72 100644 --- a/users/jarred/rules.mk +++ b/users/jarred/rules.mk
@@ -1 +1,16 @@
1	SRC += jarred.c	1	SRC += jarred.c
		2
		3	ifneq (,$(findstring planck,$(KEYBOARD)))
		4	# Enable backlight for rev4 planck only
		5	ifneq (,$(findstring rev4,$(KEYBOARD)))
		6	BACKLIGHT_ENABLE = yes
		7	BACKLIGHT_BREATHING = yes
		8	else
		9	BACKLIGHT_ENABLE = no
		10	BACKLIGHT_BREATHING = no
		11	endif
		12
		13	AUDIO_ENABLE = yes
		14	endif
		15
		16	MOUSEKEY_ENABLE = no