poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow QK_MAKE to work with converters (#18637)

Browse source
This commit is contained in:
jpe230 2022-10-08 11:13:58 -05:00 committed by GitHub
parent 7a1517b6d4
commit 86938fd958
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
builddefs/converters.mk
View file

@ -29,6 +29,7 @@ ifneq ($(CONVERT_TO),)
# Configure any defaults # Configure any defaults
OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')) OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\"
OPT_DEFS += -DCONVERTER_ENABLED OPT_DEFS += -DCONVERTER_ENABLED
VPATH += $(CONVERTER) VPATH += $(CONVERTER)

4
quantum/quantum.c
View file

@ -422,7 +422,11 @@ bool process_record_quantum(keyrecord_t *record) {
} else { } else {
SEND_STRING_DELAY(" compile ", TAP_CODE_DELAY); SEND_STRING_DELAY(" compile ", TAP_CODE_DELAY);
} }
# if defined(CONVERTER_ENABLED)
SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP " -e CONVERT_TO=" CONVERTER_TARGET SS_TAP(X_ENTER), TAP_CODE_DELAY);
# else
SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP SS_TAP(X_ENTER), TAP_CODE_DELAY); SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP SS_TAP(X_ENTER), TAP_CODE_DELAY);
# endif
if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) { if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) {
reset_keyboard(); reset_keyboard();
} }