aboutsummaryrefslogtreecommitdiff
path: root/users/zer09
diff options
context:
space:
mode:
authorzer09 <zer09@users.noreply.github.com>2018-12-10 00:28:46 +0800
committerDrashna Jaelre <drashna@live.com>2018-12-09 08:28:46 -0800
commit614b3a0f7ca266f9d625814a3bbd1c2de34f2f0f (patch)
tree75b135fb2fd6dd896caadc190090bd2e5e900f33 /users/zer09
parent11eaccdbce5246e7235ff91d0d04de83f7685919 (diff)
downloadqmk_firmware-614b3a0f7ca266f9d625814a3bbd1c2de34f2f0f.tar.gz
qmk_firmware-614b3a0f7ca266f9d625814a3bbd1c2de34f2f0f.zip
Keymap: Keymap update (#4579)
* Add YREG keycode * Add GM layer * Set tapping term to 105 * update tapping term
Diffstat (limited to 'users/zer09')
-rw-r--r--users/zer09/config.h4
-rw-r--r--users/zer09/tap_dance.c27
-rw-r--r--users/zer09/zer09.h10
3 files changed, 35 insertions, 6 deletions
diff --git a/users/zer09/config.h b/users/zer09/config.h
index 4cb65c258..c5ab32f8d 100644
--- a/users/zer09/config.h
+++ b/users/zer09/config.h
@@ -16,13 +16,13 @@
16#define FORCE_NKRO 16#define FORCE_NKRO
17 17
18#ifndef TAPPING_TOGGLE 18#ifndef TAPPING_TOGGLE
19#define TAPPING_TOGGLE 1 19#define TAPPING_TOGGLE 1
20#endif 20#endif
21 21
22#ifdef TAPPING_TERM 22#ifdef TAPPING_TERM
23#undef TAPPING_TERM 23#undef TAPPING_TERM
24#endif 24#endif
25#define TAPPING_TERM 120 25#define TAPPING_TERM 95
26 26
27// Disable action_get_macro and fn_actions, since we don't use these 27// Disable action_get_macro and fn_actions, since we don't use these
28// and it saves on space in the firmware. 28// and it saves on space in the firmware.
diff --git a/users/zer09/tap_dance.c b/users/zer09/tap_dance.c
index a23705ad8..e99b26cca 100644
--- a/users/zer09/tap_dance.c
+++ b/users/zer09/tap_dance.c
@@ -17,15 +17,27 @@ qk_tap_dance_action_t tap_dance_actions[] = {
17}; 17};
18 18
19volatile uint8_t active_layer = _BL; 19volatile uint8_t active_layer = _BL;
20volatile uint8_t gm_layer_act = false;
20static tap upltap_state = {.state = 0}; 21static tap upltap_state = {.state = 0};
21static tap dwltap_state = {.state = 0}; 22static tap dwltap_state = {.state = 0};
22static tap lsprtap_state = {.state = 0}; 23static tap lsprtap_state = {.state = 0};
23static tap ralttap_state = {.state = 0}; 24static tap ralttap_state = {.state = 0};
24 25
25void layer_switcher_tap(uint8_t new_layer) { 26void layer_switcher_tap(uint8_t new_layer) {
26 layer_off(active_layer); 27 if (gm_layer_act == true) {
27 layer_on(new_layer); 28 layer_off(active_layer);
28 active_layer = new_layer; 29 if (new_layer == _BL) {
30 layer_on(_GM);
31 active_layer = _GM;
32 } else {
33 layer_on(new_layer);
34 active_layer = new_layer;
35 }
36 } else {
37 layer_off(active_layer);
38 layer_on(new_layer);
39 active_layer = new_layer;
40 }
29} 41}
30 42
31int cur_dance(qk_tap_dance_state_t *state) { 43int cur_dance(qk_tap_dance_state_t *state) {
@@ -162,6 +174,14 @@ void dance_dwly_finished(qk_tap_dance_state_t *state, void *user_data) {
162 case DOUBLE_HOLD: 174 case DOUBLE_HOLD:
163 layer_switcher_tap(_AL); 175 layer_switcher_tap(_AL);
164 break; 176 break;
177 case TRIPLE_TAP:
178 if (gm_layer_act == true) {
179 gm_layer_act = false;
180 layer_switcher_tap(_BL);
181 } else {
182 gm_layer_act = true;
183 layer_switcher_tap(_GM);
184 }
165 default: 185 default:
166 layer_switcher_tap(_BL); 186 layer_switcher_tap(_BL);
167 break; 187 break;
@@ -174,6 +194,7 @@ void dance_dwly_reset(qk_tap_dance_state_t *state, void *user_data) {
174 break; 194 break;
175 case SINGLE_HOLD: 195 case SINGLE_HOLD:
176 case DOUBLE_HOLD: 196 case DOUBLE_HOLD:
197 case TRIPLE_TAP:
177 default: 198 default:
178 layer_switcher_tap(_BL); 199 layer_switcher_tap(_BL);
179 break; 200 break;
diff --git a/users/zer09/zer09.h b/users/zer09/zer09.h
index 75c1d3cad..acac8ab09 100644
--- a/users/zer09/zer09.h
+++ b/users/zer09/zer09.h
@@ -3,16 +3,24 @@
3 3
4#include "quantum.h" 4#include "quantum.h"
5 5
6enum custom_keycodes { CK_SAFE = SAFE_RANGE, RGUP, RGDWN, NEWPLACEHOLDER }; 6enum custom_keycodes {
7 CK_SAFE = SAFE_RANGE,
8 RGUP,
9 RGDWN,
10 YREG,
11 NEW_SAFE_RANGE
12};
7 13
8#define _______ KC_TRNS 14#define _______ KC_TRNS
9#define KC_RGUP RGUP 15#define KC_RGUP RGUP
10#define KC_RGDWN RGDWN 16#define KC_RGDWN RGDWN
17#define KC_YREG YREG
11 18
12#define _BL 0 // The base layer 19#define _BL 0 // The base layer
13#define _UL 1 // The up layer 20#define _UL 1 // The up layer
14#define _DL 2 // The down layer 21#define _DL 2 // The down layer
15#define _VL 3 // The shifted up layer 22#define _VL 3 // The shifted up layer
16#define _AL 4 // The assorted layer 23#define _AL 4 // The assorted layer
24#define _GM 5
17 25
18#endif 26#endif