~ruther/qmk_firmware

942b3cf16cceec2afa72bea2f12ef543f395a5db — Drashna Jaelre 3 years ago e8747e1
Generalize Unicode defines (#15409)

2 files changed, 3 insertions(+), 2 deletions(-)

M common_features.mk
M quantum/quantum.c
M common_features.mk => common_features.mk +1 -0
@@ 604,6 604,7 @@ ifeq ($(strip $(UNICODE_ENABLE)), yes)
endif

ifeq ($(strip $(UNICODE_COMMON)), yes)
    OPT_DEFS += -DUNICODE_COMMON_ENABLE
    SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
endif


M quantum/quantum.c => quantum/quantum.c +2 -2
@@ 263,7 263,7 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef TAP_DANCE_ENABLE
            process_tap_dance(keycode, record) &&
#endif
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
#if defined(UNICODE_COMMON_ENABLE)
            process_unicode_common(keycode, record) &&
#endif
#ifdef LEADER_ENABLE


@@ 387,7 387,7 @@ void matrix_init_quantum() {
#ifdef RGB_MATRIX_ENABLE
    rgb_matrix_init();
#endif
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
#if defined(UNICODE_COMMON_ENABLE)
    unicode_input_mode_init();
#endif
#ifdef HAPTIC_ENABLE