Skip to content

Commit 5c2ac73

Browse files
JarredSteenvoordendrashna
JarredSteenvoorden
authored and
drashna
committed
Keymap: Adding my DZ60, Satan, XD75 kemaps and updates to userspace (qmk#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
1 parent 1a33054 commit 5c2ac73

File tree

12 files changed

+173
-22
lines changed

12 files changed

+173
-22
lines changed

‎keyboards/dz60/keymaps/jarred/keymap.c‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
};

‎keyboards/planck/keymaps/jarred/rules.mk‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎keyboards/satan/keymaps/jarred/keymap.c‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
};

‎keyboards/satan/keymaps/jarred/readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Jarred's Satan GH60 layout

‎keyboards/xd75/keymaps/daniel/keymap.c‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
};

‎keyboards/xd75/keymaps/daniel/readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Daniels xd75 keymap

‎keyboards/xd75/keymaps/jarred/keymap.c‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
};

‎keyboards/xd75/keymaps/jarred/readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Jarreds xd75 keymap

keyboards/planck/keymaps/jarred/config.h renamed to users/jarred/config.h

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,37 @@
1414
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616

17-
#ifndef CONFIG_USER_H
18-
#define CONFIG_USER_H
17+
#pragma once
1918

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
2124

22-
#ifdef AUDIO_ENABLE
23-
#define STARTUP_SONG SONG(PLANCK_SOUND)
24-
#endif
25+
#define MOUSEKEY_INTERVAL 16
26+
#define MOUSEKEY_DELAY 0
27+
#define MOUSEKEY_TIME_TO_MAX 40
28+
#define MOUSEKEY_MAX_SPEED 5
2529

26-
#define TAPPING_TERM 200
30+
#undef MOUSEKEY_WHEEL_MAX_SPEED
31+
#undef MOUSEKEY_WHEEL_TIME_TO_MAX
32+
#undef MOUSEKEY_WHEEL_DELAY
2733

28-
#define MOUSEKEY_DELAY 0
29-
#define MOUSEKEY_INTERVAL 16
30-
#define MOUSEKEY_TIME_TO_MAX 40
31-
#define MOUSEKEY_MAX_SPEED 5
34+
#define MOUSEKEY_WHEEL_MAX_SPEED 4
35+
#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
36+
#define MOUSEKEY_WHEEL_DELAY 0
3237

33-
#define MOUSEKEY_WHEEL_DELAY 0
34-
#define MOUSEKEY_WHEEL_MAX_SPEED 4
35-
#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
38+
#undef TAPPING_TOGGLE
39+
#undef TAPPING_TERM
40+
#undef IGNORE_MOD_TAP_INTERRUPT
3641

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)
3748
#endif
49+
50+
#define MACRO_TIMER 5

‎users/jarred/jarred.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,18 @@
1515
*/
1616

1717
#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+
}

0 commit comments

Comments
 (0)