Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Add a register/unregister_code16 pair of functions

Browse source 
These functions register not only the 8bit keycode, but the modifiers
too. It doesn't handle the full range of the upper 8bits, just the mods,
but that's a good start.

Changed the tap-dance pair functions to use these, so one can do:

  `ACTION_TAP_DANCE_DOUBLE (KC_COLN, KC_SCLN)`

...and that will do the right thing.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
This commit is contained in:
Gergely Nagy 2016-08-18 11:29:53 +02:00
parent 8144ce8852
commit 0d28787c5c
3 changed files with 44 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
quantum/process_keycode/process_tap_dance.c
View file

@ -8,9 +8,9 @@ void qk_tap_dance_pair_finished (qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
if (state->count == 1) { if (state->count == 1) {
register_code (pair->kc1); register_code16 (pair->kc1);
} else if (state->count == 2) { } else if (state->count == 2) {
register_code (pair->kc2); register_code16 (pair->kc2);
} }
} }
@ -18,9 +18,9 @@ void qk_tap_dance_pair_reset (qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
if (state->count == 1) { if (state->count == 1) {
unregister_code (pair->kc1); unregister_code16 (pair->kc1);
} else if (state->count == 2) { } else if (state->count == 2) {
unregister_code (pair->kc2); unregister_code16 (pair->kc2);
} }
} }

37
quantum/quantum.c
View file

@ -1,5 +1,42 @@
#include "quantum.h" #include "quantum.h"
static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
switch (code) {
case QK_MODS ... QK_MODS_MAX:
break;
default:
return;
}
if (code & QK_LCTL)
f(KC_LCTL);
if (code & QK_LSFT)
f(KC_LSFT);
if (code & QK_LALT)
f(KC_LALT);
if (code & QK_LGUI)
f(KC_LGUI);
if (code & QK_RCTL)
f(KC_RCTL);
if (code & QK_RSFT)
f(KC_RSFT);
if (code & QK_RALT)
f(KC_RALT);
if (code & QK_RGUI)
f(KC_RGUI);
}
void register_code16 (uint16_t code) {
do_code16 (code, register_code);
register_code (code);
}
void unregister_code16 (uint16_t code) {
unregister_code (code);
do_code16 (code, unregister_code);
}
__attribute__ ((weak)) __attribute__ ((weak))
bool process_action_kb(keyrecord_t *record) { bool process_action_kb(keyrecord_t *record) {
return true; return true;

3
quantum/quantum.h
View file

@ -83,6 +83,9 @@ void reset_keyboard(void);
void startup_user(void); void startup_user(void);
void shutdown_user(void); void shutdown_user(void);
void register_code16 (uint16_t code);
void unregister_code16 (uint16_t code);
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
void backlight_init_ports(void); void backlight_init_ports(void);