aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Choi <iinikchi@gmail.com>2017-05-29 21:25:50 -0400
committerNick Choi <iinikchi@gmail.com>2017-05-29 21:25:50 -0400
commit5393bc6f4eee3d3cb83997e5b03d8e5a5cea85d8 (patch)
tree69a5998ea026f250d394e8c2e90eb856b9600f69
parent66e9cf9718770206f68e33a7f88b46ed372ff2a4 (diff)
downloadqmk_firmware-5393bc6f4eee3d3cb83997e5b03d8e5a5cea85d8.tar.gz
qmk_firmware-5393bc6f4eee3d3cb83997e5b03d8e5a5cea85d8.zip
switched to uint8 and 16
-rw-r--r--keyboards/frosty_flake/keymaps/nikchi/config.h2
-rw-r--r--keyboards/frosty_flake/keymaps/nikchi/keymap.c15
-rw-r--r--quantum/process_keycode/process_tap_dance.c4
3 files changed, 10 insertions, 11 deletions
diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/frosty_flake/keymaps/nikchi/config.h
index 45825781d..3f7852643 100644
--- a/keyboards/frosty_flake/keymaps/nikchi/config.h
+++ b/keyboards/frosty_flake/keymaps/nikchi/config.h
@@ -4,7 +4,7 @@
4#include "../../config.h" 4#include "../../config.h"
5 5
6#define TAPPING_TERM 200 6#define TAPPING_TERM 200
7#define LEADER_TIMEOUT 400 7#define LEADER_TIMEOUT 800
8 8
9#define DISABLE_SPACE_CADET_ROLLOVER 9#define DISABLE_SPACE_CADET_ROLLOVER
10 10
diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c
index f9dcf4556..021ffac80 100644
--- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c
+++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c
@@ -65,14 +65,7 @@ enum my_macros {
65 RIGHTDESK, 65 RIGHTDESK,
66 CLOSEDESK 66 CLOSEDESK
67}; 67};
68enum quick { 68
69 DISFACE = 0,
70 TFLIP,
71 TPUT,
72 SHRUG,
73 FACE,
74 RANDIG
75};
76 69
77// Tap Dance Definitions 70// Tap Dance Definitions
78qk_tap_dance_action_t tap_dance_actions[] = { 71qk_tap_dance_action_t tap_dance_actions[] = {
@@ -174,6 +167,11 @@ void matrix_scan_user(void) {
174 tap(KC_C); 167 tap(KC_C);
175 unregister_code(KC_LCTL); 168 unregister_code(KC_LCTL);
176 } 169 }
170 SEQ_THREE_KEYS(KC_L,KC_I,KC_T) { // 🔥
171 unicode_input_start();
172 register_hex32(pgm_read_dword(&unicode_map[LIT]));
173 unicode_input_finish();
174 }
177 175
178 } 176 }
179} 177}
@@ -240,3 +238,4 @@ void cycleMemes(qk_tap_dance_state_t *state, void *user_data) {
240 } 238 }
241}; 239};
242 240
241
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 2c7f6e937..4fd45810b 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -132,9 +132,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
132void matrix_scan_tap_dance () { 132void matrix_scan_tap_dance () {
133 if (highest_td == -1) 133 if (highest_td == -1)
134 return; 134 return;
135 int tap_user_defined; 135 uint16_t tap_user_defined;
136 136
137for (int i = 0; i <= highest_td; i++) { 137for (uint8_t i = 0; i <= highest_td; i++) {
138 qk_tap_dance_action_t *action = &tap_dance_actions[i]; 138 qk_tap_dance_action_t *action = &tap_dance_actions[i];
139 if(action->custom_tapping_term > 0 ) { 139 if(action->custom_tapping_term > 0 ) {
140 tap_user_defined = action->custom_tapping_term; 140 tap_user_defined = action->custom_tapping_term;