keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dynamic_keymap: support vial 2-byte macros

Browse Source
This commit is contained in:
Ilya Zhuravlev 2022-01-03 08:51:14 -05:00
parent 53a41dcfab
commit 54b14e8a7f
3 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
quantum/dynamic_keymap.c
View File

@ -480,6 +480,13 @@ void dynamic_keymap_macro_reset(void) {
} }
} }
static uint16_t decode_keycode(uint16_t kc) {
/* map 0xFF01 => 0x0100; 0xFF02 => 0x0200, etc */
if (kc > 0xFF00)
return (kc & 0xFF) << 8;
return kc;
}
void dynamic_keymap_macro_send(uint8_t id) { void dynamic_keymap_macro_send(uint8_t id) {
if (id >= DYNAMIC_KEYMAP_MACRO_COUNT) { if (id >= DYNAMIC_KEYMAP_MACRO_COUNT) {
return; return;
@ -534,6 +541,27 @@ void dynamic_keymap_macro_send(uint8_t id) {
data[2] = eeprom_read_byte(p++); data[2] = eeprom_read_byte(p++);
if (data[2] != 0) if (data[2] != 0)
send_string(data); send_string(data);
} else if (data[1] == VIAL_MACRO_EXT_TAP || data[1] == VIAL_MACRO_EXT_DOWN || data[1] == VIAL_MACRO_EXT_UP) {
data[2] = eeprom_read_byte(p++);
if (data[2] != 0) {
data[3] = eeprom_read_byte(p++);
if (data[3] != 0) {
uint16_t kc;
memcpy(&kc, &data[2], sizeof(kc));
kc = decode_keycode(kc);
switch (data[1]) {
case VIAL_MACRO_EXT_TAP:
vial_keycode_tap(kc);
break;
case VIAL_MACRO_EXT_DOWN:
vial_keycode_down(kc);
break;
case VIAL_MACRO_EXT_UP:
vial_keycode_up(kc);
break;
}
}
}
} else if (data[1] == SS_DELAY_CODE) { } else if (data[1] == SS_DELAY_CODE) {
// For delay, decode the delay and wait_ms for that amount // For delay, decode the delay and wait_ms for that amount
uint8_t d0 = eeprom_read_byte(p++); uint8_t d0 = eeprom_read_byte(p++);

8
quantum/vial.c
View File

@ -284,7 +284,7 @@ void vial_handle_cmd(uint8_t *msg, uint8_t length) {
uint16_t g_vial_magic_keycode_override; uint16_t g_vial_magic_keycode_override;
static void vial_keycode_down(uint16_t keycode) { void vial_keycode_down(uint16_t keycode) {
g_vial_magic_keycode_override = keycode; g_vial_magic_keycode_override = keycode;
if (keycode <= QK_MODS_MAX) { if (keycode <= QK_MODS_MAX) {
@ -296,7 +296,7 @@ static void vial_keycode_down(uint16_t keycode) {
} }
} }
static void vial_keycode_up(uint16_t keycode) { void vial_keycode_up(uint16_t keycode) {
g_vial_magic_keycode_override = keycode; g_vial_magic_keycode_override = keycode;
if (keycode <= QK_MODS_MAX) { if (keycode <= QK_MODS_MAX) {
@ -308,9 +308,7 @@ static void vial_keycode_up(uint16_t keycode) {
} }
} }
static void vial_keycode_tap(uint16_t keycode) __attribute__((unused)); void vial_keycode_tap(uint16_t keycode) {
static void vial_keycode_tap(uint16_t keycode) {
vial_keycode_down(keycode); vial_keycode_down(keycode);
qs_wait_ms(QS_tap_code_delay); qs_wait_ms(QS_tap_code_delay);
vial_keycode_up(keycode); vial_keycode_up(keycode);

8
quantum/vial.h
View File

@ -63,6 +63,14 @@ enum {
dynamic_vial_key_override_set = 0x06, dynamic_vial_key_override_set = 0x06,
}; };
#define VIAL_MACRO_EXT_TAP 5
#define VIAL_MACRO_EXT_DOWN 6
#define VIAL_MACRO_EXT_UP 7
void vial_keycode_down(uint16_t keycode);
void vial_keycode_up(uint16_t keycode);
void vial_keycode_tap(uint16_t keycode);
/* Fake position in keyboard matrix, can't use 255 as that is immediately rejected by IS_NOEVENT /* Fake position in keyboard matrix, can't use 255 as that is immediately rejected by IS_NOEVENT
used to send arbitrary keycodes thru process_record_quantum_helper */ used to send arbitrary keycodes thru process_record_quantum_helper */
#define VIAL_MATRIX_MAGIC 254 #define VIAL_MATRIX_MAGIC 254