aboutsummaryrefslogtreecommitdiff
path: root/users/jarred
diff options
context:
space:
mode:
authorJarred Steenvoorden <jazzjarred@gmail.com>2018-10-03 01:14:37 +1000
committerDrashna Jaelre <drashna@live.com>2018-10-02 08:14:37 -0700
commit5c2ac733afe9f6d68d2ad42c9d58fbff466a7874 (patch)
treee6ad426fc9ded25e13e45b77e3699a3c9483a3d7 /users/jarred
parent1a33054a3586fa69812a249762e24ecc08a40423 (diff)
downloadqmk_firmware-5c2ac733afe9f6d68d2ad42c9d58fbff466a7874.tar.gz
qmk_firmware-5c2ac733afe9f6d68d2ad42c9d58fbff466a7874.zip
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
Diffstat (limited to 'users/jarred')
-rw-r--r--users/jarred/config.h50
-rw-r--r--users/jarred/jarred.c15
-rw-r--r--users/jarred/jarred.h8
-rw-r--r--users/jarred/rules.mk15
4 files changed, 84 insertions, 4 deletions
diff --git a/users/jarred/config.h b/users/jarred/config.h
new file mode 100644
index 000000000..f28208814
--- /dev/null
+++ b/users/jarred/config.h
@@ -0,0 +1,50 @@
1/* Copyright 2018 Jarred Steenvoorden
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
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
24
25#define MOUSEKEY_INTERVAL 16
26#define MOUSEKEY_DELAY 0
27#define MOUSEKEY_TIME_TO_MAX 40
28#define MOUSEKEY_MAX_SPEED 5
29
30#undef MOUSEKEY_WHEEL_MAX_SPEED
31#undef MOUSEKEY_WHEEL_TIME_TO_MAX
32#undef MOUSEKEY_WHEEL_DELAY
33
34#define MOUSEKEY_WHEEL_MAX_SPEED 4
35#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
36#define MOUSEKEY_WHEEL_DELAY 0
37
38#undef TAPPING_TOGGLE
39#undef TAPPING_TERM
40#undef IGNORE_MOD_TAP_INTERRUPT
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)
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
20bool 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 22enum 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 @@
1SRC += jarred.c 1SRC += jarred.c
2
3ifneq (,$(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
14endif
15
16MOUSEKEY_ENABLE = no